From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.181 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793264466; b=aQVCyv4FCu2Y7ZAAUkGQngmL/R27AMFkEGKf6RmPj7yKMTPM6GCO2gGp/wPlPxxEOyKS BO01U22PZB2z+G1f1vHWWcYROPtmhdfBqrrqavAshOG6z1vmlooiabow4eN8wwc6vD+xE MSn2RmOhuvzcsZ/an/Pesi0hvJK6D0SdHoHgwQ+K6HHNlxx7f+PrSxnODFNTuX2OVLJJJ p9/ui4C+JIXju8iNBqSWpHOFSVMkAsFVtDaPIEBn7p4Nd6pBPKCm7F10Y+Zvms6BCfRu4 kUCtScLVW1/O58rBpiRYL+z0SzRm8aEdxKcgCAlq77U3LGMO30hHUI4mxdZH02xrtJQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793264466; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=Z3mbcZY+neJw3cJUW+gndo2WA1VaXIZUfre4RITk+7k=; b=hV80HcnSqT6WfjoMrhObwkFBGLxUhU7OmnYkukgyLnQp1YQA8p66sXniPzq7HrSzIdsT nsU0QzGx2V4SQ/tp6MMLuw5sLu9kcC+KTVcCybK5yv2tOgDYXXJPj+OKqVnrDCmmH4cJX qxcbIYqD8OJAHrX9qppIV3/SUP5H69lz+wdp9eFZjPbjqVcLBtVEiPkDqCE1ywjLdSZ0Y WCNaXe2ynJ5S1l3RixHT+Sf8E2xUvXa8vt9sm/JV0j/mvJeWgG5i+ehQL/Go/5238/gP+ c/W8kfCnY+o4mMn4QpsTp3+Qyrs3hM8vwP969AHV9o4ryajhvB93b+SH28ZZ6VVaIzg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=TCcGnNUJ; arc=none smtp.remote-ip=74.125.82.181 Received: from mail-dy1-f181.google.com (mail-dy1-f181.google.com [74.125.82.181]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6BD88606A31A for ; Thu, 29 Oct 2026 09:01:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 6BD88606A31A Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=TCcGnNUJ Received: by mail-dy1-f181.google.com with SMTP id 5a478bee46e88-33bf40b0c8bso1180410eec.0 for ; Thu, 29 Oct 2026 02:01:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793264465; x=1793869265; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Z3mbcZY+neJw3cJUW+gndo2WA1VaXIZUfre4RITk+7k=; b=TCcGnNUJc9rE3+MU2dfBg1/buLqpvuGZpYCZpTH5anu5u+ZMXaHl9K3FX4AOJa36iE SHLYuQ8VH7B/b7kK8397LfdltoUH5e6q2jo++wZvHhNr1Kqx2KiiJVNWv++16GSYeXQH t6Ww3ttl7Q+94LDcf7q0QvjHrUAXJfa/V7tBTLTrruB4gSw/g97V32iMOOU0Sm9ERl9S 4MGRGzLa94oKF7jIl1QFcE66oOfgguRO0RAazo4KhivQuQbL7hiPIbc7D/5wupmrnu67 NZ2ljq3nvkvPLFUrnS/YtgabfHFLNHyNR8ZRtyhzh7sH9L0c+OWsajyMQ2UolEIrFD08 PAuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793264465; x=1793869265; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=Z3mbcZY+neJw3cJUW+gndo2WA1VaXIZUfre4RITk+7k=; b=1zBSmgD8tCzreYlCNx01pyEnE+Nsru1F7rIyILff/mNfzIulnGk6hJmMIQkpbphsoL gmoe2nd9eOEjj8qPlOxjMODurpXU+a3AsGnZ2NeW4PLFCNUThfLfsBc2uYLNpSLn7nFD 2VvwiP+2XXJz7toef3SkrguK4i0A3gnCV46FZ+OpynpFNG/V6UetzZiHF3jwWHlyqWIe +i6WrPfBfbBg/MKvLVODWuGw9fc3B5sP0km2SmWcgDOZjxEzHWEbXgoNLyw+tRlQwgP5 P6ZJHfCp477kcI+jVAX2nYU/HpoiNRFFUMHGiGDXtr1wC5q28iAJYGjsW8cmU9bra/Vl Ikmg== X-Forwarded-Encrypted: i=1; AKwUvBxKGzRZgUogMQnZbqG6IN7f6BLvuJI0gTD2mw6UDIyu5o7hVZwbHajClTDOqE4rCGJZod6+sWTkLfap@vger.kernel.org X-Gm-Message-State: AFq9FYIeeC95TFsAG1sZvtAK+mVpfPOKBdKp7ew9F7jNMVtvUOwP7paX yqYBnx12ZhdOAOVMGBgU4BAlHcr2fRTnlPw303ceiHJ8VCu+ntT+l+8= X-Gm-Gg: AYBFou0kn+qkhhuAGjVDBvkNAxjnrfinRUYznX5fpfYxpdUYVbYIFh/gtLP/ri8WzUl A6Uw43/RxMwSMGLeod+OqvH6R/MjC7jdn8o/Y14MwomnpgXFFkonZTZ/ZW9NqZ9hnxRGpLb5KX6 3P70YUZJuceIWbOPKlYf2j7RstoSn8X63ueq7KbK6NZWJyY/DZ/2UVQid5mhdVtm2vsdI2gIbuI KutmWZ4MY9Cpq1k90gQDk+xIShU0YEC2PiJswjhixrARmM00y1VMdiuLMZf1KHmNU1zK8e1L2AE 9URAHdei8vqSqj20/5kdbnEbGnxFthw6YSY4lv2Jb+a4XuHeD5j5/S32H8T0hQoeEZSseRkab+s VPjT6Os45OXPBh+3EamU2W7f7HKool5zE0OKIuLcz2/lz/F/SmL4eIwaYTw5Ky4cbf8Dhxk21yj /tLKhpIj6MaFqVbNO33vtnN1dnTo/cO52QVxPJ3DtrWWooBLxNlNcpXsQ9FLusM0dhNVNtPRWGt RcqCBNJEVZPvlopBiOqxgaq3px26dDaqJjBU5gab2I1nKy8uEqZNgoP7UkXJxkHsriYgAG+cFnx M8GO3zGqJ/R2oFWeJ0kjP3vz4YMRUX14h41g3CrRwIv6icMzmlP2UW7CTVWMhA== X-Received: by 2002:a05:7300:f894:b0:351:207d:bff4 with SMTP id 5a478bee46e88-36a202bc360mr7083860eec.4.1793264464275; Thu, 29 Oct 2026 02:01:04 -0700 (PDT) Received: from at-Standard-PC-Q35-ICH9-2009 ([27.60.20.232]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-36a23641e78sm16497937eec.0.2026.10.29.02.00.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2026 02:01:03 -0700 (PDT) From: Atharva Tiwari To: Cc: Atharva Tiwari , Bjorn Helgaas , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , "Rafael J. Wysocki" , Len Brown , Linus Walleij , Bartosz Golaszewski , Sven Peter , Janne Grunau , Neal Gompa , Guenter Roeck , Jonathan Cameron , David Lechner , =?UTF-8?q?Nuno=20S=C3=A1?= , Andy Shevchenko , Lee Jones , Pavel Machek , Griffin Kroah-Hartman , Hans de Goede , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Sebastian Reichel , Alexandre Belloni , Wim Van Sebroeck , Jarkko Sakkinen , Mimi Zohar , Roberto Sassu , Dmitry Kasatkin , Eric Snowberg , Paul Moore , James Morris , "Serge E. Hallyn" , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org, linux-gpio@vger.kernel.org, asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-hwmon@vger.kernel.org, linux-iio@vger.kernel.org, linux-leds@vger.kernel.org, mfd@lists.linux.dev, platform-driver-x86@vger.kernel.org, linux-pm@vger.kernel.org, linux-rtc@vger.kernel.org, linux-watchdog@vger.kernel.org, linux-integrity@vger.kernel.org, keyrings@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [RFC PATCH 11/14] acpi: disable battery and adapter for x86 apple machines Date: Thu, 29 Oct 2026 04:52:08 -0400 Message-ID: <20261029085504.3547-12-atharvatiwarilinuxdev@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261029085504.3547-1-atharvatiwarilinuxdev@gmail.com> References: <20261029085504.3547-1-atharvatiwarilinuxdev@gmail.com> X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit When macsmc-power is enabled on an Intel Mac, skip acpi-sbs and the ACPI battery and adapter drivers, since macsmc-power now provides them. This avoids duplicate devices. Signed-off-by: Atharva Tiwari --- drivers/acpi/sbs.c | 17 +++++++++-------- drivers/acpi/x86/utils.c | 4 ++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c index f10bbf13c..b12f2acc0 100644 --- a/drivers/acpi/sbs.c +++ b/drivers/acpi/sbs.c @@ -634,6 +634,9 @@ static int acpi_sbs_probe(struct platform_device *pdev) int result = 0; int id; + if (IS_ENABLED(CONFIG_MACSMC_POWER) && x86_apple_machine) + return -ENODEV; + device = ACPI_COMPANION(&pdev->dev); if (!device) return -ENODEV; @@ -655,14 +658,12 @@ static int acpi_sbs_probe(struct platform_device *pdev) result = 0; - if (!x86_apple_machine) { - result = acpi_manager_get_info(sbs); - if (!result) { - sbs->manager_present = 1; - for (id = 0; id < MAX_SBS_BAT; ++id) - if ((sbs->batteries_supported & (1 << id))) - acpi_battery_add(sbs, id); - } + result = acpi_manager_get_info(sbs); + if (!result) { + sbs->manager_present = 1; + for (id = 0; id < MAX_SBS_BAT; ++id) + if ((sbs->batteries_supported & (1 << id))) + acpi_battery_add(sbs, id); } if (!sbs->manager_present) diff --git a/drivers/acpi/x86/utils.c b/drivers/acpi/x86/utils.c index 418951639..9f3b9b7d9 100644 --- a/drivers/acpi/x86/utils.c +++ b/drivers/acpi/x86/utils.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include "../internal.h" @@ -608,6 +609,9 @@ bool acpi_quirk_skip_acpi_ac_and_battery(void) long quirks = 0; int i; + if (IS_ENABLED(CONFIG_MACSMC_POWER) && x86_apple_machine) + return true; + dmi_id = dmi_first_match(acpi_quirk_skip_dmi_ids); if (dmi_id) quirks = (unsigned long)dmi_id->driver_data; -- 2.55.0