From patchwork Tue Jun 20 16:35:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 694806 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00586EB64D8 for ; Tue, 20 Jun 2023 16:36:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232122AbjFTQgR (ORCPT ); Tue, 20 Jun 2023 12:36:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230145AbjFTQgG (ORCPT ); Tue, 20 Jun 2023 12:36:06 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 082CF1FFC; Tue, 20 Jun 2023 09:35:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687278942; x=1718814942; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=JK3tVYgPO813k37yyUcq4KAbO6r53M5gA1CD/W9gXN8=; b=C1AncA6hwg3dXQMAeiRzYT+mJSLy/lPRbX/r5EUi9819GG6Np7ludt8R K4+QvOh3uD0T49+KXeFKR+PgUi0SN1dCovidctMwuCyHmVoZMlgy9cDyi c8BR1ZAkVeXa+l4Z8j+eysGOjhcuV8poNTohH/eNrjKunUq3jFTratDy5 2wscgl6P8BaoB1xYbb2qkV6p0i5ZwQR6uS2TmKvC8OHF493x6vbVLPWSU sOx9qg0VfP+6hnYGLyXg9DiHdWXW+0MuSq2RSHffv3WeoEUiseegrOlw1 3B0c/6hvc1ckX9s/EiupWG8Wlv6kqRQnXOKnM4PTrX4yC2nvWXq2MoX9y g==; X-IronPort-AV: E=McAfee;i="6600,9927,10747"; a="363334026" X-IronPort-AV: E=Sophos;i="6.00,257,1681196400"; d="scan'208";a="363334026" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jun 2023 09:35:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10747"; a="827062742" X-IronPort-AV: E=Sophos;i="6.00,257,1681196400"; d="scan'208";a="827062742" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga002.fm.intel.com with ESMTP; 20 Jun 2023 09:35:36 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id E770C413; Tue, 20 Jun 2023 19:35:46 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , "Rafael J. Wysocki" , Wolfram Sang , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, acpica-devel@lists.linuxfoundation.org Cc: "Rafael J. Wysocki" , Len Brown , Andi Shyti , Robert Moore , Michael Brunner Subject: [PATCH v1 1/2] ACPI: platform: Ignore SMB0001 only when it has resources Date: Tue, 20 Jun 2023 19:35:33 +0300 Message-Id: <20230620163534.1042-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org 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). Fixes: 03d4287add6e ("i2c: scmi: Convert to be a platform driver") Closes: https://lore.kernel.org/r/60c1756765b9a3f1eab0dcbd84f59f00fe1caf48.camel@kontron.com Reported-by: Michael Brunner Signed-off-by: Andy Shevchenko Tested-by: Michael Brunner --- 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; From patchwork Tue Jun 20 16:35:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 694626 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9746EB64DB for ; Tue, 20 Jun 2023 16:36:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231847AbjFTQgS (ORCPT ); Tue, 20 Jun 2023 12:36:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33276 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232079AbjFTQgH (ORCPT ); Tue, 20 Jun 2023 12:36:07 -0400 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E7BE32106; Tue, 20 Jun 2023 09:35:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687278944; x=1718814944; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=MU6h0bQC0vAge5es6R0v/1fr1IoAPMvkrNIAnaSKRwM=; b=OWDeK3t688m5Vu25OHOVjthdpTd0X3o0WHWZ791OfI1mwaedOXOWuBJI ac7LW/rNlK3nkUzyt5/IF6mX2cN0z9okQ2nZPuBAEfr7Zcf2mld0az3jS AyoRvh8vgEsr7CwBhT9QWUFh6cGyi7HnhpqyU9Jk5Wapehz3OUq0/9GXs G2C0fScAA5DnlXtrZWIdOOz8KOjrXwMNs6nFaYe6XURh0yJo7UCi1mPfK 0L5xafC1bFpX5ZLU9lqTmRP0qNGntKVdR0pjxyB1yRwhLTTL/h1gJwLok +ZEWKu5Pt5LpLL5P6iBQI5UnIDRZNP07QZ43cnEYbZn/pC5liOVtQ/91S g==; X-IronPort-AV: E=McAfee;i="6600,9927,10747"; a="423575845" X-IronPort-AV: E=Sophos;i="6.00,257,1681196400"; d="scan'208";a="423575845" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jun 2023 09:35:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10747"; a="838268291" X-IronPort-AV: E=Sophos;i="6.00,257,1681196400"; d="scan'208";a="838268291" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga004.jf.intel.com with ESMTP; 20 Jun 2023 09:35:39 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 4ED3E690; Tue, 20 Jun 2023 19:35:50 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , "Rafael J. Wysocki" , Wolfram Sang , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, acpica-devel@lists.linuxfoundation.org Cc: "Rafael J. Wysocki" , Len Brown , Andi Shyti , Robert Moore Subject: [PATCH v1 2/2] ACPI: platform: Move SMB0001 HID to the header and reuse Date: Tue, 20 Jun 2023 19:35:34 +0300 Message-Id: <20230620163534.1042-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230620163534.1042-1-andriy.shevchenko@linux.intel.com> References: <20230620163534.1042-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org 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. Signed-off-by: Andy Shevchenko Reviewed-by: Andi Shyti --- 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(-) diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c index 089a98bd18bf..e86f76ee3473 100644 --- a/drivers/acpi/acpi_platform.c +++ b/drivers/acpi/acpi_platform.c @@ -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 */ { } }; diff --git a/drivers/i2c/busses/i2c-scmi.c b/drivers/i2c/busses/i2c-scmi.c index 104570292241..421735acfa14 100644 --- a/drivers/i2c/busses/i2c-scmi.c +++ b/drivers/i2c/busses/i2c-scmi.c @@ -13,9 +13,6 @@ #include #include -/* SMBUS HID definition as supported by Microsoft Windows */ -#define ACPI_SMBUS_MS_HID "SMB0001" - struct smbus_methods_t { char *mt_info; char *mt_sbr; diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index 8372b0e7fd15..b14d165632e7 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h @@ -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"