| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20251223-rtkit-v10-v1-1-12b4783d6403@gmail.com>
Date: Tue, 23 Dec 2025 22:13:42 +0800
From: Nick Chan <towinchenmi@...il.com>
To: Sven Peter <sven@...nel.org>, Janne Grunau <j@...nau.net>,
Neal Gompa <neal@...pa.dev>, Lee Jones <lee@...nel.org>
Cc: asahi@...ts.linux.dev, linux-arm-kernel@...ts.infradead.org,
linux-kernel@...r.kernel.org, Nick Chan <towinchenmi@...il.com>
Subject: [PATCH 1/3] soc: apple: rtkit: Support verison-specific app
endpoint start
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 <towinchenmi@...il.com>
---
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-internal.h
index b8d5244678f0100b72173fa9aca80bf9db1b4e5e..52ef7a202120eb8a56c149179389741ec0f5e358 100644
--- a/drivers/soc/apple/rtkit-internal.h
+++ b/drivers/soc/apple/rtkit-internal.h
@@ -19,7 +19,7 @@
#include <linux/workqueue.h>
#include "mailbox.h"
-#define APPLE_RTKIT_APP_ENDPOINT_START 0x20
+#define APPLE_RTKIT_APP_ENDPOINT_START_V11 0x20
#define APPLE_RTKIT_MAX_ENDPOINTS 0x100
struct apple_rtkit {
@@ -35,6 +35,7 @@ struct apple_rtkit {
int boot_result;
int version;
+ u8 app_ep_start;
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..716d6a3e6eefd82d919467e39d68245c5c0d137c 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 apple_rtkit *rtk, u64 msg)
want_ver);
rtk->version = want_ver;
+ rtk->app_ep_start = APPLE_RTKIT_APP_ENDPOINT_START_V11;
+
reply = FIELD_PREP(APPLE_RTKIT_MGMT_HELLO_MINVER, want_ver);
reply |= 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 apple_rtkit *rtk, u64 msg)
if (!(msg & APPLE_RTKIT_MGMT_EPMAP_LAST))
return;
- 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 *work)
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 >= 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 >= 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);
}
kfree(rtk_work);
@@ -585,7 +588,7 @@ static void apple_rtkit_rx(struct apple_mbox *mbox, struct apple_mbox_msg msg,
"RTKit: Message to undiscovered endpoint 0x%02x\n",
ep);
- if (ep >= APPLE_RTKIT_APP_ENDPOINT_START &&
+ if (ep >= 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, u8 ep, u64 message,
return -EINVAL;
}
- if (ep >= APPLE_RTKIT_APP_ENDPOINT_START &&
- !apple_rtkit_is_running(rtk)) {
+ if (ep >= 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 endpoint)
if (!test_bit(endpoint, rtk->endpoints))
return -EINVAL;
- if (endpoint >= APPLE_RTKIT_APP_ENDPOINT_START &&
+ if (endpoint >= rtk->app_ep_start &&
!apple_rtkit_is_running(rtk))
return -EINVAL;
@@ -675,6 +677,13 @@ struct apple_rtkit *apple_rtkit_init(struct device *dev, void *cookie,
rtk->cookie = cookie;
rtk->ops = ops;
+ /*
+ * 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 = 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);
+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/rtkit.h
index 736f530180179bd144cf85eb0f0bd93844d7188a..423cf1022372b124c9b2728445f85a9b3067c707 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);
+/*
+ * Convert an endpoint number relative to start of app endpoint to an absolute
+ * 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_ */
--
2.52.0
Powered by blists - more mailing lists