platform/x86: int3472: discrete: Use FIELD_GET() on the GPIO _DSM return value
PATCH 1/2 platform/x86: int3472: discrete: Use FIELD_GET() on the GPIO _DSM return value
Add defines for the various fields encoded in the GPIO _DSM integer return value and then use FIELD_GET() to get field values.
--- drivers/platform/x86/intel/int3472/discrete.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/platform/x86/intel/int3472/discrete.c +7 -3
@@ -2,6 +2,7 @@/* Author: Dan Scally <[email protected]> */ #include <linux/acpi.h> +#include <linux/bitfield.h> #include <linux/device.h> #include <linux/gpio/consumer.h> #include <linux/gpio/machine.h>
@@ -25,6 +26,10 @@ static const guid_t int3472_gpio_guid =GUID_INIT (0x79234640 ,0x9e10 ,0x4fea ,0xa5 ,0xc1 ,0xb5 ,0xaa ,0x8b ,0x19 ,0x75 ,0x6f ); +#define INT3472_GPIO_DSM_TYPE GENMASK(7, 0) +#define INT3472_GPIO_DSM_PIN GENMASK(15, 8) +#define INT3472_GPIO_DSM_SENSOR_ON_VAL GENMASK(31, 24) +/* * 822ace8f-2814-4174-a56b-5f029fe079ee * This _DSM GUID returns a string from the sensor device, which acts as a
@@ -174,12 +179,11 @@ static int skl_int3472_handle_gpio_resources(struct acpi_resource *ares,return 1 ; } - type = obj->integer.value &0xff ; + type =FIELD_GET (INT3472_GPIO_DSM_TYPE , obj->integer.value);int3472_get_func_and_polarity (type, &func, &polarity); -/* If bits 31-24 of the _DSM entry are all 0 then the signal is inverted */ - active_value = obj->integer.value >>24 ; + active_value =FIELD_GET (INT3472_GPIO_DSM_SENSOR_ON_VAL , obj->integer.value);if (!active_value) polarity ^=GPIO_ACTIVE_LOW ;
Signature · 1 line
2.40.1
PATCH 2/2 platform/x86: int3472: discrete: Log a warning if the pin-numbers don't match
The INT3472 discrete code assumes that the ACPI GPIO resources are in the same order as the pin-info _DSM entries.
The returned pin-info includes the pin-number in bits 15-8. Add a check that this matches with the ACPI GPIO resource pin-number in case the assumption is not true with some ACPI tables.
--- drivers/platform/x86/intel/int3472/discrete.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/platform/x86/intel/int3472/discrete.c +7 -1
@@ -154,8 +154,8 @@ static int skl_int3472_handle_gpio_resources(struct acpi_resource *ares, {struct int3472_discrete_device *int3472 = data;struct acpi_resource_gpio *agpio; +u8 active_value, pin, type;union acpi_object *obj; -u8 active_value, type;const char *err_msg;const char *func;u32 polarity;
@@ -183,6 +183,12 @@ static int skl_int3472_handle_gpio_resources(struct acpi_resource *ares,int3472_get_func_and_polarity (type, &func, &polarity); + pin =FIELD_GET (INT3472_GPIO_DSM_PIN , obj->integer.value); +if (pin != agpio->pin_table[0 ]) +dev_warn (int3472->dev,"%s %s pin number mismatch _DSM %d resource %d\n" , + func, agpio->resource_source.string_ptr, pin, + agpio->pin_table[0 ]); + active_value =FIELD_GET (INT3472_GPIO_DSM_SENSOR_ON_VAL , obj->integer.value);if (!active_value) polarity ^=GPIO_ACTIVE_LOW ;
Signature · 1 line
2.40.1
Re: [PATCH 2/2] platform/x86: int3472: discrete: Log a warning if the pin-numbers don't match
Quoted 30 lines · Hans de Goede
The INT3472 discrete code assumes that the ACPI GPIO resources are in the same order as the pin-info
_DSMentries.The returned pin-info includes the pin-number in bits 15-8. Add a check that this matches with the ACPI GPIO resource pin-number in case the assumption is not true with some ACPI tables.
Reviewed-by Daniel Scally <[email protected]>Signed-off-by Hans de Goede <[email protected]>--- drivers/platform/x86/intel/int3472/discrete.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)drivers/platform/x86/intel/int3472/discrete.c +1
-1@@ -154,8 +154,8 @@ static int skl_int3472_handle_gpio_resources(struct acpi_resource *ares, {struct int3472_discrete_device *int3472 = data;struct acpi_resource_gpio *agpio; +u8 active_value, pin, type;union acpi_object *obj; -u8 active_value, type;const char *err_msg;const char *func;u32 polarity;@@ -183,6 +183,12 @@ static int skl_int3472_handle_gpio_resources(struct acpi_resource *ares,int3472_get_func_and_polarity (type, &func, &polarity);
drivers/platform/x86/intel/int3472/discrete.c static int skl_int3472_handle_gpio_resources(struct acpi_resource *ares, · line 194
Quoted 10 lines
drivers/platform/x86/intel/int3472/discrete.c +6
-0+ pin =FIELD_GET (INT3472_GPIO_DSM_PIN , obj->integer.value); +if (pin != agpio->pin_table[0 ]) +dev_warn (int3472->dev,"%s %s pin number mismatch _DSM %d resource %d\n" , + func, agpio->resource_source.string_ptr, pin, + agpio->pin_table[0 ]); + active_value =FIELD_GET (INT3472_GPIO_DSM_SENSOR_ON_VAL , obj->integer.value);if (!active_value) polarity ^=GPIO_ACTIVE_LOW ;
For both 1 and 2,
--
i.
Re: [PATCH 2/2] platform/x86: int3472: discrete: Log a warning if the pin-numbers don't match
Hi,
Quoted 45 lines · Ilpo Järvinen
Quoted 30 lines · Hans de Goede
The INT3472 discrete code assumes that the ACPI GPIO resources are in the same order as the pin-info
_DSMentries.The returned pin-info includes the pin-number in bits 15-8. Add a check that this matches with the ACPI GPIO resource pin-number in case the assumption is not true with some ACPI tables.
Reviewed-by Daniel Scally <[email protected]>Signed-off-by Hans de Goede <[email protected]>--- drivers/platform/x86/intel/int3472/discrete.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)drivers/platform/x86/intel/int3472/discrete.c +1
-1@@ -154,8 +154,8 @@ static int skl_int3472_handle_gpio_resources(struct acpi_resource *ares, {struct int3472_discrete_device *int3472 = data;struct acpi_resource_gpio *agpio; +u8 active_value, pin, type;union acpi_object *obj; -u8 active_value, type;const char *err_msg;const char *func;u32 polarity;@@ -183,6 +183,12 @@ static int skl_int3472_handle_gpio_resources(struct acpi_resource *ares,int3472_get_func_and_polarity (type, &func, &polarity);drivers/platform/x86/intel/int3472/discrete.c static int skl_int3472_handle_gpio_resources(struct acpi_resource *ares, · line 194
Quoted 10 lines
drivers/platform/x86/intel/int3472/discrete.c +6
-0+ pin =FIELD_GET (INT3472_GPIO_DSM_PIN , obj->integer.value); +if (pin != agpio->pin_table[0 ]) +dev_warn (int3472->dev,"%s %s pin number mismatch _DSM %d resource %d\n" , + func, agpio->resource_source.string_ptr, pin, + agpio->pin_table[0 ]); + active_value =FIELD_GET (INT3472_GPIO_DSM_SENSOR_ON_VAL , obj->integer.value);if (!active_value) polarity ^=GPIO_ACTIVE_LOW ;For both 1 and 2,
Quoted 1 line
Reviewed-by Ilpo Järvinen <[email protected]>
Thank you.
I've added this to my review-hans (soon to be for-next) branch now.
Regards,
Hans