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) {