From nobody Mon Feb 9 04:03:48 2026 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 8F73B1FDA92 for ; Tue, 23 Dec 2025 14:14:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766499264; cv=none; b=NeIGWtnJhYp6d/NHeBIr5jUUBjXo2dN/syZ6Gsa//pRnhIwbZl2A1YA9N8hhRzeOlgeiHhtkAM0+jt1SaX9e3EaJD4dyY/Xn01/NESq2HO79G3krH8Mzxa3cmBCJ/14wFRADb8QtVux1gyYMf1hSOxL859lh2okMWsE/6Tmy2Io= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766499264; c=relaxed/simple; bh=M8K2zyn6hgbZbYWDWq9d9LHWwqY0uxaEJ1APjbEF8uc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bExVWbqJJCjdrTJRqXKUarImELpbqYPp3FzCJqexG+2ZD6XSRnV7f87VYfi1fnHDE1RstUXYuF+u6UNuySaitG4S0FBMY+kn47ERq6PwZxrQOERBAWy7F5FnZLrN/C5D7POb+ItDqsK7PNgw0fgDhnh5AVq3YZEOZ0JHxm0Ah0c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=hjEOyEmW; arc=none smtp.client-ip=209.85.214.181 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) header.d=gmail.com header.i=@gmail.com header.b="hjEOyEmW" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2a0b4320665so76152125ad.1 for ; Tue, 23 Dec 2025 06:14:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766499261; x=1767104061; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=FzbzO6CJwLccPfkWtJ0+CvDng44py3nFdjMzI7Msc48=; b=hjEOyEmW9qx9juyahlz1+iNkGnOg19BVc75tTXFWTmdPvN2bGMJpXRGXVMmnLSSXm1 eQQP4HRttxgZFn2lXDfp52rW77T8gOzNicrBIMT5hnVcwIV4sfrZqpgJuYUQAbP4d/K4 GdO4+tk1XOEI11yhBmFOPLfXAQis1yckUVFnNmfrhCAmjQ913WGDjhdfvKvTnz6o0zh2 VQcik/2pAVJ78QkjTUSKp8u/m4CA6MGsJ8lRIVyyyRCYHP2qtFTs0O6S4CIIMmr0k0Mc yyGH4D3pwbPdLpn1Qt0GLWkENL1x1NM9N9mDQlzMwOQw0076YXmN5wakLexRJKnTojCS pM/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766499261; x=1767104061; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=FzbzO6CJwLccPfkWtJ0+CvDng44py3nFdjMzI7Msc48=; b=kHkRMpQYkPHBW0vP+pmrB4Ku2r0DkIaWU+zN9OAlJTsR3Ol5unSjDzIH0SOCkOhkZj SS6QJZw/Lklh+KfT7OW8m31xEHVvS/WC+1GtX9u4js0M2fgrL+A3LwZdnG5wPbjb1bt3 QKJCPXv/iMSY41KmgxmrrzD6LZYwLLYVIUuQ05EPJCOMDisiqb6ZwjVSvehSy3SI+TLz gdVe4NAWtlFpvPHu+CLnC1LGBL0fPfsOmpa2hjm2RISSgrZWPZG9Wx0/g0m3IGffJL3u Of4TbHy4SwtC1SlaMUTiBccT1f1xpohmc8M2sHKwpZqLYP80meO/VeAKwUYMI7Kbs0i7 xEPw== X-Forwarded-Encrypted: i=1; AJvYcCVzI9xpv9kUtqau2897HwKZJEWD4rZJ+W37RXB5E0kji1iJdzQcnJHWpvnTAfQeCbDJdu8eiLi/YOJImJA=@vger.kernel.org X-Gm-Message-State: AOJu0Yyg6+eMRKt82B8EEemYMHLxBIb6ZHZ9XjqTgZIj0mIBI4eXC5me azQ1imDp0F82CEMBaapQ/PbhFkH2s0ax6fm7nRTUYa7nTBoK6UAjZtM9mJWaHw== X-Gm-Gg: AY/fxX7sFqcZFZAxcoksOefffcB/V0GBTkye9HWxHr8s9ZdmaU+mQgLlPpwjzBy9xdJ v7gaUXMarcfNzyxHlqg8cRFhfBFLE+3pYECyAKtF5S08Wk70E9Qx+oS2V2ZzIRPCx+BciwsAoeL /E88yQhiNafKwp33s0izcwoRkhGWLiMgnhfE0qEULZXy7n38XtYs9uPNp7GV3Z7rnReOUTheHfU xeDImPfQRQHYbZxx2rAz/mmeHb+Hd8xBH0ak90wRzm/l6+0ZfUQvv6YW4bY3JGEGrr6o+PzJpbc 9YmEfWtPc3HzCttHjaVH/6+CIZw6zguWFxI1WO8ntjDnfTdn6sdUzQBWgo27rVveoOrdr0MnLhx 4Lzc1gDqp5X0EXw2u/UPl18TEx1MmpExxR/vE02bYkXW15fC143JpoA/7d9w64bS3VudkBsvg6a JMOEl1qkxaNTs3 X-Google-Smtp-Source: AGHT+IGQ72Qv40VXzWytpO8QexsPaVNcVSgbu9++QRVSPgfELMtmnY3IL6BZct+pHXLP45EtI7mwDQ== X-Received: by 2002:a17:903:3b86:b0:2a0:8966:7c9a with SMTP id d9443c01a7336-2a2f2c5e17cmr128978835ad.58.1766499261071; Tue, 23 Dec 2025 06:14:21 -0800 (PST) Received: from [127.0.1.1] ([59.188.211.98]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-2a2f3d5dea1sm126783015ad.81.2025.12.23.06.14.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Dec 2025 06:14:20 -0800 (PST) From: Nick Chan Date: Tue, 23 Dec 2025 22:13:44 +0800 Subject: [PATCH 3/3] mfd: macsmc: Support variable app endpoint start Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251223-rtkit-v10-v1-3-12b4783d6403@gmail.com> References: <20251223-rtkit-v10-v1-0-12b4783d6403@gmail.com> In-Reply-To: <20251223-rtkit-v10-v1-0-12b4783d6403@gmail.com> To: Sven Peter , Janne Grunau , Neal Gompa , Lee Jones Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Nick Chan X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4098; i=towinchenmi@gmail.com; h=from:subject:message-id; bh=M8K2zyn6hgbZbYWDWq9d9LHWwqY0uxaEJ1APjbEF8uc=; b=owEBbQKS/ZANAwAKAQHKCLemxQgkAcsmYgBpSqO0FVpbSnWy2ywhYchunAaQhBkTgjRFRp5so ykp/7/dG8iJAjMEAAEKAB0WIQRLUnh4XJes95w8aIMBygi3psUIJAUCaUqjtAAKCRABygi3psUI JIEoD/0f3NCHVZ2r8ele5bqiSXKPtHaBivP+HJp6qU5/SgN+2PTLkkR8FGBjk6qCd+1BklLR2lx YgHveWm7ER9OJn+oq/kdjl/Qc9J3csrgRdnpH5LJWHF8bEWoEfmZ/rP/NQrAd8N7FFJNkhhaRVN sUT63qgPNEPIV7O1w75BTVaS+xBXsDjE45D0pOmyMixLEX8bRpToAtMeWIiU51YrlxtDJ3zmbwl f9zPJK8OHe/cAH1JE9E+s//hWxzM9GV3tjg02NGv7bUylHHc7skszdfH5UUWAtxy5zX5vTswKFW CbKr7606xyLB42oJM7ccaJYsBBAAIlLZNhdufUlawnPofJyHy9qxRpvtSrKH64zkN5nwUBU8o3Y yWCxQyj2UBw5lq+7vlrUtKVCnI1n8r1vlzvc+qSzMctfnNVVU4NVWYj32FStCm+bC+g8P0WLOzp qg9Q/UpZe15HvQOQp84YHipBRVSl/6ganKd8LG7Fliqe4XV4D7IwOFbgO+Koxc/hj437iMGrhvc LTTmT+K3F/2j40vUrR/H8mIRtHkVa4blaYlmXsoc6QzZUvEGwJaz08V9OEnL+Nv+U9csORd6yOB SURtZQBqNHF3JCQWeaCCagEHpm0Khnn3kYGCcl0vRRECxoZFnnqK+NOPIOg2tvXpEsPQIdKQfaU asmCSLfjrPHh2Tg== X-Developer-Key: i=towinchenmi@gmail.com; a=openpgp; fpr=4B5278785C97ACF79C3C688301CA08B7A6C50824 Instead of hardcoding the SMC endpoint number, use apple_rtkit_app_ep_to_ep() to convert a relative endpoint number to an absolute endpoint number in order to support protocol versions with a different start of app endpoint number. Signed-off-by: Nick Chan --- drivers/mfd/macsmc.c | 18 +++++++++++------- include/linux/mfd/macsmc.h | 2 ++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/mfd/macsmc.c b/drivers/mfd/macsmc.c index e3893e255ce5e4bb4832d80ad1fc002d413a291a..4e0fc5ddf9293ee7281680e964f= c5f9b80260b3d 100644 --- a/drivers/mfd/macsmc.c +++ b/drivers/mfd/macsmc.c @@ -21,7 +21,7 @@ #include #include =20 -#define SMC_ENDPOINT 0x20 +#define SMC_APP_ENDPOINT 0 =20 /* We don't actually know the true size here but this seem reasonable */ #define SMC_SHMEM_SIZE 0x1000 @@ -72,7 +72,7 @@ static int apple_smc_cmd_locked(struct apple_smc *smc, u6= 4 cmd, u64 arg, FIELD_PREP(SMC_ID, smc->msg_id) | FIELD_PREP(SMC_DATA, arg)); =20 - ret =3D apple_rtkit_send_message(smc->rtk, SMC_ENDPOINT, msg, NULL, false= ); + ret =3D apple_rtkit_send_message(smc->rtk, smc->ep, msg, NULL, false); if (ret) { dev_err(smc->dev, "Failed to send command\n"); return ret; @@ -262,7 +262,7 @@ int apple_smc_write_atomic(struct apple_smc *smc, smc_k= ey key, const void *buf, FIELD_PREP(SMC_DATA, key)); smc->atomic_pending =3D true; =20 - ret =3D apple_rtkit_send_message(smc->rtk, SMC_ENDPOINT, msg, NULL, true); + ret =3D apple_rtkit_send_message(smc->rtk, smc->ep, msg, NULL, true); if (ret < 0) { dev_err(smc->dev, "Failed to send command (%d)\n", ret); return ret; @@ -330,7 +330,7 @@ static bool apple_smc_rtkit_recv_early(void *cookie, u8= endpoint, u64 message) { struct apple_smc *smc =3D cookie; =20 - if (endpoint !=3D SMC_ENDPOINT) { + if (endpoint !=3D smc->ep) { dev_warn(smc->dev, "Received message for unknown endpoint 0x%x\n", endpo= int); return false; } @@ -366,7 +366,7 @@ static void apple_smc_rtkit_recv(void *cookie, u8 endpo= int, u64 message) { struct apple_smc *smc =3D cookie; =20 - if (endpoint !=3D SMC_ENDPOINT) { + if (endpoint !=3D smc->ep) { dev_warn(smc->dev, "Received message for unknown endpoint 0x%x\n", endpo= int); return; } @@ -427,18 +427,22 @@ static int apple_smc_probe(struct platform_device *pd= ev) if (ret) return dev_err_probe(dev, ret, "Failed to wake up SMC"); =20 + smc->ep =3D apple_rtkit_app_ep_to_ep(smc->rtk, SMC_APP_ENDPOINT); + if (!smc->ep) + return dev_err_probe(dev, ret, "Failed to get SMC endpoint"); + ret =3D devm_add_action_or_reset(dev, apple_smc_rtkit_shutdown, smc); if (ret) return ret; =20 - ret =3D apple_rtkit_start_ep(smc->rtk, SMC_ENDPOINT); + ret =3D apple_rtkit_start_ep(smc->rtk, smc->ep); if (ret) return dev_err_probe(dev, ret, "Failed to start SMC endpoint"); =20 init_completion(&smc->init_done); init_completion(&smc->cmd_done); =20 - ret =3D apple_rtkit_send_message(smc->rtk, SMC_ENDPOINT, + ret =3D apple_rtkit_send_message(smc->rtk, smc->ep, FIELD_PREP(SMC_MSG, SMC_MSG_INITIALIZE), NULL, false); if (ret) return dev_err_probe(dev, ret, "Failed to send init message"); diff --git a/include/linux/mfd/macsmc.h b/include/linux/mfd/macsmc.h index cc09ecce0df7424b288d4248d869f4c9bed3e188..1a462baae0e38ac099f90988afd= a0f3f5ad968b9 100644 --- a/include/linux/mfd/macsmc.h +++ b/include/linux/mfd/macsmc.h @@ -93,6 +93,7 @@ enum apple_smc_boot_stage { * @sram: Pointer to SRAM resource * @sram_base: SRAM base address * @shmem: RTKit shared memory structure for SRAM + * @ep: SMC endpoint number * @msg_id: Current message id for commands, will be incremented for each = command * @atomic_mode: Flag set when atomic mode is entered * @atomic_pending: Flag indicating pending atomic command @@ -118,6 +119,7 @@ struct apple_smc { struct resource *sram; void __iomem *sram_base; struct apple_rtkit_shmem shmem; + u8 ep; =20 unsigned int msg_id; =20 --=20 2.52.0