From nobody Thu Oct 2 11:50:42 2025 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D77F437C102 for ; Wed, 17 Sep 2025 12:07:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758110856; cv=none; b=c6Vclwd9IXRWLBY0FzmMMLE5+2CDVYBHdWSzYqo+/xL50RZCAp3X8OaacR9THSaLvro95hUjqJSC8HdbuEpkJUKrBlNxw32asnRrPllZ6uXjTL0fXAdqYRXNEo1d4gau9L+lwL35y3xKyDkMlTnBb+XUTUlJj4EASMxQtD0okJY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758110856; c=relaxed/simple; bh=CfXS5/PPeqiRHOfIV/RY4aKkXODckn9t5qURcuM16r0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ShHrV3CQ/2A/TWsk/aOmjP/dE2z5Qd2U3k3x+U+VUKRD6Gx/gMlsypMGL05nj6Tcc5Vap/RGGDuNkEAnvng/peV+oyCIOplXp7NcgHFMPl2I8R6t3/uDdptMhEIuk3sceEeQcRcpwVcCiMQ0DNu1XuO07QhAYe0Cf/bK3P2raiI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--srosek.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=W6qE10gz; arc=none smtp.client-ip=209.85.128.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--srosek.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="W6qE10gz" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-45f28552927so19463405e9.2 for ; Wed, 17 Sep 2025 05:07:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1758110853; x=1758715653; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=SXPpYw5PptfhxuGeyMlPO4iaL9Igmx+1S+SUZwA7GbM=; b=W6qE10gzXtVTlHE7Kgr0vxxauDXDlrd5kZ+zAg8KgvTVzLo15ZY/O1YuSdXeSNckGd epX67hBza6sHzvUOl8yMKucNdfxMcLOYnZ5GDbQH1zQxzjAgZHG7iZKjlkIg1Y71fkHO WmFGGxu+BhrOvlCx3UGAxinlbg5vnY4Vu49kJbR6KIIzeczBlPrM2hYSaUjkA/8dBlWm lcP1xiD9a5wK8466Pcyh8fHb7IS8UsUe8MQta8cKvZa2aRgfLA7YJKEFUg3cFgSF6Lr4 WKNv4UXtjyIsx0e2CWb/BMruxdfl8eViWsnoIHgWNaeWDtbRz/bY/Q36kZAUgjkGaVv3 Oskw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758110853; x=1758715653; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=SXPpYw5PptfhxuGeyMlPO4iaL9Igmx+1S+SUZwA7GbM=; b=af62Xg7NO9PBS97KcgRMMqQ5Z9n8oSIhMlUJcXIf/a/IKlXBLtcRmm3p7pudQ+1Zhn nzQuqAwAt7KdYO/WLj5UgPZD/T9n7y0IGitpFPbvVPpd6XZQxm9mAiAAjb43cm8GtN/+ Lkr3p2WKbrsiBbukvGKuym9hXMFxMzQktAnLxX8O47VKo+LN9UW/OLpkefqBloUBWFoZ s8vnHPpCjpp+dE26yP9fp0lji73EdqmtrPHfe7kdIFeEpvuhYdOs3FWib0ViDRX0lbHH JaDHpl2jNS/QXTIhYikk+7uk7Anw8jR2JghejrpVw4yhtfq9cKuUpp450VA3f7pMqe8J uMTg== X-Forwarded-Encrypted: i=1; AJvYcCUF/62FICr9m+NdaVdZw75Czpzdc6S/ZF/VrOgeGn3v0tAMSzxKNHiEpbTL+Z3+FE+vphr4PY62+lpsLFs=@vger.kernel.org X-Gm-Message-State: AOJu0Ywei9AZ5TZC7c5crWowhJOBk5/NKUJ7m910v6Olq5725KrweIaG DYBAoLMHYFyKm/+DEiYxlNBv5kT2P5SX12LXEyMnCn1sl4e4l8GPySIsZeGV6zevqwOekNCYnhi Lbh3glQ== X-Google-Smtp-Source: AGHT+IG5EYuiZGTb0cN7pl1n8KbdAeBSylPX3GcroguKVU2xV9KwaI/F70l4wkEMjhLkEIA7QuUMhQPK0SM= X-Received: from wmsr5.prod.google.com ([2002:a05:600c:8b05:b0:459:7c15:15b9]) (user=srosek job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3b09:b0:45f:27a3:6e0e with SMTP id 5b1f17b1804b1-46202de0b19mr20212145e9.14.1758110853279; Wed, 17 Sep 2025 05:07:33 -0700 (PDT) Date: Wed, 17 Sep 2025 12:07:14 +0000 In-Reply-To: <20250917120719.2390847-1-srosek@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250917120719.2390847-1-srosek@google.com> X-Mailer: git-send-email 2.51.0.384.g4c02a37b29-goog Message-ID: <20250917120719.2390847-2-srosek@google.com> Subject: [PATCH v2 1/6] ACPI: DPTF: Ignore SoC DTS thermal while scanning From: Slawomir Rosek To: "Rafael J . Wysocki" , Alex Hung , Hans de Goede , Ilpo Jarvinen , AceLan Kao , Daniel Lezcano Cc: Greg Kroah-Hartman , Zhang Rui , Srinivas Pandruvada , Tomasz Nowicki , Stanislaw Kardach , Michal Krawczyk , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-pm@vger.kernel.org, Slawomir Rosek Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The Intel SoC DTS thermal driver on Baytrail platform uses IRQ 86 for critical overheating notification. The IRQ 86 is described in the _CRS control method of INT3401 device, thus Intel SoC DTS thermal driver requires INT3401 device to be enumerated. Since dependency on INT3401 device is unrelated to DPTF the IS_ENABLE() macro is removed from ACPI DPTF INT340X scan handler, instead Kconfig is updated to ensure proper enumeration of INT3401 device. Fixes: 014d9d5d0cc1 ("ACPI/int340x_thermal: enumerate INT3401 for Intel SoC= DTS thermal driver") Signed-off-by: Slawomir Rosek --- drivers/acpi/dptf/int340x_thermal.c | 7 +------ drivers/thermal/intel/Kconfig | 1 + 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/acpi/dptf/int340x_thermal.c b/drivers/acpi/dptf/int340= x_thermal.c index a222df059a16..947fe50c2ef6 100644 --- a/drivers/acpi/dptf/int340x_thermal.c +++ b/drivers/acpi/dptf/int340x_thermal.c @@ -11,10 +11,9 @@ =20 #include "../internal.h" =20 -#define INT3401_DEVICE 0X01 static const struct acpi_device_id int340x_thermal_device_ids[] =3D { {"INT3400"}, - {"INT3401", INT3401_DEVICE}, + {"INT3401"}, {"INT3402"}, {"INT3403"}, {"INT3404"}, @@ -76,10 +75,6 @@ static int int340x_thermal_handler_attach(struct acpi_de= vice *adev, { if (IS_ENABLED(CONFIG_INT340X_THERMAL)) acpi_create_platform_device(adev, NULL); - /* Intel SoC DTS thermal driver needs INT3401 to set IRQ descriptor */ - else if (IS_ENABLED(CONFIG_INTEL_SOC_DTS_THERMAL) && - id->driver_data =3D=3D INT3401_DEVICE) - acpi_create_platform_device(adev, NULL); return 1; } =20 diff --git a/drivers/thermal/intel/Kconfig b/drivers/thermal/intel/Kconfig index e0268fac7093..47950859b790 100644 --- a/drivers/thermal/intel/Kconfig +++ b/drivers/thermal/intel/Kconfig @@ -45,6 +45,7 @@ config INTEL_SOC_DTS_IOSF_CORE config INTEL_SOC_DTS_THERMAL tristate "Intel SoCs DTS thermal driver" depends on X86 && PCI && ACPI + select INT340X_THERMAL select INTEL_SOC_DTS_IOSF_CORE help Enable this to register Intel SoCs (e.g. Bay Trail) platform digital --=20 2.51.0.384.g4c02a37b29-goog From nobody Thu Oct 2 11:50:42 2025 Received: from mail-ej1-f73.google.com (mail-ej1-f73.google.com [209.85.218.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6FFF430CB3D for ; Wed, 17 Sep 2025 12:07:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758110863; cv=none; b=OYsjUCrnkZBQyjOGeUi3sEFlEKEqoB38NbNy3nMU+kno8IhHvsdfyxvbG8uHCVKIcyyBtd7EY4cbIIOdoK/rZcofxBiQSW7E++KecvEjTsfdQNq+BIL4UXReeMSpZGoMJFJ0Z1N9Hlb6werQ2OwqJ5ozHaR/xmm4W+U+Qi7L+24= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758110863; c=relaxed/simple; bh=3GKrM5qvk/7L+4STTpEdIWwKZscM3QuPJv3FqOM9Va8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Rh0gy7+avPLgXT7NE3JwQIA+fIFegztPB7AUeCjINQ+vdp6CWXECqQLA50uwIOosz8wGqHphX5f64rrZ/v9pK0D6t9E3s2U8759GSEx9eGkbIFz3hDsQaZTav3XZnFIxxA1bY++pjDn/JoWvGowSPqPhfhmXdaq2RMet48vPVL8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--srosek.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=DSoMv4nQ; arc=none smtp.client-ip=209.85.218.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--srosek.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="DSoMv4nQ" Received: by mail-ej1-f73.google.com with SMTP id a640c23a62f3a-b111d2951b9so395287566b.3 for ; Wed, 17 Sep 2025 05:07:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1758110860; x=1758715660; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=NV43YwBZiRSdCnIID1DuFxlHUNP/YouE1V9ZkJbiCfw=; b=DSoMv4nQov4r38xBl9X1ucxl3NEeRJ5bcQrsUGbAZn8N4Vr48GdekCQBs14bf6kdiD F1snO/G/ePYv6uuWnYXj/ig/gRgwjjmkqTHzKawbPldPIArG3eVUhqJqwDb32tQBtlPc o2M9nk6qcTdBtJ1Msj4euP0j3gsZMjnLlTcv0Qt+msSnTwesXYk0Tkof8Wn6Szb2wE8g lEXwmp8JBeOv0xnklUCVGszMjWfAV3IQLUYYQL2k/Hs/vXiSAfmdF8caly9axQIcqkT5 D8ZZATfo9g2E4zeWeL4FyC/7pnpvYA/HOy2mDem1YyTUHPjm4qBGEQaFtA7dhCInU5Sq V2lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758110860; x=1758715660; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NV43YwBZiRSdCnIID1DuFxlHUNP/YouE1V9ZkJbiCfw=; b=w/ctNoIjnckQ3MW+ETkKEGgnD6Q3FCXWrcJioSXgcHxo1iu/nFW8XLW6upQwxxcqTR r5xj3Ww6QxWEqVaDP9A7+vpiLffHh5f8A7JaEcaV++ieuEiYjI/WvL3KQnhtHFAvzqrA 6pXcyEEOerIGX2b6XAqCZop36b50Fp0l+c6HJZ2fR3SfaeEEuxwYAlz0Mropgn+V0rv4 ZX7T2nfgQxc8Ed/aYMlrtJAa4eI9eEXoVzdpzO9xDYM70hOWMEtWEql0qBW+vnSeyAdI 9RVs/yBjz9pZ+7KVWcWAlQxvytTvGPbnXPKQmf1ZWSNZNcYR1S5Km7cQuN2yd+PJfdko YG2w== X-Forwarded-Encrypted: i=1; AJvYcCVIEfeEI86MTF8nwZ7T9sVeiwrfrS2N6M8W1A1nBphaKx3iO4FQdvOaBwzjEtW3vjZE7QwAAiE+by1wvIg=@vger.kernel.org X-Gm-Message-State: AOJu0YyeBEB/m8lGq8mfqKdZJW3V1ATxB2oAqQT+jgLY4Egfv7Dzl0Sz YQZ3wgcmmHzQEJijr59kQAwcIXlqg5QXyr3wygSrKxhViGckaNMeFlEk1Oci9AIUsGNZsICcohR MrDW7PA== X-Google-Smtp-Source: AGHT+IFjjeeDTEOyecd8Zr4tdZZMZaH/t1jfmBx1qoRAE6uV2MaObMSXrX+vngcdsUxJ9Ux7ia/cMUMtasc= X-Received: from edh23.prod.google.com ([2002:a05:6402:5057:b0:61e:d219:d99d]) (user=srosek job=prod-delivery.src-stubby-dispatcher) by 2002:a17:907:3f19:b0:b04:84db:c83 with SMTP id a640c23a62f3a-b1bbb067943mr232742966b.27.1758110859801; Wed, 17 Sep 2025 05:07:39 -0700 (PDT) Date: Wed, 17 Sep 2025 12:07:15 +0000 In-Reply-To: <20250917120719.2390847-1-srosek@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250917120719.2390847-1-srosek@google.com> X-Mailer: git-send-email 2.51.0.384.g4c02a37b29-goog Message-ID: <20250917120719.2390847-3-srosek@google.com> Subject: [PATCH v2 2/6] ACPI: DPTF: Move INT340X device IDs to header From: Slawomir Rosek To: "Rafael J . Wysocki" , Alex Hung , Hans de Goede , Ilpo Jarvinen , AceLan Kao , Daniel Lezcano Cc: Greg Kroah-Hartman , Zhang Rui , Srinivas Pandruvada , Tomasz Nowicki , Stanislaw Kardach , Michal Krawczyk , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-pm@vger.kernel.org, Slawomir Rosek Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The ACPI INT340X device IDs are shared between the DPTF core and thermal drivers, thus they are moved to the common header. Signed-off-by: Slawomir Rosek --- drivers/acpi/dptf/dptf_power.c | 18 +---- drivers/acpi/dptf/int340x_thermal.c | 51 +++----------- drivers/acpi/fan.h | 10 +-- drivers/acpi/int340x_thermal.h | 68 +++++++++++++++++++ .../intel/int340x_thermal/int3400_thermal.c | 10 +-- .../intel/int340x_thermal/int3401_thermal.c | 3 +- .../intel/int340x_thermal/int3402_thermal.c | 3 +- .../intel/int340x_thermal/int3403_thermal.c | 10 +-- .../intel/int340x_thermal/int3406_thermal.c | 3 +- 9 files changed, 90 insertions(+), 86 deletions(-) create mode 100644 drivers/acpi/int340x_thermal.h diff --git a/drivers/acpi/dptf/dptf_power.c b/drivers/acpi/dptf/dptf_power.c index 776914f31b9e..d7c59f016083 100644 --- a/drivers/acpi/dptf/dptf_power.c +++ b/drivers/acpi/dptf/dptf_power.c @@ -8,6 +8,7 @@ #include #include #include +#include "../int340x_thermal.h" =20 /* * Presentation of attributes which are defined for INT3407 and INT3532. @@ -224,22 +225,7 @@ static void dptf_power_remove(struct platform_device *= pdev) } =20 static const struct acpi_device_id int3407_device_ids[] =3D { - {"INT3407", 0}, - {"INT3532", 0}, - {"INTC1047", 0}, - {"INTC1050", 0}, - {"INTC1060", 0}, - {"INTC1061", 0}, - {"INTC1065", 0}, - {"INTC1066", 0}, - {"INTC106C", 0}, - {"INTC106D", 0}, - {"INTC10A4", 0}, - {"INTC10A5", 0}, - {"INTC10D8", 0}, - {"INTC10D9", 0}, - {"INTC1100", 0}, - {"INTC1101", 0}, + ACPI_INT3407_DEVICE_IDS, {"", 0}, }; MODULE_DEVICE_TABLE(acpi, int3407_device_ids); diff --git a/drivers/acpi/dptf/int340x_thermal.c b/drivers/acpi/dptf/int340= x_thermal.c index 947fe50c2ef6..43afb6141b98 100644 --- a/drivers/acpi/dptf/int340x_thermal.c +++ b/drivers/acpi/dptf/int340x_thermal.c @@ -9,63 +9,28 @@ #include #include =20 +#include "../int340x_thermal.h" #include "../internal.h" =20 static const struct acpi_device_id int340x_thermal_device_ids[] =3D { - {"INT3400"}, - {"INT3401"}, - {"INT3402"}, - {"INT3403"}, - {"INT3404"}, - {"INT3406"}, - {"INT3407"}, + ACPI_INT3400_DEVICE_IDS, + ACPI_INT3401_DEVICE_IDS, + ACPI_INT3402_DEVICE_IDS, + ACPI_INT3403_DEVICE_IDS, + ACPI_INT3404_DEVICE_IDS, + ACPI_INT3406_DEVICE_IDS, + ACPI_INT3407_DEVICE_IDS, {"INT3408"}, {"INT3409"}, {"INT340A"}, {"INT340B"}, - {"INT3532"}, - {"INTC1040"}, - {"INTC1041"}, - {"INTC1042"}, - {"INTC1043"}, - {"INTC1044"}, {"INTC1045"}, - {"INTC1046"}, - {"INTC1047"}, - {"INTC1048"}, {"INTC1049"}, - {"INTC1050"}, - {"INTC1060"}, - {"INTC1061"}, - {"INTC1062"}, - {"INTC1063"}, {"INTC1064"}, - {"INTC1065"}, - {"INTC1066"}, - {"INTC1068"}, - {"INTC1069"}, - {"INTC106A"}, {"INTC106B"}, - {"INTC106C"}, - {"INTC106D"}, - {"INTC10A0"}, - {"INTC10A1"}, - {"INTC10A2"}, {"INTC10A3"}, - {"INTC10A4"}, - {"INTC10A5"}, - {"INTC10D4"}, - {"INTC10D5"}, - {"INTC10D6"}, {"INTC10D7"}, - {"INTC10D8"}, - {"INTC10D9"}, - {"INTC10FC"}, - {"INTC10FD"}, - {"INTC10FE"}, {"INTC10FF"}, - {"INTC1100"}, - {"INTC1101"}, {"INTC1102"}, {""}, }; diff --git a/drivers/acpi/fan.h b/drivers/acpi/fan.h index 8a28a72a7c6a..4015ac56c009 100644 --- a/drivers/acpi/fan.h +++ b/drivers/acpi/fan.h @@ -11,16 +11,10 @@ #define _ACPI_FAN_H_ =20 #include +#include "int340x_thermal.h" =20 #define ACPI_FAN_DEVICE_IDS \ - {"INT3404", }, /* Fan */ \ - {"INTC1044", }, /* Fan for Tiger Lake generation */ \ - {"INTC1048", }, /* Fan for Alder Lake generation */ \ - {"INTC1063", }, /* Fan for Meteor Lake generation */ \ - {"INTC106A", }, /* Fan for Lunar Lake generation */ \ - {"INTC10A2", }, /* Fan for Raptor Lake generation */ \ - {"INTC10D6", }, /* Fan for Panther Lake generation */ \ - {"INTC10FE", }, /* Fan for Wildcat Lake generation */ \ + ACPI_INT3404_DEVICE_IDS, \ {"PNP0C0B", } /* Generic ACPI fan */ =20 #define ACPI_FPS_NAME_LEN 20 diff --git a/drivers/acpi/int340x_thermal.h b/drivers/acpi/int340x_thermal.h new file mode 100644 index 000000000000..854e4d3bb739 --- /dev/null +++ b/drivers/acpi/int340x_thermal.h @@ -0,0 +1,68 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +/* + * The ACPI INT340X device IDs are shared between the DPTF core + * and thermal drivers. + */ + +#ifndef _ACPI_INT340X_H_ +#define _ACPI_INT340X_H_ + +#define ACPI_INT3400_DEVICE_IDS \ + {"INT3400"}, \ + {"INTC1040"}, \ + {"INTC1041"}, \ + {"INTC1042"}, \ + {"INTC1068"}, \ + {"INTC10A0"}, \ + {"INTC10D4"}, \ + {"INTC10FC"} + +#define ACPI_INT3401_DEVICE_IDS \ + {"INT3401"} + +#define ACPI_INT3402_DEVICE_IDS \ + {"INT3402"} + +#define ACPI_INT3403_DEVICE_IDS \ + {"INT3403"}, \ + {"INTC1043"}, \ + {"INTC1046"}, \ + {"INTC1062"}, \ + {"INTC1069"}, \ + {"INTC10A1"}, \ + {"INTC10D5"}, \ + {"INTC10FD"} + +#define ACPI_INT3404_DEVICE_IDS \ + {"INT3404", }, /* Fan */ \ + {"INTC1044", }, /* Fan for Tiger Lake generation */ \ + {"INTC1048", }, /* Fan for Alder Lake generation */ \ + {"INTC1063", }, /* Fan for Meteor Lake generation */ \ + {"INTC106A", }, /* Fan for Lunar Lake generation */ \ + {"INTC10A2", }, /* Fan for Raptor Lake generation */ \ + {"INTC10D6", }, /* Fan for Panther Lake generation */ \ + {"INTC10FE", } /* Fan for Wildcat Lake generation */ + +#define ACPI_INT3406_DEVICE_IDS \ + {"INT3406"} + +#define ACPI_INT3407_DEVICE_IDS \ + {"INT3407"}, \ + {"INT3532"}, \ + {"INTC1047"}, \ + {"INTC1050"}, \ + {"INTC1060"}, \ + {"INTC1061"}, \ + {"INTC1065"}, \ + {"INTC1066"}, \ + {"INTC106C"}, \ + {"INTC106D"}, \ + {"INTC10A4"}, \ + {"INTC10A5"}, \ + {"INTC10D8"}, \ + {"INTC10D9"}, \ + {"INTC1100"}, \ + {"INTC1101"} + +#endif diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c b/driv= ers/thermal/intel/int340x_thermal/int3400_thermal.c index 908cc1bf57f1..6311125c3ebd 100644 --- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c @@ -11,6 +11,7 @@ #include #include #include "acpi_thermal_rel.h" +#include "../../../../drivers/acpi/int340x_thermal.h" =20 #define INT3400_THERMAL_TABLE_CHANGED 0x83 #define INT3400_ODVP_CHANGED 0x88 @@ -683,14 +684,7 @@ static void int3400_thermal_remove(struct platform_dev= ice *pdev) } =20 static const struct acpi_device_id int3400_thermal_match[] =3D { - {"INT3400", 0}, - {"INTC1040", 0}, - {"INTC1041", 0}, - {"INTC1042", 0}, - {"INTC1068", 0}, - {"INTC10A0", 0}, - {"INTC10D4", 0}, - {"INTC10FC", 0}, + ACPI_INT3400_DEVICE_IDS, {} }; =20 diff --git a/drivers/thermal/intel/int340x_thermal/int3401_thermal.c b/driv= ers/thermal/intel/int340x_thermal/int3401_thermal.c index 96d6277a5a8c..e0603f218d2e 100644 --- a/drivers/thermal/intel/int340x_thermal/int3401_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3401_thermal.c @@ -11,9 +11,10 @@ =20 #include "int340x_thermal_zone.h" #include "processor_thermal_device.h" +#include "../../../../drivers/acpi/int340x_thermal.h" =20 static const struct acpi_device_id int3401_device_ids[] =3D { - {"INT3401", 0}, + ACPI_INT3401_DEVICE_IDS, {"", 0}, }; MODULE_DEVICE_TABLE(acpi, int3401_device_ids); diff --git a/drivers/thermal/intel/int340x_thermal/int3402_thermal.c b/driv= ers/thermal/intel/int340x_thermal/int3402_thermal.c index 57b90005888a..213d4535f2c1 100644 --- a/drivers/thermal/intel/int340x_thermal/int3402_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3402_thermal.c @@ -11,6 +11,7 @@ #include #include #include "int340x_thermal_zone.h" +#include "../../../../drivers/acpi/int340x_thermal.h" =20 #define INT3402_PERF_CHANGED_EVENT 0x80 #define INT3402_THERMAL_EVENT 0x90 @@ -84,7 +85,7 @@ static void int3402_thermal_remove(struct platform_device= *pdev) } =20 static const struct acpi_device_id int3402_thermal_match[] =3D { - {"INT3402", 0}, + ACPI_INT3402_DEVICE_IDS, {} }; =20 diff --git a/drivers/thermal/intel/int340x_thermal/int3403_thermal.c b/driv= ers/thermal/intel/int340x_thermal/int3403_thermal.c index ba63796761eb..d246c69d4872 100644 --- a/drivers/thermal/intel/int340x_thermal/int3403_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3403_thermal.c @@ -12,6 +12,7 @@ #include #include #include "int340x_thermal_zone.h" +#include "../../../../drivers/acpi/int340x_thermal.h" =20 #define INT3403_TYPE_SENSOR 0x03 #define INT3403_TYPE_CHARGER 0x0B @@ -269,14 +270,7 @@ static void int3403_remove(struct platform_device *pde= v) } =20 static const struct acpi_device_id int3403_device_ids[] =3D { - {"INT3403", 0}, - {"INTC1043", 0}, - {"INTC1046", 0}, - {"INTC1062", 0}, - {"INTC1069", 0}, - {"INTC10A1", 0}, - {"INTC10D5", 0}, - {"INTC10FD", 0}, + ACPI_INT3403_DEVICE_IDS, {"", 0}, }; MODULE_DEVICE_TABLE(acpi, int3403_device_ids); diff --git a/drivers/thermal/intel/int340x_thermal/int3406_thermal.c b/driv= ers/thermal/intel/int340x_thermal/int3406_thermal.c index e21fcbccf4ba..d05ca8bc4061 100644 --- a/drivers/thermal/intel/int340x_thermal/int3406_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3406_thermal.c @@ -12,6 +12,7 @@ #include #include #include +#include "../../../../drivers/acpi/int340x_thermal.h" =20 #define INT3406_BRIGHTNESS_LIMITS_CHANGED 0x80 =20 @@ -187,7 +188,7 @@ static void int3406_thermal_remove(struct platform_devi= ce *pdev) } =20 static const struct acpi_device_id int3406_thermal_match[] =3D { - {"INT3406", 0}, + ACPI_INT3406_DEVICE_IDS, {} }; =20 --=20 2.51.0.384.g4c02a37b29-goog From nobody Thu Oct 2 11:50:42 2025 Received: from mail-ed1-f74.google.com (mail-ed1-f74.google.com [209.85.208.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7B5AE30CB44 for ; Wed, 17 Sep 2025 12:07:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758110864; cv=none; b=MAkPKs3h+AUTuf0cGq+F/Zk+RZScmzc75LtMk0oKjgddJwq7a5iSMQ1GWxRBVaGqm67bNMDl7zUnWB0zN49VEqe1W9KRT/LSeqbN9BkabdYpj84Cnq+pQ6fqsmojVxUxyjodAaszw2YrvzCzs7g8yg6lhBzmIj/oAWfzbMehBsk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758110864; c=relaxed/simple; bh=jtSocMDOLb1lorJOj5v0eJtZ0mT23dw3ZAUJoypwP80=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Wis8luBqKXeVeXPFsvtFogGKR3GqM9Nf2Rs8IQ2NDBwgUyyj1gs3tf3Q+UI3rdyS/Yyfz8RSwsYGX/OnV68E1u/11SG/XmGbNDh5NIn2QokOWvi0wVNR7ldc2GGgWsokc75oAwqIuzNUlVCvcdBrx4v9Ga4MY7ZpFPWi+I7j1kg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--srosek.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=iZtB4d0x; arc=none smtp.client-ip=209.85.208.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--srosek.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="iZtB4d0x" Received: by mail-ed1-f74.google.com with SMTP id 4fb4d7f45d1cf-61d2d2b792aso6917115a12.1 for ; Wed, 17 Sep 2025 05:07:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1758110861; x=1758715661; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=TnmIhuAryfUThPrOWha9IORVkxR4s5Wy0BMv2x6APvY=; b=iZtB4d0xv4+08+cBkCxACRFMY9y62n+j6IZfGI0ZEoLlSo1GJpja/QXQsjqrpO4+kE IE7TnGETo55allGLQW8JBHWfBPlwQNdxHL7gwIQSUmDVetepGKjw9whjJLY+1bqhGOR/ fdPK4SZoCrxlwsvvPefGLBoE9b7s0djLC1hpMnxNTMBYV3Nkk7vxDOKsru7ObecrtG4V KMv/QSQWacTL6cTgmuFpTMdkApUDNzBX9zuE0aGAVok3FlUlNu/kgdaJo39sJguaPZoV pKVch1h8R1H0XX/iijPSk+H9HkC2nZw5yomBKAnrlYuttDr2tyxfNCLB5atr6eDtUh41 3Yug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758110861; x=1758715661; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=TnmIhuAryfUThPrOWha9IORVkxR4s5Wy0BMv2x6APvY=; b=MKJZWqtBQeP7a+SJqr9H3Jz13TwuHFUVLIEH7Lq8JjYozjyQXJ994LtrELSj0S0W4c 64gXf7bGlT/Jc392XI7K/MvdLxRhz3WmVlNn4cWZhW6Ecmt9s4WDxeGYEFSUfSrxIAVM Iowrwkzk9QxelSiyzUcwLwj/JH/zNmPXMTLaqF2lOhTBqTixzNgUfGhADvEVN3MxOQI5 WDEx3cm6YoMamw7OXuFeKA9b65EP5ErHNV8Nx7p0nuHKx8Ke+lThr2laj57QB6XPidv8 z+rv+bB7T/mtJAjtkv/vu+Rk66acWtEwlitGAf/L6i5ySeqWCxOUQkATknkJXIoHvWnS poBw== X-Forwarded-Encrypted: i=1; AJvYcCU9PhCkwKQSJ5fa8cbmoMjD7fzkd4vq8PtQqvGsZvv9wEl5nEKs9G1WJ5zeq9FvcAxvnSoT1mP5PglS3kg=@vger.kernel.org X-Gm-Message-State: AOJu0YxQN8R7wVl0kMauom0FRfoZJiT7m1/CaPAd/V18YiXOwpgniA0y aUr0LUDhLN/2862tuey4D86IvhQoaXjmBAyIPJ/m0H6UPKmtgRX1vx8ys5hqct/105E1Pi2bA/q hIoLIew== X-Google-Smtp-Source: AGHT+IE9JxQINOgMAD00LdxNBgiaiiAyNPHD+AyZlkNGA2Dk6RD20m5WkWGC1DsTYu+3JzPdr74YOVTETzw= X-Received: from edbin5.prod.google.com ([2002:a05:6402:2085:b0:61c:9195:6148]) (user=srosek job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:84f:b0:62f:7bf4:c65e with SMTP id 4fb4d7f45d1cf-62f83a0cbb8mr2093077a12.2.1758110860857; Wed, 17 Sep 2025 05:07:40 -0700 (PDT) Date: Wed, 17 Sep 2025 12:07:16 +0000 In-Reply-To: <20250917120719.2390847-1-srosek@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250917120719.2390847-1-srosek@google.com> X-Mailer: git-send-email 2.51.0.384.g4c02a37b29-goog Message-ID: <20250917120719.2390847-4-srosek@google.com> Subject: [PATCH v2 3/6] ACPI: DPTF: Move PCH FIVR device IDs to header From: Slawomir Rosek To: "Rafael J . Wysocki" , Alex Hung , Hans de Goede , Ilpo Jarvinen , AceLan Kao , Daniel Lezcano Cc: Greg Kroah-Hartman , Zhang Rui , Srinivas Pandruvada , Tomasz Nowicki , Stanislaw Kardach , Michal Krawczyk , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-pm@vger.kernel.org, Slawomir Rosek Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The ACPI PCH FIVR device IDs are shared between the DPTF core and PCH FIVR driver, thus they are moved to the common header. Signed-off-by: Slawomir Rosek --- drivers/acpi/dptf/dptf_pch_fivr.c | 8 ++------ drivers/acpi/dptf/int340x_thermal.c | 7 +------ drivers/acpi/int340x_thermal.h | 8 ++++++++ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/acpi/dptf/dptf_pch_fivr.c b/drivers/acpi/dptf/dptf_pch= _fivr.c index 952216c67d58..cb81636a5d63 100644 --- a/drivers/acpi/dptf/dptf_pch_fivr.c +++ b/drivers/acpi/dptf/dptf_pch_fivr.c @@ -8,6 +8,7 @@ #include #include #include +#include "../int340x_thermal.h" =20 struct pch_fivr_resp { u64 status; @@ -147,12 +148,7 @@ static void pch_fivr_remove(struct platform_device *pd= ev) } =20 static const struct acpi_device_id pch_fivr_device_ids[] =3D { - {"INTC1045", 0}, - {"INTC1049", 0}, - {"INTC1064", 0}, - {"INTC106B", 0}, - {"INTC10A3", 0}, - {"INTC10D7", 0}, + ACPI_PCH_FIVR_DEVICE_IDS, {"", 0}, }; MODULE_DEVICE_TABLE(acpi, pch_fivr_device_ids); diff --git a/drivers/acpi/dptf/int340x_thermal.c b/drivers/acpi/dptf/int340= x_thermal.c index 43afb6141b98..26522ddfcbaa 100644 --- a/drivers/acpi/dptf/int340x_thermal.c +++ b/drivers/acpi/dptf/int340x_thermal.c @@ -20,16 +20,11 @@ static const struct acpi_device_id int340x_thermal_devi= ce_ids[] =3D { ACPI_INT3404_DEVICE_IDS, ACPI_INT3406_DEVICE_IDS, ACPI_INT3407_DEVICE_IDS, + ACPI_PCH_FIVR_DEVICE_IDS, {"INT3408"}, {"INT3409"}, {"INT340A"}, {"INT340B"}, - {"INTC1045"}, - {"INTC1049"}, - {"INTC1064"}, - {"INTC106B"}, - {"INTC10A3"}, - {"INTC10D7"}, {"INTC10FF"}, {"INTC1102"}, {""}, diff --git a/drivers/acpi/int340x_thermal.h b/drivers/acpi/int340x_thermal.h index 854e4d3bb739..dee53c444a32 100644 --- a/drivers/acpi/int340x_thermal.h +++ b/drivers/acpi/int340x_thermal.h @@ -65,4 +65,12 @@ {"INTC1100"}, \ {"INTC1101"} =20 +#define ACPI_PCH_FIVR_DEVICE_IDS \ + {"INTC1045"}, \ + {"INTC1049"}, \ + {"INTC1064"}, \ + {"INTC106B"}, \ + {"INTC10A3"}, \ + {"INTC10D7"} + #endif --=20 2.51.0.384.g4c02a37b29-goog From nobody Thu Oct 2 11:50:42 2025 Received: from mail-ej1-f73.google.com (mail-ej1-f73.google.com [209.85.218.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E4F0F37C0EE for ; Wed, 17 Sep 2025 12:07:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758110865; cv=none; b=NMRS4FJ3HsxZAXWNXRH36YpySQe5+ff1qC8eagaKiGLfJDuGwm+LfxPaZKNifGGxutXcl0g8wpndQmQJB5uxQ3ZjKH2N9FDh40ARWwdl+X+hybybMC7AGA6wRs/ufaPAiSGlhkPB0SZlOw/b2lE1MFENBb4QkOxKFE8zZ67bXeU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758110865; c=relaxed/simple; bh=lS7uSOog8ynt4mAljbR1uTVazr99QgBpcuHJijrXPag=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=BjgNMZigN0PIvF+sRk4zqBhpH7/RTRhkrT2/wZOliAF/9kLHHchIQRuZJUP9iDMnvHxHbIrWKO9G8tPpPUUPYrrpanjMCE/BhejhyPevClahHTo89+NGt1bPa2tsGusmz8RwB+cG9G6naP51A2XxGpyqApckG2oVYBDLHry8KqA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--srosek.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=wgAa6aGu; arc=none smtp.client-ip=209.85.218.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--srosek.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="wgAa6aGu" Received: by mail-ej1-f73.google.com with SMTP id a640c23a62f3a-b07c2924d53so417854866b.3 for ; Wed, 17 Sep 2025 05:07:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1758110862; x=1758715662; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=u6Kw2BRYLs6Jf4HMAdqvkiMKQ9fATMhkMoyiFVJ9jgk=; b=wgAa6aGudbVEya+EtzknlCjDSpKO9nSPsAM3Bd++e+95Z69XzS/rlUeUer2RlMW8Go QivLLIfFJv2+J27RfZsCC+zrDmgPvukxUY0Y3lJgrKkhzEn6EuN01X+Ru8Y4slFuJ9vP UF8maigmZtEt8SVkxFUiyrv6bmfIs4BjyGUkWVY3EUaUZjdB3fHvRNGu8PIBouASuSS2 mScYLDIXzfOLEjLJQ8FxeGvTqXdUe705tZF68FAEBmDdvkkhJq3Shhqn1gBb5j+bZDQT 8rD27B6v1kFQ6vEbpDRHPXSwBJ2c/g3qH5X8OaUZ309nKSFWYdBobH3KOTl2jTvmnCoS TgLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758110862; x=1758715662; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=u6Kw2BRYLs6Jf4HMAdqvkiMKQ9fATMhkMoyiFVJ9jgk=; b=i6MBarfx0WoJY7jKndgs5D+bdvWeqDAKxpCMNj7mSSl/Rnz2DrZ9KWR0PaY6v2B5j0 hnl92uZmsqorSCh1SW1fnvKScibTxJtBlwJ2ss9c+WP3Io4QWviqxsTBEu23imLOfJlt CQWNqeq0SoDUTjwpOkBal6SuwXLuXzOY7+QErSnccWoOnINMeuveEgcdbVgqqjHECxkU tKdIfVwGN4z4t9yjNX9WeteaXuPgyweAYEIlsdIQgjOPZqt5oNvz95qkCoe07ny5uMyf ra0IEn8kimi0luHI01uKkxZPPY2+/x6N+lKTFD8sCMqHkmef/sgwEycviXES88c6NaHF BKBw== X-Forwarded-Encrypted: i=1; AJvYcCWvXJ7xOC3qj62Pu66CKA5RyVW3B7S99lu3rPDpfnsrdF7AHISUlL+GXxyp7EYQuIAIP2N9Ytpfa7AYqmc=@vger.kernel.org X-Gm-Message-State: AOJu0YzBNNfpbpUhho9JVg7VSFktmRnZVLB32cMs51sOijfd0IRII4fu nj9brfM906EGDZgEAy+C/V/A4kN5t3JDZfZ/cZN10qCSQp7BEUQSbOMGaH9Agw6CueU4ICTjX9u p3hz4aA== X-Google-Smtp-Source: AGHT+IEXCIHFNrzZ1iYEZnrwN3IyAVT8tvIT/ujeWiRXjj+rV/3PEHRamZPqq/aoS/HmYzWlsldfyMLOcV0= X-Received: from ejcsl10.prod.google.com ([2002:a17:906:618a:b0:b04:2b56:f5ab]) (user=srosek job=prod-delivery.src-stubby-dispatcher) by 2002:a17:907:94d1:b0:b04:b981:8823 with SMTP id a640c23a62f3a-b1bb08695aamr245223966b.4.1758110862243; Wed, 17 Sep 2025 05:07:42 -0700 (PDT) Date: Wed, 17 Sep 2025 12:07:17 +0000 In-Reply-To: <20250917120719.2390847-1-srosek@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250917120719.2390847-1-srosek@google.com> X-Mailer: git-send-email 2.51.0.384.g4c02a37b29-goog Message-ID: <20250917120719.2390847-5-srosek@google.com> Subject: [PATCH v2 4/6] ACPI: DPTF: Remove not supported INT340X IDs From: Slawomir Rosek To: "Rafael J . Wysocki" , Alex Hung , Hans de Goede , Ilpo Jarvinen , AceLan Kao , Daniel Lezcano Cc: Greg Kroah-Hartman , Zhang Rui , Srinivas Pandruvada , Tomasz Nowicki , Stanislaw Kardach , Michal Krawczyk , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-pm@vger.kernel.org, Slawomir Rosek Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove not supported INT340X and Wildcat Lake ACPI device IDs from scan handler. Fixes: 3230bbfce8a9 ("ACPI: introduce ACPI int340x thermal scan handler") Fixes: 9cf45756a4b9 ("ACPI: DPTF: Support for Wildcat Lake") Signed-off-by: Slawomir Rosek --- drivers/acpi/dptf/int340x_thermal.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/acpi/dptf/int340x_thermal.c b/drivers/acpi/dptf/int340= x_thermal.c index 26522ddfcbaa..7d1308b1f513 100644 --- a/drivers/acpi/dptf/int340x_thermal.c +++ b/drivers/acpi/dptf/int340x_thermal.c @@ -21,12 +21,6 @@ static const struct acpi_device_id int340x_thermal_devic= e_ids[] =3D { ACPI_INT3406_DEVICE_IDS, ACPI_INT3407_DEVICE_IDS, ACPI_PCH_FIVR_DEVICE_IDS, - {"INT3408"}, - {"INT3409"}, - {"INT340A"}, - {"INT340B"}, - {"INTC10FF"}, - {"INTC1102"}, {""}, }; =20 --=20 2.51.0.384.g4c02a37b29-goog From nobody Thu Oct 2 11:50:42 2025 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E8A8D31A7E9 for ; Wed, 17 Sep 2025 12:07:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758110867; cv=none; b=n9QkuD6brd1vHWv2ZPR6L6KZdKGaRO0Cn25BC/pvdOd7XJu29s38fNAxvYdbs+plBa1bP4z8QYmT9vtOpJpQb5I2qxasd4ykt39Gcqf1RPtSBMfgYAAD3Z0zwuMSTJsZSEBAD23JGzg2F3DCRZYNG6FDjlUikgHtq5oU45+1vgE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758110867; c=relaxed/simple; bh=0Ha7m8b/+ZHVHZAlQIkXhY2JBJJqlstM5Tl623XLNO0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=nRwOVfUtRVQ3jh8f55h1bsLA7toietgjQGdgu2H87MX37z19Pf0BlZGxJ4hCVO170Eeq8ojoLyq4FxonSv61oXyOWW7AWuSbvDby54TlTgeYbZ/QfyJlf/V0Kf/YGzac6YytyDnoGeX9/SNnvW2qu213AdkTEzqi54rXISpGGLc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--srosek.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=h1rqRLGK; arc=none smtp.client-ip=209.85.221.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--srosek.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="h1rqRLGK" Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-3ecdfe971abso550291f8f.2 for ; Wed, 17 Sep 2025 05:07:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1758110863; x=1758715663; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=iM2iOBhF3jTNwGiyMt11FxfeniZGf805/faeSnHTQeo=; b=h1rqRLGKrFFIgQWSLGXPRud2BJGDA1O6bWOV2uskUQCr+YsiW9ZHpchmyZ0tw8tmS+ M8WhmIP+KiCH/dHwOcE7foBNbBzJTFEFkd4yOetNES3aoynbMHqFrTjJAy8Ex8Ow2f4y E2MHBUD6JBB7jdHUKvphyl2wGiwx1tg7cFmTUCHpBEZLW0d38fe17id+9ecJfpBdqmTg 4CHXg3bwufnOtZefGhsncXYdmusY8ut/q01KucjYnUL/08q/q6EtX2nx16MfI2tBHNUZ t5iJzmMguylJI9Zy68theTlt5jXk1wdlTKLXVSUbj7tYyXw+ORdnUKxLpgjxSOinXMZb Ffbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758110863; x=1758715663; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=iM2iOBhF3jTNwGiyMt11FxfeniZGf805/faeSnHTQeo=; b=QpdcUawaCt1/uRAJBkmUnMM0WI74SHhyQ27Nu6ftdYg1KADDdEXYF8B3iEX4E+0MBw aOYWGAeOr+zvOAKx5lsrCS2YBeruV+nv66Q1d9y46ovmBTVbYLvuckIO/ZkLKseBJWet Mta1wvlnrv8RgEAWFsJul5+KGJobag8MY6NfSla+qDA5tFQJ5VP5mdmZkTIbu0yV1/8K 0hQbdMAQSWc1RpWdqOC6Hnsz5BJjkFRDTE4iATNEb2Ocdz1NqhTg8IE77EgVT9z9C4/a 31eO0kEOnR7TAaICUDV/IwCSpbCjBOvBf8fhcb/IzBDpn9FBX3XoWGomNJRduDPpqnqg wEyg== X-Forwarded-Encrypted: i=1; AJvYcCWNotOgMrhNiuCuWpa1Rb73OTZWEmwtXAqpvtL9PLsCJIUJylD4PDcSoCfwM3F13c5glp1ZOPi4jdHXB3M=@vger.kernel.org X-Gm-Message-State: AOJu0YwfTnOaklXxZhZKQWTXpbaK1TnNhgX/I4mmyJQlLA86zFeSBn72 dpRHxkI2q8hiXigjRuEhbZO4mYsj7VL4BFzaADFwbSHsv7+cVvrRmvNqoqFKj+y1vVdELOY2qlC gnec7Mw== X-Google-Smtp-Source: AGHT+IEFmZwObfFR6PR74lZUpnUMvooCASwa43V7SnenyQCqtdR5oiv4vgIEIY4/wx+xKfDpXGuPB3huCAc= X-Received: from wrbhb2.prod.google.com ([2002:a05:6000:4902:b0:3ea:892d:90cf]) (user=srosek job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:178e:b0:3e5:25c2:9637 with SMTP id ffacd0b85a97d-3ecdf9ba45bmr1712866f8f.17.1758110863238; Wed, 17 Sep 2025 05:07:43 -0700 (PDT) Date: Wed, 17 Sep 2025 12:07:18 +0000 In-Reply-To: <20250917120719.2390847-1-srosek@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250917120719.2390847-1-srosek@google.com> X-Mailer: git-send-email 2.51.0.384.g4c02a37b29-goog Message-ID: <20250917120719.2390847-6-srosek@google.com> Subject: [PATCH v2 5/6] ACPI: platform: Add macro for acpi platform driver From: Slawomir Rosek To: "Rafael J . Wysocki" , Alex Hung , Hans de Goede , Ilpo Jarvinen , AceLan Kao , Daniel Lezcano Cc: Greg Kroah-Hartman , Zhang Rui , Srinivas Pandruvada , Tomasz Nowicki , Stanislaw Kardach , Michal Krawczyk , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-pm@vger.kernel.org, Slawomir Rosek Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce module_acpi_platform_driver() macro to simplify dynamic enumeration of ACPI device objects on the platform bus by loadable modules. Move common code from the intel-hid and intel-vbtn drivers to the ACPI platform core. Signed-off-by: Slawomir Rosek --- drivers/acpi/acpi_platform.c | 27 +++++++++++++++++++++++++ drivers/platform/x86/intel/hid.c | 33 +++---------------------------- drivers/platform/x86/intel/vbtn.c | 30 +--------------------------- include/linux/platform_device.h | 17 ++++++++++++++++ 4 files changed, 48 insertions(+), 59 deletions(-) diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c index 48d15dd785f6..adf32ffa6be6 100644 --- a/drivers/acpi/acpi_platform.c +++ b/drivers/acpi/acpi_platform.c @@ -190,6 +190,33 @@ struct platform_device *acpi_create_platform_device(st= ruct acpi_device *adev, } EXPORT_SYMBOL_GPL(acpi_create_platform_device); =20 +static acpi_status +__acpi_platform_driver_register_cb(acpi_handle handle, u32 lvl, + void *context, void **rv) +{ + const struct acpi_device_id *ids =3D context; + struct acpi_device *dev =3D acpi_fetch_acpi_dev(handle); + + if (dev && acpi_match_device_ids(dev, ids) =3D=3D 0) + if (!IS_ERR_OR_NULL(acpi_create_platform_device(dev, NULL))) { + dev_info(&dev->dev, + "created platform device\n"); + } + + return AE_OK; +} + +int __acpi_platform_driver_register(struct platform_driver *drv, + struct module *owner) +{ + acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX, + __acpi_platform_driver_register_cb, NULL, + (void *)drv->driver.acpi_match_table, NULL); + + return __platform_driver_register(drv, owner); +} +EXPORT_SYMBOL_GPL(__acpi_platform_driver_register); + void __init acpi_platform_init(void) { acpi_reconfig_notifier_register(&acpi_platform_notifier); diff --git a/drivers/platform/x86/intel/hid.c b/drivers/platform/x86/intel/= hid.c index f25a427cccda..37f990686446 100644 --- a/drivers/platform/x86/intel/hid.c +++ b/drivers/platform/x86/intel/hid.c @@ -775,34 +775,7 @@ static struct platform_driver intel_hid_pl_driver =3D { * * As a workaround until the ACPI core figures out how to handle * this corner case, manually ask the ACPI platform device code to - * claim the ACPI node. + * claim the ACPI node by using module_acpi_platform_driver() + * instead of the regular module_platform_driver(). */ -static acpi_status __init -check_acpi_dev(acpi_handle handle, u32 lvl, void *context, void **rv) -{ - const struct acpi_device_id *ids =3D context; - struct acpi_device *dev =3D acpi_fetch_acpi_dev(handle); - - if (dev && acpi_match_device_ids(dev, ids) =3D=3D 0) - if (!IS_ERR_OR_NULL(acpi_create_platform_device(dev, NULL))) - dev_info(&dev->dev, - "intel-hid: created platform device\n"); - - return AE_OK; -} - -static int __init intel_hid_init(void) -{ - acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, - ACPI_UINT32_MAX, check_acpi_dev, NULL, - (void *)intel_hid_ids, NULL); - - return platform_driver_register(&intel_hid_pl_driver); -} -module_init(intel_hid_init); - -static void __exit intel_hid_exit(void) -{ - platform_driver_unregister(&intel_hid_pl_driver); -} -module_exit(intel_hid_exit); +module_acpi_platform_driver(intel_hid_pl_driver); diff --git a/drivers/platform/x86/intel/vbtn.c b/drivers/platform/x86/intel= /vbtn.c index 232cd12e3c9f..42932479de35 100644 --- a/drivers/platform/x86/intel/vbtn.c +++ b/drivers/platform/x86/intel/vbtn.c @@ -390,32 +390,4 @@ static struct platform_driver intel_vbtn_pl_driver =3D= { .remove =3D intel_vbtn_remove, }; =20 -static acpi_status __init -check_acpi_dev(acpi_handle handle, u32 lvl, void *context, void **rv) -{ - const struct acpi_device_id *ids =3D context; - struct acpi_device *dev =3D acpi_fetch_acpi_dev(handle); - - if (dev && acpi_match_device_ids(dev, ids) =3D=3D 0) - if (!IS_ERR_OR_NULL(acpi_create_platform_device(dev, NULL))) - dev_info(&dev->dev, - "intel-vbtn: created platform device\n"); - - return AE_OK; -} - -static int __init intel_vbtn_init(void) -{ - acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, - ACPI_UINT32_MAX, check_acpi_dev, NULL, - (void *)intel_vbtn_ids, NULL); - - return platform_driver_register(&intel_vbtn_pl_driver); -} -module_init(intel_vbtn_init); - -static void __exit intel_vbtn_exit(void) -{ - platform_driver_unregister(&intel_vbtn_pl_driver); -} -module_exit(intel_vbtn_exit); +module_acpi_platform_driver(intel_vbtn_pl_driver); diff --git a/include/linux/platform_device.h b/include/linux/platform_devic= e.h index 074754c23d33..3b70b054d8a5 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h @@ -264,6 +264,14 @@ extern int __platform_driver_register(struct platform_= driver *, struct module *); extern void platform_driver_unregister(struct platform_driver *); =20 +/* + * use a macro to avoid include chaining to get THIS_MODULE + */ +#define acpi_platform_driver_register(drv) \ + __acpi_platform_driver_register(drv, THIS_MODULE) +extern int __acpi_platform_driver_register(struct platform_driver *, + struct module *); + /* non-hotpluggable platform devices may use this so that probe() and * its support may live in __init sections, conserving runtime memory. */ @@ -292,6 +300,15 @@ static inline void platform_set_drvdata(struct platfor= m_device *pdev, module_driver(__platform_driver, platform_driver_register, \ platform_driver_unregister) =20 +/* module_acpi_platform_driver() - Helper macro for drivers that don't do + * anything special in module init/exit. This eliminates a lot of + * boilerplate. Each module may only use this macro once, and + * calling it replaces module_init() and module_exit() + */ +#define module_acpi_platform_driver(__platform_driver) \ + module_driver(__platform_driver, acpi_platform_driver_register, \ + platform_driver_unregister) + /* builtin_platform_driver() - Helper macro for builtin drivers that * don't do anything special in driver init. This eliminates some * boilerplate. Each driver may only use this macro once, and --=20 2.51.0.384.g4c02a37b29-goog From nobody Thu Oct 2 11:50:42 2025 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B9C0C31A7FD for ; Wed, 17 Sep 2025 12:07:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758110869; cv=none; b=BfkZ4sIvbA4JCoVZ4aa+34m9NtPwFxduHapLIXh6GQKtiyVJpsOUJ18vgsgGor57fW/ZiI+VRBdoxnMuitTKzEf3XRwPzgmoyj/yb5hvBasHOoDzXgm/32gPdwtW5qUw5ws99OPYavuBzEkIgD3Aw3BUuJtBftz/VaDQtFmLNik= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758110869; c=relaxed/simple; bh=tU762bI0xjmHVqq18zAAOPUzkyoCPt7UCqr5rNDSzXg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=uzgKwkxp/Li9xq908660IZ5xLpA2F4Bc6bGpkCVxq3IXdFwV7/aLl0LfJKPBi7voPNh90Cw4HU2KmdHjAqJdZSz2VqCoeovmyhpe217Zq5qZ0JuoIKGYXFsMP46s9x7devE5v5az+BYkYoPSWBYbmSHn2eTe2DUelbVjcWFXT0I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--srosek.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=uyuI34de; arc=none smtp.client-ip=209.85.221.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--srosek.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="uyuI34de" Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-3ec7be07a24so1028088f8f.1 for ; Wed, 17 Sep 2025 05:07:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1758110864; x=1758715664; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=BlR6y3fxG98sQ/Eewnl5kAjfb6+S1suRK717CcwkbKU=; b=uyuI34deKtzMNdtMSWwOHub0IrOrglhEagNgHyhd0gSGXOxtrGFiiSM4PxOMzAjKLN 3D310wl+0gw8lsbSr1mhn4QcJhMYGviMSR3upgBNpf4CbJjp4OEd6LwEm+1vuv894dFL vNogqY8jWz/IoM3EoJ/KFqP5V1AZp6JW5DqwK48o5EO+KaNemm8C/K1bEU7DWXm2IIMo PQoxfdlFtfUgpgNklYLFXoNuljFnpNBm4vrceEpZYQ61ufEGhjw+7SJP++DgHDwKTsOr uIHeb8MvN0IUGH/UW2mgJYL+x9Ab3SQU8bktdnCtVWKDa3RFUpwfYR6kt1XusVgp9Oux kGQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758110864; x=1758715664; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=BlR6y3fxG98sQ/Eewnl5kAjfb6+S1suRK717CcwkbKU=; b=ePMUPdtA81Dknh1ocECzZaR5w7Slg2s+KaVi5Jx3PD4lzTJIs+U/YquW38cDko75ie yT69912vF5splUbPMW3hNTsv6lUzeFFu0FDIUKyYwrKURKgPhizqzw9gfKxOVTRI31mC DCtpcQMMn/mp4UT2nAr2fpSSx0p79NCVZUCCig3ooHZfppfeKIGXL7MKHFA67sdcg1pH ZQ+A3qaGza6db4CTG5bkUH/IrHgRLo9jaERddnKd2xg73Ufb5RQhqro5KzW+HqXYD/Wq zLEQZKMWzQfHNE9G+UKv8vYq95B2upWF+HBRljXZEhbbOqwcOX5ZUIHD8pij6aro5yyC 4P8g== X-Forwarded-Encrypted: i=1; AJvYcCU6bn92Jb0xGSRqqMOIwIj0vlL/urKzYSwwtt6G4Drd7qmrEmdCsXBYuK8ReFJt9xd06q8u7VwINIfMslI=@vger.kernel.org X-Gm-Message-State: AOJu0YzwvKC3lJE3Op+K9tpZZ1eP07lpdgPQWIkScLVdN8G1Mdou2eT+ F6QvoqpCTGnUFZkQiv0Q5gYma4ptO51wLakS7ZaJO46aX6R3xmRHRjdLEKSQDB3TMJbn12JBdG9 9wxAxxw== X-Google-Smtp-Source: AGHT+IGOAdZFO28NRYCmZTgbDO00GhheP/jEh493wkfP2hN9YkezE8rvmlHxlcfstNv8u00RkaPzUYQvyWI= X-Received: from wrbdn1.prod.google.com ([2002:a05:6000:c01:b0:3d6:801b:c728]) (user=srosek job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:24ca:b0:3d6:212b:9ae2 with SMTP id ffacd0b85a97d-3ecdfa4d51dmr1825000f8f.63.1758110864148; Wed, 17 Sep 2025 05:07:44 -0700 (PDT) Date: Wed, 17 Sep 2025 12:07:19 +0000 In-Reply-To: <20250917120719.2390847-1-srosek@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250917120719.2390847-1-srosek@google.com> X-Mailer: git-send-email 2.51.0.384.g4c02a37b29-goog Message-ID: <20250917120719.2390847-7-srosek@google.com> Subject: [PATCH v2 6/6] ACPI: DPTF: Move INT340X enumeration to modules From: Slawomir Rosek To: "Rafael J . Wysocki" , Alex Hung , Hans de Goede , Ilpo Jarvinen , AceLan Kao , Daniel Lezcano Cc: Greg Kroah-Hartman , Zhang Rui , Srinivas Pandruvada , Tomasz Nowicki , Stanislaw Kardach , Michal Krawczyk , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-pm@vger.kernel.org, Slawomir Rosek Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move enumeration of INT340X ACPI device objects on the platform bus from DPTF core to thermal drivers using ACPI platform core methods Signed-off-by: Slawomir Rosek --- drivers/acpi/dptf/dptf_pch_fivr.c | 2 +- drivers/acpi/dptf/dptf_power.c | 2 +- drivers/acpi/dptf/int340x_thermal.c | 7 +++++-- drivers/acpi/fan_core.c | 2 +- drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 2 +- drivers/thermal/intel/int340x_thermal/int3401_thermal.c | 2 +- drivers/thermal/intel/int340x_thermal/int3402_thermal.c | 2 +- drivers/thermal/intel/int340x_thermal/int3403_thermal.c | 2 +- drivers/thermal/intel/int340x_thermal/int3406_thermal.c | 2 +- 9 files changed, 13 insertions(+), 10 deletions(-) diff --git a/drivers/acpi/dptf/dptf_pch_fivr.c b/drivers/acpi/dptf/dptf_pch= _fivr.c index cb81636a5d63..f3cd52c89e8d 100644 --- a/drivers/acpi/dptf/dptf_pch_fivr.c +++ b/drivers/acpi/dptf/dptf_pch_fivr.c @@ -162,7 +162,7 @@ static struct platform_driver pch_fivr_driver =3D { }, }; =20 -module_platform_driver(pch_fivr_driver); +module_acpi_platform_driver(pch_fivr_driver); =20 MODULE_AUTHOR("Srinivas Pandruvada "); MODULE_LICENSE("GPL v2"); diff --git a/drivers/acpi/dptf/dptf_power.c b/drivers/acpi/dptf/dptf_power.c index d7c59f016083..b85e876b2e85 100644 --- a/drivers/acpi/dptf/dptf_power.c +++ b/drivers/acpi/dptf/dptf_power.c @@ -239,7 +239,7 @@ static struct platform_driver dptf_power_driver =3D { }, }; =20 -module_platform_driver(dptf_power_driver); +module_acpi_platform_driver(dptf_power_driver); =20 MODULE_AUTHOR("Srinivas Pandruvada "); MODULE_LICENSE("GPL v2"); diff --git a/drivers/acpi/dptf/int340x_thermal.c b/drivers/acpi/dptf/int340= x_thermal.c index 7d1308b1f513..b2be3a8df9ac 100644 --- a/drivers/acpi/dptf/int340x_thermal.c +++ b/drivers/acpi/dptf/int340x_thermal.c @@ -27,8 +27,11 @@ static const struct acpi_device_id int340x_thermal_devic= e_ids[] =3D { static int int340x_thermal_handler_attach(struct acpi_device *adev, const struct acpi_device_id *id) { - if (IS_ENABLED(CONFIG_INT340X_THERMAL)) - acpi_create_platform_device(adev, NULL); + /* + * Do not attach INT340X devices until platform drivers are loaded. + * Enumeration of INT340X ACPI device objects on the platform bus + * should be done by thermal drivers. + */ return 1; } =20 diff --git a/drivers/acpi/fan_core.c b/drivers/acpi/fan_core.c index 095502086b41..7df3caa59b73 100644 --- a/drivers/acpi/fan_core.c +++ b/drivers/acpi/fan_core.c @@ -473,7 +473,7 @@ static struct platform_driver acpi_fan_driver =3D { }, }; =20 -module_platform_driver(acpi_fan_driver); +module_acpi_platform_driver(acpi_fan_driver); =20 MODULE_AUTHOR("Paul Diefenbaugh"); MODULE_DESCRIPTION("ACPI Fan Driver"); diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c b/driv= ers/thermal/intel/int340x_thermal/int3400_thermal.c index 6311125c3ebd..0005961328fc 100644 --- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c @@ -699,7 +699,7 @@ static struct platform_driver int3400_thermal_driver = =3D { }, }; =20 -module_platform_driver(int3400_thermal_driver); +module_acpi_platform_driver(int3400_thermal_driver); =20 MODULE_DESCRIPTION("INT3400 Thermal driver"); MODULE_AUTHOR("Zhang Rui "); diff --git a/drivers/thermal/intel/int340x_thermal/int3401_thermal.c b/driv= ers/thermal/intel/int340x_thermal/int3401_thermal.c index e0603f218d2e..d496f8b171e0 100644 --- a/drivers/thermal/intel/int340x_thermal/int3401_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3401_thermal.c @@ -69,7 +69,7 @@ static struct platform_driver int3401_driver =3D { }, }; =20 -module_platform_driver(int3401_driver); +module_acpi_platform_driver(int3401_driver); =20 MODULE_AUTHOR("Srinivas Pandruvada "); MODULE_DESCRIPTION("Processor Thermal Reporting Device Driver"); diff --git a/drivers/thermal/intel/int340x_thermal/int3402_thermal.c b/driv= ers/thermal/intel/int340x_thermal/int3402_thermal.c index 213d4535f2c1..d06c06fadce5 100644 --- a/drivers/thermal/intel/int340x_thermal/int3402_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3402_thermal.c @@ -100,7 +100,7 @@ static struct platform_driver int3402_thermal_driver = =3D { }, }; =20 -module_platform_driver(int3402_thermal_driver); +module_acpi_platform_driver(int3402_thermal_driver); =20 MODULE_DESCRIPTION("INT3402 Thermal driver"); MODULE_LICENSE("GPL"); diff --git a/drivers/thermal/intel/int340x_thermal/int3403_thermal.c b/driv= ers/thermal/intel/int340x_thermal/int3403_thermal.c index d246c69d4872..33735515b47d 100644 --- a/drivers/thermal/intel/int340x_thermal/int3403_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3403_thermal.c @@ -284,7 +284,7 @@ static struct platform_driver int3403_driver =3D { }, }; =20 -module_platform_driver(int3403_driver); +module_acpi_platform_driver(int3403_driver); =20 MODULE_AUTHOR("Srinivas Pandruvada "); MODULE_LICENSE("GPL v2"); diff --git a/drivers/thermal/intel/int340x_thermal/int3406_thermal.c b/driv= ers/thermal/intel/int340x_thermal/int3406_thermal.c index d05ca8bc4061..03cc026cdffb 100644 --- a/drivers/thermal/intel/int340x_thermal/int3406_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3406_thermal.c @@ -203,7 +203,7 @@ static struct platform_driver int3406_thermal_driver = =3D { }, }; =20 -module_platform_driver(int3406_thermal_driver); +module_acpi_platform_driver(int3406_thermal_driver); =20 MODULE_DESCRIPTION("INT3406 Thermal driver"); MODULE_LICENSE("GPL v2"); --=20 2.51.0.384.g4c02a37b29-goog