From nobody Mon Feb 9 02:12:15 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