From nobody Fri Oct 2 04:33:10 2026 Received: from chaosmail.tech (chaosmail.tech [77.81.229.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BF25B3F870C; Wed, 5 Aug 2026 10:11:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=77.81.229.115 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785924686; cv=none; b=VRPbF9ASZcPAAOaGmGVan7flmPbTBog4O7eenVN9k8IZZWjoXqNvxMXAgDsHCPqgBBM+flRxKn7rKnjEh3xwTaIIzykCZtqc3Q3qh6NKE9hanAxHPp7HyLrr06lknviAoQxiC8j0PG3iFVoi36XE/9BlfNds3IyKLL6n7PkjprY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785924686; c=relaxed/simple; bh=aEu4DhLKCZR+9M5iOh+LW5VoY6WvL4eLkjfDVZ+NFaY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Fouc49sYr7a34uttN9Oc9OGg3E7w4sIxP0FJGOARqwN9CErKhvDEDYTRer+oX21UrdT/yZu0KgFaC8DxZPX8g55f90K/NX62WIDT0qDSHBOcJvaxx3oMdukU1DdwlYm6A3BaDgTiiL0v/iMqes22n+dsD2fbMwybJd9sRU10lO4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=chaosmail.tech; spf=pass smtp.mailfrom=chaosmail.tech; dkim=pass (1024-bit key) header.d=chaosmail.tech header.i=@chaosmail.tech header.b=dmBf+axX; arc=none smtp.client-ip=77.81.229.115 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=chaosmail.tech Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chaosmail.tech Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chaosmail.tech header.i=@chaosmail.tech header.b="dmBf+axX" Received: by chaosmail.tech (Postfix) id 4C5A21C878A; Wed, 05 Aug 2026 10:11:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chaosmail.tech; s=mail; t=1785924675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YlXyLAprOBxybUF+7IFtOCRxZM/TnVWUvC6NWyiKbnU=; b=dmBf+axXubrHmcXBLhz3E1kuv8F9eG7DUtAgF+6kptd1Arn+0snEj3P3YYZ65Dnf8mHUOj mnLv/ekCV5G+xZO5k+16sYpybwPa06hvMCOS6e7VGMs9aoiM+WgLkH6pwJ7XR8EoJm7SNF WJbqBfNpEjWCpBukSWQTgyTMpS2Bq20= From: Sasha Finkelstein Date: Wed, 05 Aug 2026 12:11:11 +0200 Subject: [PATCH v4 1/6] dt-bindings: spmi: apple,spmi: Add t603x 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: <20260805-t603x-spmi-v4-1-c15a12d9a7d1@chaosmail.tech> References: <20260805-t603x-spmi-v4-0-c15a12d9a7d1@chaosmail.tech> In-Reply-To: <20260805-t603x-spmi-v4-0-c15a12d9a7d1@chaosmail.tech> To: Sven Peter , Janne Grunau , Neal Gompa , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Sasha Finkelstein X-Developer-Signature: v=1; a=ed25519-sha256; t=1785924674; l=1440; i=k@chaosmail.tech; s=20241124; h=from:subject:message-id; bh=aEu4DhLKCZR+9M5iOh+LW5VoY6WvL4eLkjfDVZ+NFaY=; b=JPuc2eWE9jDFzYThYBIqgpVQvdz5cdUO1lY0Wt+W/Z6eld3E6dWnCJNC63oauuimg79YNdzxo zOwNLbHIlgvA1cSi8u2vPPVKedziDjRdKcOrKZzOCt4ekVf70LfpRVb X-Developer-Key: i=k@chaosmail.tech; a=ed25519; pk=aSkp1PdZ+eF4jpMO6oLvz/YfT5XkBUneWwyhQrOgmsU= Add t603x compatibles, interrupt support, and support for SPMI controllers that are not always-on. Keeping the "interrupt-controller" property as optional, as taking the j514c as an example, we only need this functionality on 3 out of 10 SPMI controllers present on this SoC. Signed-off-by: Sasha Finkelstein Reviewed-by: Janne Grunau --- Documentation/devicetree/bindings/spmi/apple,spmi.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Documentation/devicetree/bindings/spmi/apple,spmi.yaml b/Docum= entation/devicetree/bindings/spmi/apple,spmi.yaml index 3e5b14bc8c31..fceed47b2cd1 100644 --- a/Documentation/devicetree/bindings/spmi/apple,spmi.yaml +++ b/Documentation/devicetree/bindings/spmi/apple,spmi.yaml @@ -20,8 +20,11 @@ properties: - items: - enum: - apple,t6020-spmi + - apple,t6030-spmi + - apple,t6031-spmi - apple,t8012-spmi - apple,t8015-spmi + - apple,t8122-spmi - const: apple,t8103-spmi - items: - enum: @@ -34,6 +37,18 @@ properties: reg: maxItems: 1 =20 + interrupts: + maxItems: 1 + description: Optional, operates in polled mode if not present + + interrupt-controller: true + + "#interrupt-cells": + const: 2 + + power-domains: + maxItems: 1 + required: - compatible - reg --=20 2.55.0 From nobody Fri Oct 2 04:33:10 2026 Received: from chaosmail.tech (chaosmail.tech [77.81.229.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4D96640EBB0; Wed, 5 Aug 2026 10:11:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=77.81.229.115 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785924688; cv=none; b=AhhF3iSFibRGPOsiNlIgd6AztX8yo4vpI4DHO2s3oIHhBrd5XUJmZobL8FR/McffGDxJKF8HXzsXfXF4t4AUAV+GnJPUrNVzAZR/ySbpRJYhkdZv/q9KtyozJBVpKW+LxVa8djgjyikSVuL7/O5X/Cx7KdqhrHR1zX+CpaNG/wQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785924688; c=relaxed/simple; bh=071LsSsg7ghiWIlH6dNrhiGqG05SSG9F8D0BcvnpFXY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dh/slICzvsisxuNFR9F5aRjf09xERfAo5+8Iji4G/mFoL6+LRHJOyMD7fxwgREY8aVbBtqep7l+AHLLFKsB6TU6qocgs52YwVqkVg3qaEHx7RfMaj5YbtCtnhPptLOLyUHNXTQYSK6GyV+EYoCV6/0sDt8Y32JjUbmkj5dPuVHw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=chaosmail.tech; spf=pass smtp.mailfrom=chaosmail.tech; dkim=pass (1024-bit key) header.d=chaosmail.tech header.i=@chaosmail.tech header.b=SN9etDu6; arc=none smtp.client-ip=77.81.229.115 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=chaosmail.tech Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chaosmail.tech Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chaosmail.tech header.i=@chaosmail.tech header.b="SN9etDu6" Received: by chaosmail.tech (Postfix) id 068391C87E8; Wed, 05 Aug 2026 10:11:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chaosmail.tech; s=mail; t=1785924676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ev3guMI3pa4jIhBV2LK4xUBM68k7udsEbyo3V1HZycQ=; b=SN9etDu6tTRlECohoiyMx6kbZxpVb9wZYDUJO9HWMjnI5zH+1BF5JzES9x0nMVk9nY9THX 5YBsgOmrcVDkOS1VLnTEyVNjFPeAf1lp3gPr1Jn6tpKrv7fXAYOl7/8tMFsIxxFskZmXi4 c74jxGkCxoe9Q+iYBo53bfdquMHNvAU= From: Sasha Finkelstein Date: Wed, 05 Aug 2026 12:11:12 +0200 Subject: [PATCH v4 2/6] spmi: apple: Validate FIFO state 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: <20260805-t603x-spmi-v4-2-c15a12d9a7d1@chaosmail.tech> References: <20260805-t603x-spmi-v4-0-c15a12d9a7d1@chaosmail.tech> In-Reply-To: <20260805-t603x-spmi-v4-0-c15a12d9a7d1@chaosmail.tech> To: Sven Peter , Janne Grunau , Neal Gompa , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Sasha Finkelstein , Alba Mendez X-Developer-Signature: v=1; a=ed25519-sha256; t=1785924674; l=2928; i=k@chaosmail.tech; s=20241124; h=from:subject:message-id; bh=NftmAX/uPgLU8Gnq6dt9Z2aebL3y06ApgoPzXw/y1ps=; b=8l1Wumyyd1K0x8zpstEmn8vdgXbEzuL8Hwx8gVj9z3QDtkwnr+zeP4btFOR79EphPI/h33cHR mwomfTzdgYEDugFrAFitwmJroOq4i2CMiPRVNPEJZESnx+eFFIlYI1O X-Developer-Key: i=k@chaosmail.tech; a=ed25519; pk=aSkp1PdZ+eF4jpMO6oLvz/YfT5XkBUneWwyhQrOgmsU= From: Alba Mendez Check for data before reading the body of a reply, and check for end of data afterwards. Signed-off-by: Alba Mendez Signed-off-by: Sasha Finkelstein Reviewed-by: Janne Grunau --- drivers/spmi/spmi-apple-controller.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/drivers/spmi/spmi-apple-controller.c b/drivers/spmi/spmi-apple= -controller.c index 376cf682c43e..4d5356bf9bbf 100644 --- a/drivers/spmi/spmi-apple-controller.c +++ b/drivers/spmi/spmi-apple-controller.c @@ -21,7 +21,9 @@ #define SPMI_STATUS_REG 0 #define SPMI_CMD_REG 0x4 #define SPMI_RSP_REG 0x8 +#define SPMI_ACT_REG 0xa4 =20 +#define SPMI_ACT_FIFO_FLUSH BIT(0) #define SPMI_RX_FIFO_EMPTY BIT(24) =20 #define REG_POLL_INTERVAL_US 10000 @@ -29,6 +31,7 @@ =20 struct apple_spmi { void __iomem *regs; + bool prev_fail; }; =20 #define poll_reg(spmi, reg, val, cond) \ @@ -49,6 +52,7 @@ static int apple_spmi_wait_rx_not_empty(struct spmi_contr= oller *ctrl) =20 ret =3D poll_reg(spmi, SPMI_STATUS_REG, status, !(status & SPMI_RX_FIFO_E= MPTY)); if (ret) { + spmi->prev_fail =3D true; dev_err(&ctrl->dev, "failed to wait for RX FIFO not empty\n"); return ret; @@ -67,6 +71,11 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, u= 8 opc, u8 sid, u8 i; int ret; =20 + if (spmi->prev_fail) { + writel(SPMI_ACT_FIFO_FLUSH, spmi->regs + SPMI_RSP_REG); + spmi->prev_fail =3D false; + } + writel(spmi_cmd, spmi->regs + SPMI_CMD_REG); =20 ret =3D apple_spmi_wait_rx_not_empty(ctrl); @@ -78,6 +87,11 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, u= 8 opc, u8 sid, =20 /* Read SPMI data reply */ while (len_read < len) { + if (readl(spmi->regs + SPMI_STATUS_REG) & SPMI_RX_FIFO_EMPTY) { + dev_err_ratelimited(&ctrl->dev, + "FIFO lacks reply data, controller stuck?\n"); + return -EIO; + } rsp =3D readl(spmi->regs + SPMI_RSP_REG); i =3D 0; while ((len_read < len) && (i < 4)) { @@ -86,6 +100,11 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, = u8 opc, u8 sid, } } =20 + if (!(readl(spmi->regs + SPMI_STATUS_REG) & SPMI_RX_FIFO_EMPTY)) { + dev_warn(&ctrl->dev, "FIFO has extra data\n"); + spmi->prev_fail =3D true; + } + return 0; } =20 @@ -97,6 +116,11 @@ static int spmi_write_cmd(struct spmi_controller *ctrl,= u8 opc, u8 sid, size_t i =3D 0, j; int ret; =20 + if (spmi->prev_fail) { + writel(SPMI_ACT_FIFO_FLUSH, spmi->regs + SPMI_RSP_REG); + spmi->prev_fail =3D false; + } + writel(spmi_cmd, spmi->regs + SPMI_CMD_REG); =20 while (i < len) { @@ -115,6 +139,11 @@ static int spmi_write_cmd(struct spmi_controller *ctrl= , u8 opc, u8 sid, /* Discard */ readl(spmi->regs + SPMI_RSP_REG); =20 + if (!(readl(spmi->regs + SPMI_STATUS_REG) & SPMI_RX_FIFO_EMPTY)) { + dev_warn(&ctrl->dev, "FIFO has extra data\n"); + spmi->prev_fail =3D true; + } + return 0; } =20 --=20 2.55.0 From nobody Fri Oct 2 04:33:10 2026 Received: from chaosmail.tech (chaosmail.tech [77.81.229.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2CD9940801B; Wed, 5 Aug 2026 10:11:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=77.81.229.115 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785924687; cv=none; b=cSrwJtSeyePodHeyUkMYaCG8LMTbU7txWxvR6HNdMuhOcVNHYUy59XmSnMfHtKEyO1PecgqGs/1pjeLv0LY3D1ZXkIFmGKkrW72eFOYPtS70O085fbbrPLo4g1d1AGDMYkum6FJKckvIaK402XCqcStsOXtfM4eSovhxKQSvZZY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785924687; c=relaxed/simple; bh=mgcfq/sXd4QVBA0RVkaKXfbQYstTXN8JShjK0s7ZVQA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SWQhvX5xWmzS1HvTBiU7LKdMrL44Ea775NTJ7hY2SmdEUBNGs8gFK3FzdOM3IaBetMYV2tpnU9Q32ks4s5IDpJ65JskwjxSh/R8SoKz631181yO403HhXxGEMgRSTtc0z2cG4gZqU4u+WKKYg2NMzftSlmEZz5yfHRJQLzxIpe8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=chaosmail.tech; spf=pass smtp.mailfrom=chaosmail.tech; dkim=pass (1024-bit key) header.d=chaosmail.tech header.i=@chaosmail.tech header.b=CXLH+0xH; arc=none smtp.client-ip=77.81.229.115 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=chaosmail.tech Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chaosmail.tech Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chaosmail.tech header.i=@chaosmail.tech header.b="CXLH+0xH" Received: by chaosmail.tech (Postfix) id BF2271C87FD; Wed, 05 Aug 2026 10:11:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chaosmail.tech; s=mail; t=1785924677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nVI76y/kmEWLkXTt+2xI8u8rqOWmneKjz9si4V0g36k=; b=CXLH+0xHQ6hKzscrBPoq9eIQyBKt5i+7yOwM4piOIXLt1csY7DQNVJSbeqR/vtznrgFzA+ fPYyyZDl33vy8ioZkMKBfmkoQhiCPdUpQjcpuPlnNLW7JaDPZIiTAVPUSAgOZTEOQE/78Z Zsk6b8+Q5t6nADzLMZgFNdtQDd62yd8= From: Sasha Finkelstein Date: Wed, 05 Aug 2026 12:11:13 +0200 Subject: [PATCH v4 3/6] spmi: apple: check transaction status 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: <20260805-t603x-spmi-v4-3-c15a12d9a7d1@chaosmail.tech> References: <20260805-t603x-spmi-v4-0-c15a12d9a7d1@chaosmail.tech> In-Reply-To: <20260805-t603x-spmi-v4-0-c15a12d9a7d1@chaosmail.tech> To: Sven Peter , Janne Grunau , Neal Gompa , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Sasha Finkelstein , Alba Mendez X-Developer-Signature: v=1; a=ed25519-sha256; t=1785924674; l=3016; i=k@chaosmail.tech; s=20241124; h=from:subject:message-id; bh=9XTAYVcaB1AO8VLXsd74SgL+1OMOm6gdvcFnlxzblE8=; b=6+1jatgUAByPzClHjlQebLJmTbD+0rF/JkBg9HospQZHak9z7q5JMLwZfnqr086JJDG7vKMXs 5proZchjHNbDbQ6e27tUzQUixiE4OM2hX2yPjJmaAHuDcmpJvam4rbG X-Developer-Key: i=k@chaosmail.tech; a=ed25519; pk=aSkp1PdZ+eF4jpMO6oLvz/YfT5XkBUneWwyhQrOgmsU= From: Alba Mendez Check for parity errors and missing command ACKs Signed-off-by: Alba Mendez Signed-off-by: Sasha Finkelstein Reviewed-by: Janne Grunau --- drivers/spmi/spmi-apple-controller.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/drivers/spmi/spmi-apple-controller.c b/drivers/spmi/spmi-apple= -controller.c index 4d5356bf9bbf..7ebf899edf17 100644 --- a/drivers/spmi/spmi-apple-controller.c +++ b/drivers/spmi/spmi-apple-controller.c @@ -11,6 +11,8 @@ * spmi-pmic-arb.c Copyright (c) 2021, The Linux Foundation. */ =20 +#include +#include #include #include #include @@ -23,6 +25,12 @@ #define SPMI_RSP_REG 0x8 #define SPMI_ACT_REG 0xa4 =20 +/* SPMI_RSP_REG reply word */ +#define SPMI_REPLY_FRAME_PARITY_STATUS GENMASK(31, 16) +#define SPMI_REPLY_ACK BIT(15) +#define SPMI_REPLY_SLAVE_ID GENMASK(14, 8) +#define SPMI_REPLY_CMD GENMASK(7, 0) + #define SPMI_ACT_FIFO_FLUSH BIT(0) #define SPMI_RX_FIFO_EMPTY BIT(24) =20 @@ -66,7 +74,7 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, u8= opc, u8 sid, { struct apple_spmi *spmi =3D spmi_controller_get_drvdata(ctrl); u32 spmi_cmd =3D apple_spmi_pack_cmd(opc, sid, saddr, len); - u32 rsp; + u32 reply, rsp; size_t len_read =3D 0; u8 i; int ret; @@ -82,12 +90,12 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, = u8 opc, u8 sid, if (ret) return ret; =20 - /* Discard SPMI reply status */ - readl(spmi->regs + SPMI_RSP_REG); + reply =3D readl(spmi->regs + SPMI_RSP_REG); =20 /* Read SPMI data reply */ while (len_read < len) { if (readl(spmi->regs + SPMI_STATUS_REG) & SPMI_RX_FIFO_EMPTY) { + spmi->prev_fail =3D true; dev_err_ratelimited(&ctrl->dev, "FIFO lacks reply data, controller stuck?\n"); return -EIO; @@ -105,6 +113,10 @@ static int spmi_read_cmd(struct spmi_controller *ctrl,= u8 opc, u8 sid, spmi->prev_fail =3D true; } =20 + if (~FIELD_GET(SPMI_REPLY_FRAME_PARITY_STATUS, reply) & ((1 << len) - 1))= { + dev_err(&ctrl->dev, "some frames failed parity check\n"); + return -EIO; + } return 0; } =20 @@ -113,6 +125,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl,= u8 opc, u8 sid, { struct apple_spmi *spmi =3D spmi_controller_get_drvdata(ctrl); u32 spmi_cmd =3D apple_spmi_pack_cmd(opc, sid, saddr, len); + u32 reply; size_t i =3D 0, j; int ret; =20 @@ -136,14 +149,17 @@ static int spmi_write_cmd(struct spmi_controller *ctr= l, u8 opc, u8 sid, if (ret) return ret; =20 - /* Discard */ - readl(spmi->regs + SPMI_RSP_REG); + reply =3D readl(spmi->regs + SPMI_RSP_REG); =20 if (!(readl(spmi->regs + SPMI_STATUS_REG) & SPMI_RX_FIFO_EMPTY)) { dev_warn(&ctrl->dev, "FIFO has extra data\n"); spmi->prev_fail =3D true; } =20 + if (!FIELD_GET(SPMI_REPLY_ACK, reply)) { + dev_err(&ctrl->dev, "command not acknowledged\n"); + return -EIO; + } return 0; } =20 --=20 2.55.0 From nobody Fri Oct 2 04:33:10 2026 Received: from chaosmail.tech (chaosmail.tech [77.81.229.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4D78940E8FB; Wed, 5 Aug 2026 10:11:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=77.81.229.115 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785924687; cv=none; b=KZKLA1Xj5nPtb7cj/2j+3WP4z61Gd2xS7WCw+OOsc2Gmq16TCRDH+tsdRfByBMeP0CsEfosrV34mnGWdcxkuxsIGxndiQFCyvQIhtX8IGQhOwU4IRCsjdCi0XxVwGb/4sfenH01nGf2MSAbXvQjllPK5ME8GMhrGVT3Tw5RssL0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785924687; c=relaxed/simple; bh=Oc+5OaYD8AjfBi9bC0cbTupHh8IHVtsM1OUCZ5ohOtA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Vtiody8zDTxCp5nKPGleZaHjIEo+8uNkNdP+E8ufOc7S+w+PPHCXB/yBp+FGjBHEn3xlhbvTpkxr8geQkgTofRt6U1Qq8VEgfG7+fckCb/rDoox10N4KUtBCLWl1hzzdUeJmKVf3f/yUgL1a+VJ1ev+3Jq9fPUX192zr3XvxwcM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=chaosmail.tech; spf=pass smtp.mailfrom=chaosmail.tech; dkim=pass (1024-bit key) header.d=chaosmail.tech header.i=@chaosmail.tech header.b=G9sMYRvc; arc=none smtp.client-ip=77.81.229.115 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=chaosmail.tech Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chaosmail.tech Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chaosmail.tech header.i=@chaosmail.tech header.b="G9sMYRvc" Received: by chaosmail.tech (Postfix) id 81BDE1C87FF; Wed, 05 Aug 2026 10:11:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chaosmail.tech; s=mail; t=1785924678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=joMRTEFMyu43u8WzmY0xYe3iWb4z0rzfE2Q1XzOQSv0=; b=G9sMYRvc0XRwFi7vh0kZm7dBfaGjnFO5433WTG+vLxswsiJAzmd7ixfltNBTVtenJ6yUJN hue5+R1o1hASC18tc/jNW1eHGqsZ78Zw1lAVB53TOLBcUy0Qv+c94w2F3wiO3DymiZmJOY pRszCGFsM0qyNOBslB6S8wcQwWjLxrw= From: Sasha Finkelstein Date: Wed, 05 Aug 2026 12:11:14 +0200 Subject: [PATCH v4 4/6] spmi: apple: Implement remaining commands 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: <20260805-t603x-spmi-v4-4-c15a12d9a7d1@chaosmail.tech> References: <20260805-t603x-spmi-v4-0-c15a12d9a7d1@chaosmail.tech> In-Reply-To: <20260805-t603x-spmi-v4-0-c15a12d9a7d1@chaosmail.tech> To: Sven Peter , Janne Grunau , Neal Gompa , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Sasha Finkelstein , Alba Mendez X-Developer-Signature: v=1; a=ed25519-sha256; t=1785924674; l=6569; i=k@chaosmail.tech; s=20241124; h=from:subject:message-id; bh=X8XkU0u/Zly9LkV1CBL7op4iKilfsa4gT4J9RPLwQJE=; b=HN76gvDW/0e2Z5RHicsoCn7jAhW+2ETi+r8cXTdSrnE3KWNQU1hzm5zJv6hFLW3i4cJERSh3A ECys58YXGwhAIOCJvVx7FOu0VDDCOApr+CyLzNPBDTveNX0a+TxtMlv X-Developer-Key: i=k@chaosmail.tech; a=ed25519; pk=aSkp1PdZ+eF4jpMO6oLvz/YfT5XkBUneWwyhQrOgmsU= From: Alba Mendez Add support for zero write and power management commands Signed-off-by: Alba Mendez Signed-off-by: Sasha Finkelstein --- drivers/spmi/spmi-apple-controller.c | 114 +++++++++++++++++++++++++++++++= +++++++++++++++++++++++++++++++++++++--------------------------------------= -------- 1 file changed, 68 insertions(+), 46 deletions(-) diff --git a/drivers/spmi/spmi-apple-controller.c b/drivers/spmi/spmi-apple= -controller.c index 7ebf899edf17..49827e51e93e 100644 --- a/drivers/spmi/spmi-apple-controller.c +++ b/drivers/spmi/spmi-apple-controller.c @@ -46,9 +46,9 @@ struct apple_spmi { readl_poll_timeout((spmi)->regs + (reg), (val), (cond), \ REG_POLL_INTERVAL_US, REG_POLL_TIMEOUT_US) =20 -static inline u32 apple_spmi_pack_cmd(u8 opc, u8 sid, u16 saddr, size_t le= n) +static inline u32 apple_spmi_pack_cmd(u8 opc, u8 sid, u16 param) { - return opc | sid << 8 | saddr << 16 | (len - 1) | (1 << 15); + return opc | sid << 8 | (u32)param << 16 | (1 << 15); } =20 /* Wait for Rx FIFO to have something */ @@ -69,14 +69,14 @@ static int apple_spmi_wait_rx_not_empty(struct spmi_con= troller *ctrl) return 0; } =20 -static int spmi_read_cmd(struct spmi_controller *ctrl, u8 opc, u8 sid, - u16 saddr, u8 *buf, size_t len) +static int spmi_raw_cmd(struct spmi_controller *ctrl, u8 opc, u8 sid, + u16 param, const u8 *buf, size_t len, u8 *ibuf, size_t ilen) { struct apple_spmi *spmi =3D spmi_controller_get_drvdata(ctrl); - u32 spmi_cmd =3D apple_spmi_pack_cmd(opc, sid, saddr, len); + u32 spmi_cmd =3D apple_spmi_pack_cmd(opc, sid, param); u32 reply, rsp; size_t len_read =3D 0; - u8 i; + size_t i =3D 0, j; int ret; =20 if (spmi->prev_fail) { @@ -86,6 +86,14 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, u= 8 opc, u8 sid, =20 writel(spmi_cmd, spmi->regs + SPMI_CMD_REG); =20 + while (i < len) { + j =3D min_t(size_t, sizeof(spmi_cmd), len - i); + spmi_cmd =3D 0; + memcpy(&spmi_cmd, buf + i, j); + writel(spmi_cmd, spmi->regs + SPMI_CMD_REG); + i +=3D j; + } + ret =3D apple_spmi_wait_rx_not_empty(ctrl); if (ret) return ret; @@ -93,7 +101,7 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, u= 8 opc, u8 sid, reply =3D readl(spmi->regs + SPMI_RSP_REG); =20 /* Read SPMI data reply */ - while (len_read < len) { + while (len_read < ilen) { if (readl(spmi->regs + SPMI_STATUS_REG) & SPMI_RX_FIFO_EMPTY) { spmi->prev_fail =3D true; dev_err_ratelimited(&ctrl->dev, @@ -101,11 +109,9 @@ static int spmi_read_cmd(struct spmi_controller *ctrl,= u8 opc, u8 sid, return -EIO; } rsp =3D readl(spmi->regs + SPMI_RSP_REG); - i =3D 0; - while ((len_read < len) && (i < 4)) { - buf[len_read++] =3D ((0xff << (8 * i)) & rsp) >> (8 * i); - i +=3D 1; - } + i =3D min_t(size_t, sizeof(spmi_cmd), ilen - len_read); + memcpy(ibuf + len_read, &rsp, i); + len_read +=3D i; } =20 if (!(readl(spmi->regs + SPMI_STATUS_REG) & SPMI_RX_FIFO_EMPTY)) { @@ -113,54 +119,69 @@ static int spmi_read_cmd(struct spmi_controller *ctrl= , u8 opc, u8 sid, spmi->prev_fail =3D true; } =20 - if (~FIELD_GET(SPMI_REPLY_FRAME_PARITY_STATUS, reply) & ((1 << len) - 1))= { + if (!ilen && !FIELD_GET(SPMI_REPLY_ACK, reply)) { + dev_err(&ctrl->dev, "command not acknowledged\n"); + return -EIO; + } + if (~FIELD_GET(SPMI_REPLY_FRAME_PARITY_STATUS, reply) & ((1 << ilen) - 1)= ) { dev_err(&ctrl->dev, "some frames failed parity check\n"); return -EIO; } return 0; } =20 -static int spmi_write_cmd(struct spmi_controller *ctrl, u8 opc, u8 sid, - u16 saddr, const u8 *buf, size_t len) +/* Send a raw command with 1..16 input data frames */ +static int spmi_raw_cmd_input(struct spmi_controller *ctrl, u8 opc, u8 sid, + u16 param, u8 *buf, size_t len) { - struct apple_spmi *spmi =3D spmi_controller_get_drvdata(ctrl); - u32 spmi_cmd =3D apple_spmi_pack_cmd(opc, sid, saddr, len); - u32 reply; - size_t i =3D 0, j; - int ret; - - if (spmi->prev_fail) { - writel(SPMI_ACT_FIFO_FLUSH, spmi->regs + SPMI_RSP_REG); - spmi->prev_fail =3D false; - } - - writel(spmi_cmd, spmi->regs + SPMI_CMD_REG); + return spmi_raw_cmd(ctrl, opc, sid, param, NULL, 0, buf, len); +} =20 - while (i < len) { - j =3D 0; - spmi_cmd =3D 0; - while ((j < 4) & (i < len)) - spmi_cmd |=3D buf[i++] << (j++ * 8); +/* Send a raw command with (optional) body and an input ACK */ +static int spmi_raw_cmd_ack(struct spmi_controller *ctrl, u8 opc, u8 sid, + u16 param, const u8 *buf, size_t len) +{ + return spmi_raw_cmd(ctrl, opc, sid, param, buf, len, NULL, 0); +} =20 - writel(spmi_cmd, spmi->regs + SPMI_CMD_REG); +static int spmi_read_cmd(struct spmi_controller *ctrl, u8 opc, u8 sid, + u16 saddr, u8 *buf, size_t len) +{ + switch (opc) { + case SPMI_CMD_EXT_READ: + case SPMI_CMD_EXT_READL: + return spmi_raw_cmd_input(ctrl, opc | (len - 1), sid, saddr, buf, len); + case SPMI_CMD_READ: + return spmi_raw_cmd_input(ctrl, opc | saddr, sid, saddr, buf, len); } + return -EINVAL; +} =20 - ret =3D apple_spmi_wait_rx_not_empty(ctrl); - if (ret) - return ret; - - reply =3D readl(spmi->regs + SPMI_RSP_REG); - - if (!(readl(spmi->regs + SPMI_STATUS_REG) & SPMI_RX_FIFO_EMPTY)) { - dev_warn(&ctrl->dev, "FIFO has extra data\n"); - spmi->prev_fail =3D true; +static int spmi_write_cmd(struct spmi_controller *ctrl, u8 opc, u8 sid, + u16 saddr, const u8 *buf, size_t len) +{ + switch (opc) { + case SPMI_CMD_WRITE: + return spmi_raw_cmd_ack(ctrl, opc | saddr, sid, buf[0] << 8 | saddr, NUL= L, 0); + case SPMI_CMD_ZERO_WRITE: + return spmi_raw_cmd_ack(ctrl, opc | buf[0], sid, buf[0] << 8 | saddr, NU= LL, 0); + case SPMI_CMD_EXT_WRITE: + case SPMI_CMD_EXT_WRITEL: + return spmi_raw_cmd_ack(ctrl, opc | (len - 1), sid, saddr, buf, len); } + return -EINVAL; +} =20 - if (!FIELD_GET(SPMI_REPLY_ACK, reply)) { - dev_err(&ctrl->dev, "command not acknowledged\n"); - return -EIO; +static int spmi_cmd(struct spmi_controller *ctrl, u8 opc, u8 sid) +{ + switch (opc) { + case SPMI_CMD_RESET: + case SPMI_CMD_SLEEP: + case SPMI_CMD_SHUTDOWN: + case SPMI_CMD_WAKEUP: + return spmi_raw_cmd_ack(ctrl, opc, sid, 0, NULL, 0); } - return 0; + return -EINVAL; } =20 static int apple_spmi_probe(struct platform_device *pdev) @@ -183,6 +204,7 @@ static int apple_spmi_probe(struct platform_device *pde= v) =20 ctrl->read_cmd =3D spmi_read_cmd; ctrl->write_cmd =3D spmi_write_cmd; + ctrl->cmd =3D spmi_cmd; =20 ret =3D devm_spmi_controller_add(&pdev->dev, ctrl); if (ret) --=20 2.55.0 From nobody Fri Oct 2 04:33:10 2026 Received: from chaosmail.tech (chaosmail.tech [77.81.229.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9B25641D222; Wed, 5 Aug 2026 10:11:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=77.81.229.115 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785924690; cv=none; b=PXLioGkMuBsmFzh/fap4maH+6BlpQczmn81vzluezY6PPDtqb+SuVZgP+kdKTKW3FxdayHBS2tS1TnoqTXG2ZfMVe2QMicuYq80WYJZYWu66AQghhnV+dFW7TlkoCfNOuYgoY3qi+rC7UtuWajUutX3zPIPiudv8VZp3WMBQ9Gs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785924690; c=relaxed/simple; bh=9v1qsSuSt17zkWDo0rgT7u0GD8CFvNhT5tDlGVpSQWg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YlNz6tgU+0v+GO/HGQlwLhv0Sf+O/yfjDigFBgKn0Wg22otnyRi/cr2tK3oUbkbndj0pSV3U21OXaJM8J5Ye5iMJawrr9VbpmimrnOOFvAnP6fdq3TsZM+xQ7r9cD8wBY0NhBbYDXrtz4hiQ6ot7JUGsyQhHCPo9pCHs27YspSs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=chaosmail.tech; spf=pass smtp.mailfrom=chaosmail.tech; dkim=pass (1024-bit key) header.d=chaosmail.tech header.i=@chaosmail.tech header.b=OWw9k4+6; arc=none smtp.client-ip=77.81.229.115 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=chaosmail.tech Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chaosmail.tech Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chaosmail.tech header.i=@chaosmail.tech header.b="OWw9k4+6" Received: by chaosmail.tech (Postfix) id 460D61C8806; Wed, 05 Aug 2026 10:11:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chaosmail.tech; s=mail; t=1785924678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pzFkFB/PMVDNKVFIxgRys9fGD169vs7WxjV3LX9ohSc=; b=OWw9k4+6fTyxDX4n+2MuQB0/NQC5SonigBjrqrMD72vOrrbmB5EORcBbLrOM/HFSW8jxwb 4weYgzSHC6xJ79QA62rmI/MUFlHPwNiZSZD5j8VgcIXcd7BOl/GNY/mDHciYzkKcnttPFn NOuqNV+rlrT+oiT4pWMR7Wi6F6hFrAo= From: Sasha Finkelstein Date: Wed, 05 Aug 2026 12:11:15 +0200 Subject: [PATCH v4 5/6] spmi: apple: lock around FIFOs 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: <20260805-t603x-spmi-v4-5-c15a12d9a7d1@chaosmail.tech> References: <20260805-t603x-spmi-v4-0-c15a12d9a7d1@chaosmail.tech> In-Reply-To: <20260805-t603x-spmi-v4-0-c15a12d9a7d1@chaosmail.tech> To: Sven Peter , Janne Grunau , Neal Gompa , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Sasha Finkelstein , Alba Mendez X-Developer-Signature: v=1; a=ed25519-sha256; t=1785924674; l=1338; i=k@chaosmail.tech; s=20241124; h=from:subject:message-id; bh=fzMIw6AN9yEpQ6+KWLdyrm9k+KS8cIdmqz+BmFm8hO0=; b=w7oaICNm5Z83Ah+/lmDSgUWvYkB8SY2yDQKYxQU09i126frvsL4943XUsVXGiXIZAZ9qqIdq+ 0XPCoOX89uOBjIyJ0thtHzdvtcfafnp60v0C5NY5Qch7q+9lGZdviii X-Developer-Key: i=k@chaosmail.tech; a=ed25519; pk=aSkp1PdZ+eF4jpMO6oLvz/YfT5XkBUneWwyhQrOgmsU= From: Alba Mendez The driver was missing locking around register interactions Signed-off-by: Alba Mendez Signed-off-by: Sasha Finkelstein Reviewed-by: Janne Grunau --- drivers/spmi/spmi-apple-controller.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/spmi/spmi-apple-controller.c b/drivers/spmi/spmi-apple= -controller.c index 49827e51e93e..c3bc1f6d5741 100644 --- a/drivers/spmi/spmi-apple-controller.c +++ b/drivers/spmi/spmi-apple-controller.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include =20 @@ -39,6 +40,7 @@ =20 struct apple_spmi { void __iomem *regs; + struct mutex fifo_lock; bool prev_fail; }; =20 @@ -79,6 +81,8 @@ static int spmi_raw_cmd(struct spmi_controller *ctrl, u8 = opc, u8 sid, size_t i =3D 0, j; int ret; =20 + guard(mutex)(&spmi->fifo_lock); + if (spmi->prev_fail) { writel(SPMI_ACT_FIFO_FLUSH, spmi->regs + SPMI_RSP_REG); spmi->prev_fail =3D false; @@ -195,6 +199,7 @@ static int apple_spmi_probe(struct platform_device *pde= v) return -ENOMEM; =20 spmi =3D spmi_controller_get_drvdata(ctrl); + mutex_init(&spmi->fifo_lock); =20 spmi->regs =3D devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(spmi->regs)) --=20 2.55.0 From nobody Fri Oct 2 04:33:10 2026 Received: from chaosmail.tech (chaosmail.tech [77.81.229.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9B2E341D226; Wed, 5 Aug 2026 10:11:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=77.81.229.115 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785924691; cv=none; b=auu03KbjzyNzIp0xem9eJqKv3H6XydUoWLiArcw3bJ8CXj/uxBpC5vHKLDVRFbsvJTf5uf6fk+JLNvEeALX/osf67ck3mqSEQrKQCwKzWUs+95b3TejSYskwOoe83SJKc7eMZ+nSP/QbNAXgepUe682Y94Ilo0G1Z0C5C/T0bo8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785924691; c=relaxed/simple; bh=mFA/xOyUUMJbV+b/D2+k812JhItvP5+SODMgwIdc0Og=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FlEePpwmJycs/qQK1l/yphz8drfUQUYUdbd6bLP8zCsmOGSiEuobX2fnp/MQUMXsjezqQkrTCoHGxb6d3KTMkUtNHx0HOgFCezEYjVY9OKLFbbXWeYpLIwU4xPtTfxfFOLMDDxQUpasr8qz6EZMR3LWQ9U99CyK4LhsjQhlftq4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=chaosmail.tech; spf=pass smtp.mailfrom=chaosmail.tech; dkim=pass (1024-bit key) header.d=chaosmail.tech header.i=@chaosmail.tech header.b=P6ijPLMt; arc=none smtp.client-ip=77.81.229.115 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=chaosmail.tech Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chaosmail.tech Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chaosmail.tech header.i=@chaosmail.tech header.b="P6ijPLMt" Received: by chaosmail.tech (Postfix) id 09C911C8820; Wed, 05 Aug 2026 10:11:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chaosmail.tech; s=mail; t=1785924679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1Slt7NKhIR4KoxaRQR8Vyr2DxtGwNw8zMJXfa1p3G4I=; b=P6ijPLMtri9AvDqdH/A3SaNged+5hmc8xjgRiVIHfo1JbvDXms8oq1siBndOPk7JXlypqB pGvMcCucDMthV2ZvuNgKI86PFd6FtYC5kRVSkUCgyiS76Q7gdfSJLyPUbUneWpooeJetjX s4iv/L5PqLgoXLow44bfEpFDPgz48Ds= From: Sasha Finkelstein Date: Wed, 05 Aug 2026 12:11:16 +0200 Subject: [PATCH v4 6/6] spmi: apple: Add interrupt functionality 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: <20260805-t603x-spmi-v4-6-c15a12d9a7d1@chaosmail.tech> References: <20260805-t603x-spmi-v4-0-c15a12d9a7d1@chaosmail.tech> In-Reply-To: <20260805-t603x-spmi-v4-0-c15a12d9a7d1@chaosmail.tech> To: Sven Peter , Janne Grunau , Neal Gompa , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Sasha Finkelstein , Alba Mendez X-Developer-Signature: v=1; a=ed25519-sha256; t=1785924674; l=10882; i=k@chaosmail.tech; s=20241124; h=from:subject:message-id; bh=iFfcOvRrLwNXZ/rOeZ8JUAskkaIdKQYHDW+xZsGT2qU=; b=AQ8d9a3XOTqQHD5JxSSoKU8olodwLVJstZURWjMkmqtwRdeqmNTWxuzrPpNGLWRK/6veWGxM4 f0BYFUM0xF2CWFirhS1Vt2MFF0NdIQPzF0FN5tIGuZtlasZzkb41ziS X-Developer-Key: i=k@chaosmail.tech; a=ed25519; pk=aSkp1PdZ+eF4jpMO6oLvz/YfT5XkBUneWwyhQrOgmsU= From: Alba Mendez Add support for interrupts sent by slave devices and use IRQ for RX FIFO if possible, as that IRQ fires as soon as the reply is available, which is usually takes a few us instead of the 10ms sleep interval for polling Signed-off-by: Alba Mendez Signed-off-by: Sasha Finkelstein Reviewed-by: Janne Grunau --- drivers/spmi/Kconfig | 3 +- drivers/spmi/spmi-apple-controller.c | 254 +++++++++++++++++++++++++++++++= +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++= +++++++++++++++++++++++++++++++++- 2 files changed, 255 insertions(+), 2 deletions(-) diff --git a/drivers/spmi/Kconfig b/drivers/spmi/Kconfig index a80cf4047b86..7243863a09b4 100644 --- a/drivers/spmi/Kconfig +++ b/drivers/spmi/Kconfig @@ -13,7 +13,8 @@ if SPMI =20 config SPMI_APPLE tristate "Apple SoC SPMI Controller platform driver" - depends on ARCH_APPLE || COMPILE_TEST + select IRQ_DOMAIN_HIERARCHY + depends on ARCH_APPLE || (COMPILE_TEST && 64BIT) help If you say yes to this option, support will be included for the SPMI controller present on many Apple SoCs, including the diff --git a/drivers/spmi/spmi-apple-controller.c b/drivers/spmi/spmi-apple= -controller.c index c3bc1f6d5741..7e86d7983fb4 100644 --- a/drivers/spmi/spmi-apple-controller.c +++ b/drivers/spmi/spmi-apple-controller.c @@ -13,11 +13,17 @@ =20 #include #include +#include +#include #include #include +#include +#include +#include #include #include #include +#include #include =20 /* SPMI Controller Registers */ @@ -26,6 +32,13 @@ #define SPMI_RSP_REG 0x8 #define SPMI_ACT_REG 0xa4 =20 +#define SPMI_IRQ_MASK_BASE 0x20 +#define SPMI_IRQ_ACK_BASE 0x60 +#define SPMI_NUM_PERIPHERAL_IRQS 256 +#define SPMI_NUM_IRQS (SPMI_NUM_PERIPHERAL_IRQS + 32) + +#define SPMI_IRQ_NOTIFY 256 + /* SPMI_RSP_REG reply word */ #define SPMI_REPLY_FRAME_PARITY_STATUS GENMASK(31, 16) #define SPMI_REPLY_ACK BIT(15) @@ -41,6 +54,12 @@ struct apple_spmi { void __iomem *regs; struct mutex fifo_lock; + struct completion fifo_rx; + struct irq_domain *irqd; + raw_spinlock_t irq_mask_lock; + DECLARE_BITMAP(irq_mask_cache, SPMI_NUM_PERIPHERAL_IRQS); + int irq; + bool notify_irq; bool prev_fail; }; =20 @@ -48,6 +67,56 @@ struct apple_spmi { readl_poll_timeout((spmi)->regs + (reg), (val), (cond), \ REG_POLL_INTERVAL_US, REG_POLL_TIMEOUT_US) =20 +static void apple_spmi_irq_ack_raw(struct apple_spmi *spmi, u32 irq) +{ + u32 __iomem *reg =3D spmi->regs + SPMI_IRQ_ACK_BASE + (irq / 32) * 4; + + writel(BIT(irq % 32), reg); +} + +static void apple_spmi_irq_mask_raw(struct apple_spmi *spmi, u32 irq) +{ + u32 __iomem *reg =3D spmi->regs + SPMI_IRQ_MASK_BASE + (irq / 32) * 4; + + writel(readl(reg) & ~BIT(irq % 32), reg); +} + +static void apple_spmi_irq_unmask_raw(struct apple_spmi *spmi, u32 irq) +{ + u32 __iomem *reg =3D spmi->regs + SPMI_IRQ_MASK_BASE + (irq / 32) * 4; + + writel(readl(reg) | BIT(irq % 32), reg); +} + +static void apple_spmi_irq_ack(struct irq_data *d) +{ + struct apple_spmi *spmi =3D irq_data_get_irq_chip_data(d); + + apple_spmi_irq_ack_raw(spmi, d->hwirq); +} + +static void apple_spmi_irq_mask(struct irq_data *d) +{ + struct apple_spmi *spmi =3D irq_data_get_irq_chip_data(d); + unsigned long flags; + + raw_spin_lock_irqsave(&spmi->irq_mask_lock, flags); + apple_spmi_irq_mask_raw(spmi, d->hwirq); + clear_bit(d->hwirq, spmi->irq_mask_cache); + raw_spin_unlock_irqrestore(&spmi->irq_mask_lock, flags); +} + +static void apple_spmi_irq_unmask(struct irq_data *d) +{ + struct apple_spmi *spmi =3D irq_data_get_irq_chip_data(d); + unsigned long flags; + + raw_spin_lock_irqsave(&spmi->irq_mask_lock, flags); + set_bit(d->hwirq, spmi->irq_mask_cache); + apple_spmi_irq_unmask_raw(spmi, d->hwirq); + raw_spin_unlock_irqrestore(&spmi->irq_mask_lock, flags); +} + static inline u32 apple_spmi_pack_cmd(u8 opc, u8 sid, u16 param) { return opc | sid << 8 | (u32)param << 16 | (1 << 15); @@ -60,7 +129,19 @@ static int apple_spmi_wait_rx_not_empty(struct spmi_con= troller *ctrl) int ret; u32 status; =20 - ret =3D poll_reg(spmi, SPMI_STATUS_REG, status, !(status & SPMI_RX_FIFO_E= MPTY)); + if (spmi->notify_irq) { + ret =3D wait_for_completion_timeout(&spmi->fifo_rx, + usecs_to_jiffies(REG_POLL_TIMEOUT_US)); + if (!ret) + ret =3D -ETIMEDOUT; + else if (readl(spmi->regs + SPMI_STATUS_REG) & SPMI_RX_FIFO_EMPTY) + ret =3D -EIO; + else + ret =3D 0; + } else { + ret =3D poll_reg(spmi, SPMI_STATUS_REG, status, !(status & SPMI_RX_FIFO_= EMPTY)); + } + if (ret) { spmi->prev_fail =3D true; dev_err(&ctrl->dev, @@ -85,8 +166,10 @@ static int spmi_raw_cmd(struct spmi_controller *ctrl, u= 8 opc, u8 sid, =20 if (spmi->prev_fail) { writel(SPMI_ACT_FIFO_FLUSH, spmi->regs + SPMI_RSP_REG); + apple_spmi_irq_ack_raw(spmi, SPMI_IRQ_NOTIFY); spmi->prev_fail =3D false; } + reinit_completion(&spmi->fifo_rx); =20 writel(spmi_cmd, spmi->regs + SPMI_CMD_REG); =20 @@ -188,6 +271,164 @@ static int spmi_cmd(struct spmi_controller *ctrl, u8 = opc, u8 sid) return -EINVAL; } =20 +static int apple_spmi_irq_set_type(struct irq_data *d, unsigned int type) +{ + /* all interrupts have MSI semantics */ + return type =3D=3D IRQ_TYPE_EDGE_RISING ? 0 : -EINVAL; +} + +static struct irq_chip apple_spmi_irq_chip =3D { + .name =3D "apple_spmi", + .irq_mask =3D apple_spmi_irq_mask, + .irq_unmask =3D apple_spmi_irq_unmask, + .irq_ack =3D apple_spmi_irq_ack, + .irq_set_type =3D apple_spmi_irq_set_type, + .flags =3D IRQCHIP_ONESHOT_SAFE, +}; + +static int apple_spmi_irq_domain_map(struct irq_domain *irqd, + unsigned int irq, irq_hw_number_t hw) +{ + irq_domain_set_info(irqd, irq, hw, &apple_spmi_irq_chip, irqd->host_data, + handle_edge_irq, NULL, NULL); + return 0; +} + +static int apple_spmi_irq_domain_translate(struct irq_domain *irqd, + struct irq_fwspec *fwspec, + unsigned long *hwirq, + unsigned int *type) +{ + u32 *args =3D fwspec->param; + + if (fwspec->param_count !=3D 2) + return -EINVAL; + + if (args[0] >=3D SPMI_NUM_PERIPHERAL_IRQS) + return -EINVAL; + *hwirq =3D args[0]; + *type =3D args[1] & IRQ_TYPE_SENSE_MASK; + return 0; +} + +static int apple_spmi_irq_domain_alloc(struct irq_domain *irqd, unsigned i= nt virq, + unsigned int nr_irqs, void *arg) +{ + unsigned int type =3D IRQ_TYPE_NONE; + struct irq_fwspec *fwspec =3D arg; + irq_hw_number_t hwirq; + int i, ret; + + ret =3D apple_spmi_irq_domain_translate(irqd, fwspec, &hwirq, &type); + if (ret) + return ret; + + if (hwirq + nr_irqs > SPMI_NUM_PERIPHERAL_IRQS) + return -EINVAL; + + for (i =3D 0; i < nr_irqs; i++) { + ret =3D apple_spmi_irq_domain_map(irqd, virq + i, hwirq + i); + if (ret) + return ret; + } + + return 0; +} + +static void apple_spmi_irq_domain_free(struct irq_domain *irqd, unsigned i= nt virq, + unsigned int nr_irqs) +{ + int i; + + for (i =3D 0; i < nr_irqs; i++) { + struct irq_data *d =3D irq_domain_get_irq_data(irqd, virq + i); + + irq_set_handler(virq + i, NULL); + irq_domain_reset_irq_data(d); + } +} + +static const struct irq_domain_ops apple_spmi_irq_domain_ops =3D { + .translate =3D apple_spmi_irq_domain_translate, + .alloc =3D apple_spmi_irq_domain_alloc, + .free =3D apple_spmi_irq_domain_free, +}; + +static void apple_spmi_irq_handler(struct irq_desc *desc) +{ + struct apple_spmi *spmi =3D irq_desc_get_handler_data(desc); + struct irq_chip *chip =3D irq_desc_get_chip(desc); + bool handled =3D false; + unsigned long val, offset, bit; + + chained_irq_enter(chip, desc); + val =3D readl(spmi->regs + SPMI_IRQ_ACK_BASE + (SPMI_IRQ_NOTIFY / 32) * 4= ); + if (val & BIT(SPMI_IRQ_NOTIFY % 32)) { + apple_spmi_irq_ack_raw(spmi, SPMI_IRQ_NOTIFY); + complete(&spmi->fifo_rx); + handled =3D true; + } + + for (offset =3D 0; offset < SPMI_NUM_PERIPHERAL_IRQS / 8; offset +=3D siz= eof(val)) { + val =3D readq(spmi->regs + SPMI_IRQ_ACK_BASE + offset); + /** + * because of other masters in the bus, we're going to get a multitude of + * interrupts we're not interested in. irq_resolve_mapping isn't very + * optimized for the nonexistent path, so instead we mask with (a locally + * cached version of) the IRQ mask + */ + val &=3D spmi->irq_mask_cache[offset / sizeof(val)]; + for_each_set_bit(bit, &val, 64) { + generic_handle_domain_irq(spmi->irqd, offset * 8 + bit); + handled =3D true; + val &=3D ~BIT(bit); + } + } + if (!handled) + handle_bad_irq(desc); + chained_irq_exit(chip, desc); +} + +static void remove_chained_handler(void *data) +{ + unsigned int irq =3D (unsigned int)(uintptr_t)data; + + irq_set_chained_handler_and_data(irq, NULL, NULL); +} + +static int apple_spmi_init_irq(struct platform_device *pdev, + struct apple_spmi *spmi, int irq) +{ + int ret; + struct irq_domain_info info =3D { + .fwnode =3D pdev->dev.fwnode, + .hwirq_max =3D ~0U, + .ops =3D &apple_spmi_irq_domain_ops, + .host_data =3D spmi, + }; + + raw_spin_lock_init(&spmi->irq_mask_lock); + + for (size_t offset =3D 0; offset < SPMI_NUM_IRQS / 8; offset +=3D 4) { + writel(0, spmi->regs + SPMI_IRQ_MASK_BASE + offset); + writel(U32_MAX, spmi->regs + SPMI_IRQ_ACK_BASE + offset); + } + + spmi->irqd =3D devm_irq_domain_instantiate(&pdev->dev, &info); + if (IS_ERR(spmi->irqd)) + return PTR_ERR(spmi->irqd); + + spmi->notify_irq =3D true; + ret =3D devm_add_action(&pdev->dev, remove_chained_handler, (void *)(uint= ptr_t)spmi->irq); + if (ret) + return ret; + + irq_set_chained_handler_and_data(spmi->irq, apple_spmi_irq_handler, spmi); + apple_spmi_irq_unmask_raw(spmi, SPMI_IRQ_NOTIFY); + + return 0; +} + static int apple_spmi_probe(struct platform_device *pdev) { struct apple_spmi *spmi; @@ -200,6 +441,8 @@ static int apple_spmi_probe(struct platform_device *pde= v) =20 spmi =3D spmi_controller_get_drvdata(ctrl); mutex_init(&spmi->fifo_lock); + init_completion(&spmi->fifo_rx); + platform_set_drvdata(pdev, spmi); =20 spmi->regs =3D devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(spmi->regs)) @@ -211,6 +454,15 @@ static int apple_spmi_probe(struct platform_device *pd= ev) ctrl->write_cmd =3D spmi_write_cmd; ctrl->cmd =3D spmi_cmd; =20 + spmi->irq =3D platform_get_irq_optional(pdev, 0); + if (spmi->irq < 0 && spmi->irq !=3D -ENXIO) + return spmi->irq; + if (spmi->irq >=3D 0) { + ret =3D apple_spmi_init_irq(pdev, spmi, spmi->irq); + if (ret) + return ret; + } + ret =3D devm_spmi_controller_add(&pdev->dev, ctrl); if (ret) return dev_err_probe(&pdev->dev, ret, --=20 2.55.0