ACPI: sysfs: Make sparse happy about address space in use
Subsystems (2)
PATCH 1/7 ACPI: sysfs: Make sparse happy about address space in use
Sparse is not happy about address space in use in acpi_data_show():
drivers/acpi/sysfs.c:428:14: warning: incorrect type in assignment (different address spaces)drivers/acpi/sysfs.c:428:14: expected void [noderef] __iomem *basedrivers/acpi/sysfs.c:428:14: got void *drivers/acpi/sysfs.c:431:59: warning: incorrect type in argument 4 (different address spaces)drivers/acpi/sysfs.c:431:59: expected void const *fromdrivers/acpi/sysfs.c:431:59: got void [noderef] __iomem *basedrivers/acpi/sysfs.c:433:30: warning: incorrect type in argument 1 (different address spaces)drivers/acpi/sysfs.c:433:30: expected void *logical_addressdrivers/acpi/sysfs.c:433:30: got void [noderef] __iomem *base
Indeed, acpi_os_map_memory() returns a void pointer with dropped specific address space. Hence, we don't need to carry out __iomem in acpi_data_show().
--- drivers/acpi/sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/sysfs.c +1 -1
@@ -419,7 +419,7 @@ static ssize_t acpi_data_show(struct file *filp, struct kobject *kobj, loff_t offset, size_t count) {struct acpi_data_attr *data_attr; -void __iomem *base; +void *base;ssize_t rc; data_attr = container_of(bin_attr, struct acpi_data_attr, attr);
Signature · 1 line
2.30.2
PATCH 6/7 ACPI: sysfs: Remove tailing return statement in void functions
The tail return statement is redundant in void functions. Remove it.
--- drivers/acpi/sysfs.c | 9 --------- 1 file changed, 9 deletions(-)
drivers/acpi/sysfs.c +0 -9
@@ -577,8 +577,6 @@ static void delete_gpe_attr_array(void)kfree (counter_attrs); }kfree (all_attrs); - -return ; }static void gpe_count (u32 gpe_number)
@@ -593,8 +591,6 @@ static void gpe_count(u32 gpe_number)else all_counters[num_gpes +ACPI_NUM_FIXED_EVENTS +COUNT_ERROR ].count++; - -return ; }static void fixed_event_count (u32 event_number)
@@ -607,8 +603,6 @@ static void fixed_event_count(u32 event_number)else all_counters[num_gpes +ACPI_NUM_FIXED_EVENTS +COUNT_ERROR ].count++; - -return ; } static void acpi_global_event_handler(u32 event_type, acpi_handle device,
@@ -903,7 +897,6 @@ void acpi_irq_stats_init(void) fail:delete_gpe_attr_array (); -return ; } static void __exit interrupt_stats_exit(void)
@@ -911,8 +904,6 @@ static void __exit interrupt_stats_exit(void)sysfs_remove_group (acpi_kobj, &interrupt_stats_attr_group);delete_gpe_attr_array (); - -return ; }static ssize_t pm_profile_show (struct kobject *kobj,struct kobj_attribute *attr,char *buf)
Signature · 1 line
2.30.2
PATCH 5/7 ACPI: sysfs: Use __ATTR_RO() and __ATTR_RW() macros
In reply to Andy ShevchenkoWe have a few open-coded __ATTR_RO() and __ATTR_RW() macros. Replace the custom code with generic macros.
--- drivers/acpi/sysfs.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-)
drivers/acpi/sysfs.c +7 -16
@@ -915,27 +915,22 @@ static void __exit interrupt_stats_exit(void)return ; } -static ssize_t -acpi_show_profile (struct kobject *kobj,struct kobj_attribute *attr, -char *buf) +static ssize_t pm_profile_show (struct kobject *kobj,struct kobj_attribute *attr,char *buf) {return sprintf (buf,"%d\n" , acpi_gbl_FADT.preferred_profile); } -static const struct kobj_attribute pm_profile_attr = -__ATTR (pm_profile,S_IRUGO , acpi_show_profile,NULL ); +static const struct kobj_attribute pm_profile_attr =__ATTR_RO (pm_profile); -static ssize_t hotplug_enabled_show (struct kobject *kobj, -struct kobj_attribute *attr,char *buf) +static ssize_t enabled_show (struct kobject *kobj,struct kobj_attribute *attr,char *buf) {struct acpi_hotplug_profile *hotplug =to_acpi_hotplug_profile (kobj);return sprintf (buf,"%d\n" , hotplug->enabled); } -static ssize_t hotplug_enabled_store (struct kobject *kobj, -struct kobj_attribute *attr, -const char *buf,size_t size) +static ssize_t enabled_store (struct kobject *kobj,struct kobj_attribute *attr, +const char *buf,size_t size) {struct acpi_hotplug_profile *hotplug =to_acpi_hotplug_profile (kobj);unsigned int val;
@@ -947,9 +942,7 @@ static ssize_t hotplug_enabled_store(struct kobject *kobj,return size; } -static struct kobj_attribute hotplug_enabled_attr = -__ATTR (enabled,S_IRUGO |S_IWUSR , hotplug_enabled_show, - hotplug_enabled_store); +static struct kobj_attribute hotplug_enabled_attr =__ATTR_RW (enabled);static struct attribute *hotplug_profile_attrs[] = { &hotplug_enabled_attr.attr,
@@ -1007,9 +1000,7 @@ static ssize_t force_remove_store(struct kobject *kobj,return size; } -static const struct kobj_attribute force_remove_attr = -__ATTR (force_remove,S_IRUGO |S_IWUSR , force_remove_show, - force_remove_store); +static const struct kobj_attribute force_remove_attr =__ATTR_RW (force_remove);int __init acpi_sysfs_init (void ) {
Signature · 1 line
2.30.2
PATCH 7/7 ACPI: sysfs: Sort headers alphabetically
In reply to Andy ShevchenkoFor the sake of better maintenance, sort included headers alphabetically.
--- drivers/acpi/sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/sysfs.c +1 -1
@@ -5,11 +5,11 @@#define pr_fmt (fmt) "ACPI: " fmt +#include <linux/acpi.h> #include <linux/bitmap.h> #include <linux/init.h> #include <linux/kernel.h> #include <linux/moduleparam.h> -#include <linux/acpi.h> #include "internal.h"
Signature · 1 line
2.30.2
PATCH 3/7 ACPI: sysfs: Unify pattern of memory allocations
In reply to Andy ShevchenkoUse the form of foo = kmalloc(sizeof(*foo)) everywhere in order to unify pattern of memory allocations.
--- drivers/acpi/sysfs.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/acpi/sysfs.c +4 -8
@@ -388,8 +388,7 @@ acpi_status acpi_sysfs_table_handler(u32 event, void *table, void *context)switch (event) {case ACPI_TABLE_EVENT_INSTALL : - table_attr = -kzalloc (sizeof (struct acpi_table_attr ),GFP_KERNEL ); + table_attr =kzalloc (sizeof (*table_attr),GFP_KERNEL );if (!table_attr)return AE_NO_MEMORY ;
@@ -846,13 +845,11 @@ void acpi_irq_stats_init(void) num_gpes = acpi_current_gpe_count; num_counters = num_gpes +ACPI_NUM_FIXED_EVENTS +NUM_COUNTERS_EXTRA ; - all_attrs =kcalloc (num_counters +1 ,sizeof (struct attribute *), -GFP_KERNEL ); + all_attrs =kcalloc (num_counters +1 ,sizeof (*all_attrs),GFP_KERNEL );if (all_attrs ==NULL )return ; - all_counters =kcalloc (num_counters,sizeof (struct event_counter ), -GFP_KERNEL ); + all_counters =kcalloc (num_counters,sizeof (*all_counters),GFP_KERNEL );if (all_counters ==NULL ) goto fail;
@@ -860,8 +857,7 @@ void acpi_irq_stats_init(void)if (ACPI_FAILURE (status)) goto fail; - counter_attrs =kcalloc (num_counters,sizeof (struct kobj_attribute ), -GFP_KERNEL ); + counter_attrs =kcalloc (num_counters,sizeof (*counter_attrs),GFP_KERNEL );if (counter_attrs ==NULL ) goto fail;
Signature · 1 line
2.30.2
PATCH 4/7 ACPI: sysfs: Refactor param_get_trace_state() to drop dead code
In reply to Andy ShevchenkoThe param_get_trace_state() has a few dead code issues:
- 'return 0;' is never reachable
- a few 'else' keywords are redundant
Refactor param_get_trace_state() to drop dead code.
Note, leave one 'else' in order to have the best readability.
--- drivers/acpi/sysfs.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
drivers/acpi/sysfs.c +6 -10
@@ -255,16 +255,12 @@ static int param_get_trace_state(char *buffer, const struct kernel_param *kp) {if (!(acpi_gbl_trace_flags &ACPI_TRACE_ENABLED ))return sprintf (buffer,"disable\n" ); -else { -if (acpi_gbl_trace_method_name) { -if (acpi_gbl_trace_flags &ACPI_TRACE_ONESHOT ) -return sprintf (buffer,"method-once\n" ); -else -return sprintf (buffer,"method\n" ); - }else -return sprintf (buffer,"enable\n" ); - } -return 0 ; +if (!acpi_gbl_trace_method_name) +return sprintf (buffer,"enable\n" ); +if (acpi_gbl_trace_flags &ACPI_TRACE_ONESHOT ) +return sprintf (buffer,"method-once\n" ); +else +return sprintf (buffer,"method\n" ); } module_param_call(trace_state, param_set_trace_state, param_get_trace_state,
Signature · 1 line
2.30.2
PATCH 2/7 ACPI: sysfs: Allow bitmap list to be supplied to acpi_mask_gpe
In reply to Andy ShevchenkoCurrently we need to use as many acpi_mask_gpe options as we want to have GPEs to be masked. Even with two it already becomes inconveniently large the kernel command line.
Instead, allow acpi_mask_gpe to represent bitmap list.
--- Documentation/admin-guide/kernel-parameters.txt | 2 +- drivers/acpi/sysfs.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +1 -1
@@ -113,7 +113,7 @@ the GPE dispatcher. This facility can be used to prevent such uncontrolled GPE floodings. - Format: <byte> + Format: <byte> or <bitmap-list> acpi_no_auto_serialize [HW,ACPI] Disable auto-serialization of AML methods
drivers/acpi/sysfs.c +10 -3
@@ -5,6 +5,7 @@#define pr_fmt (fmt) "ACPI: " fmt +#include <linux/bitmap.h> #include <linux/init.h> #include <linux/kernel.h> #include <linux/moduleparam.h>
@@ -794,6 +795,7 @@ static ssize_t counter_set(struct kobject *kobj,* the GPE flooding for GPE 00, they need to specify the following boot * parameter: * acpi_mask_gpe=0x00 +* Note, the parameter can be a list (see bitmap_parselist() for the details). * The masking status can be modified by the following runtime controlling * interface: * echo unmask > /sys/firmware/acpi/interrupts/gpe00
@@ -803,11 +805,16 @@ static DECLARE_BITMAP(acpi_masked_gpes_map, ACPI_MASKABLE_GPE_MAX) __initdata;static int __init acpi_gpe_set_masked_gpes (char *val) { +int ret;u8 gpe; -if (kstrtou8 (val,0 , &gpe)) -return -EINVAL ; -set_bit (gpe, acpi_masked_gpes_map); + ret =kstrtou8 (val,0 , &gpe); +if (ret) { + ret =bitmap_parselist (val, acpi_masked_gpes_map,ACPI_MASKABLE_GPE_MAX ); +if (ret) +return ret; + }else +set_bit (gpe, acpi_masked_gpes_map);return 1 ; }
Signature · 1 line
2.30.2
Quoted 26 lines · Andy Shevchenko
Sparse is not happy about address space in use in
acpi_data_show():
drivers/acpi/sysfs.c:428:14: warning: incorrect type in assignment (different address spaces)drivers/acpi/sysfs.c:428:14: expected void [noderef]__iomem*basedrivers/acpi/sysfs.c:428:14: got void *drivers/acpi/sysfs.c:431:59: warning: incorrect type in argument 4 (different address spaces)drivers/acpi/sysfs.c:431:59: expected void const *fromdrivers/acpi/sysfs.c:431:59: got void [noderef]__iomem*basedrivers/acpi/sysfs.c:433:30: warning: incorrect type in argument 1 (different address spaces)drivers/acpi/sysfs.c:433:30: expected void*logical_addressdrivers/acpi/sysfs.c:433:30: got void [noderef]__iomem*baseIndeed,
acpi_os_map_memory()returns a void pointer with dropped specific address space. Hence, we don't need to carry out__iomeminacpi_data_show().Signed-off-by Andy Shevchenko <[email protected]>--- drivers/acpi/sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/acpi/sysfs.c +0
-0
drivers/acpi/sysfs.c static ssize_t acpi_data_show(struct file *filp, struct kobject *kobj,
Quoted 9 lines
drivers/acpi/sysfs.c +1
-2@@ -419,7 +419,7 @@ static ssize_t acpi_data_show(struct file *filp, struct kobject *kobj, loff_t offset, size_t count) {struct acpi_data_attr *data_attr; -void __iomem *base; +void *base;ssize_t rc; data_attr = container_of(bin_attr, struct acpi_data_attr, attr); --
Applied as 5.14 material along with patches [2-4,7/7] from this series.
Patches [5-6/7] did not apply for me on top of my acpi-sysfs branch (that is included into my linux-next branch), so I have not applied them.
Thanks!