From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.180 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793264357; b=VHWrWI0zHFr8KpKEfrWQb9enz+dYa0xaR+5WlSIwwwt0eWNeALFxO9II+ygWczfuZQBB 7Q7jgExr6K8xCsXZoiRHHR4zqHsabEG+okG0do5jRvVxcuLX8A0q4m/3fPvyagajbPbPv PgmgzeJjUXgXdOFjdgiFYnH1dCRU/4SbeQr0+CJkFTch6CwUXxwAT3iq9ICIdZxDn4Gdv ulBNbut9sVj/IX+Etv/jT0Ey+eG1WjxUw7ENuqrmDzSsTXUQZN6zHIWGUU4R7NPPlIfJN RrB7Fb6BpRUqQhCU5qXlQycFfYQlbxtvlb+Je90DrPRRDpYAzky1VgznSZAx/lUo3rg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793264357; 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=Pf8vm5N7CuEKM9qQ3heupZiM07wEvXe0DI+wIb1mu6U=; b=Yc3WqU0UEfwNGZ8OkF7j2gXfWH9ER/ZC1kenC0IAXkweleSMjT/YzRFF8EvwsGkQNu69 vHmAvyO4neixsWdqBWEn0IUysaqXIVbfoZfNvNNRn1o0CNAQGVE8SToDtQgAsM+E+SBUf a8Xr+T4/vmCCbnwo1HJqOGtYkvOiD34YkLlO798+OulDNGU4gmAR8VCtT6IsCoPaepd+P 7X5l/jwCsaEVatz6bjmXJTAyp5rarlymPUHzI2+WGj3uvAPS9Lz7lEBHVOCeE3OcSyrxh v/ljiEDR9+u4IGcPws1Smw8xsOHGrsXSfJsuyZ/nDhngl7TPszuZzOhEA99UpEp62iw== 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=TxCRMGdA; arc=none smtp.remote-ip=74.125.82.180 Received: from mail-dy1-f180.google.com (mail-dy1-f180.google.com [74.125.82.180]) (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 E1AB0606A31F for ; Thu, 29 Oct 2026 08:59:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org E1AB0606A31F 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=TxCRMGdA Received: by mail-dy1-f180.google.com with SMTP id 5a478bee46e88-35c76e9614aso2705300eec.0 for ; Thu, 29 Oct 2026 01:59:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793264356; x=1793869156; darn=lists.linux.dev; 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=Pf8vm5N7CuEKM9qQ3heupZiM07wEvXe0DI+wIb1mu6U=; b=TxCRMGdAWIxglZX/DPfUnwR9RQjBVvmcH/w/90nB7Iy5GfCwGk/xUtWliVZ4eurdKq vfpb5lq91Gq73mgRePyhm4I3gH4LotPIN5PF0ElW8hyd9VGQSZnwdZfLRfYtxdFZI6hx aKVI6PIWtFgmSQaErbzvnbgkyQQw/kytiy869lYnP68cmUHxrXe1L8uvZMzr2Qcy6cPu +7WGfthJpmRaMCSv6u7MJFCatJKAks8GnOqlIAk/tM8MjFoz0JYxz6p8dJ0JqujB7QKy /YaifNt9sHeJzCTpvhZf3iozn9w9sBbn01y8blzxi0geEDyvzytTxL063pW29PojT+gm dNYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793264356; x=1793869156; 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=Pf8vm5N7CuEKM9qQ3heupZiM07wEvXe0DI+wIb1mu6U=; b=bB6CQtpdvwVjIA1bW9fJ5cTX9n9l9b6RfBKdH7qXKFDDi9BO+arTtpRLSwa2dX4viR clKVCadjPmfNz+c/vPlZvqpwF1UO3Zg6ScJke52IsVHsAGS8dEzd6K8PJ3iwStbMJSXH cJ0oDKZzZpc+KlhcW+Eg5yaWVWlehuUenZOloS1jJOvb51ehnwysfHtrS0/yAuL/gWqq QCsB8XCrPwpcty1AZ3bsURstSOYmIu+1mKzE14oRgGFGdsuk6Igt+DBFF1cu/SuYPk5b hgD2tA1lO+nmCMECYN0/EQV71THR+h504E41kUEsyNS7taOuPAPHDNU99XxoqT4XqvlX RFNg== X-Forwarded-Encrypted: i=1; AKwUvBzdjLw9mfjgy9/A833cQLz7nvLjFj4bxX3GRQvl3W9otLuO81oSPnboIXARJmF8CXL/6YdI1A==@lists.linux.dev X-Gm-Message-State: AFq9FYIPw9Cz9RAovxy6lY6O0JfM2eXLPJhMaiJtFz4Pf6hv+5lytEgA wtAbUIpJWpeRCF5BAe+dg3Kcb3waWo5wL8z0ZgStHGUvbog0E6cpw6M= X-Gm-Gg: AYBFou1XUwqc4/go2KVwfGrljYcJRc4yblol5bRoSjqePv0GB7hZotUwgmIweX5mfGN fZf7OFW+JPNrOw1NrqAVadP3so0gIgsiJXjXvu4P7esM26FkS+SNAmyMnlM3UaaRUXF3xOyHHrS 9NnslNNYs5Dl6xRAlogbR2ZQWEnW64BKWkCUOoYXx0TLYEtk15prtMKV0ZdVtV0ssdaxKSkK46X V5lq+ESFYHwg5LHnlRYhKpUGiF3LDLUbBx4z/gL7jjYd7Vv5FWn3fKiy29Vs2O4KEMBVDgo1OjL k3Ng2y8voeP4KMYaGyaHLZNkTWsyWqqD626wYwaH8S1xK/O67CzDJC85JVIo0lclfx5MjDnfkKR yMc13t+G0TAoPJKlP24aGc2gyZmPN/+0lq5mC7V+npWUwqbKRUvw1iU+q3Ot+2JtXt1SmNoqvGr e1YgMzgARI0hHC7dMwwr3crkBlouYdt4vkT12QGz97wPJBImGWS4AZ0JHyxEb+bUb20c9SmyhSa 4jNSIzPgiNbEdI7Hcq6VIkjb7r6DUz7XYD2+2qB1SVYzSjAn3B2JXhGIqZG7pe3tkCGiaLY9rsn jgrYUWGVw6QG6t9y7tzXkXpq9eMnFwCjKehhYHJsZVidAvFxS2+EA1gzxRBiAw== X-Received: by 2002:a05:693c:4141:10b0:36a:3453:a356 with SMTP id 5a478bee46e88-36a3453a84dmr1973145eec.36.1793264356042; Thu, 29 Oct 2026 01:59:16 -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.01.58.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2026 01:59:15 -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 07/14] rtc: add support for x86 macs in macsmc-rtc Date: Thu, 29 Oct 2026 04:52:04 -0400 Message-ID: <20261029085504.3547-8-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: asahi@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Make macsmc-rtc work on Intel Macs. The ACPI RTC doesn't work correctly on T2 Macs, so the clock from the SMC is used instead. On these machines the time offset is kept in the SMC instead of NVMEM, and the clock rate is read from the SMC too. Signed-off-by: Atharva Tiwari --- drivers/rtc/rtc-macsmc.c | 126 ++++++++++++++++++++++++++++++++------- 1 file changed, 106 insertions(+), 20 deletions(-) diff --git a/drivers/rtc/rtc-macsmc.c b/drivers/rtc/rtc-macsmc.c index 8fe883066..37395c64c 100644 --- a/drivers/rtc/rtc-macsmc.c +++ b/drivers/rtc/rtc-macsmc.c @@ -2,9 +2,12 @@ /* * Apple SMC RTC driver * Copyright The Asahi Linux Contributors + * + * Copyright (C) 2026 Atharva Tiwari */ #include +#include #include #include #include @@ -20,13 +23,54 @@ /* 32768 Hz clock */ #define RTC_SEC_SHIFT 15 +static bool force_clkm; +module_param(force_clkm, bool, 0644); +MODULE_PARM_DESC(force_clkm, "Force CLKM Key, instead of trying to use CLKL"); + struct macsmc_rtc { struct device *dev; struct apple_smc *smc; struct rtc_device *rtc_dev; struct nvmem_cell *rtc_offset; + uint8_t shift; + bool async_rtc; }; +static int macsmc_rtc_read_clkl(struct macsmc_rtc *rtc, u64 *ctr) +{ + u64 request = 0xffffffffffffULL; + u64 response = 0; + int i, j, ret; + + for (i = 0; i < 4; i++) { + for (j = 0; j < 40; j++) { + ret = apple_smc_write(rtc->smc, SMC_KEY(CLKL), &request, RTC_BYTES); + if (ret == RTC_BYTES) + break; + } + if (ret != RTC_BYTES) + continue; + + msleep(20); + + for (j = 0; j < 20; j++) { + ret = apple_smc_read(rtc->smc, SMC_KEY(CLKL), &response, RTC_BYTES); + if (ret == RTC_BYTES) { + if ((response & 0x7fff) == 5 || (response & 0x7fff) == 6) + return -EAGAIN; + + if (response != 0xffffffffffffULL) { + *ctr = response; + return RTC_BYTES; + } + } + fsleep(1000); + } + } + + return -EIO; +} + static int macsmc_rtc_get_time(struct device *dev, struct rtc_time *tm) { struct macsmc_rtc *rtc = dev_get_drvdata(dev); @@ -36,25 +80,36 @@ static int macsmc_rtc_get_time(struct device *dev, struct rtc_time *tm) size_t len; int ret; - ret = apple_smc_read(rtc->smc, SMC_KEY(CLKM), &ctr, RTC_BYTES); + if (rtc->async_rtc && !force_clkm) + ret = macsmc_rtc_read_clkl(rtc, &ctr); + else + ret = apple_smc_read(rtc->smc, SMC_KEY(CLKM), &ctr, RTC_BYTES); + if (ret < 0) return ret; if (ret != RTC_BYTES) return -EIO; - p_off = nvmem_cell_read(rtc->rtc_offset, &len); - if (IS_ERR(p_off)) - return PTR_ERR(p_off); - if (len < RTC_BYTES) { + if (rtc->smc->is_acpi) { + ret = apple_smc_read(rtc->smc, SMC_KEY(CLKO), &off, RTC_BYTES); + if (ret < 0) + return ret; + if (ret != RTC_BYTES) + return -EIO; + } else { + p_off = nvmem_cell_read(rtc->rtc_offset, &len); + if (IS_ERR(p_off)) + return PTR_ERR(p_off); + if (len < RTC_BYTES) { + kfree(p_off); + return -EIO; + } + + memcpy(&off, p_off, RTC_BYTES); kfree(p_off); - return -EIO; } - - memcpy(&off, p_off, RTC_BYTES); - kfree(p_off); - /* Sign extend from 48 to 64 bits, then arithmetic shift right 15 bits to get seconds */ - now = sign_extend64(ctr + off, RTC_BITS - 1) >> RTC_SEC_SHIFT; + now = sign_extend64(ctr + off, RTC_BITS - 1) >> rtc->shift; rtc_time64_to_tm(now, tm); return ret; @@ -66,14 +121,20 @@ static int macsmc_rtc_set_time(struct device *dev, struct rtc_time *tm) u64 ctr = 0, off = 0; int ret; - ret = apple_smc_read(rtc->smc, SMC_KEY(CLKM), &ctr, RTC_BYTES); + if (rtc->async_rtc && !force_clkm) + ret = macsmc_rtc_read_clkl(rtc, &ctr); + else + ret = apple_smc_read(rtc->smc, SMC_KEY(CLKM), &ctr, RTC_BYTES); if (ret < 0) return ret; if (ret != RTC_BYTES) return -EIO; /* This sets the offset such that the set second begins now */ - off = (rtc_tm_to_time64(tm) << RTC_SEC_SHIFT) - ctr; + off = (rtc_tm_to_time64(tm) << rtc->shift) - ctr; + if (rtc->smc->is_acpi) + return (apple_smc_write(rtc->smc, SMC_KEY(CLKO), &off, RTC_BYTES) != RTC_BYTES); + return nvmem_cell_write(rtc->rtc_offset, &off, RTC_BYTES); } @@ -86,13 +147,15 @@ static int macsmc_rtc_probe(struct platform_device *pdev) { struct apple_smc *smc = dev_get_drvdata(pdev->dev.parent); struct macsmc_rtc *rtc; + int ret; + uint32_t clkr = 0xFFFFFFFF; /* * MFD will probe this device even without a node in the device tree, * thus bail out early if the SMC on the current machines does not * support RTC and has no node in the device tree. */ - if (!pdev->dev.of_node) + if (!pdev->dev.of_node && !smc->is_acpi) return -ENODEV; rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL); @@ -102,18 +165,40 @@ static int macsmc_rtc_probe(struct platform_device *pdev) rtc->dev = &pdev->dev; rtc->smc = smc; - rtc->rtc_offset = devm_nvmem_cell_get(&pdev->dev, "rtc_offset"); - if (IS_ERR(rtc->rtc_offset)) - return dev_err_probe(&pdev->dev, PTR_ERR(rtc->rtc_offset), - "Failed to get rtc_offset NVMEM cell\n"); + if (!rtc->smc->is_acpi) { + rtc->rtc_offset = devm_nvmem_cell_get(&pdev->dev, "rtc_offset"); + if (IS_ERR(rtc->rtc_offset)) + return dev_err_probe(&pdev->dev, PTR_ERR(rtc->rtc_offset), + "Failed to get rtc_offset NVMEM cell\n"); + } + + if (rtc->smc->is_acpi) { + ret = apple_smc_read_u32(rtc->smc, SMC_KEY(CLKR), &clkr); + if (ret < 0 || clkr == 0xFFFFFFFF) + rtc->shift = RTC_SEC_SHIFT; + else + rtc->shift = ffs(clkr) - 1; + + if (apple_smc_key_exists(rtc->smc, SMC_KEY(CLKL))) { + u64 clkl; + + ret = apple_smc_read(rtc->smc, SMC_KEY(CLKL), &clkl, RTC_BYTES); + if (ret == RTC_BYTES && clkl != 0xFFFFFFFFFFFFFFFFULL) + rtc->async_rtc = true; + } + } else + rtc->shift = RTC_SEC_SHIFT; + + dev_info(&pdev->dev, "%u clock, using %s key\n", (clkr != 0xFFFFFFFF) ? clkr : 32768, + rtc->async_rtc ? "CLKL" : "CLKM"); rtc->rtc_dev = devm_rtc_allocate_device(&pdev->dev); if (IS_ERR(rtc->rtc_dev)) return PTR_ERR(rtc->rtc_dev); rtc->rtc_dev->ops = &macsmc_rtc_ops; - rtc->rtc_dev->range_min = S64_MIN >> (RTC_SEC_SHIFT + (64 - RTC_BITS)); - rtc->rtc_dev->range_max = S64_MAX >> (RTC_SEC_SHIFT + (64 - RTC_BITS)); + rtc->rtc_dev->range_min = S64_MIN >> (rtc->shift + (64 - RTC_BITS)); + rtc->rtc_dev->range_max = S64_MAX >> (rtc->shift + (64 - RTC_BITS)); platform_set_drvdata(pdev, rtc); @@ -138,3 +223,4 @@ module_platform_driver(macsmc_rtc_driver); MODULE_LICENSE("Dual MIT/GPL"); MODULE_DESCRIPTION("Apple SMC RTC driver"); MODULE_AUTHOR("Hector Martin "); +MODULE_ALIAS("platform:macsmc-rtc"); -- 2.55.0