Return-Path: DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org C855841E84 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 684C041DB0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687360614; x=1718896614; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=VblY/rm86Nrtd/B1UCaI/PliO/WD8SqNOUgqlsMUt7g=; b=BoQC/xxsd5VDPdnN0ikpp2LY1C1/+iQYf2iCw1n8EJ/FCqOeGjHwP2Ke D2w9DDMnC0BEwfOrBpnxDXEHNCMYowp5FTItePCcllNmpqOqQRqz3APUW ZjJi9VdFAJ5656cBSuJvknelFy6c7IELC6Xp+Vy6VdFeYci9I9iqt76U0 /BeiBJQ9H+FeEug1XuM0zkWthmFfPUgwodi4qnvPlhYm5d7CDYZ5uYwzt rVyxaadk3oBanJbFmBRF1EH5UiC+HUY5Gs64Mfw79BS5kreDY+vPbqd+3 prlsOaLLVCrh1UhCq71umsZkLrR2bWAtb1aPH3dZx5kl9JvbIuLunqjCO Q==; From: Andy Shevchenko Message-Id: <20230621151652.79579-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Acpica-devel] [PATCH v2 1/2] ACPI: platform: Ignore SMB0001 only when it has resources List-Id: "This is the central place for ACPICA developer discussions and issues." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Wed, 21 Jun 2023 15:16:56 -0000 To: Andy Shevchenko , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, acpica-devel@lists.linuxfoundation.org Cc: Robert Moore , Len Brown , Andi Shyti , Michael Brunner After switching i2c-scmi driver to be a plaform one, it stopped being enumerated on number of Kontron platforms, 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 skipped if and only if 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@kontron.com Reported-by: Michael Brunner Tested-by: Michael Brunner Reviewed-by: Andi Shyti Link: https://lore.kernel.org/r/20230620163534.1042-1-andriy.shevchenko@linux.intel.com Signed-off-by: Andy Shevchenko --- v2: added tags (Andi, Michael), fixed spelling (Andi) 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); + count = acpi_dev_get_resources(adev, &resource_list, NULL, NULL); if (count < 0) return NULL; -- 2.40.0.1.gaa8946217a0b