From nobody Sun Feb 8 02:22:48 2026 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 BBF7722D7B9 for ; Tue, 23 Dec 2025 14:14:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766499262; cv=none; b=hV+1fdtxZDVQJteddR40Q+NFfGLeQSGqFYFwF3DpF6lVsR4vvo8UI5Sgv4oluzDv1K9SwN0SgBmVC/D3pDwaUi6frzJJtk39Tl0JtAavpTAfck+0OaG3++duDlAaPYbOsaQDgK9s8tED7eljPGBd75HAlZIxW3IurSlGjYgiNoo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766499262; c=relaxed/simple; bh=iA1+3eI9x9rFDwZEUdABu0BB3ZKzLtixecDcPV1pc4k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ed+eYt+7PVihm5ehkPO74n6RAEKKMS4KArI1i8tdIW5v+EWdX7Y3huUamwBRf/igRYIh+HHofnzVP7nGN2AIs96H+egjKSXorivVyT3tRlVuvzoDzRGXIPvPyFN2Pcdls1B65O8SJ4Ds0qFiC5Mj+8CPDQj0OBHx5BssY/mDlFM= 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=Kih/HPQr; arc=none smtp.client-ip=209.85.214.172 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="Kih/HPQr" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2a09757004cso63673025ad.3 for ; Tue, 23 Dec 2025 06:14:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766499259; x=1767104059; 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=4UnW1anc6pr/tyiih44WqyFteYhZhigDYAds7CEfJQ4=; b=Kih/HPQrzStCUIUoPJSndZfA1OtoA2hcW2o/mncl91QGneUHcaCLiR2hGdRXeoi1JX 1I2qNzmRuBhFule/mCk0AAqUKgM6o/Zwk67XrxL0CgOZP5HgTDIOsYCFVWlzwqRn5DJO a3nwibZjQe+AqFq4slSObrhLUwzhhsjYp5EvvJp3B/hJHZbFMyMi+HXvBh0SfsVB8u8X cowNGXBDOtoGggenLt2h9hjz0IiImUwoNpHadFvYp4XDDbiXbBTpr4tpPrApa6pv5uxM s37ACmkRDLd8IVv0bh/y9JYh8nB0o9DIDZhB+EBUPSpuXvB85HbhQtj+TGIohLq2oXUG SGMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766499259; x=1767104059; 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=4UnW1anc6pr/tyiih44WqyFteYhZhigDYAds7CEfJQ4=; b=ByAH/GE53g0LielW3zpqaiPC3pwDPGMI9HBi18RdQRdL9DikAZs3JzCytK+rX08Xjs 5XSU3M3iqiKoah6Tm1pzlUmi+q4DOgFEIDCc20P3DYKPqwDngWf4mP/GmhVu3Wi6nA3v LaiAQvgZWzq9cd+nSWz47tb5cMzsbtjrPEWmw8CMSlROIvD0jzOLATuWd2f3bWmNB7rm 9w/S+d0+f/DONpl0FPEl/iEbEPcfLKeAFUocYZzPS4Z9d176vGYLb+3Top4r19zeXXXr zPq7EzhaMxDG6dfi3lH1NR7pGioYOKPL6ZS5k1GHl8R51irqZoypY73/NxvGZt9W29l1 u0XQ== X-Forwarded-Encrypted: i=1; AJvYcCUArPxRUPuNI4PN7t92Gp6CiF0i/w7cxOxX6ydPfvnMEH7hav1Ugk5iColohfZ+Oa7Z3GTWZVxiUJnh/6s=@vger.kernel.org X-Gm-Message-State: AOJu0Yy06zxgFXWACR7UZsfMaX8OBigi7geGetWQARN0WVIr0CWNqRbx MeT3LGZKZZvZHoYavcFzlx6j1CR1eP8hmSjoWfx/Ta7dLC3//qdJESE7hYl79w== X-Gm-Gg: AY/fxX6QAN4ZLrUtvvh7gDmAuUAYznmT7tMROQoyFweYDsaPenSSNGOndjkndZIr+kS xoO17IKOO4Xxbk0GeKx78AxmSGaZoniemUPyZzTAuCPj7sH0uveSHSPB9jW/QmzgFCatC7jGUNn bsy0gl4B7DL1t+WcQ6b7CnI6mq3yVd8ZtokmkPsh2k6c5cOpzj2qphDzLuY3iejFBPOilYF76He Ml9DUxCIJjvRAAycSlVSRg9EXGxbvk1kueFi7YoaguMvQ82ps79VFfLwAPcN29FzkAnsLsJoQbO oDM+Do2KEXhfLUqTaOK/+cA+nIJe5LpWzCqc6IyUPPs0gZV5Wjk7zQnAbl/YAbXvzipCGSNYxzM A89hlcN7WDd2iSv7dYfPIL694wnZZNPk10DvzgJtIx8cYs6wMEBdx+bzhSfqNA/c5H4PuPUbqEA craDlwjxcC4KdX X-Google-Smtp-Source: AGHT+IHCc53v26luZ+3auDSa3AlQsLD2YSn5E27WHQPltbbGQM4XExZHehktEvDZXNxnbr8xXYLk8g== X-Received: by 2002:a17:902:d2d1:b0:2a0:980a:4f0b with SMTP id d9443c01a7336-2a2f2a4f5b8mr158871395ad.40.1766499256696; Tue, 23 Dec 2025 06:14:16 -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.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Dec 2025 06:14:16 -0800 (PST) From: Nick Chan Date: Tue, 23 Dec 2025 22:13:42 +0800 Subject: [PATCH 1/3] soc: apple: rtkit: Support verison-specific 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-1-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=5874; i=towinchenmi@gmail.com; h=from:subject:message-id; bh=iA1+3eI9x9rFDwZEUdABu0BB3ZKzLtixecDcPV1pc4k=; b=owEBbQKS/ZANAwAKAQHKCLemxQgkAcsmYgBpSqOzN2tQKzsUw2m7820RCzQBBs74PBwhQ8M9v PL/E3wUhK6JAjMEAAEKAB0WIQRLUnh4XJes95w8aIMBygi3psUIJAUCaUqjswAKCRABygi3psUI JGp5EACRQ+fMw0heugAjIZvRb3eUUcNAShJr9X/qNDFmbFv2l7wZBBHCp4MpGUbZEAa/XnnJFO6 ejFKoRXs8TRdAj5svnR3rR/kIc18G21CqZ0sb3AZVppOs/2P45lVWmoteAzPCWTuizKZPGYHVM8 NGPXnAMrCFgUiYvwr92siK/bmNsDSJl6tsYQHZy4rP0XWBaHB1ohJs8cm4DztF7qOfznul1QjLs Ro/qVpynQUFk4vpAYU6HyWE5+oHSseKnq4lWZQaMIo1BvGcPSfjQSV0uDnmU7TrNDfLu7TJQThb yqa7F/N63FXuZP/WtmEW580ei7raxRAAbQpWcUMMjP9VrdwKOo0PHbRiB6oxYwOvLOHr800Lxxe B3nheHhepRzKSWOf9mTo49/usNb9V/2VuKEnT/S+akugYHynY4e9aH3QBzBLjoYCSr5r36UfQYX qJIHARrVLiQNPttTjOJ/YaoUJTXLBch/VyMlnPfM63RRrO+p49IyTqy7TMXtxhIjzoP3B+PKSkw s3H05dbRICtN82erOxVTHLG54GzFXaE+o2yy5n56CKU7yeb8udlpz+7VrCR9h2DV5R4qL0tQkUO Z23SR1dWKWMfzY1/oIvz28q7yraGFEO4EEmOMkeNp+pd2WnIYiSFONCcYEqTEFS9zg5eN9HQDxX C8mq67DQT0IRk6Q== X-Developer-Key: i=towinchenmi@gmail.com; a=openpgp; fpr=4B5278785C97ACF79C3C688301CA08B7A6C50824 Support for protocol versions where app endpoints starts at a different endpoint number will be added. Consumer drivers will also need to be modified to have them to work with such protocol versions. Signed-off-by: Nick Chan --- drivers/soc/apple/rtkit-internal.h | 3 ++- drivers/soc/apple/rtkit.c | 42 +++++++++++++++++++++++++++-------= ---- include/linux/soc/apple/rtkit.h | 10 +++++++++ 3 files changed, 42 insertions(+), 13 deletions(-) diff --git a/drivers/soc/apple/rtkit-internal.h b/drivers/soc/apple/rtkit-i= nternal.h index b8d5244678f0100b72173fa9aca80bf9db1b4e5e..52ef7a202120eb8a56c14917938= 9741ec0f5e358 100644 --- a/drivers/soc/apple/rtkit-internal.h +++ b/drivers/soc/apple/rtkit-internal.h @@ -19,7 +19,7 @@ #include #include "mailbox.h" =20 -#define APPLE_RTKIT_APP_ENDPOINT_START 0x20 +#define APPLE_RTKIT_APP_ENDPOINT_START_V11 0x20 #define APPLE_RTKIT_MAX_ENDPOINTS 0x100 =20 struct apple_rtkit { @@ -35,6 +35,7 @@ struct apple_rtkit { =20 int boot_result; int version; + u8 app_ep_start; =20 unsigned int iop_power_state; unsigned int ap_power_state; diff --git a/drivers/soc/apple/rtkit.c b/drivers/soc/apple/rtkit.c index b8d4da147d23f7e99e76eea314e4d976cddbd1c6..716d6a3e6eefd82d919467e39d6= 8245c5c0d137c 100644 --- a/drivers/soc/apple/rtkit.c +++ b/drivers/soc/apple/rtkit.c @@ -140,6 +140,8 @@ static void apple_rtkit_management_rx_hello(struct appl= e_rtkit *rtk, u64 msg) want_ver); rtk->version =3D want_ver; =20 + rtk->app_ep_start =3D APPLE_RTKIT_APP_ENDPOINT_START_V11; + reply =3D FIELD_PREP(APPLE_RTKIT_MGMT_HELLO_MINVER, want_ver); reply |=3D FIELD_PREP(APPLE_RTKIT_MGMT_HELLO_MAXVER, want_ver); apple_rtkit_management_send(rtk, APPLE_RTKIT_MGMT_HELLO_REPLY, reply); @@ -179,7 +181,7 @@ static void apple_rtkit_management_rx_epmap(struct appl= e_rtkit *rtk, u64 msg) if (!(msg & APPLE_RTKIT_MGMT_EPMAP_LAST)) return; =20 - for_each_set_bit(ep, rtk->endpoints, APPLE_RTKIT_APP_ENDPOINT_START) { + for_each_set_bit(ep, rtk->endpoints, rtk->app_ep_start) { switch (ep) { /* the management endpoint is started by default */ case APPLE_RTKIT_EP_MGMT: @@ -547,20 +549,21 @@ static void apple_rtkit_rx_work(struct work_struct *w= ork) case APPLE_RTKIT_EP_OSLOG: apple_rtkit_oslog_rx(rtk, rtk_work->msg); break; - case APPLE_RTKIT_APP_ENDPOINT_START ... 0xff: - if (rtk->ops->recv_message) + default: + if (rtk_work->ep >=3D rtk->app_ep_start && rtk->ops->recv_message) rtk->ops->recv_message(rtk->cookie, rtk_work->ep, rtk_work->msg); - else + else if (rtk_work->ep >=3D rtk->app_ep_start) dev_warn( rtk->dev, "Received unexpected message to EP%02d: %llx\n", rtk_work->ep, rtk_work->msg); + else + dev_warn( + rtk->dev, + "RTKit: message to unknown endpoint %02x: %llx\n", + rtk_work->ep, rtk_work->msg); break; - default: - dev_warn(rtk->dev, - "RTKit: message to unknown endpoint %02x: %llx\n", - rtk_work->ep, rtk_work->msg); } =20 kfree(rtk_work); @@ -585,7 +588,7 @@ static void apple_rtkit_rx(struct apple_mbox *mbox, str= uct apple_mbox_msg msg, "RTKit: Message to undiscovered endpoint 0x%02x\n", ep); =20 - if (ep >=3D APPLE_RTKIT_APP_ENDPOINT_START && + if (ep >=3D rtk->app_ep_start && rtk->ops->recv_message_early && rtk->ops->recv_message_early(rtk->cookie, ep, msg.msg0)) return; @@ -615,8 +618,7 @@ int apple_rtkit_send_message(struct apple_rtkit *rtk, u= 8 ep, u64 message, return -EINVAL; } =20 - if (ep >=3D APPLE_RTKIT_APP_ENDPOINT_START && - !apple_rtkit_is_running(rtk)) { + if (ep >=3D rtk->app_ep_start && !apple_rtkit_is_running(rtk)) { dev_warn(rtk->dev, "RTKit: Endpoint 0x%02x is not running, cannot send message\n", ep); return -EINVAL; @@ -645,7 +647,7 @@ int apple_rtkit_start_ep(struct apple_rtkit *rtk, u8 en= dpoint) =20 if (!test_bit(endpoint, rtk->endpoints)) return -EINVAL; - if (endpoint >=3D APPLE_RTKIT_APP_ENDPOINT_START && + if (endpoint >=3D rtk->app_ep_start && !apple_rtkit_is_running(rtk)) return -EINVAL; =20 @@ -675,6 +677,13 @@ struct apple_rtkit *apple_rtkit_init(struct device *de= v, void *cookie, rtk->cookie =3D cookie; rtk->ops =3D ops; =20 + /* + * The management endpoint is required to receive the HELLO message + * and infer the start of app endpoints so assume it is a system + * endpoint here and update this value when HELLO is received. + */ + rtk->app_ep_start =3D APPLE_RTKIT_EP_CRASHLOG; + init_completion(&rtk->epmap_completion); init_completion(&rtk->iop_pwr_ack_completion); init_completion(&rtk->ap_pwr_ack_completion); @@ -851,6 +860,15 @@ int apple_rtkit_shutdown(struct apple_rtkit *rtk) } EXPORT_SYMBOL_GPL(apple_rtkit_shutdown); =20 +u8 apple_rtkit_app_ep_to_ep(struct apple_rtkit *rtk, u8 app_ep) +{ + if (!apple_rtkit_is_running(rtk)) + return 0; + + return rtk->app_ep_start + app_ep; +} +EXPORT_SYMBOL_GPL(apple_rtkit_app_ep_to_ep); + int apple_rtkit_idle(struct apple_rtkit *rtk) { int ret; diff --git a/include/linux/soc/apple/rtkit.h b/include/linux/soc/apple/rtki= t.h index 736f530180179bd144cf85eb0f0bd93844d7188a..423cf1022372b124c9b2728445f= 85a9b3067c707 100644 --- a/include/linux/soc/apple/rtkit.h +++ b/include/linux/soc/apple/rtkit.h @@ -172,4 +172,14 @@ int apple_rtkit_send_message(struct apple_rtkit *rtk, = u8 ep, u64 message, */ int apple_rtkit_poll(struct apple_rtkit *rtk); =20 +/* + * Convert an endpoint number relative to start of app endpoint to an abso= lute + * endpoint number. + * + * Returns the endpoint number on success, 0 on failure. + * + * @rtk: RTKit reference + */ +u8 apple_rtkit_app_ep_to_ep(struct apple_rtkit *rtk, u8 app_ep); + #endif /* _LINUX_APPLE_RTKIT_H_ */ --=20 2.52.0 From nobody Sun Feb 8 02:22:48 2026 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 350AE2D3732 for ; Tue, 23 Dec 2025 14:14:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766499261; cv=none; b=IDG8aFLF/+13aUOAB1bGKb386XF6B8ztmW6UrJpF/mwdaPRT4inQN5Oz5sR4aJzZN5EBksl9a2INriUU1KVgltUe6CvnV7QyiwPzGwjUTYzc5v1E+gu9IScNce9l8J/30V5ivV7n/xxppGt2WMD88vjV7JvU0LxlKQqj0F94vzQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766499261; c=relaxed/simple; bh=tTm+zqXwen50SB01rU9h2NYFDbVkJ0agw2KXYp566Rw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=H7qHzCZ/E9n9og+mKloxd1ThXjwzc23X9igSqYZhInAGGiQjJs2AkT/lazIzLsDq0ARKjK7Zmlgcz0gXdZYVfPLXcSDffCglkWmnIVdJNY8ykatHWKwqDo4RPicWCuD7vToxyHbud2ETL2kOmvti31CUs072hcwK/T6fGISiBos= 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=J/5CiPqT; arc=none smtp.client-ip=209.85.214.171 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="J/5CiPqT" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2a0a95200e8so46562335ad.0 for ; Tue, 23 Dec 2025 06:14:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766499259; x=1767104059; 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=93Pf6X13SUCkXiU5R7ykDf2LAtr96ckHMpNWb3vo6Bg=; b=J/5CiPqT4QgucJhjx4CcahTrMV1ZXw1EguL81FjxcwD6sW+jeNegLUjQjTjm9Bmr9n 1xp5ANkr8TJrGB54i3wobzudxv32IlJ1B/rcjLU+RzOgpZK7aTE519RQlLSSloPjAhJN ONAOFA3tpVYmK4hbhwlIzeGw0M1dZK5Gc7eb3iwrpMclX+0H2Cnir0SYUthCbxGdDOUT HC2NtqBwxgcrBE4dMKi4lyzYvDKOdxcEY2IdBWGYFjVHIlPU6AnJrUD7f4dsJ/r4At+p ZgPXqm/Q0DKy++wCoVimLE6V1J96SMnLT2JuofdaLDLwvY2fomlTUSmUjBW+VrIkLJaV 3XAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766499259; x=1767104059; 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=93Pf6X13SUCkXiU5R7ykDf2LAtr96ckHMpNWb3vo6Bg=; b=vXkPBXY4vzcMgKxJQmevEF3+cS8Wdnf19hxlp6FA2jhtGP23IITV+xnSktuHPVkpL2 RqLtSAu955nlKOEUsZtNKWVkTJAj7U8nTy/+pnokcAOJWU84COlyHXavqUsuxwU8XvxQ hqyKECh8xUsTa8tItvme1Zt5WU+hBWvvCdmhZEG8Wc5lZffIepkrhFGTIqWPpNjlfDUe gOiNCmOO8BKKfJZRC+HnXMbMYsOT1m27+AR7aUcp7DQ7t5u1VRA3SCIEUQZTLJPRmkwk ZAelq3CrLPJhq1F1ksihSSGPMe3WXithvaHTvKCRcAbBu/v4rGxs3jNxCYVIOAqE5CAf 8esg== X-Forwarded-Encrypted: i=1; AJvYcCXMcexpstV8XMej1E4LDC4TbK5kSxDw5AHEdbPX5db0/iYlM6ExxSYfKnJJ3F5xxuSl0ggOYFkFhehNE1k=@vger.kernel.org X-Gm-Message-State: AOJu0YzmlAR/Aiqmzq5GKd1T3f458dB2ThKL+ls7xzf9iDcIeTEpIiJD MdSuRWVKn3pT7zwHUtYHjxlQSElKdB7j0+JUmnT8lD+LFz0NPvUCGEKodUlV0A== X-Gm-Gg: AY/fxX4XM9WIc7z6AfSaneMTQ1I+XbA63pkdVfqDZ2AjME6YxT2+jzqxousx2Zu/qHi cCOpHzroheeZ4CzJm/Yb/hM7p+RHDfS/DWtxyRx3G7GMmrKiBWdMcy1Scg/dOjaminEk6utmhqM AN1EkNyncwMM40+M9wGz05dqm13tKsYOlPNqSdUtvUtlNncs8VarFce7k7JQr2JrkG3hG1zJDl6 buGbF87xtPLnw8tEKoF4tufN8nFgEKD8SVZFRkgI8TGLdsSr5ueclh7rkamCkNI+8hQce+t4rUU t1sYZjSH6y19mf/cdB67CQR5Sk9YDXDpSC9ekqiPEtvNKbBfrsLiJPNQNJV/AZenDsWA1F9QdQX CzsTLhbDBTKbaTQTHYNYWWQiFdUY6ZFMweJ6ScpthuaREdt7cKUunZXOGk1ICqpHERSIfDLI7Kh y0oMWPkNWzTeZd X-Google-Smtp-Source: AGHT+IFxxP4o8t9oxgJnfMD7Rvph5B8jqUM/0u1lCIkIRDfEj0VekGFpThdkzLHanj3mcLJ2UNhZtw== X-Received: by 2002:a17:903:19cf:b0:2a0:abba:a2f4 with SMTP id d9443c01a7336-2a2f2202f9fmr180596745ad.2.1766499258811; Tue, 23 Dec 2025 06:14:18 -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.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Dec 2025 06:14:18 -0800 (PST) From: Nick Chan Date: Tue, 23 Dec 2025 22:13:43 +0800 Subject: [PATCH 2/3] soc: apple: rtkit: Add protocol version 10 support 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-2-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=2685; i=towinchenmi@gmail.com; h=from:subject:message-id; bh=tTm+zqXwen50SB01rU9h2NYFDbVkJ0agw2KXYp566Rw=; b=owEBbQKS/ZANAwAKAQHKCLemxQgkAcsmYgBpSqO00cm9gv6KSqRnEOw+U36x5MViiExoXK7ex +D6c8eT/xeJAjMEAAEKAB0WIQRLUnh4XJes95w8aIMBygi3psUIJAUCaUqjtAAKCRABygi3psUI JJ+HEACIk6GTMOs0PDPBjmRg01FJtNN9rcdzL8dCpXfy5X/I1/6GLZI+H2rJMZU7lNdCazplt4v aGYE6aL+d1xpwKsEFGGR2nKfu2No0WRAsBJeFXcjQRYbMuKTBWwg6Q5MTdMXnZ/HVzXZSd2rURj IWQ7KxszSNG23lX8pzC5Dd1RbnY6C2bfaYShPzmOShThArTTR0kmVGgJIMphlQYS+n6rlCgqES/ fnu6LF7mC23G1HcAKInIuh2mg5dbDu8pvg0N8g9qIvEVIoXbsasBxWA5RUAXt1aYjskiyJTbZEV BQ9l6FBzjaY/wmIBV72/d0SGXsRCTUOcy08cP2P0tT+CwGeMUZ0iJ9jqQAazSce15j3lsTvVlcq SwN7tGJKJs2GcDds+HWCSD9hCVLhzCkKzWYgoz5+ahmRe9DZqbVpD09IT48CYKAU1/2X25h20Bk sr5G9nu76yqXVj4JhrfB7dmYsMIOGsOtfmn+lA1vPI0hQajvTePtqtJIyB1gjoUf9C5DgyImncu onMIVq6Ysc25U5Iuot9o3EckNK0mPnen76ldjS1ckH28YC+FkqktlYWmEdDKQB7xnhesI7EqvJL YODj3XltpvKFNr3q6RsBKclhQEOXrwYgnjna6BTJej+dluDTQ11ZmiiMMy0JaGPzXBptqldbg25 88uroAOXqqLp2yg== X-Developer-Key: i=towinchenmi@gmail.com; a=openpgp; fpr=4B5278785C97ACF79C3C688301CA08B7A6C50824 Add support for protocol version 10 used from iOS 11-13. In protocol version 10, epmap is always completed within a single message, and app endpoints start at 0x6 instead of 0x20. Signed-off-by: Nick Chan --- drivers/soc/apple/rtkit-internal.h | 1 + drivers/soc/apple/rtkit.c | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/soc/apple/rtkit-internal.h b/drivers/soc/apple/rtkit-i= nternal.h index 52ef7a202120eb8a56c149179389741ec0f5e358..5f91dea8b7a178b368783d74f8c= 5786ea2965fa7 100644 --- a/drivers/soc/apple/rtkit-internal.h +++ b/drivers/soc/apple/rtkit-internal.h @@ -19,6 +19,7 @@ #include #include "mailbox.h" =20 +#define APPLE_RTKIT_APP_ENDPOINT_START_V10 0x6 #define APPLE_RTKIT_APP_ENDPOINT_START_V11 0x20 #define APPLE_RTKIT_MAX_ENDPOINTS 0x100 =20 diff --git a/drivers/soc/apple/rtkit.c b/drivers/soc/apple/rtkit.c index 716d6a3e6eefd82d919467e39d68245c5c0d137c..376d1d30fd1e2176357c1daa24c= 76300c7c70f85 100644 --- a/drivers/soc/apple/rtkit.c +++ b/drivers/soc/apple/rtkit.c @@ -71,7 +71,7 @@ enum { #define APPLE_RTKIT_OSLOG_SIZE GENMASK_ULL(55, 36) #define APPLE_RTKIT_OSLOG_IOVA GENMASK_ULL(35, 0) =20 -#define APPLE_RTKIT_MIN_SUPPORTED_VERSION 11 +#define APPLE_RTKIT_MIN_SUPPORTED_VERSION 10 #define APPLE_RTKIT_MAX_SUPPORTED_VERSION 12 =20 struct apple_rtkit_rx_work { @@ -140,7 +140,10 @@ static void apple_rtkit_management_rx_hello(struct app= le_rtkit *rtk, u64 msg) want_ver); rtk->version =3D want_ver; =20 - rtk->app_ep_start =3D APPLE_RTKIT_APP_ENDPOINT_START_V11; + if (rtk->version < 11) + rtk->app_ep_start =3D APPLE_RTKIT_APP_ENDPOINT_START_V10; + else + rtk->app_ep_start =3D APPLE_RTKIT_APP_ENDPOINT_START_V11; =20 reply =3D FIELD_PREP(APPLE_RTKIT_MGMT_HELLO_MINVER, want_ver); reply |=3D FIELD_PREP(APPLE_RTKIT_MGMT_HELLO_MAXVER, want_ver); @@ -171,14 +174,16 @@ static void apple_rtkit_management_rx_epmap(struct ap= ple_rtkit *rtk, u64 msg) } =20 reply =3D FIELD_PREP(APPLE_RTKIT_MGMT_EPMAP_BASE, base); - if (msg & APPLE_RTKIT_MGMT_EPMAP_LAST) - reply |=3D APPLE_RTKIT_MGMT_EPMAP_LAST; - else - reply |=3D APPLE_RTKIT_MGMT_EPMAP_REPLY_MORE; + if (rtk->version > 10) { + if (msg & APPLE_RTKIT_MGMT_EPMAP_LAST) + reply |=3D APPLE_RTKIT_MGMT_EPMAP_LAST; + else + reply |=3D APPLE_RTKIT_MGMT_EPMAP_REPLY_MORE; + } =20 apple_rtkit_management_send(rtk, APPLE_RTKIT_MGMT_EPMAP_REPLY, reply); =20 - if (!(msg & APPLE_RTKIT_MGMT_EPMAP_LAST)) + if (rtk->version > 10 && !(msg & APPLE_RTKIT_MGMT_EPMAP_LAST)) return; =20 for_each_set_bit(ep, rtk->endpoints, rtk->app_ep_start) { --=20 2.52.0 From nobody Sun Feb 8 02:22: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