From patchwork Mon Jul 3 12:14:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 115336 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp489655vqx; Mon, 3 Jul 2023 05:38:30 -0700 (PDT) X-Google-Smtp-Source: APBJJlH1qFFMuLGQ8OkxnxdaF4EsHS45pYIW86teQnMbOTmv69IaW5b6ZhUb7WqqRFPiGZsmLeaQ X-Received: by 2002:a05:6a00:1d05:b0:67d:308b:97ef with SMTP id a5-20020a056a001d0500b0067d308b97efmr11511779pfx.2.1688387910662; Mon, 03 Jul 2023 05:38:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688387910; cv=none; d=google.com; s=arc-20160816; b=h99i0uYg6mXc/PUjxM4LcUWxatYKyRMvn79t+6Uw/1gsVqz/O9V6lzcxGwufW4EFWw w0zBsWJLBG7d9xR+/XKgoCsjVS6G08YCcShUmTt5WWiZNPugWPZcYrXMCicPzC+uJjZy 3nDLxM1yS04Fq1HHTLrxCqcB05GqxyvHA5AXUytob34+TcZJjitWxZo50J1VZ9sjp3KE tEizIwc0Q0h+vmBLilE5sQBZ/dkR/RS3OdWt3ruahThWST/CtGVgST/i9c+mfZSePNZR P8L9eLKOyFQQ9ZgKFE6wCh2YH8auJrkws+/0yVuSYXKXBN+cSZ+5qN+1EkxWaelXaa+z X6kQ== 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=oZkk6LtpmiqvWfgeKMkTwqtfSqBt1fetT+wcA6gKvqY=; fh=z41p7sb2mQHDU0cDatvZvSvBt/K/qZ0WnYN8eOL4by8=; b=KgflvW/YfKJGAdWqXZj+Jvl9uK29TZaT0ylnqD4Z0FuykW4orFMzCM3XKBW5VPJmsl WfY+V3mCU9aVhck4spr/PNZRRhiMgyN+/XCP/ji4eyYGuC6EsqT+6PTeATxrqWV/ay+H YkkPHM1pGIUjyqRciKICZxLMO5Hd0FL+o/s5fwC85HGWuiId1o0gFoD1rgWgCAOJ3lFT A1sMtWe8hpmxeNBonJu3CQzzuHy1juzewTy6MH59pvoIHFZqm4M8UfBoZvimGP9sGCuJ xXU/hWzzjr6/SyGdWNHEPm5tFWysALjctRgcCIjq3JTEKSZ6ojjg7Zork8xmRieTV0GN xEbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=m0+VtHtT; 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 n129-20020a632787000000b0053481057d3asi18145213pgn.75.2023.07.03.05.38.09; Mon, 03 Jul 2023 05:38:30 -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=m0+VtHtT; 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 S231322AbjGCMOT (ORCPT + 99 others); Mon, 3 Jul 2023 08:14:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229980AbjGCMOP (ORCPT ); Mon, 3 Jul 2023 08:14:15 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1AB7B10E; Mon, 3 Jul 2023 05:14:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688386454; x=1719922454; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tcBflnra7gCALSSSxjriqj/Y8FpJYDW+EY6Pd4pNPvY=; b=m0+VtHtTC98PYJH+/ZS3/VhNpVotMRPrfKP0en2aLPL5CKa9buWDL4ja hG3Bn+a4j/EGmFzzsx1N7NGJH/ifOliSk1zFeyzR+T+pUNPbaefjNrFXr I4Af4pPcnu5JfgUk8+rnpgqWis8MoTQPJsw+/PbYClLxkKl5mJcTbEQSi EY2b9ceml+6ynUUO/PsJcSDuMBaWAia1dV5istWwVB9ToQq4LBUWUoxfs 6whsyvYCbFV3B4QbvSxPyCdjNw8KChyVkJOBO0oWvtNQRUKefIpmtSrME TIBIxQuuT6OKtczy4TmpKQzmTCEEL553DnL30YqFNEw3sNlaK2/4lE1eW g==; X-IronPort-AV: E=McAfee;i="6600,9927,10759"; a="449241138" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="449241138" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2023 05:14:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10759"; a="718574508" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="718574508" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 03 Jul 2023 05:14:09 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id F0B4A13C; Mon, 3 Jul 2023 15:14:12 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , "Rafael J. Wysocki" , Wolfram Sang , Andi Shyti , 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 , Robert Moore , Michael Walle Subject: [PATCH v4 1/5] ACPI: bus: Introduce acpi_match_acpi_device() helper Date: Mon, 3 Jul 2023 15:14:07 +0300 Message-Id: <20230703121411.69606-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230703121411.69606-1-andriy.shevchenko@linux.intel.com> References: <20230703121411.69606-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 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?1770403041446527477?= X-GMAIL-MSGID: =?utf-8?q?1770403041446527477?= Match the ACPI device against a given list of ACPI IDs. This may be helpful in different cases. Signed-off-by: Andy Shevchenko --- drivers/acpi/bus.c | 25 +++++++++++++++++++++---- include/linux/acpi.h | 9 +++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 20cdfb37da79..2fc2b43a4ed3 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -850,6 +850,26 @@ static bool __acpi_match_device(const struct acpi_device *device, return true; } +/** + * acpi_match_acpi_device - Match an ACPI device against a given list of ACPI IDs + * @ids: Array of struct acpi_device_id objects to match against. + * @adev: The ACPI device pointer to match. + * + * Match the ACPI device @adev against a given list of ACPI IDs @ids. + * + * Return: + * a pointer to the first matching ACPI ID on success or %NULL on failure. + */ +const struct acpi_device_id *acpi_match_acpi_device(const struct acpi_device_id *ids, + const struct acpi_device *adev) +{ + const struct acpi_device_id *id = NULL; + + __acpi_match_device(adev, ids, NULL, &id, NULL); + return id; +} +EXPORT_SYMBOL_GPL(acpi_match_acpi_device); + /** * acpi_match_device - Match a struct device against a given list of ACPI IDs * @ids: Array of struct acpi_device_id object to match against. @@ -864,10 +884,7 @@ static bool __acpi_match_device(const struct acpi_device *device, const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids, const struct device *dev) { - const struct acpi_device_id *id = NULL; - - __acpi_match_device(acpi_companion_match(dev), ids, NULL, &id, NULL); - return id; + return acpi_match_acpi_device(ids, acpi_companion_match(dev)); } EXPORT_SYMBOL_GPL(acpi_match_device); diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 640f1c07c894..641dc4843987 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -707,6 +707,9 @@ extern int acpi_nvs_register(__u64 start, __u64 size); extern int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *), void *data); +const struct acpi_device_id *acpi_match_acpi_device(const struct acpi_device_id *ids, + const struct acpi_device *adev); + const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids, const struct device *dev); @@ -922,6 +925,12 @@ static inline int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *), struct acpi_device_id; +static inline const struct acpi_device_id *acpi_match_acpi_device( + const struct acpi_device_id *ids, const struct acpi_device *adev) +{ + return NULL; +} + static inline const struct acpi_device_id *acpi_match_device( const struct acpi_device_id *ids, const struct device *dev) { From patchwork Mon Jul 3 12:14:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 115328 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp476497vqx; Mon, 3 Jul 2023 05:17:53 -0700 (PDT) X-Google-Smtp-Source: APBJJlFHh1pnY2mOCSvo0PpO7cnuqkahsRlUzkta0i/GIEGBuL3eN7BA+xBN33NF6Fn0OTuW2zYV X-Received: by 2002:a17:90b:890:b0:262:e6a9:bf1 with SMTP id bj16-20020a17090b089000b00262e6a90bf1mr11482460pjb.1.1688386672931; Mon, 03 Jul 2023 05:17:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688386672; cv=none; d=google.com; s=arc-20160816; b=mM7rVNQ+dbAwBjacODrvak5G7RcRrprbBcikPuuMu2ylE5vuhAix5PCsvm//k/E2+5 W3OlmNpgdGksRNuWiK3SeWmKqEtZyOxUj+5a2ylGs0CHkQaPL2FDCNPvwCPsiI9VAtnt ZZwP51sB/sF/h806AtNgiDgqpb/NnvGLV380K1MwFnUfu2uyUhRsba+pKoVdWTg5ljsE NPRLFwK/oCLldFVJl42Lt4uL/gXwX3jXZjTOxt0iC6mmOqyPghQwW9xWd1VTCeUqSKjP C8p6HyBBptk5IRwuL/VeYX8zHgzJWcVXZDCU+ZFdl/WhQBcQNwbMyTd7DY5kBlTzANGf milQ== 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=LmCAJEunU3wChkgoGCbUFjaQ5ws2GPhWrvkypAz0Dhs=; fh=z41p7sb2mQHDU0cDatvZvSvBt/K/qZ0WnYN8eOL4by8=; b=xyPcZxJPBY5a/BEphXnfgwAkyA+b+r1CuRYUkU4PGn9pcip69iigiJW03Tquv/ruJz jJRYUKmy0JEW9uDBSMjfGdpRKh4YwYznk7rPq7GDQv1iwnxdYKN+J4tQAPt/E1O/WONd H/gPwqJT3AOKJLh4fBjbhAtBa+iv5As6gYSCwz+sD3miD4YnspDyTsoEjIwSbL1It89w KIuoQjpTlasdB2H6raJVzZ9SiJ2GN+/jqMfYUdJSkWaoqUaTUAv37yE5MdhDOzjCmS21 juCGaT2ROgMSlubiczqWPWMkvMMkRh+X/1qb9X6JrhfBybpBfGJEDSPyrrVM+0Eqz+mS LRBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=DcvuSax7; 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 67-20020a630246000000b0055785a37147si17979871pgc.590.2023.07.03.05.17.40; Mon, 03 Jul 2023 05:17:52 -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=DcvuSax7; 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 S230338AbjGCMOZ (ORCPT + 99 others); Mon, 3 Jul 2023 08:14:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230262AbjGCMOQ (ORCPT ); Mon, 3 Jul 2023 08:14:16 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2DD4A11F; Mon, 3 Jul 2023 05:14:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688386455; x=1719922455; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0+SSNItGZd8DaGAVZM/aUS3kbeqhy2m38fy5KVkHewA=; b=DcvuSax7COzNFhXb9gdsI6E2rdAe6wUQvvbRu2SpIDrS4d+mhrai6A/k /TqsiWWFeNYGLd7zK6YVcQJJG8RbQSRKddUIh3Gdpji6pIl4LGYig3g1Y lg/s/2anTqv2ja0QT/z8r/6dESYJzdf2ST9VwNyAvG+lEsHM+3wDRRDB0 6fnBZpibxU3hraxkgQYIXOTvabg7x9Uh5NMKHqPtXQil4iMoSgq3BiBQf KrNCB7L1I1bDbowy6pm9wjmyUBQWRLm0tyZ8n5wzmEdO3Vjd49ZbWxNlQ gP1J5JpyM8D/rnOp7vPkEkeARNR6m/ggwqIFGDq/1ldkT3MAUY4r16a+S Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10759"; a="449241149" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="449241149" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2023 05:14:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10759"; a="718574513" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="718574513" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 03 Jul 2023 05:14:10 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 085C6178; Mon, 3 Jul 2023 15:14:13 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , "Rafael J. Wysocki" , Wolfram Sang , Andi Shyti , 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 , Robert Moore , Michael Walle Subject: [PATCH v4 2/5] ACPI: platform: Ignore SMB0001 only when it has resources Date: Mon, 3 Jul 2023 15:14:08 +0300 Message-Id: <20230703121411.69606-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230703121411.69606-1-andriy.shevchenko@linux.intel.com> References: <20230703121411.69606-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 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?1770401743691895928?= X-GMAIL-MSGID: =?utf-8?q?1770401743691895928?= After switching i2c-scmi driver to be a platform one, it stopped being enumerated on number of Kontron platforms, because it's listed in the forbidden_id_list. To resolve the situation, add a flag to driver data to allow devices with no resources in _CRS to be enumerated via platform bus. Fixes: 03d4287add6e ("i2c: scmi: Convert to be a platform driver") Closes: https://lore.kernel.org/r/60c1756765b9a3f1eab0dcbd84f59f00fe1caf48.camel@kontron.com Link: https://lore.kernel.org/r/20230621151652.79579-1-andriy.shevchenko@linux.intel.com Signed-off-by: Andy Shevchenko Reviewed-by: Andi Shyti --- drivers/acpi/acpi_platform.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c index fe00a5783f53..c2ce558bd032 100644 --- a/drivers/acpi/acpi_platform.c +++ b/drivers/acpi/acpi_platform.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include @@ -19,13 +20,16 @@ #include "internal.h" +/* Exclude devices that have no _CRS resources provided */ +#define ACPI_ALLOW_WO_RESOURCES BIT(0) + 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 */ + {"SMB0001", ACPI_ALLOW_WO_RESOURCES}, /* 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 unsigned int acpi_platform_resource_count(struct acpi_resource *ares, void *data) +{ + bool *has_resources = data; + + *has_resources = true; + + return AE_CTRL_TERMINATE; +} + /** * acpi_create_platform_device - Create platform device for ACPI device node * @adev: ACPI device node to create a platform device for. @@ -100,17 +113,28 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev, struct acpi_device *parent = acpi_dev_parent(adev); struct platform_device *pdev = NULL; struct platform_device_info pdevinfo; + const struct acpi_device_id *match; struct resource_entry *rentry; struct list_head resource_list; struct resource *resources = NULL; + bool has_resources; int count; /* If the ACPI node already has a physical device attached, skip it. */ if (adev->physical_node_count) return NULL; - if (!acpi_match_device_ids(adev, forbidden_id_list)) - return ERR_PTR(-EINVAL); + match = acpi_match_acpi_device(forbidden_id_list, adev); + if (match) { + if (match->driver_data & ACPI_ALLOW_WO_RESOURCES) { + acpi_walk_resources(adev->handle, METHOD_NAME__CRS, + acpi_platform_resource_count, &has_resources); + if (has_resources) + return ERR_PTR(-EINVAL); + } else { + return ERR_PTR(-EINVAL); + } + } INIT_LIST_HEAD(&resource_list); count = acpi_dev_get_resources(adev, &resource_list, NULL, NULL); From patchwork Mon Jul 3 12:14:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 115327 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp476342vqx; Mon, 3 Jul 2023 05:17:40 -0700 (PDT) X-Google-Smtp-Source: APBJJlGU+9NS+4PRXIx5F9eHlToHVziPblrqf0wHp4pIOChg8j+ojbvq8rtIP3EibcJVRxfKjzJ8 X-Received: by 2002:a17:903:1001:b0:1b8:9215:9163 with SMTP id a1-20020a170903100100b001b892159163mr3694384plb.6.1688386659715; Mon, 03 Jul 2023 05:17:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688386659; cv=none; d=google.com; s=arc-20160816; b=unHADA7f2aU1/0ELRK32dlK11FYgpDcoY24vmceHePJnRNTWF26ZqsFlzb+r2OFyd/ wFqZzaOhEKuE65H0JhTbRM/odtUCKMBLL0cI2iSk7dICTpnFlNWhsLGPa4+ub1s5Yxq2 qrBCRuw8iGoLlEmXPcgVNTPhbTpDo8CoH6XiX/9r544BSg28T8GN0KriDHP8HrUZN+fa zwGetVn+flU4BESJubxdOYoKrkMttMZCXMpCLUAgwnfeyfbdK/DvoYyWleWBRFbKdAKJ MwWcwOW2k7Dl9+zDYUIDJRhbP/mpS4qPWC1Onfk5fSSQN802TBJ3Th+ebtYaZLrMFgPN 6DqQ== 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=5iemao1POgRE/CvMCeRaCXAPB0CyOPW9l2gtyyY8uws=; fh=z41p7sb2mQHDU0cDatvZvSvBt/K/qZ0WnYN8eOL4by8=; b=fZH6nsbu+GNdpfaQ72ElHlZELUN6BaJjr/XWGeODEfbzZ5TyEGbc0+FzTsVDnwasYo FE6qay7bM/deTWER8Ak8lH0mG0eufBvZKk/m74KqzMOUJvJXKKLL2naD7EwE0NgS03vh 9GvbI5/GnyRnQ8FGdYSD7FsXEUap+OiEVlovzFs/yO66JJuVcSjFl5JwMt7GVTwYpI8Z SJ78h231C79ChclLB37VAP6clMb0nR3Lk1vOjMB2Z7AKM5ag9JCvPKObRk6Mq1Jm0WwL LmZYDc719OjNKFDnn30RajlwnWGqZl1J+rXVddR9nzPoqK9prKrtjpUF4fsvUTfdHNm8 9qyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=cmN2v3Bs; 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 t6-20020a170902b20600b0019c354055d0si17392783plr.304.2023.07.03.05.17.26; Mon, 03 Jul 2023 05:17:39 -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=cmN2v3Bs; 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 S229810AbjGCMOW (ORCPT + 99 others); Mon, 3 Jul 2023 08:14:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229728AbjGCMOP (ORCPT ); Mon, 3 Jul 2023 08:14:15 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0FC5F109; Mon, 3 Jul 2023 05:14:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688386455; x=1719922455; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=SqHkBAkMK8Hr6vUp+4hcp7KlH8mbLu8d9B93Kaa2CI0=; b=cmN2v3BsUccyQpB/JP3I9AtikT+eCMQn8WwHu9egn0wTtsuAYkJePai1 6HEjlNDFWllbAKPK60bGVrSH/GYvzl0UQXdKSAB5LWU4n8/saIkNoTzaA fMh+YAlfqXEMOlMMQ0CwefQZTVz3RDjwuAvshaHuA+RDCz/YbJSQE75HA hpXgpCwhxOTNx5bi2F58iuFl58g6RGaSGvPTjLE51k0XKVDf5NT/kznuZ ftDipyD8x8ixCcklcmp+ULXMzkKvDR30DeZQXpxGilEpPjfL0su892qqI ju1zCNIHGPfUCnGWKs4v5ZBYAxl1DpI+SRp2Ahdzf0szGGFoUPiRihiOa g==; X-IronPort-AV: E=McAfee;i="6600,9927,10759"; a="449241146" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="449241146" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2023 05:14:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10759"; a="718574510" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="718574510" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 03 Jul 2023 05:14:09 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 12A1A177; Mon, 3 Jul 2023 15:14:13 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , "Rafael J. Wysocki" , Wolfram Sang , Andi Shyti , 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 , Robert Moore , Michael Walle Subject: [PATCH v4 3/5] ACPI: platform: Move SMB0001 HID to the header and reuse Date: Mon, 3 Jul 2023 15:14:09 +0300 Message-Id: <20230703121411.69606-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230703121411.69606-1-andriy.shevchenko@linux.intel.com> References: <20230703121411.69606-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 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?1770401730221189098?= X-GMAIL-MSGID: =?utf-8?q?1770401730221189098?= 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 Acked-by: Wolfram Sang # for I2C Link: https://lore.kernel.org/r/20230621151652.79579-2-andriy.shevchenko@linux.intel.com Signed-off-by: Andy Shevchenko --- 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 c2ce558bd032..3867d5389c51 100644 --- a/drivers/acpi/acpi_platform.c +++ b/drivers/acpi/acpi_platform.c @@ -29,7 +29,7 @@ static const struct acpi_device_id forbidden_id_list[] = { {"PNP0000", 0}, /* PIC */ {"PNP0100", 0}, /* Timer */ {"PNP0200", 0}, /* AT DMA Controller */ - {"SMB0001", ACPI_ALLOW_WO_RESOURCES}, /* ACPI SMBUS virtual device */ + {ACPI_SMBUS_MS_HID, ACPI_ALLOW_WO_RESOURCES}, /* 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" From patchwork Mon Jul 3 12:14:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 115335 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp487966vqx; Mon, 3 Jul 2023 05:35:52 -0700 (PDT) X-Google-Smtp-Source: APBJJlEOS/JTOgcr+6ihqI6Q+yMC9lGLHgI5eFdjivKUwxgC0Au+c6MESo6jqdjmFUzOPl2Cxlqh X-Received: by 2002:a17:90b:24d:b0:263:1e82:2dc7 with SMTP id fz13-20020a17090b024d00b002631e822dc7mr11569215pjb.0.1688387752115; Mon, 03 Jul 2023 05:35:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688387752; cv=none; d=google.com; s=arc-20160816; b=1Jiajt9tPqzY4+Vp0TdCsblQY9aHdhZgU3XXo3skWJGacZX2/WjPmfu7gdIom7RId2 zg1CF6WaifeCbAmQnOw/l0vstcB20GqYm1jKQT8BTwBFHTYZeGxN2jRc2a0PZcQHfOzh nHSn1WTnBEoOV0l502yCqJkgMr92HwJ5THe589ZVUu7z/WNQG0XcUXND7otP0YXOyx8g 2QUQf3DKawD2HbMwW0mIpjwSYSRO9XvBtpM1CYKsqGz2QiYOKpKgHowuhgZ99nSMIGpc aiKkssmqYUfgjBKSZ5FeKb1I2DlA6w7hTnHcD11Al1jlFOpcR0qX8dHN+X83CoX56baR bpMA== 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=GPrtuCl/amqaNY9mbMAVD3ENJ2c/ANutpwvCXJbGFR8=; fh=z41p7sb2mQHDU0cDatvZvSvBt/K/qZ0WnYN8eOL4by8=; b=zgbipljCQWGMei0CpM1Fm0t7pzS1rVjb4y2X8SKLS8yCioajDR3NXG0cmLRKqwGfwr t6gZXy46WwLbLDNbYD6DwxV63csDiPV6ioX+NpTHqOBKNiy5vxVLz3S2/XdkgVhWJcXX PxbgLYZaQ1qp5vrrQNj2FfZfYWYLrSGGigxyQHVpGAbHDkQ6koR7HiQnLBKMYbfQMlM/ g0jO2MS3ErNFX+KVzrQRexj1bDJGPWMWgeuYwcOUoHCw7CTfB5KtBmCiIqOU0mGBX43Y 8nCYJrAI3YJoRGQWxaiEp5dXueCBdes0VBsf9THYOeAsaoP6+bF9hNeWVj59Hyu4OAMo 1XJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=NgWm81nl; 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 m8-20020a17090a4d8800b00263131a650bsi12656236pjh.77.2023.07.03.05.35.39; Mon, 03 Jul 2023 05:35:52 -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=NgWm81nl; 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 S230451AbjGCMOR (ORCPT + 99 others); Mon, 3 Jul 2023 08:14:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229989AbjGCMOP (ORCPT ); Mon, 3 Jul 2023 08:14:15 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48480115; Mon, 3 Jul 2023 05:14:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688386454; x=1719922454; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Z7bCMN6xKQi+ypGD5LL1aECtFx/TCb2DP0kRtZYvV10=; b=NgWm81nllrMuJmp/bRu/UKkw/UVojjh3HHK7yCFnShWqG/duNrkqWkgS CHgYchjvGjt+s2NGqsnMjDjjqOQrzUGn4zFXumNxx/nJhchWBXMeRtOrp efZY6DMhZw3cz+xW2Ly1+ftVY754CqoBtmjm/NZsbutC4gBQOYHzYf3cB sruHhESK3zosSYhn4/pjxMflqpSj5T7MXLytnlCfKF3E3a2hOJFBxK5v/ E5p5jX3XaJ8MHnlPxBOldkk1SkdjtcKC7cBmEOx/duXd/U+pgloUKMpbK c2oolHZ5eAXsePF6oxXt1hG958l599byK6w8/GvCTQ3KsCmESOpsV9Mis Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10759"; a="361726055" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="361726055" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2023 05:14:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10759"; a="788508188" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="788508188" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 03 Jul 2023 05:14:10 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 22DA81C7; Mon, 3 Jul 2023 15:14:13 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , "Rafael J. Wysocki" , Wolfram Sang , Andi Shyti , 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 , Robert Moore , Michael Walle Subject: [PATCH v4 4/5] ACPI: scan: Use the acpi_match_acpi_device() helper Date: Mon, 3 Jul 2023 15:14:10 +0300 Message-Id: <20230703121411.69606-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230703121411.69606-1-andriy.shevchenko@linux.intel.com> References: <20230703121411.69606-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 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?1770402875758847797?= X-GMAIL-MSGID: =?utf-8?q?1770402875758847797?= Instead of doing two pass parsing of the table, replace acpi_match_device_ids() with acpi_match_acpi_device(). Signed-off-by: Andy Shevchenko --- drivers/acpi/scan.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index e75ed9123931..ec1c9bec8bae 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -928,26 +928,29 @@ static int acpi_bus_extract_wakeup_device_power_package(struct acpi_device *dev) return err; } +/* Do not use a button for S5 wakeup */ +#define ACPI_AVOID_WAKE_FROM_S5 BIT(0) + static bool acpi_wakeup_gpe_init(struct acpi_device *device) { static const struct acpi_device_id button_device_ids[] = { - {"PNP0C0C", 0}, /* Power button */ - {"PNP0C0D", 0}, /* Lid */ - {"PNP0C0E", 0}, /* Sleep button */ + {"PNP0C0C", 0}, /* Power button */ + {"PNP0C0D", ACPI_AVOID_WAKE_FROM_S5}, /* Lid */ + {"PNP0C0E", ACPI_AVOID_WAKE_FROM_S5}, /* Sleep button */ {"", 0}, }; struct acpi_device_wakeup *wakeup = &device->wakeup; + const struct acpi_device_id *match; acpi_status status; wakeup->flags.notifier_present = 0; /* Power button, Lid switch always enable wakeup */ - if (!acpi_match_device_ids(device, button_device_ids)) { - if (!acpi_match_device_ids(device, &button_device_ids[1])) { - /* Do not use Lid/sleep button for S5 wakeup */ - if (wakeup->sleep_state == ACPI_STATE_S5) - wakeup->sleep_state = ACPI_STATE_S4; - } + match = acpi_match_acpi_device(button_device_ids, device); + if (match) { + if ((match->driver_data & ACPI_AVOID_WAKE_FROM_S5) && + wakeup->sleep_state == ACPI_STATE_S5) + wakeup->sleep_state = ACPI_STATE_S4; acpi_mark_gpe_for_wake(wakeup->gpe_device, wakeup->gpe_number); device_set_wakeup_capable(&device->dev, true); return true; From patchwork Mon Jul 3 12:14:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 115329 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp476551vqx; Mon, 3 Jul 2023 05:17:57 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6ZBJEVC7SNoUuqeH74MGiwtIYi+r+WRoUMPmXh9t2ziBoNqiaUiSkkdgDDEAfBIewr9zji X-Received: by 2002:a05:6870:a107:b0:1a6:a838:ae79 with SMTP id m7-20020a056870a10700b001a6a838ae79mr9637115oae.2.1688386677557; Mon, 03 Jul 2023 05:17:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688386677; cv=none; d=google.com; s=arc-20160816; b=Ozl3gguNhHlGpw1R9T95wGgGcSD7vosXp4luNifwWhSICSSNRXa99TsAlXO6p7W3C3 WJ8uAHWjHisASf3RkyjERVyAkQFV5JoJQEDfQShC6CEvEwogboY+e/M0KMyZO/OVnnFI mScBBvdHSh1xMFywjHC60Bpebpvr+5jh7DdJkuIV7Hgsj+iLVPLPjTYW7H0MpRW7GwCk THrZCrff14VYJYu0PqK6SV3yZSvWppzFG1x7vVOVDWNlRn3bEne5FDv3AECMqld3ahy8 RI+ckVdXwF0DJMGC/Vjf8e5m8qMG3NkX264iaBoBHgrNYrxJcN/v71Jn49vsru/5tI4t z96w== 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=aZ0CKwD8GTWfoOsdNHMJQnb1BrDwwqDl19MTlkaeIWc=; fh=z41p7sb2mQHDU0cDatvZvSvBt/K/qZ0WnYN8eOL4by8=; b=Vt6wauN0rnLB+gwILDTlr+UNHEgzuux9+WfuuYMGp4EbT6sp2vbZX+QM8J0W59VCKR /DnIK+rMcl7kHAZKDCDpmOeA6fL/KG25/snhjJhxv8SU6dJMuBiCDbGcWwAWfJ3Q1yM8 THIy2awLGM7GAGcey6M429YiWo8Mhp9v5zl+cTEH0xjAk/RWgUX1ee3Ab59YqhqO8Xmw 94ZszApaflkveBTKM0d7C92hAMeWQSD6S+XANAWZGNtkeUwHx6UAKR71txR1N4yFXNjD ICVkCxTFDLX0OoXhOTSMTgAyUNB9lcXq1S+GLE9cpaCHa+qxGUuq985eEy25XMfxTexI 8gTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=In5Upfr6; 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 i4-20020a63e444000000b0054fd3dd12d4si18662037pgk.799.2023.07.03.05.17.45; Mon, 03 Jul 2023 05:17:57 -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=In5Upfr6; 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 S231522AbjGCMO2 (ORCPT + 99 others); Mon, 3 Jul 2023 08:14:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229932AbjGCMOR (ORCPT ); Mon, 3 Jul 2023 08:14:17 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C6E910E; Mon, 3 Jul 2023 05:14:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688386457; x=1719922457; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6dRCLDNqHkkgOUVmba5HT205hg+Hl4f7VC7TUVOvuDs=; b=In5Upfr6C5gXiONAMV1wQ16x/2QH4eupis0ImI9fmQs/oIit5CGE3Vfu Yuf8spOZYtPt3pwy1PHuRLCsRnwy51aG16KSzHQvEEDJ614Ouj8EKsIcL zoL9c3KEFd5vT2dXtE9xjDRnGxic8/5fcYJUBDqy2+tETF03FA3MjL42c 45GXZCsbQQlU+yg21obn/mpfJqc6WiqaFNBPEv+NCBs2comcvyaB5V7Qn EAZWLJSSLlbJDYYm4EKCyNUvNc0IliaJvHF1gB0svq9HIBh4HSF4v8TyF x0La9plWQBrmJEVJExkH1mCqcNWu5HJ7547N8/SlKlGinEljTQgodHKtR Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10759"; a="361726070" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="361726070" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2023 05:14:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10759"; a="788508205" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="788508205" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 03 Jul 2023 05:14:13 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 28A8C17C; Mon, 3 Jul 2023 15:14:13 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , "Rafael J. Wysocki" , Wolfram Sang , Andi Shyti , 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 , Robert Moore , Michael Walle Subject: [PATCH v4 5/5] ACPI: scan: Provide symbol declarations Date: Mon, 3 Jul 2023 15:14:11 +0300 Message-Id: <20230703121411.69606-6-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230703121411.69606-1-andriy.shevchenko@linux.intel.com> References: <20230703121411.69606-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 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?1770401748804357859?= X-GMAIL-MSGID: =?utf-8?q?1770401748804357859?= Compiler is not happy about a couple of symbols that, it thinks, are not declared: warning: symbol 'acpi_device_lock' was not declared. Should it be static? warning: symbol 'acpi_wakeup_device_list' was not declared. Should it be static? Include "sleep.h" to have them explicitly declared and make the compiler happy. Signed-off-by: Andy Shevchenko --- drivers/acpi/scan.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index ec1c9bec8bae..5b145f1aaa1b 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -23,6 +23,7 @@ #include #include "internal.h" +#include "sleep.h" #define ACPI_BUS_CLASS "system_bus" #define ACPI_BUS_HID "LNXSYBUS"