Re: [PATCH v1 1/2] ACPI: platform: Ignore SMB0001 only when it has resources
From: Andi Shyti
Date: Wed Jun 21 2023 - 05:31:53 EST
Hi Andy,
On Tue, Jun 20, 2023 at 07:35:33PM +0300, Andy Shevchenko wrote:
> After switchind i2c-scmi driver to be a plaform one it stopped
/switchind/switching/
/one/one,/
> being enumerated on number of Kontron platformsm, because it's
/platformsm/platforms/
> 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/
> they have bogus resources attached (_CRS method returns some).
>
> Fixes: 03d4287add6e ("i2c: scmi: Convert to be a platform driver")
> Closes: https://lore.kernel.org/r/60c1756765b9a3f1eab0dcbd84f59f00fe1caf48.camel@xxxxxxxxxxx
> Reported-by: Michael Brunner <michael.brunner@xxxxxxxxxxx>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> ---
> drivers/acpi/acpi_platform.c | 27 +++++++++++++++++++++++++--
> 1 file changed, 25 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
> index fe00a5783f53..089a98bd18bf 100644
> --- a/drivers/acpi/acpi_platform.c
> +++ b/drivers/acpi/acpi_platform.c
> @@ -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);
... so that you rule out first the devices in this list.
Reviewed-by: Andi Shyti <andi.shyti@xxxxxxxxxx>
Andi
> +
> count = acpi_dev_get_resources(adev, &resource_list, NULL, NULL);
> if (count < 0)
> return NULL;
> --
> 2.40.0.1.gaa8946217a0b
>