From patchwork Thu Nov 23 10:06:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raag Jadav X-Patchwork-Id: 168850 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp339538vqx; Thu, 23 Nov 2023 02:10:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IG+GkMVzIxmmmUTU3zUnGJL9ZUlZGpVwdriWHCIcnQmw9bELYXjgmTVHN/fRH1DWQB1Vqpu X-Received: by 2002:a17:902:ce81:b0:1cc:ef37:664a with SMTP id f1-20020a170902ce8100b001ccef37664amr5402882plg.31.1700734252148; Thu, 23 Nov 2023 02:10:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700734252; cv=none; d=google.com; s=arc-20160816; b=mshjLTTJDtNhhBwdq657IW+rKlbw0zzwT9So8xGu3QQ/wSgsqmtd8A+6acQdWEWcGZ mUETPWuhbGI/wwR+rxEgablP4ze1QRD4F9zfjqSEiDsiGSZm1DslkpDU9UwAnoQrcyvq lsouVLmiet92z6BRha2xu3x7VsIU/RMsNCJzzNWy2fzFQINC2RvWu1YHpZrkZnxCP2ew cLnaQcyy6oKW/pytTetXwxkEBBCIulIOAACGz+/C4JxQT4D7yPjl80YkiZFmh3g7PDv4 IPHSfRabufy4vSZhSu6JIMXM2BuS1VXQ8t4cgGerjUuriDwu5wSeUzR8TpNk79lz9eEB +/LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=cym6fEr41glX61uMCOzw3aw34axigvB6E1lbcdoq4D8=; fh=LrjGCQr9k+7CYyd6XEdJgJkCFIUW/cPwqK3zW8PbdHI=; b=CidM1r2yrQaaWskzgjPwl1a2MXPmT3P8bGV7bjZNS0Z+LJo7DPeHZGkT3rlbUNqZ7q 1F92r4q7KdKSTuMiU5ACouxH0F+koWfkYMQihYKgGuKnPU0/Zt9XhD7IGHdr9IMlPrcI JxXRi+PTsdMStaTKYG73BxwM/a2dohbYVQ2Bm9XL8Jl5fqMnSdb5kwm4yUA9JNn6n2kW XO6W9NB0yAop4wa77+3zlFGpExEXBgg2nLcnw4VOQNohNSWfBi9ZpG4UcZdjkJkh2VvX 9EN65xMA+x5rs5fsNXNvSIivuzzNLvFknaHvhokqb9WkJhoAUkvk2fOX3gVNOh1WRUF7 eeng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=d6D4ZIWw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id a16-20020a170902ecd000b001bbc138af04si881446plh.158.2023.11.23.02.10.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 02:10:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=d6D4ZIWw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 57D478116E52; Thu, 23 Nov 2023 02:07:59 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344540AbjKWKHm (ORCPT + 99 others); Thu, 23 Nov 2023 05:07:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235346AbjKWKHT (ORCPT ); Thu, 23 Nov 2023 05:07:19 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC42210D9; Thu, 23 Nov 2023 02:07:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700734045; x=1732270045; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=tzAt7QISCosBSiPi2y68kDzl7xHEO4UQ7yEioSdJzTc=; b=d6D4ZIWw51g4zde6DbTb4vdlnMgeSj1Rhd5UCuht/Jp65HSTJz4gEZgD coiUu9MpdWr8HW2ufqRjCNhSnbLJtZ2CbhdtwHUob2PMxoMy64b3jpntN B6Erz/CScmEB+cvUEGj+NOOb/aY8Svc/AGlrLSRifeoJ/wXzzw/WrUxN4 bYPeMJFr03g32I7REq2d/MsM8jtbtDTG8I0M+d/dE4lNWjxmlOHr9LtUm jRuBgNpyaTQ8ar2n4Id0+P/fx7r0Q5MUxLbz46P54y7rrpBdQqnSGVPZT gW0URWfeoW4tDO0n63+dy+5q66ywaieCFT30/OlIGCF/PGBbcAhME3/b9 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="456576394" X-IronPort-AV: E=Sophos;i="6.04,221,1695711600"; d="scan'208";a="456576394" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2023 02:07:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="767160433" X-IronPort-AV: E=Sophos;i="6.04,221,1695711600"; d="scan'208";a="767160433" Received: from inlubt0316.iind.intel.com ([10.191.20.213]) by orsmga002.jf.intel.com with ESMTP; 23 Nov 2023 02:07:07 -0800 From: Raag Jadav To: mika.westerberg@linux.intel.com, andriy.shevchenko@linux.intel.com, rafael@kernel.org, lenb@kernel.org, robert.moore@intel.com, ardb@kernel.org, will@kernel.org, mark.rutland@arm.com Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, acpica-devel@lists.linuxfoundation.org, linux-efi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, mallikarjunappa.sangannavar@intel.com, bala.senthil@intel.com, Raag Jadav Subject: [PATCH v3 1/5] ACPI: bus: update acpi_dev_uid_match() to support multiple types Date: Thu, 23 Nov 2023 15:36:13 +0530 Message-Id: <20231123100617.28020-2-raag.jadav@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231123100617.28020-1-raag.jadav@intel.com> References: <20231123100617.28020-1-raag.jadav@intel.com> X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 23 Nov 2023 02:07:59 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783349119563494600 X-GMAIL-MSGID: 1783349119563494600 According to ACPI specification, a _UID object can evaluate to either a numeric value or a string. Update acpi_dev_uid_match() helper to support _UID matching for both integer and string types. Suggested-by: Mika Westerberg Signed-off-by: Raag Jadav --- drivers/acpi/utils.c | 19 ------------------- include/acpi/acpi_bus.h | 41 ++++++++++++++++++++++++++++++++++++++++- include/linux/acpi.h | 8 +++----- 3 files changed, 43 insertions(+), 25 deletions(-) diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c index 28c75242fca9..fe7e850c6479 100644 --- a/drivers/acpi/utils.c +++ b/drivers/acpi/utils.c @@ -824,25 +824,6 @@ bool acpi_check_dsm(acpi_handle handle, const guid_t *guid, u64 rev, u64 funcs) } EXPORT_SYMBOL(acpi_check_dsm); -/** - * acpi_dev_uid_match - Match device by supplied UID - * @adev: ACPI device to match. - * @uid2: Unique ID of the device. - * - * Matches UID in @adev with given @uid2. - * - * Returns: - * - %true if matches. - * - %false otherwise. - */ -bool acpi_dev_uid_match(struct acpi_device *adev, const char *uid2) -{ - const char *uid1 = acpi_device_uid(adev); - - return uid1 && uid2 && !strcmp(uid1, uid2); -} -EXPORT_SYMBOL_GPL(acpi_dev_uid_match); - /** * acpi_dev_hid_uid_match - Match device by supplied HID and UID * @adev: ACPI device to match. diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index ec6a673dcb95..a4622d95a36d 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -857,10 +857,49 @@ static inline bool acpi_device_can_poweroff(struct acpi_device *adev) adev->power.states[ACPI_STATE_D3_HOT].flags.explicit_set); } -bool acpi_dev_uid_match(struct acpi_device *adev, const char *uid2); bool acpi_dev_hid_uid_match(struct acpi_device *adev, const char *hid2, const char *uid2); int acpi_dev_uid_to_integer(struct acpi_device *adev, u64 *integer); +static inline bool acpi_str_uid_match(struct acpi_device *adev, const char *uid2) +{ + const char *uid1 = acpi_device_uid(adev); + + return uid1 && uid2 && !strcmp(uid1, uid2); +} + +static inline bool acpi_int_uid_match(struct acpi_device *adev, u64 uid2) +{ + u64 uid1; + + return !acpi_dev_uid_to_integer(adev, &uid1) && uid1 == uid2; +} + +/** + * acpi_dev_uid_match - Match device by supplied UID + * @adev: ACPI device to match. + * @uid2: Unique ID of the device. + * + * Matches UID in @adev with given @uid2. + * + * Returns: %true if matches, %false otherwise. + */ +#define CONSTIFY(type, x) \ + const type: x, \ + type: x + +#define ACPI_STR_TYPE(match) \ + CONSTIFY(unsigned char *, match), \ + CONSTIFY(signed char *, match), \ + CONSTIFY(char *, match), \ + CONSTIFY(void *, match) + +#define acpi_dev_uid_match(adev, uid2) \ + _Generic(uid2, \ + /* Treat @uid2 as a string for acpi string types */ \ + ACPI_STR_TYPE(acpi_str_uid_match), \ + /* Treat as an integer otherwise */ \ + default: acpi_int_uid_match)(adev, uid2) + void acpi_dev_clear_dependencies(struct acpi_device *supplier); bool acpi_dev_ready_for_enumeration(const struct acpi_device *device); struct acpi_device *acpi_dev_get_next_consumer_dev(struct acpi_device *supplier, diff --git a/include/linux/acpi.h b/include/linux/acpi.h index b556f716d115..6f1e9f98fa44 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -763,6 +763,9 @@ const char *acpi_get_subsystem_id(acpi_handle handle); #define ACPI_HANDLE(dev) (NULL) #define ACPI_HANDLE_FWNODE(fwnode) (NULL) +/* Get rid of the -Wunused-variable for adev */ +#define acpi_dev_uid_match(adev, uid2) (adev && false) + #include struct fwnode_handle; @@ -779,11 +782,6 @@ static inline bool acpi_dev_present(const char *hid, const char *uid, s64 hrv) struct acpi_device; -static inline bool acpi_dev_uid_match(struct acpi_device *adev, const char *uid2) -{ - return false; -} - static inline bool acpi_dev_hid_uid_match(struct acpi_device *adev, const char *hid2, const char *uid2) { From patchwork Thu Nov 23 10:06:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raag Jadav X-Patchwork-Id: 168845 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp338273vqx; Thu, 23 Nov 2023 02:08:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IHW1EYt+EqDWPY2xfcvOBy4VqppwHUe5432nVgLGPvkO7F59HmlrFuhzGDM2foBd4vpqfBy X-Received: by 2002:a05:6e02:1053:b0:35b:b31:6a4b with SMTP id p19-20020a056e02105300b0035b0b316a4bmr3895977ilj.30.1700734090901; Thu, 23 Nov 2023 02:08:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700734090; cv=none; d=google.com; s=arc-20160816; b=PM7ytb1uYiByfjHdBWoAyZYpJ0NQgVviJ/dNajjlhKi6gSploj+mY2f2yAQ17j59ZN K8xp82KbMheC2gcLp/1lQFUXt5yBhzxDS33z+Ffo5aa8s0y5wxsa48W3tESKGlrKf5Gs XCutKDfGlbGcTIyi+n0ejQAahdRUSzrbsu9y70jM88iCdPHf2rJ4d33UxL2X7bryGLpn NXl5ESawx2GB75e2X6zqS7z0E3o8SCalLmrLwPcdbRAx9dcYgLyfe2uNrQBJFX7XBDp8 cJvn1bhVPJkh3x4LlBUTsksqUoVJtGnZydZtDqX4YsXCmAG25HpmkcUx7LSutM5PqshX Cxkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=NfYTsuDcqc/kQmopngjjrLxDTSlEDr2/B59Sa6Ol6xA=; fh=LrjGCQr9k+7CYyd6XEdJgJkCFIUW/cPwqK3zW8PbdHI=; b=0vwC/ac5JwFG4jWjjArNIHQvXOjGM9EAnWxyIB5zUGKMsjWYlwySH7fjNhSrPlGYU3 pD4QoOuZz9/hRtV3odnQnb7Sknr1gZ9mj9nbQZp/RXEg9K215C61aBbMVg4qICTcpBVx p0TB2l30uK4C9DLR/DzK1A44cDRd2fnVbmENQCi3bt4Ie4lrffwe5s8Vm+1x7SYTIHce Ti8/jQrB7I4befL9+zuNooaB20Fo68G97CmYMF/LPvMlxclUME39Y3vd8x7iyTtAhy1a fxea1m6pBDlXh5bbX5T/ohqT+kgISgtkadyXA3lP5HhdsA/HWyezBwcXV1WWE5cLRiUY rNHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="g0/9uDb4"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id q6-20020a635046000000b005c20241fd89si968476pgl.822.2023.11.23.02.08.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 02:08:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="g0/9uDb4"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 0259780834A6; Thu, 23 Nov 2023 02:08:04 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344740AbjKWKHw (ORCPT + 99 others); Thu, 23 Nov 2023 05:07:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235257AbjKWKHV (ORCPT ); Thu, 23 Nov 2023 05:07:21 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40114D5C; Thu, 23 Nov 2023 02:07:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700734047; x=1732270047; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=M17rtlGu3x0u3QSxZOF2OqZZLdquFjrEe7DlHL2uUIM=; b=g0/9uDb4clB/q4HySwqyj4+a4xz+4oYB5oN4f81TZUrctuBwnBJmfnYS 3r5GAq732atzqh4QbLPiKo6Ez2NKAmtawuastxOtWrwsTJ8u5Vmd5KnYh sFopdsJe4lO2/ugOo3Q0yhobwh/SHsIVhemVWOe9oXF+ug+qFLTrfzGXS Lcc+qE33t9ysfgANmoPU/LaGlpqd/3RKoq1FyEeqr2quCJyNyfusQ4jDV 2CI17tcgWlE35z5/0iQsgwU2clQ1+Bqs1FlaDeCX3cAgiwRgulumCTiSY lxdjC8qiOUXvfj0l0hb0D0ekdXaYRquIb7znNWhcZPv/Bbt/FGg/SWcaT g==; X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="456576407" X-IronPort-AV: E=Sophos;i="6.04,221,1695711600"; d="scan'208";a="456576407" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2023 02:07:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="767160473" X-IronPort-AV: E=Sophos;i="6.04,221,1695711600"; d="scan'208";a="767160473" Received: from inlubt0316.iind.intel.com ([10.191.20.213]) by orsmga002.jf.intel.com with ESMTP; 23 Nov 2023 02:07:12 -0800 From: Raag Jadav To: mika.westerberg@linux.intel.com, andriy.shevchenko@linux.intel.com, rafael@kernel.org, lenb@kernel.org, robert.moore@intel.com, ardb@kernel.org, will@kernel.org, mark.rutland@arm.com Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, acpica-devel@lists.linuxfoundation.org, linux-efi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, mallikarjunappa.sangannavar@intel.com, bala.senthil@intel.com, Raag Jadav Subject: [PATCH v3 2/5] ACPI: bus: update acpi_dev_hid_uid_match() to support multiple types Date: Thu, 23 Nov 2023 15:36:14 +0530 Message-Id: <20231123100617.28020-3-raag.jadav@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231123100617.28020-1-raag.jadav@intel.com> References: <20231123100617.28020-1-raag.jadav@intel.com> X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Thu, 23 Nov 2023 02:08:05 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783348950424803413 X-GMAIL-MSGID: 1783348950424803413 Now that we have _UID matching support for both integer and string types, we can support them into acpi_dev_hid_uid_match() helper as well. Signed-off-by: Raag Jadav Reviewed-by: Mika Westerberg --- drivers/acpi/utils.c | 29 ----------------------------- include/acpi/acpi_bus.h | 24 +++++++++++++++++++++++- include/linux/acpi.h | 7 +------ 3 files changed, 24 insertions(+), 36 deletions(-) diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c index fe7e850c6479..03f6de9a0807 100644 --- a/drivers/acpi/utils.c +++ b/drivers/acpi/utils.c @@ -824,35 +824,6 @@ bool acpi_check_dsm(acpi_handle handle, const guid_t *guid, u64 rev, u64 funcs) } EXPORT_SYMBOL(acpi_check_dsm); -/** - * acpi_dev_hid_uid_match - Match device by supplied HID and UID - * @adev: ACPI device to match. - * @hid2: Hardware ID of the device. - * @uid2: Unique ID of the device, pass NULL to not check _UID. - * - * Matches HID and UID in @adev with given @hid2 and @uid2. Absence of @uid2 - * will be treated as a match. If user wants to validate @uid2, it should be - * done before calling this function. - * - * Returns: - * - %true if matches or @uid2 is NULL. - * - %false otherwise. - */ -bool acpi_dev_hid_uid_match(struct acpi_device *adev, - const char *hid2, const char *uid2) -{ - const char *hid1 = acpi_device_hid(adev); - - if (strcmp(hid1, hid2)) - return false; - - if (!uid2) - return true; - - return acpi_dev_uid_match(adev, uid2); -} -EXPORT_SYMBOL(acpi_dev_hid_uid_match); - /** * acpi_dev_uid_to_integer - treat ACPI device _UID as integer * @adev: ACPI device to get _UID from diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index a4622d95a36d..e5b4c3f8d2be 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -857,9 +857,15 @@ static inline bool acpi_device_can_poweroff(struct acpi_device *adev) adev->power.states[ACPI_STATE_D3_HOT].flags.explicit_set); } -bool acpi_dev_hid_uid_match(struct acpi_device *adev, const char *hid2, const char *uid2); int acpi_dev_uid_to_integer(struct acpi_device *adev, u64 *integer); +static inline bool acpi_dev_hid_match(struct acpi_device *adev, const char *hid2) +{ + const char *hid1 = acpi_device_hid(adev); + + return hid1 && hid2 && !strcmp(hid1, hid2); +} + static inline bool acpi_str_uid_match(struct acpi_device *adev, const char *uid2) { const char *uid1 = acpi_device_uid(adev); @@ -900,6 +906,22 @@ static inline bool acpi_int_uid_match(struct acpi_device *adev, u64 uid2) /* Treat as an integer otherwise */ \ default: acpi_int_uid_match)(adev, uid2) +/** + * acpi_dev_hid_uid_match - Match device by supplied HID and UID + * @adev: ACPI device to match. + * @hid2: Hardware ID of the device. + * @uid2: Unique ID of the device, pass 0 or NULL to not check _UID. + * + * Matches HID and UID in @adev with given @hid2 and @uid2. Absence of @uid2 + * will be treated as a match. If user wants to validate @uid2, it should be + * done before calling this function. + * + * Returns: %true if matches or @uid2 is 0 or NULL, %false otherwise. + */ +#define acpi_dev_hid_uid_match(adev, hid2, uid2) \ + (acpi_dev_hid_match(adev, hid2) && \ + (!(uid2) || acpi_dev_uid_match(adev, uid2))) + void acpi_dev_clear_dependencies(struct acpi_device *supplier); bool acpi_dev_ready_for_enumeration(const struct acpi_device *device); struct acpi_device *acpi_dev_get_next_consumer_dev(struct acpi_device *supplier, diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 6f1e9f98fa44..118a18b7ff84 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -765,6 +765,7 @@ const char *acpi_get_subsystem_id(acpi_handle handle); /* Get rid of the -Wunused-variable for adev */ #define acpi_dev_uid_match(adev, uid2) (adev && false) +#define acpi_dev_hid_uid_match(adev, hid2, uid2) (adev && false) #include @@ -782,12 +783,6 @@ static inline bool acpi_dev_present(const char *hid, const char *uid, s64 hrv) struct acpi_device; -static inline bool -acpi_dev_hid_uid_match(struct acpi_device *adev, const char *hid2, const char *uid2) -{ - return false; -} - static inline int acpi_dev_uid_to_integer(struct acpi_device *adev, u64 *integer) { return -ENODEV; From patchwork Thu Nov 23 10:06:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raag Jadav X-Patchwork-Id: 168847 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp338385vqx; Thu, 23 Nov 2023 02:08:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IH+7ipr+uI9L5IQGytobKouVNBSPKjsfHwsK9BerBmjy987KTLkJeODmS11fynpyKRfaWSi X-Received: by 2002:a05:6e02:d03:b0:35b:24ef:ddb6 with SMTP id g3-20020a056e020d0300b0035b24efddb6mr5257967ilj.19.1700734105957; Thu, 23 Nov 2023 02:08:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700734105; cv=none; d=google.com; s=arc-20160816; b=Z+grYNMNQKTLpDj24sNl1Y1t62bsTtmT9OS6oxELe5lsrtdsoSRkIp5rko7Ycxllsl 6DJehIBTu9fJAvlREUS4PKvy0vOUvdDuZWCns2JlU+iuvJRgotAlRIl7oMgs8tm9PJcR reoErrsbEYhyiTABf6TwqIHLOKU16fq23hkSyRar/v50UoVTRx6ymlwsQ1IpEqJxD2OR zMMcrMc7q95mtmvEtrosCDjcnIztwtzNfCjIBL0p9ueL0mxGzr2SDHcW582mm+VNEJiF UjjdnazQDfVcp6x//hFlKEpXHdWl1Pu/+wqsWCDfC91DpxUWX0fw1iZgUBzRlmD2fjVs b+Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=vKn2+4j3l1cxWUSYl/dGHbyi8WL+9X4sZnCFaAS32PI=; fh=LrjGCQr9k+7CYyd6XEdJgJkCFIUW/cPwqK3zW8PbdHI=; b=Tkb/jxHs2JAgnk/lrEZFO3x++Sa+aQz1HjxIY9EtXhkjVm4PC/MuyriMCK4WQwf6mF klU5wBDNykQsOELLF7Le0ZWsoFkq9fMgKbQTzIlKVxl6YUswqIp5vqE4STuB7MvI8XxG IRMgJAOOtL/SmIut5h4dMQFcnBpS7bncnkYhqos+HdwguKgnP98OHyXi3q9cIuqN8XQA yi00MlDXERsTon1Aio+IgiHjHMimNRKdk9e6PCG0aMZ9PZNbnf1/REjk1sORlOzlgDXQ tRSSqZceAtKqOKXykcev88T1JPUVdGAEUM1ng43/FS7mO8aOccB6ycjL9Z67NgXSq5IB RgMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="Kq0gVa/R"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id k2-20020a635a42000000b005be1ee5beb7si963505pgm.534.2023.11.23.02.08.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 02:08:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="Kq0gVa/R"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 6F4AA80834B5; Thu, 23 Nov 2023 02:08:21 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235319AbjKWKHr (ORCPT + 99 others); Thu, 23 Nov 2023 05:07:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235259AbjKWKHV (ORCPT ); Thu, 23 Nov 2023 05:07:21 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C181510DF; Thu, 23 Nov 2023 02:07:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700734047; x=1732270047; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=UiSJDgehd3ZmZrMiVJSfKgyDPoJmiX2ZPNSPqcXf4ys=; b=Kq0gVa/Rbbqvwi9qHmf/ChbmHC0mx/iVDs8WcAdrWOJEA6tPpYCAQ6Xn zwDOH11XAY0h4CcxTsLdjNJQYNgu78j+cLGshjp5f0BIgfJrLphmlzn7V VCsQIKH2jR8NzTFq+K0b2ibIuiYWKwaSKPFCPwxR+uTC+Irr5rul0DAo/ dIoksejh0QIKcCiXpu7ofvISthm15FBosLlJGHlj62hZlKJ/U5dHaHIfZ satVtOsvq5ipRh2xq3U+8G9qpc6nxnukCJytrfDlKzfV0kXRnx5SGmtyv 847sdFklD1NGXV1OXOHlrq3a4mbBf/VEaSME6/B5ylKyF3/m3AIZGD1az Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="456576415" X-IronPort-AV: E=Sophos;i="6.04,221,1695711600"; d="scan'208";a="456576415" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2023 02:07:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="767160492" X-IronPort-AV: E=Sophos;i="6.04,221,1695711600"; d="scan'208";a="767160492" Received: from inlubt0316.iind.intel.com ([10.191.20.213]) by orsmga002.jf.intel.com with ESMTP; 23 Nov 2023 02:07:16 -0800 From: Raag Jadav To: mika.westerberg@linux.intel.com, andriy.shevchenko@linux.intel.com, rafael@kernel.org, lenb@kernel.org, robert.moore@intel.com, ardb@kernel.org, will@kernel.org, mark.rutland@arm.com Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, acpica-devel@lists.linuxfoundation.org, linux-efi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, mallikarjunappa.sangannavar@intel.com, bala.senthil@intel.com, Raag Jadav Subject: [PATCH v3 3/5] ACPI: LPSS: use acpi_dev_uid_match() for matching _UID Date: Thu, 23 Nov 2023 15:36:15 +0530 Message-Id: <20231123100617.28020-4-raag.jadav@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231123100617.28020-1-raag.jadav@intel.com> References: <20231123100617.28020-1-raag.jadav@intel.com> X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Thu, 23 Nov 2023 02:08:21 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783348965667941666 X-GMAIL-MSGID: 1783348965667941666 Now that we have _UID matching support for integer types, we can use acpi_dev_uid_match() for it. Signed-off-by: Raag Jadav Acked-by: Mika Westerberg --- drivers/acpi/acpi_lpss.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c index 875de44961bf..79f4fc7d6871 100644 --- a/drivers/acpi/acpi_lpss.c +++ b/drivers/acpi/acpi_lpss.c @@ -167,13 +167,9 @@ static struct pwm_lookup byt_pwm_lookup[] = { static void byt_pwm_setup(struct lpss_private_data *pdata) { - u64 uid; - /* Only call pwm_add_table for the first PWM controller */ - if (acpi_dev_uid_to_integer(pdata->adev, &uid) || uid != 1) - return; - - pwm_add_table(byt_pwm_lookup, ARRAY_SIZE(byt_pwm_lookup)); + if (acpi_dev_uid_match(pdata->adev, 1)) + pwm_add_table(byt_pwm_lookup, ARRAY_SIZE(byt_pwm_lookup)); } #define LPSS_I2C_ENABLE 0x6c @@ -218,13 +214,9 @@ static struct pwm_lookup bsw_pwm_lookup[] = { static void bsw_pwm_setup(struct lpss_private_data *pdata) { - u64 uid; - /* Only call pwm_add_table for the first PWM controller */ - if (acpi_dev_uid_to_integer(pdata->adev, &uid) || uid != 1) - return; - - pwm_add_table(bsw_pwm_lookup, ARRAY_SIZE(bsw_pwm_lookup)); + if (acpi_dev_uid_match(pdata->adev, 1)) + pwm_add_table(bsw_pwm_lookup, ARRAY_SIZE(bsw_pwm_lookup)); } static const struct property_entry lpt_spi_properties[] = { From patchwork Thu Nov 23 10:06:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raag Jadav X-Patchwork-Id: 168848 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp338445vqx; Thu, 23 Nov 2023 02:08:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IFoUlSi4by0ugpfQ0hskjiFIJ5Gwqcylg/2RuD6nU0uQZdKpt0qAWMOBtMGfe2UtEIf38vW X-Received: by 2002:a17:903:1108:b0:1cc:2575:db14 with SMTP id n8-20020a170903110800b001cc2575db14mr6095440plh.60.1700734111586; Thu, 23 Nov 2023 02:08:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700734111; cv=none; d=google.com; s=arc-20160816; b=B63NkElqZsQflb7ENEo5OSx8Vhm19ImRrv/T2TScTGO7Hdveul8AYsSFlTXR7WO232 fiSWiglSKJINU2BcP94j00hI3z44kPUqkVX7Mw5NNwPI8E0uXUIY6qyZ2gc4D/yAZWo+ HfQG7OLWnDRxecR0VvZ6M4/XGrrwxj668S804bsXHS3QfvdWx5Qmb/T8lHp2j1DAud4S B0kBQd0/b+aUjEGPm7Ygsp6w4xuk+n99DGtCIu9EQLNvsNCk2TaX/BwQ5a5VRtpkhFAk pGyIEjcLbHYhrgDd3IDe0XNcAqMkDOt4FP01bX8BCEDzTAY6ZcWJA/B9ZWQ5uuh5Vvh7 zJ6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=NQJ42DI1/kJ2EhQYP9IbkQly2pwdytZxZ2jV9J8mazM=; fh=LrjGCQr9k+7CYyd6XEdJgJkCFIUW/cPwqK3zW8PbdHI=; b=h9DAIEGTnrttva2trxMAmhEGaGEcj9xKGWJRIW5vj+drMAhfHkrlGoOIgTDDXNd/l4 Mo578Su7HxvfofAES9V9fQlVQDQW1DreVJpKUU0bdHXW4BV0/fXMNAJ+ztLOEp7/fyJD xQK+0fSuF++aU7lXNzu+2KJmndm59iiBqFqtIZxCi3DoF4c0/2vVqf5/Ym8K0SOQVLoW LpcKBtkESzv1wU1Ew4kEpqExlQeSTP3hJTZgwd6vqc4cEOYYz6pe3adIj0kluqDWBwwG dVf4po+oArs9h10pj9OjomayUq7NVcslB+JFsnJYYPsptxH48qDLPFaURNeBn/MI9cV4 Aeug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TaQG2Lew; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id iw17-20020a170903045100b001cf56ff28a4si813827plb.522.2023.11.23.02.08.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 02:08:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TaQG2Lew; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 1B6D380732A9; Thu, 23 Nov 2023 02:08:29 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344779AbjKWKH4 (ORCPT + 99 others); Thu, 23 Nov 2023 05:07:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235349AbjKWKHW (ORCPT ); Thu, 23 Nov 2023 05:07:22 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9969010E0; Thu, 23 Nov 2023 02:07:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700734048; x=1732270048; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=ibYMWWRd/P2AQAHicSo9ziPs651CklYQuIen4L+deis=; b=TaQG2LewxNxeUWqKuhpYuwb3nBje1pKnwXSRrxiXt4JtjzvoEjvHkmTb sIp8GVsY/jwKyW0gzIplwMOSEvwKqa0gRQIFTyWBWtzJPwodg7GNPmmSi gSKDOPsLUOinHAj830KcdSW3960ljlHw6noYPybpoUS9h/eqyNRoKJzVR pddlpu6tmhYYmlAnGcXZI+FkE4FqEp3f7kPfF8BVMheksBUe/gHzOCcbA e1Yb3YpUDJn2g9LAl9eSGpfWFiMZesMoNTqog4NdD0B2utdAKkpDfKrS0 8i+fnI02nqJlZxHf5+rmzSxWqLnLporMO1OAwd/TfcVtLUcZyHWRmJXOI Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="456576426" X-IronPort-AV: E=Sophos;i="6.04,221,1695711600"; d="scan'208";a="456576426" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2023 02:07:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="767160521" X-IronPort-AV: E=Sophos;i="6.04,221,1695711600"; d="scan'208";a="767160521" Received: from inlubt0316.iind.intel.com ([10.191.20.213]) by orsmga002.jf.intel.com with ESMTP; 23 Nov 2023 02:07:21 -0800 From: Raag Jadav To: mika.westerberg@linux.intel.com, andriy.shevchenko@linux.intel.com, rafael@kernel.org, lenb@kernel.org, robert.moore@intel.com, ardb@kernel.org, will@kernel.org, mark.rutland@arm.com Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, acpica-devel@lists.linuxfoundation.org, linux-efi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, mallikarjunappa.sangannavar@intel.com, bala.senthil@intel.com, Raag Jadav Subject: [PATCH v3 4/5] efi: dev-path-parser: use acpi_dev_uid_match() for matching _UID Date: Thu, 23 Nov 2023 15:36:16 +0530 Message-Id: <20231123100617.28020-5-raag.jadav@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231123100617.28020-1-raag.jadav@intel.com> References: <20231123100617.28020-1-raag.jadav@intel.com> X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Thu, 23 Nov 2023 02:08:29 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783348971616189226 X-GMAIL-MSGID: 1783348971616189226 Now that we have _UID matching support for integer types, we can use acpi_dev_uid_match() for it. Signed-off-by: Raag Jadav Reviewed-by: Ard Biesheuvel --- drivers/firmware/efi/dev-path-parser.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/firmware/efi/dev-path-parser.c b/drivers/firmware/efi/dev-path-parser.c index f80d87c199c3..937be269fee8 100644 --- a/drivers/firmware/efi/dev-path-parser.c +++ b/drivers/firmware/efi/dev-path-parser.c @@ -18,8 +18,6 @@ static long __init parse_acpi_path(const struct efi_dev_path *node, struct acpi_device *adev; struct device *phys_dev; char hid[ACPI_ID_LEN]; - u64 uid; - int ret; if (node->header.length != 12) return -EINVAL; @@ -31,10 +29,9 @@ static long __init parse_acpi_path(const struct efi_dev_path *node, node->acpi.hid >> 16); for_each_acpi_dev_match(adev, hid, NULL, -1) { - ret = acpi_dev_uid_to_integer(adev, &uid); - if (ret == 0 && node->acpi.uid == uid) + if (acpi_dev_uid_match(adev, node->acpi.uid)) break; - if (ret == -ENODATA && node->acpi.uid == 0) + if (!acpi_device_uid(adev) && node->acpi.uid == 0) break; } if (!adev) From patchwork Thu Nov 23 10:06:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raag Jadav X-Patchwork-Id: 168849 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp338629vqx; Thu, 23 Nov 2023 02:08:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IGZ7l1Ghx6io26rI7dXHx0yCFvr8C8gz+HoLIenOOd2iqduDrAzIsVfrmA+qua4lIpvAoo4 X-Received: by 2002:a17:902:c408:b0:1cf:7911:4619 with SMTP id k8-20020a170902c40800b001cf79114619mr6431199plk.49.1700734136833; Thu, 23 Nov 2023 02:08:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700734136; cv=none; d=google.com; s=arc-20160816; b=HjnH3HKyeLrvFf5oicSW7i6Q5a+z7DTVTkHee9AvqI5MnycRQAZEmJFkfaGVOALIaZ 5uf4aFKlTZBDD1hSXHiJRveG8klOU8L2B8/rc7Q57F5NbEI0rIOHHVLNvnKt1wNKjv4F IWb1+fKitQ14U0s5MYQlrXuKIqk90OxlxjXuwH5ecMQNd2owJLyAzMdUQaH3sAlWT8IW OCEyA4i6VwYCcqhjU4/OTED7PAyJupCVwk23vWo6FXtyOrROikTl527aGYctfqrdtoDc gZIlp3QkwDY8fynSn/NGEVl0JfAE13qip2pvAu7ShAAFHRx5rJdojNStGvVsq5mpDsRN EjnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=QjTjnPHdHtVH1dC7lHvGdGK387/jBH30+7TqV7VysKg=; fh=LrjGCQr9k+7CYyd6XEdJgJkCFIUW/cPwqK3zW8PbdHI=; b=FN5CY0g0oifJyDMcRPH/1TRm3Q/19Xdl0qlHelcw8nGcpVPWzKCd6zdo+1qXcHOt1N O5149M7mdOKU3jCFQrjUXT4QCF2Db/64Jz1d/O1RxyD5WQJIIXhTBw40pT34/aYFrCPb PjcLV1Cc9rfDChOF8NTOG2VdzuQoH51MrwINJd5vilTCjo97bK2FVWMWCdK6gBm9izVL KIPwpLKPgszKIb8GcnM9nhTWbp44rN+6N+lRuLPK9m4cenoY1JiZnhBicfTcWwssfQwf 3QK0z0gHz9DsXv8kEBcMk7PMePLw1rtXHtVpmu4ZnZa+IrPYJDzH1FWWgZyGSmxWpQfa zItg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=fySHu95r; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id j4-20020a170902690400b001ce5fce5328si840952plk.99.2023.11.23.02.08.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 02:08:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=fySHu95r; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 6A0208098439; Thu, 23 Nov 2023 02:08:16 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344342AbjKWKH7 (ORCPT + 99 others); Thu, 23 Nov 2023 05:07:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235351AbjKWKHY (ORCPT ); Thu, 23 Nov 2023 05:07:24 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0956D10EB; Thu, 23 Nov 2023 02:07:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700734051; x=1732270051; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=eGrPJB71BQqPQgzBxdkMDsK/ebN3t2PqlY8XYy9ELos=; b=fySHu95rX65pKTF/wNvbOZ170G5WL0GKZQKbQWukKyWG2dbMqd8TxFPR gPQ2FtFwLy1Qmn0OkciwDjwcCQXBdpdZ7zofhQFLJSad9WvS+YdeG7IPp KCXTH7b32BSbiejOu2MQREjp9eLz+Q4yO7Gh0r7PtJdJT+LIhoPyYVWEQ 8GVAb9Oiuuikd9Xcdye/JbXotxWItfhbhXPW9eVsQDmoDtxC6E632AiKg gnezJnIRBTrjhv58ASiAis4Gl95xGSOV71xgOdDaFmO772acVp1lGiVhN UttWsbHr3ls06V8NKSaIYrjCQtrid5/s9Qwuw1dzU5t/VvGuPieGSJG86 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="456576447" X-IronPort-AV: E=Sophos;i="6.04,221,1695711600"; d="scan'208";a="456576447" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2023 02:07:30 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="767160544" X-IronPort-AV: E=Sophos;i="6.04,221,1695711600"; d="scan'208";a="767160544" Received: from inlubt0316.iind.intel.com ([10.191.20.213]) by orsmga002.jf.intel.com with ESMTP; 23 Nov 2023 02:07:26 -0800 From: Raag Jadav To: mika.westerberg@linux.intel.com, andriy.shevchenko@linux.intel.com, rafael@kernel.org, lenb@kernel.org, robert.moore@intel.com, ardb@kernel.org, will@kernel.org, mark.rutland@arm.com Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, acpica-devel@lists.linuxfoundation.org, linux-efi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, mallikarjunappa.sangannavar@intel.com, bala.senthil@intel.com, Raag Jadav Subject: [PATCH v3 5/5] perf: arm_cspmu: drop redundant acpi_dev_uid_to_integer() Date: Thu, 23 Nov 2023 15:36:17 +0530 Message-Id: <20231123100617.28020-6-raag.jadav@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231123100617.28020-1-raag.jadav@intel.com> References: <20231123100617.28020-1-raag.jadav@intel.com> X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Thu, 23 Nov 2023 02:08:16 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783348997833838642 X-GMAIL-MSGID: 1783348997833838642 Now that we have _UID matching support for integer types, we can use acpi_dev_hid_uid_match() for it. Signed-off-by: Raag Jadav Acked-by: Will Deacon --- drivers/perf/arm_cspmu/arm_cspmu.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/perf/arm_cspmu/arm_cspmu.c b/drivers/perf/arm_cspmu/arm_cspmu.c index 2cc35dded007..50b89b989ce7 100644 --- a/drivers/perf/arm_cspmu/arm_cspmu.c +++ b/drivers/perf/arm_cspmu/arm_cspmu.c @@ -1108,7 +1108,6 @@ static int arm_cspmu_request_irq(struct arm_cspmu *cspmu) static inline int arm_cspmu_find_cpu_container(int cpu, u32 container_uid) { - u64 acpi_uid; struct device *cpu_dev; struct acpi_device *acpi_dev; @@ -1118,8 +1117,7 @@ static inline int arm_cspmu_find_cpu_container(int cpu, u32 container_uid) acpi_dev = ACPI_COMPANION(cpu_dev); while (acpi_dev) { - if (acpi_dev_hid_uid_match(acpi_dev, ACPI_PROCESSOR_CONTAINER_HID, NULL) && - !acpi_dev_uid_to_integer(acpi_dev, &acpi_uid) && acpi_uid == container_uid) + if (acpi_dev_hid_uid_match(acpi_dev, ACPI_PROCESSOR_CONTAINER_HID, container_uid)) return 0; acpi_dev = acpi_dev_parent(acpi_dev);