From patchwork Wed Jun 21 15:16:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 111141 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp4468984vqr; Wed, 21 Jun 2023 09:00:47 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7ylEDa2nicmojJLxBzMjr79GcYkvXpzivShi71BZIzi14bClEDbA1Fr8BarAmXYO8e9ELU X-Received: by 2002:a17:90a:d996:b0:256:d262:e686 with SMTP id d22-20020a17090ad99600b00256d262e686mr14940563pjv.19.1687363246874; Wed, 21 Jun 2023 09:00:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687363246; cv=none; d=google.com; s=arc-20160816; b=vQA+4q55DumKeLLGnILmbFjMn9GPqxjH5ANbVOK/AiuA3iQee482ARObjIGBZueaby TCR1pCbYUKCaJZ0WybgsNDNb5Knoz9q6eR0TThI2GChhYvWXtj+SX6PqV4GGlumYlJqE pNhS4nYMILgmSOdhF/JuCSbBbOQgIKp+9jFBHZ/fOBRLCPv/Hcz0dujAVaCZb9iltOlD ut1prY8wkVSJgoELwARy+ygsniOlLfJlDxjPR8K6Zk5+WE+N6ujb91BLEmf+k7oz+5iW 7ur1+5i5uR9ehB6FTN0xjuzx5Djfj7DrDOnPT8TSGeS4up/WtRaIPKh+ufxsC9Kgrrp5 UQ1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=m+78IWs0M4APlCqYH+5sy26NI6QM5jPd4CYyajqLXd0=; b=LVbwvCtuUMLFOQDTdUZIS98JfYK3KArQsX1khlAtY/4cUEG+7O5jym1h4iiDbPHfsp nYDPSHi06/Bhoc2+CgheWMp1Fcf3ruNujy4hI2vCXQUuGfaSozfxb0LdkLxlZDj5yNlE BmuNh+k6HRft6+1EPULrcab2nKLM05pkNEmhkigsGHOVDGOB4QdEwbRr3Dh8YnKCcVuO shTsYH0iT20itlsZYFUpGVH4tyIFmp76LgDa+M8c6SbINHqVQ2PgRA8v5eVKMDVNq7PU 4Fh5MDAI5UYyd4yaawNeu0qUQaPUReAxp2pcbvJAmlHOLSvLlyIRiRAcnPHIctRHHgha 5JAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="l//1jgSk"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j14-20020a17090aeb0e00b0025e81e3e0c1si4271207pjz.187.2023.06.21.09.00.04; Wed, 21 Jun 2023 09:00:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="l//1jgSk"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231243AbjFUPUK (ORCPT + 99 others); Wed, 21 Jun 2023 11:20:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233356AbjFUPTu (ORCPT ); Wed, 21 Jun 2023 11:19:50 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B9984C05; Wed, 21 Jun 2023 08:16:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687360609; x=1718896609; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=VblY/rm86Nrtd/B1UCaI/PliO/WD8SqNOUgqlsMUt7g=; b=l//1jgSkwfkYX76FIKACDJUB4PKtFBr0f4x/qiTfudQ1nHTreJzfGwI5 FkmFcC4y+u0R3HuXrm9ETdg5Okl4/8qf7+9Imh/tQ20D6gZMq4k9ylANO jxT1aGfvHx2pONaPQhzxPMUtulf3iS5LXlsBSGYbreGiueTgcd5O+QHPA h1q/bIuTputnGbb+7CbD25v7Ynjvib7DQ0HJpiera0TB0AtzRYCCr0+eH qKwpT1ABSKoFJcw90lOpuuFzE080yUIAEm7ustQPgATjA8sHC42D47eDz z1SgqFG/8QcN2/0N74iKeFcuSBmvVW4shLwy+vC+oLxb27eGTwpxwbyzw Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10748"; a="446584489" X-IronPort-AV: E=Sophos;i="6.00,260,1681196400"; d="scan'208";a="446584489" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jun 2023 08:16:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10748"; a="664702531" X-IronPort-AV: E=Sophos;i="6.00,260,1681196400"; d="scan'208";a="664702531" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga003.jf.intel.com with ESMTP; 21 Jun 2023 08:16:44 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 43DDF1FD; Wed, 21 Jun 2023 18:16:55 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , 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 v2 1/2] ACPI: platform: Ignore SMB0001 only when it has resources Date: Wed, 21 Jun 2023 18:16:51 +0300 Message-Id: <20230621151652.79579-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769328603811384455?= X-GMAIL-MSGID: =?utf-8?q?1769328603811384455?= 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; From patchwork Wed Jun 21 15:16:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 111138 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp4468060vqr; Wed, 21 Jun 2023 08:59:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4beSfFjdVlJl9PZJ8JfPkszDP2T3kE9HVobkwpAcJjmXcdrh3tepLr4vqCUZQ7TOdmocIG X-Received: by 2002:a05:6a00:a13:b0:668:7292:b2bc with SMTP id p19-20020a056a000a1300b006687292b2bcmr15789345pfh.10.1687363176022; Wed, 21 Jun 2023 08:59:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687363176; cv=none; d=google.com; s=arc-20160816; b=dJ9I2EgNjU5hGIxAcmCL6ehHkB7ktCNcNX8yk9Mcr9+7QGgXXK82z7cEFIdYHCARwI bo5QdPktEiB0BEVm83RvhstOpCD/xk9xhLRk+8wQI6ArKomxyiItvf+7gW8DS3uNJzoV K0wGZDwhkDgGifyaceuKKQGQFeC55hxH+4c81zVx28nWbEw0cyd9TWxutucrTHAXKUcH peicmTxcvkvtXwvSnbwYiABopndOfYQBuQA+nJB5dzF+pxnLBjsOPbnlMFMLQYCoTT4s IgfhS67BThmbNmiDPsdwlVzQO/7A6vC0i00Hlcb+VsRjuzMUv51XYi1+3+dK9nylSNHL efCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=JmqNX7X2p+hMMe/iMYjhtb+g0pf6bbuy+PahdrB+afg=; b=UEt/0tko7tp+4VpfaGg6awz4eT98Qa850yA2DJK8Ri9cBA6v44J1HvL7du88RoqVil RGdYI3wp+moQNitJiu4uQrUsBYKkIwx277Hf6I30CWFGsm0gYG5w/yX57C7FYSfgoX4W 9VEVc5Kty+WX1IXI1Tcl+yajG+p16fnQTbiizl8Qm9RHifiGMWmO+agWQFw6VNDaDmdG eHMHip7rNrjtYSvIcMhBXf3LZ+BNHaGaEF5yOWPj2mgsuBwRAJ5dMp0aDgSQ81uDsevE 2OPEfMUQj3zxua4EUHLwVn+8ZwvRl1N4vmNzU5Lt6Fgj9AnOWObyCQejBEiu80VfNj0O vV3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=bfMDzeCK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p2-20020aa79e82000000b00668873710d9si4417281pfq.162.2023.06.21.08.59.23; Wed, 21 Jun 2023 08:59:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=bfMDzeCK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231517AbjFUPUM (ORCPT + 99 others); Wed, 21 Jun 2023 11:20:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233381AbjFUPTx (ORCPT ); Wed, 21 Jun 2023 11:19:53 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D832ED2; Wed, 21 Jun 2023 08:16:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687360610; x=1718896610; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BZCM5lLaApqKK/yTbVaJKND0T8mjA20qNjOsA8/s5nU=; b=bfMDzeCKjGK6H4FHShn/5ZdLutzkHVU11a33O9iqmeqxrfBZJt9ZBljw rSF/InNEnMxd7QULv5c7U0DXmoQdykfDSwJB7tzQO3Z4ARh8o7kJfN+Hi zISSaxlRaMmD9ucQsXB6pauKiGSHaZgDaffPtYEWAPh5umNzHJ5EYMTsX 1jGCQOjCYLIhb1/sj+T5+HqK00ggbpqYokCVIO7DXS/Qw74zVtMBVoNhx 8lJZxg58k9eHqYsrmEclLp4c8i5OuMDQIp+kyFXrtTz9Y/ALITd6Hp8Aa DpM967FR8z6EpgbMbPN3uq9qzoxMtYjKMHelf6FAxI6DUVdgwlsSWzuRM Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10748"; a="446584496" X-IronPort-AV: E=Sophos;i="6.00,260,1681196400"; d="scan'208";a="446584496" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jun 2023 08:16:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10748"; a="664702536" X-IronPort-AV: E=Sophos;i="6.00,260,1681196400"; d="scan'208";a="664702536" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga003.jf.intel.com with ESMTP; 21 Jun 2023 08:16:45 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 8D4D0241; Wed, 21 Jun 2023 18:16:56 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , 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 v2 2/2] ACPI: platform: Move SMB0001 HID to the header and reuse Date: Wed, 21 Jun 2023 18:16:52 +0300 Message-Id: <20230621151652.79579-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230621151652.79579-1-andriy.shevchenko@linux.intel.com> References: <20230621151652.79579-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769328529614155229?= X-GMAIL-MSGID: =?utf-8?q?1769328529614155229?= 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. Reviewed-by: Andi Shyti Link: https://lore.kernel.org/r/20230620163534.1042-2-andriy.shevchenko@linux.intel.com Signed-off-by: Andy Shevchenko Acked-by: Wolfram Sang # for I2C --- v2: added tag (Andi) 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"