From patchwork Mon Oct 23 05:35:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raag Jadav X-Patchwork-Id: 156666 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1090326vqx; Sun, 22 Oct 2023 22:36:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFi6BGXrqLU7iieeiETveIXr1fGFMY1aZxK5EQN4sRbCiQhhkUc8as/OJqHXQXNHnwFhNgx X-Received: by 2002:a05:6808:a1b:b0:3a4:225f:a15b with SMTP id n27-20020a0568080a1b00b003a4225fa15bmr8770957oij.31.1698039409004; Sun, 22 Oct 2023 22:36:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698039408; cv=none; d=google.com; s=arc-20160816; b=Fi6xFNyJJJQVh7gzWxsn3cSovILOj0k3BRvzYepwb/SNNXMQcIf/DtJdjk9BcCbOtO azg7eER6St60OfFiQdAN2WjWybNCJ5OKK7lEZStXuumVIqyqagvbjyOjs/Za9DuZRbup YnCXuhEpk65HoDPcwqRzOsoDPFZx3LtVy5sdFPfrBuubdUz/T0ajKw7TE1jPYd4m9hNb IgASpkR414tlL8yD6uzfxRNgdHEEzbflBpfnKKf9abFZsC0UtBLUYbBcA2XUn1yPV13v XAH4ruJvFVf7+z4C3Nb/mUai1BWFRnlrKoXSYlWIFAGlNiJfCIofypmSL8ATJrJWXdCt X0Rw== 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=SjS9S8NnaVme7XGcirswhT2unTIEYlBoOjv31ot9G50=; fh=jahFJYSZbW5wMNYi6sgvoYqPjA4Ed86fT1kpbcI5rrM=; b=f9xxi2XunTwOgVw0dGgv/lNFD/su5j17Ef1pvqkOrOjW5ZVlqKTLK5JoE6CDqfA0PJ b5kJxHdnJpmKYOqX9WzjRoY9SyIz34ydgR4km46ne5HrKUyruqK23J3AluPGdzpk4CfI qn37z/2hcz6dcGBWES6e5uqn2InEiwRWrKGmMIqO/BkX9z3CwzPJdQnPfYh0VgT2O8SL DeZN6GX8naqXg1IjUz26cxaKIcgUtg5Q3u2CcuSotQ9N5NThmEzD2XSt41H104vVtFJH ijr83PvBqB/HwIUn7wOLBvHD2fgV89wtwa59AcVFaVKcpQU4Lm5+Iuw9iip9DYPm+PXK QOqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=RbrLhWum; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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. [23.128.96.37]) by mx.google.com with ESMTPS id m188-20020a6326c5000000b0057c7341d568si5860472pgm.645.2023.10.22.22.36.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 22:36:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=RbrLhWum; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 40E9680755D4; Sun, 22 Oct 2023 22:36:48 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229599AbjJWFgb (ORCPT + 26 others); Mon, 23 Oct 2023 01:36:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229530AbjJWFg0 (ORCPT ); Mon, 23 Oct 2023 01:36:26 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7751DD5D; Sun, 22 Oct 2023 22:36:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698039384; x=1729575384; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=8Pmv3DZWM/2dbRrEDbbreAnJn6Hwwne5SAiYAHhbnP4=; b=RbrLhWumLqNBeINKT6dIjlbHg/BdSt1vYZ4DWu4WcaTmA9VvdEdgAuLx 2EuLFgR8ygKo04BonKL3mjdRvsJub0zE+6RKQ4HJa8ryiYs+H7ltD7lMK A1K5ydILuOPNF3syF4Zy1yTY+ruC1w1BsWZtFXXAIwKWp8YVaGNR8Tkuo uv+eeA77ABi4l9JE5aFKGinBmG22cbOTX0ER+5pArLOQ+Y28xrxo4MNrl 9MAk59AGRgyDnJCOaTRzLUw0jpbyWGR2+pH0wMiLx3DqZ1fj7s7xd+LVi c6JEIkbSpKctI6f/1hPKKxDE9pPmWbQDeEpXO7eSWv8p1Q9w8lywceXhA w==; X-IronPort-AV: E=McAfee;i="6600,9927,10871"; a="417905368" X-IronPort-AV: E=Sophos;i="6.03,244,1694761200"; d="scan'208";a="417905368" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Oct 2023 22:36:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10871"; a="734556678" X-IronPort-AV: E=Sophos;i="6.03,244,1694761200"; d="scan'208";a="734556678" Received: from inlubt0316.iind.intel.com ([10.191.20.213]) by orsmga006.jf.intel.com with ESMTP; 22 Oct 2023 22:35:59 -0700 From: Raag Jadav To: rafael@kernel.org, len.brown@intel.com, robert.moore@intel.com, mika.westerberg@linux.intel.com, andriy.shevchenko@linux.intel.com, mark.rutland@arm.com, will@kernel.org, linux@roeck-us.net, Jonathan.Cameron@Huawei.com Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, acpica-devel@lists.linuxfoundation.org, linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-hwmon@vger.kernel.org, mallikarjunappa.sangannavar@intel.com, bala.senthil@intel.com, Raag Jadav Subject: [PATCH v2 1/6] ACPI: utils: Introduce acpi_dev_uid_match() for matching _UID Date: Mon, 23 Oct 2023 11:05:25 +0530 Message-Id: <20231023053530.5525-2-raag.jadav@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231023053530.5525-1-raag.jadav@intel.com> References: <20231023053530.5525-1-raag.jadav@intel.com> X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_NONE 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]); Sun, 22 Oct 2023 22:36:48 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780523371026089129 X-GMAIL-MSGID: 1780523371026089129 Introduce acpi_dev_uid_match() helper that matches the device with supplied _UID string. Suggested-by: Andy Shevchenko Signed-off-by: Raag Jadav --- drivers/acpi/utils.c | 31 +++++++++++++++++++++++++++---- include/acpi/acpi_bus.h | 1 + include/linux/acpi.h | 5 +++++ 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c index 79915d4a0031..be21b77059af 100644 --- a/drivers/acpi/utils.c +++ b/drivers/acpi/utils.c @@ -824,20 +824,43 @@ 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. * @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. - * Returns true if matches. + * 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); - const char *uid1 = acpi_device_uid(adev); if (strcmp(hid1, hid2)) return false; @@ -845,7 +868,7 @@ bool acpi_dev_hid_uid_match(struct acpi_device *adev, if (!uid2) return true; - return uid1 && !strcmp(uid1, uid2); + return acpi_dev_uid_match(adev, uid2); } EXPORT_SYMBOL(acpi_dev_hid_uid_match); diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 756b3f3c2c45..afeed6e72049 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -763,6 +763,7 @@ 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); diff --git a/include/linux/acpi.h b/include/linux/acpi.h index afd94c9b8b8a..db3a33e19c97 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -787,6 +787,11 @@ 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) {