Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3677842pxb; Mon, 24 Jan 2022 15:07:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJzuANrhdLdpUUgm8/MQirolpm0/89WxwlxKFQsykTE31CX/ONuZr9QikRlJyUWVYjP9Lf8j X-Received: by 2002:a05:6a00:2186:b0:4c6:50ea:6701 with SMTP id h6-20020a056a00218600b004c650ea6701mr15707009pfi.12.1643065666720; Mon, 24 Jan 2022 15:07:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643065666; cv=none; d=google.com; s=arc-20160816; b=ixIN7tNEQ8BjmyimpsPsxDX7d/i9LTbBk58RWz+zOZF4ruOXc0iGOOn4UjtuN5iV/8 GVg7tSkcv4myoo8s5y2Rt9hoQU3izt33DpPVn81x+ryppYroZiirh+K9CaQeSWEARqsF S5azS4YAB81nFqmWwG4SsXGR0MHJwplyKmdfR+mrqo9BZR3nyQBI3VcLhng7nixeeAHw q9RzB9/8CyfL5/svtmag8fR9qjqGSiespoasteHl8DXnyoeV0ZUnCdprYt+JCG8NW+Hl tmYyzIVU10daLlJaSouBptzdi/xxxuqKkFz2y0nnVosYJSOsA/Atlt0rf81Z9+PqqHTA CElQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ZcxetouM5mMUUn9J+KY7Zyc/YkFB2W5SUhiWeWOLjf8=; b=iNNL9KK0bKEcldD9yGC2Og/nFDgh1GXPWshh/ujtEr3qg95+uRDRTXW52Z4YRD/CEP Ke3spZc/oNGYNYKOxN7PTkdWRtDpLUSdEaEfqA9YMXIkBmzehV9CRevFZ8XGeOK9yBM9 KP8s1n9RWNpEGvCWud9/OHRxnYrjgoOmyUI3JiHqb/4x7xlFUYNFV0iDhZfRwzfPbQqc jutKdgvnSjJ110mvups3igwhMm6sMVC0ovDkxcLTS2HFrknTih3lDOTWaVMj+YAUezYR iNb0neDqMkAMk3gNng+OeJEC8oi6l7rc1IeSmVx31jN525YwDOJzfpv4s2D0FOpFx64t T0QQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FrBdsVW3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u10si17153167plf.330.2022.01.24.15.07.35; Mon, 24 Jan 2022 15:07:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FrBdsVW3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1842751AbiAXXCa (ORCPT + 99 others); Mon, 24 Jan 2022 18:02:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1455685AbiAXVzA (ORCPT ); Mon, 24 Jan 2022 16:55:00 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 583FDC061362; Mon, 24 Jan 2022 12:35:29 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id EA1C361507; Mon, 24 Jan 2022 20:35:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B28F4C340E5; Mon, 24 Jan 2022 20:35:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643056528; bh=gHZDIl4ijtbPfwSZrWODXsLXyJ1ff7iEnfrh/2hqDMw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FrBdsVW3Zebjf840O4rCVWUghPL2q3PBgkK6U89ZLhu4ALqX3BCeIPZxpI56zFl8S 7x27nkCGb32pe45bE/MXtkWYsyxNAnNczG3xLE4IV2Zq6+fdKKeDnEg+TiBQFtmcBk Yk925ZfoV15xtPhupUkXK7SwWy2Sy7CHdHZCUrnk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hans de Goede , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 5.15 515/846] ACPI / x86: Allow specifying acpi_device_override_status() quirks by path Date: Mon, 24 Jan 2022 19:40:32 +0100 Message-Id: <20220124184118.779801721@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184100.867127425@linuxfoundation.org> References: <20220124184100.867127425@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hans de Goede [ Upstream commit ba46e42e925b5d09b4e441f8de3db119cc7df58f ] Not all ACPI-devices have a HID + UID, allow specifying quirks for acpi_device_override_status() by path too. Note this moves the path/HID+UID check to after the CPU + DMI checks since the path lookup is somewhat costly. This way this lookup is only done on devices where the other checks match. Signed-off-by: Hans de Goede Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/x86/utils.c | 42 ++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/drivers/acpi/x86/utils.c b/drivers/acpi/x86/utils.c index edb4f3fd93dc3..190bfc2ab3f26 100644 --- a/drivers/acpi/x86/utils.c +++ b/drivers/acpi/x86/utils.c @@ -38,22 +38,30 @@ struct override_status_id { struct x86_cpu_id cpu_ids[2]; struct dmi_system_id dmi_ids[2]; /* Optional */ const char *uid; + const char *path; unsigned long long status; }; -#define ENTRY(status, hid, uid, cpu_model, dmi...) { \ +#define ENTRY(status, hid, uid, path, cpu_model, dmi...) { \ { { hid, }, {} }, \ { X86_MATCH_INTEL_FAM6_MODEL(cpu_model, NULL), {} }, \ { { .matches = dmi }, {} }, \ uid, \ + path, \ status, \ } #define PRESENT_ENTRY_HID(hid, uid, cpu_model, dmi...) \ - ENTRY(ACPI_STA_DEFAULT, hid, uid, cpu_model, dmi) + ENTRY(ACPI_STA_DEFAULT, hid, uid, NULL, cpu_model, dmi) #define NOT_PRESENT_ENTRY_HID(hid, uid, cpu_model, dmi...) \ - ENTRY(0, hid, uid, cpu_model, dmi) + ENTRY(0, hid, uid, NULL, cpu_model, dmi) + +#define PRESENT_ENTRY_PATH(path, cpu_model, dmi...) \ + ENTRY(ACPI_STA_DEFAULT, "", NULL, path, cpu_model, dmi) + +#define NOT_PRESENT_ENTRY_PATH(path, cpu_model, dmi...) \ + ENTRY(0, "", NULL, path, cpu_model, dmi) static const struct override_status_id override_status_ids[] = { /* @@ -120,13 +128,6 @@ bool acpi_device_override_status(struct acpi_device *adev, unsigned long long *s unsigned int i; for (i = 0; i < ARRAY_SIZE(override_status_ids); i++) { - if (acpi_match_device_ids(adev, override_status_ids[i].hid)) - continue; - - if (!adev->pnp.unique_id || - strcmp(adev->pnp.unique_id, override_status_ids[i].uid)) - continue; - if (!x86_match_cpu(override_status_ids[i].cpu_ids)) continue; @@ -134,6 +135,27 @@ bool acpi_device_override_status(struct acpi_device *adev, unsigned long long *s !dmi_check_system(override_status_ids[i].dmi_ids)) continue; + if (override_status_ids[i].path) { + struct acpi_buffer path = { ACPI_ALLOCATE_BUFFER, NULL }; + bool match; + + if (acpi_get_name(adev->handle, ACPI_FULL_PATHNAME, &path)) + continue; + + match = strcmp((char *)path.pointer, override_status_ids[i].path) == 0; + kfree(path.pointer); + + if (!match) + continue; + } else { + if (acpi_match_device_ids(adev, override_status_ids[i].hid)) + continue; + + if (!adev->pnp.unique_id || + strcmp(adev->pnp.unique_id, override_status_ids[i].uid)) + continue; + } + *status = override_status_ids[i].status; ret = true; break; -- 2.34.1