ACPI: platform: Ignore SMB0001 only when it has resources
PATCH 1/2 ACPI: platform: Ignore SMB0001 only when it has resources
After switchind i2c-scmi driver to be a plaform one it stopped being enumerated on number of Kontron platformsm, because it's listed in the forbidden_id_list.
To resolve the situation, split the list to generic one and another that holds devices that has to be skiped if and only if they have bogus resources attached (_CRS method returns some).
--- drivers/acpi/acpi_platform.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-)
drivers/acpi/acpi_platform.c +25 -2
@@ -19,13 +19,17 @@#include "internal.h" +static const struct acpi_device_id forbidden_id_with_resourses[] = { + {"SMB0001" ,0 },/* ACPI SMBUS virtual device */ + { } +}; +static const struct acpi_device_id forbidden_id_list[] = { {"ACPI0009" ,0 },/* IOxAPIC */ {"ACPI000A" ,0 },/* IOAPIC */ {"PNP0000" ,0 },/* PIC */ {"PNP0100" ,0 },/* Timer */ {"PNP0200" ,0 },/* AT DMA Controller */ - {"SMB0001" ,0 },/* ACPI SMBUS virtual device */ { } };
@@ -83,6 +87,15 @@ static void acpi_platform_fill_resource(struct acpi_device *adev, dest->parent =pci_find_resource (to_pci_dev (parent), dest); } +static int acpi_platform_resource_count (struct acpi_resource *ares,void *data) +{ +int *count = data; + + *count = *count +1 ; + +return 1 ; +} +/** * acpi_create_platform_device - Create platform device for ACPI device node * @adev: ACPI device node to create a platform device for.
@@ -103,7 +116,8 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev,struct resource_entry *rentry;struct list_head resource_list;struct resource *resources =NULL ; -int count; +int count =0 ; +int ret;/* If the ACPI node already has a physical device attached, skip it. */ if (adev->physical_node_count)
@@ -113,6 +127,15 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev,return ERR_PTR (-EINVAL );INIT_LIST_HEAD (&resource_list); + ret =acpi_dev_get_resources (adev, &resource_list, acpi_platform_resource_count, &count); +if (ret <0 ) +return ERR_PTR (ret); + +acpi_dev_free_resource_list (&resource_list); + +if (count >0 && !acpi_match_device_ids (adev, forbidden_id_with_resourses)) +return ERR_PTR (-EINVAL ); + count =acpi_dev_get_resources (adev, &resource_list,NULL ,NULL );if (count <0 )return NULL ;
Signature · 1 line
2.40.0.1.gaa8946217a0b
PATCH 2/2 ACPI: platform: Move SMB0001 HID to the header and reuse
There are at least two places in the kernel that are using the SMB0001 HID. Make it to be available via acpi_drivers.h header file. While at it, replace hard coded one with a definition.
--- drivers/acpi/acpi_platform.c | 2 +- drivers/i2c/busses/i2c-scmi.c | 3 --- include/acpi/acpi_drivers.h | 2 ++ 3 files changed, 3 insertions(+), 4 deletions(-)
drivers/acpi/acpi_platform.c +1 -1
@@ -20,7 +20,7 @@#include "internal.h" static const struct acpi_device_id forbidden_id_with_resourses[] = { - {"SMB0001" ,0 },/* ACPI SMBUS virtual device */ + {ACPI_SMBUS_MS_HID ,0 },/* ACPI SMBUS virtual device */ { } };
drivers/i2c/busses/i2c-scmi.c +0 -3
@@ -13,9 +13,6 @@#include <linux/i2c.h> #include <linux/acpi.h> -/* SMBUS HID definition as supported by Microsoft Windows */ -#define ACPI_SMBUS_MS_HID "SMB0001" -struct smbus_methods_t {char *mt_info;char *mt_sbr;
include/acpi/acpi_drivers.h +2 -0
@@ -27,6 +27,8 @@#define ACPI_BAY_HID "LNXIOBAY"#define ACPI_DOCK_HID "LNXDOCK"#define ACPI_ECDT_HID "LNXEC" +/* SMBUS HID definition as supported by Microsoft Windows */ +#define ACPI_SMBUS_MS_HID "SMB0001"/* Quirk for broken IBM BIOSes */ #define ACPI_SMBUS_IBM_HID "SMBUSIBM"
Signature · 1 line
2.40.0.1.gaa8946217a0b
Quoted 4 lines · Andy Shevchenko
After switchind i2c-scmi driver to be a plaform one it stopped being enumerated on number of Kontron platformsm, because it's listed in the
forbidden_id_list.
Quoted 8 lines
To resolve the situation, split the list to generic one and another that holds devices that has to be skiped if and only if they have bogus resources attached (
_CRSmethod returns some).Fixes 03d4287add6e ("i2c: scmi: Convert to be a platform driver")Reported-by Michael Brunner <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>
Works as expected - the SMB0001 device shows up as platform device and the i2c-scmi driver is enumerated again on the affected boards. Thanks a lot!
Best regards,
Michael Brunner
Hi Andy,
Quoted 1 line · Andy Shevchenko
After switchind i2c-scmi driver to be a plaform one it stopped
/switchind/switching/
/one/one,/
Quoted 1 line
being enumerated on number of Kontron platformsm, because it's
/platformsm/platforms/
Quoted 4 lines
listed in the
forbidden_id_list.To resolve the situation, split the list to generic one and another that holds devices that has to be skiped if and only if
/skiped/skipped/
Quoted 61 lines
they have bogus resources attached (
_CRSmethod returns some).Fixes 03d4287add6e ("i2c: scmi: Convert to be a platform driver")Reported-by Michael Brunner <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>--- drivers/acpi/acpi_platform.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-)drivers/acpi/acpi_platform.c +16
-2@@ -19,13 +19,17 @@#include "internal.h" +static const struct acpi_device_id forbidden_id_with_resourses[] = { + {"SMB0001" ,0 },/* ACPI SMBUS virtual device */ + { } +}; +static const struct acpi_device_id forbidden_id_list[] = { {"ACPI0009" ,0 },/* IOxAPIC */ {"ACPI000A" ,0 },/* IOAPIC */ {"PNP0000" ,0 },/* PIC */ {"PNP0100" ,0 },/* Timer */ {"PNP0200" ,0 },/* AT DMA Controller */ - {"SMB0001" ,0 },/* ACPI SMBUS virtual device */ { } };@@ -83,6 +87,15 @@ static void acpi_platform_fill_resource(struct acpi_device *adev, dest->parent =pci_find_resource (to_pci_dev (parent), dest); } +static int acpi_platform_resource_count (struct acpi_resource *ares,void *data) +{ +int *count = data; + + *count = *count +1 ; + +return 1 ; +} +/** * acpi_create_platform_device - Create platform device for ACPI device node * @adev: ACPI device node to create a platform device for. @@ -103,7 +116,8 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev,struct resource_entry *rentry;struct list_head resource_list;struct resource *resources =NULL ; -int count; +int count =0 ; +int ret;/* If the ACPI node already has a physical device attached, skip it. */ if (adev->physical_node_count)@@ -113,6 +127,15 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev,return ERR_PTR (-EINVAL );
drivers/acpi/acpi_platform.c struct platform_device *acpi_create_platform_device(struct acpi_device *adev, · line 137
Quoted 10 lines
drivers/acpi/acpi_platform.c +8
-0INIT_LIST_HEAD (&resource_list); + ret =acpi_dev_get_resources (adev, &resource_list, acpi_platform_resource_count, &count); +if (ret <0 ) +return ERR_PTR (ret); + +acpi_dev_free_resource_list (&resource_list); + +if (count >0 && !acpi_match_device_ids (adev, forbidden_id_with_resourses)) +return ERR_PTR (-EINVAL );
... so that you rule out first the devices in this list.
Andi
Quoted 7 lines
drivers/acpi/acpi_platform.c +1
-0+ count =acpi_dev_get_resources (adev, &resource_list,NULL ,NULL );if (count <0 )return NULL ;Signature · 1 line
2.40.0.1.gaa8946217a0b
Andi Shyti
maintainerQuoted 9 lines · Michael Brunner
Quoted 8 lines · Andy Shevchenko
After switchind i2c-scmi driver to be a plaform one it stopped being enumerated on number of Kontron platformsm, because it's listed in the
forbidden_id_list.To resolve the situation, split the list to generic one and another that holds devices that has to be skiped if and only if they have bogus resources attached (
_CRSmethod returns some).
Quoted 8 lines
Quoted 4 lines
Fixes 03d4287add6e ("i2c: scmi: Convert to be a platform driver")Reported-by Michael Brunner <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>Works as expected - the SMB0001 device shows up as platform device and the i2c-scmi driver is enumerated again on the affected boards. Thanks a lot!
is this a "Tested-by: Michael Brunner <[email protected]>" :)
Andi
Re: [PATCH v1 2/2] ACPI: platform: Move SMB0001 HID to the header and reuse
In reply to Andy ShevchenkoHi Andy,
Quoted 6 lines · Andy Shevchenko
There are at least two places in the kernel that are using the SMB0001 HID. Make it to be available via
acpi_drivers.hheader file. While at it, replace hard coded one with a definition.Signed-off-by Andy Shevchenko <[email protected]>
Andi
Quoted 15 lines · Andi Shyti
Quoted 14 lines · Michael Brunner
Quoted 12 lines · Andy Shevchenko
After switchind i2c-scmi driver to be a plaform one it stopped being enumerated on number of Kontron platformsm, because it's listed in the
forbidden_id_list.To resolve the situation, split the list to generic one and another that holds devices that has to be skiped if and only if they have bogus resources attached (
_CRSmethod returns some).Fixes 03d4287add6e ("i2c: scmi: Convert to be a platform driver")Reported-by Michael Brunner <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>
Quoted 5 lines
Quoted 3 lines
Works as expected - the SMB0001 device shows up as platform device and the i2c-scmi driver is enumerated again on the affected boards. Thanks a lot!
is this a "Tested-by: Michael Brunner <[email protected]>" :)
Michael, indeed, it would be nice to have a formal tag. After that I will send a v2 with tags and fixed typos as Andi noticed (thank you, Andi!).
Signature · 2 lines
With Best Regards, Andy Shevchenko
Michael Brunner
Tested-byQuoted 24 lines · On Wed, 2023-06-21 at 16:19 +0300, [email protected] wrote:
Quoted 23 lines · Andi Shyti
Quoted 21 lines · Michael Brunner
Quoted 8 lines · Andy Shevchenko
After switchind i2c-scmi driver to be a plaform one it stopped being enumerated on number of Kontron platformsm, because it's listed in the
forbidden_id_list.To resolve the situation, split the list to generic one and another that holds devices that has to be skiped if and only if they have bogus resources attached (
_CRSmethod returns some).Quoted 7 lines
Fixes 03d4287add6e ("i2c: scmi: Convert to be a platformdriver")
Closes:
https://lore.kernel.org/r/[email protected]Reported-by Michael Brunner <[email protected]>Signed-off-by Andy Shevchenko <Works as expected - the SMB0001 device shows up as platform device and
the i2c-scmi driver is enumerated again on the affected boards. Thanks a lot!
Quoted 6 lines
Quoted 2 lines
is this a "Tested-by: Michael Brunner <[email protected]> " :)
Michael, indeed, it would be nice to have a formal tag. After that I will send a v2 with tags and fixed typos as Andi noticed (thank you, Andi!).
No problem:
Best regards,
Michael