From nobody Fri Oct 2 08:29:12 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 EACEC39A045; Mon, 3 Aug 2026 13:02:55 +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=1785762178; cv=none; b=s8/fL21fRAOC3H6nzOXWHLmMTCqegkfZ/sjlgUmsREKa5CUQrZDTQU1Dg5Y4ScHAO8TUOWvRsT4Q41mIFasuoOhPnWKKHzyGGIGx+lfwZNt4UR5EJKhXj9WLorFmPz47dUFZJ7a7U03LV8aCRWIV4NXa5pQCeI/GibfBcRBbcEo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785762178; 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=h7xupT540u6DKFn58RTHwu2J/hA2d45bv8vnGMD0fL2F34hMzHiytit/1rzZ1S1I9M+PpYv5ZMKGQv3+/tS4PTFUqZRYyvnFj5yY1cRd1TGyup/Fr8tUB12sWIXfMocIGvo6HfjOSCExMx2PDb8Qf4nYbuUTeZP4NOpcxAwaikA= 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=xxHa9NpQ; 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="xxHa9NpQ" Received: by chaosmail.tech (Postfix) id 062761C867A; Mon, 03 Aug 2026 13:02:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chaosmail.tech; s=mail; t=1785762168; 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=xxHa9NpQkLulh6OioIeyiZBRqlTOXOsu+fh10rudCOwmQA5yV1FSj0JS4MVQT1ZbmQHC7e Ypygbq02jWt/eCf5bJWt1/Fbrbb+hXFgAbLWmeifxBwf+Ji8Z/sypEEuunqDXpa3yAP6Gg iYFwpKH9CbcVaddYDzeQSLTmzjX8aRw= From: Sasha Finkelstein Date: Mon, 03 Aug 2026 15:02:43 +0200 Subject: [PATCH v3 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: <20260803-t603x-spmi-v3-1-c17b506d91a1@chaosmail.tech> References: <20260803-t603x-spmi-v3-0-c17b506d91a1@chaosmail.tech> In-Reply-To: <20260803-t603x-spmi-v3-0-c17b506d91a1@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=1785762167; l=1440; i=k@chaosmail.tech; s=20241124; h=from:subject:message-id; bh=aEu4DhLKCZR+9M5iOh+LW5VoY6WvL4eLkjfDVZ+NFaY=; b=5jIoiT1dCduBwhsIm2iJYJXDqRxV74AB1x+UwHp+YF49QIfpXGbyfJpSL8ZNtydUrRSfxBAt+ ZaRYPApDrjzC5XAnLsOiXbjVzej64r625sXa96M7QmeHFYlUjEisSNa 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 --- 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 08:29:12 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 833FC3BAD9F; Mon, 3 Aug 2026 13:02:56 +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=1785762179; cv=none; b=nrKgwaPavrpzicplM5hr1ceJWFaUgUZiHZFLbwYi+0wh4vTvHW8xh9F8+e12pVBcmVbP8pp/evZGMREcSnIrhzZkilepjgJcyfugT27c6bu0pS6qf0HMHwoULXAnX3HlwTcmNmL0HRvFLPesg365NxeHIRnR4sI70WNiWtfKWWs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785762179; c=relaxed/simple; bh=WnSqo5DkKEebqBayu2UDewUn0iMVdFk9k+nwTD4hroA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IF+f/pCc2ET2rT2rAm2sCS99l89EQVPrRlsP9wvPnk0Iu2QfvWGVcYhrQaujFb2TKorc0M+DAtso46TFKhkxtJ7lryIlsJiJlHb9sorV4InOgwr/D4O+fl8V+LwHwmU0aw7+9zkNy0caWkfqnaRBQ9iaQ8LYJ3lTUNm3V7SZ6CQ= 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=qW9UtaB0; 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="qW9UtaB0" Received: by chaosmail.tech (Postfix) id B1DED1C878A; Mon, 03 Aug 2026 13:02:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chaosmail.tech; s=mail; t=1785762169; 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=Dp0o1m5yR2f4Z+ciPm4AbRNRENMEbbSgtEL3uzjlmxQ=; b=qW9UtaB03q2/iFqAGH2zC3o7QCw5a8JJLJXwBubWfxvhUfoAkt5rzMHZhnk5tqrZAs8Z+2 71cPPhBV2hWTTWiHihcHkRAXwROLtV5S9VC7p8DZsPa4lVze5oziBY8rTJcIHMQA9+e5+k 37g2RoCMXNHpmtmPO39ezYoq+O/iDvo= From: Sasha Finkelstein Date: Mon, 03 Aug 2026 15:02:44 +0200 Subject: [PATCH v3 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: <20260803-t603x-spmi-v3-2-c17b506d91a1@chaosmail.tech> References: <20260803-t603x-spmi-v3-0-c17b506d91a1@chaosmail.tech> In-Reply-To: <20260803-t603x-spmi-v3-0-c17b506d91a1@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=1785762167; l=1923; i=k@chaosmail.tech; s=20241124; h=from:subject:message-id; bh=PkmvT+O1yoJbmERoyOrzU/RzWX78PMERIonM3LtJq8g=; b=K1gkvvUPbxJZxhkWs1UjBnx7EK9MM6PUBsqSP5hIupZQ8BM9IMWmZsNpOrcRJPsxj74o3/Vj9 /TzUJllIznOAO7wF1bVS0fEpcmaMoBTcfz56M28Jz9yKpoHpiyAIx/1 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 --- drivers/spmi/spmi-apple-controller.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/spmi/spmi-apple-controller.c b/drivers/spmi/spmi-apple= -controller.c index 376cf682c43e..e037ef914b6c 100644 --- a/drivers/spmi/spmi-apple-controller.c +++ b/drivers/spmi/spmi-apple-controller.c @@ -57,6 +57,20 @@ static int apple_spmi_wait_rx_not_empty(struct spmi_cont= roller *ctrl) return 0; } =20 +static void flush_extra_data(struct spmi_controller *ctrl) +{ + struct apple_spmi *spmi =3D spmi_controller_get_drvdata(ctrl); + bool warned =3D false; + + while (!(readl(spmi->regs + SPMI_STATUS_REG) & SPMI_RX_FIFO_EMPTY)) { + if (!warned) { + dev_warn(&ctrl->dev, "FIFO has extra data\n"); + warned =3D true; + } + readl(spmi->regs + SPMI_RSP_REG); + } +} + static int spmi_read_cmd(struct spmi_controller *ctrl, u8 opc, u8 sid, u16 saddr, u8 *buf, size_t len) { @@ -78,6 +92,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 +105,8 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, u= 8 opc, u8 sid, } } =20 + flush_extra_data(ctrl); + return 0; } =20 @@ -115,6 +136,8 @@ static int spmi_write_cmd(struct spmi_controller *ctrl,= u8 opc, u8 sid, /* Discard */ readl(spmi->regs + SPMI_RSP_REG); =20 + flush_extra_data(ctrl); + return 0; } =20 --=20 2.55.0 From nobody Fri Oct 2 08:29:12 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 8E3B531E846; Mon, 3 Aug 2026 13:02:57 +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=1785762179; cv=none; b=mHAXTVQJzZcj407QiQXCcC5tiD9zTtIMZ06YuKaS/hWtB3TB/+EFgw0FnEOoPNn4pWTVCGDoAi5ky6h4ceu3lnLg3FS11mhEi1yvngYZi1dxQcTMryCwN/7vfmppem6ZToLxsHGiGAqO9Z6fczvcswWAsI8/9M0Kqz+KCUTC9YY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785762179; c=relaxed/simple; bh=1D3696k1UMOZodsP8VRLAjZgOk2Lm/UF5XqnyjaOrBY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GNGcrrrQjPL2QN7UImC3p7yv4NXm1KD082vfALKadiUUeZsPhQOFHh5RsGsXHJtv+7P1xrmxj3Wyk3pdGUrRstHmYBuoNad7oWWasaCJnzCf8ziGs4KIogmNkMAHv9iA36d/0C2F/phLJ4EdvLFl1HAGwfuKe/ULTYRfYhtBUwg= 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=IvGnhCMH; 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="IvGnhCMH" Received: by chaosmail.tech (Postfix) id 777531C87E8; Mon, 03 Aug 2026 13:02:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chaosmail.tech; s=mail; t=1785762170; 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=tyJNA99L9vX85qotZSnU+cUukPaUc9GgIg7vFCtLncc=; b=IvGnhCMHEbfH7d277Gx9kiG29iMNk6LtkKOhgH+Q4ciCQRgdgUJWBcUiG6WRrLqyMhlaEv lb3AsuRMTRTEEwP82b2cVTZtRgvHpMOoyVbnhG/TR/9xeQEeCsa4fpfJOmoLsGgYC7Xj8m RVODIIjwfP+XFK20dQDpIAxV3isStk8= From: Sasha Finkelstein Date: Mon, 03 Aug 2026 15:02:45 +0200 Subject: [PATCH v3 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: <20260803-t603x-spmi-v3-3-c17b506d91a1@chaosmail.tech> References: <20260803-t603x-spmi-v3-0-c17b506d91a1@chaosmail.tech> In-Reply-To: <20260803-t603x-spmi-v3-0-c17b506d91a1@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=1785762167; l=2442; i=k@chaosmail.tech; s=20241124; h=from:subject:message-id; bh=MQQKCL+2hqQSxayW3TO3xUWQbGnFAR6iCdnBHYXDXa0=; b=c/+HkhJAISslxQIwwQqZxsV2o4xZdJPhYXjlClWBaPXhPfQYVr6zaZAmJVtxGYZ9Bww08lg9l gS+G9M50nNgBXXEz3A0CU6aFkstYJly94Y61L4TixYOVAPDKm5mMPf/ 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 --- drivers/spmi/spmi-apple-controller.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/drivers/spmi/spmi-apple-controller.c b/drivers/spmi/spmi-apple= -controller.c index e037ef914b6c..db03081796d1 100644 --- a/drivers/spmi/spmi-apple-controller.c +++ b/drivers/spmi/spmi-apple-controller.c @@ -22,6 +22,12 @@ #define SPMI_CMD_REG 0x4 #define SPMI_RSP_REG 0x8 =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_RX_FIFO_EMPTY BIT(24) =20 #define REG_POLL_INTERVAL_US 10000 @@ -76,7 +82,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; @@ -87,8 +93,7 @@ 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) { @@ -107,6 +112,10 @@ static int spmi_read_cmd(struct spmi_controller *ctrl,= u8 opc, u8 sid, =20 flush_extra_data(ctrl); =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 @@ -115,6 +124,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 @@ -133,11 +143,14 @@ 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 flush_extra_data(ctrl); =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 08:29:12 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 BC96140B0F3; Mon, 3 Aug 2026 13:02:58 +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=1785762180; cv=none; b=NPGuNqle2lM07eH4iBAC+CbrLXmYw5xhLksP9Z3gdXFjFi/S8teP6012/K1htz+iSs8bSwh+q2M02nnCmkYKqh+0O2/HVpFpD+gGT0xpYgoU6TtY7RO4EprAC0k6bK9d7OmxsLVuhzS+2hI9ZckJ7D9/wtHfYtKpHmdoiScvoWE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785762180; c=relaxed/simple; bh=BxLFBl6JdQTyA8WM2wXkWyV2nMSybqOeJ3hM9By2nQs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ebSh3h68JRmb8HhUFBJzen0wcUd8b2F9l9E2gv9oi73hzWDl2JEPwIZ/Wz7sdwxVIBUjg4gnieR/rDrAdia56WQSefhYQ1omzQL/mPNvIxgrL/VSLxSP3DjyUe6GR/E4CRA7WgCChGGdmPnbllX6a3esFEdzZY3V0HHMzQLrTRs= 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=of80bx3Y; 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="of80bx3Y" Received: by chaosmail.tech (Postfix) id 3C22D1C87FD; Mon, 03 Aug 2026 13:02:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chaosmail.tech; s=mail; t=1785762170; 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=hGr2YMWMrCYP6rutj+pDrWkBkphw9fh9VHfFwxOFkuA=; b=of80bx3YOaw8HHgmnxFw8QPicT5QlF4Sl1MmeLCwAeVwepQ2I6u4tEVoANL6/M1PWeVAed F2sXYySEXzj+hSqxzgPGFl0y4hoOi6ieR51t+lazuj4RmolS11HFlT5KGMHAK3aqJ1fuLi +TNEUr5qazbt6LK49UKVFltDeDZ0oIg= From: Sasha Finkelstein Date: Mon, 03 Aug 2026 15:02:46 +0200 Subject: [PATCH v3 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: <20260803-t603x-spmi-v3-4-c17b506d91a1@chaosmail.tech> References: <20260803-t603x-spmi-v3-0-c17b506d91a1@chaosmail.tech> In-Reply-To: <20260803-t603x-spmi-v3-0-c17b506d91a1@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=1785762167; l=6022; i=k@chaosmail.tech; s=20241124; h=from:subject:message-id; bh=l7Ypd0vDkHyX1IZN4ihXllZWpReF8xWi6dZCN+7i/qY=; b=yIwUALcZb2S/ahlyemwrJKJDcQKtJNS81etvUE2rOkECRnyIf1G/AAYBf2D8zfPr6ec0zUf9F xQLSqY1GLZsBij3FU+X3K2GgjctmE+JMfRbM2KQe/S+zcafn2w1ADzi 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 | 111 +++++++++++++++++++++++++++++++= +++++++++++++++++++++++++++++++++++++++------------------------------------= ----- 1 file changed, 70 insertions(+), 41 deletions(-) diff --git a/drivers/spmi/spmi-apple-controller.c b/drivers/spmi/spmi-apple= -controller.c index db03081796d1..8c9a70ba0422 100644 --- a/drivers/spmi/spmi-apple-controller.c +++ b/drivers/spmi/spmi-apple-controller.c @@ -41,9 +41,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 */ @@ -77,18 +77,26 @@ static void flush_extra_data(struct spmi_controller *ct= rl) } } =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 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; @@ -96,62 +104,82 @@ static int spmi_read_cmd(struct spmi_controller *ctrl,= u8 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) { - dev_err_ratelimited(&ctrl->dev, - "FIFO lacks reply data, controller stuck?\n"); + dev_err(&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)) { - buf[len_read++] =3D ((0xff << (8 * i)) & rsp) >> (8 * i); - i +=3D 1; - } + i =3D min_t(size_t, sizeof(spmi_cmd), len_read - ilen); + memcpy(ibuf + len_read, &rsp, i); + len_read +=3D i; } =20 flush_extra_data(ctrl); =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; - - 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); - - flush_extra_data(ctrl); +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) @@ -174,6 +202,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 08:29:12 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 B6CD240C5DD; Mon, 3 Aug 2026 13:02:59 +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=1785762181; cv=none; b=JSvN6hY3Uu7ESFsU4rgHZ13HFasqAO5rc9X5zXe1fyJoFtl7V5VNkLBmEaSYM+Q+3Lego/2+tzy0cMZwPp1+QIigRoZySrZ1hWuWp187/id7cYZz/U7CTY5S1QdHE10zMo0ifXQzJQPQrSLHsd2xcK7IQ8rvoNHedY2UoDIXDNc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785762181; c=relaxed/simple; bh=XZ27KXuY7asjhR0rrerZb9XoaDUi+0CTSSnjYRBoUEg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qo/5btSeNd4ND1Ju+dnY06kp7eaetLcBQHi/7U9MQJWK2hFT8C/4/bkNEtm0j8Uq0Tkqra3IXJY1tCMiSs5bsn3em+M+cxPWs/ERByOmXd0yQHIt8x+/U6TUNpbXy69clnUMjCby4drLIVBc/vfJf3EIqhsHatU8M3YZuQpG8uY= 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=xW/HgEfu; 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="xW/HgEfu" Received: by chaosmail.tech (Postfix) id F3B6F1C87FF; Mon, 03 Aug 2026 13:02:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chaosmail.tech; s=mail; t=1785762171; 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=JtnHVUij68ugKVFNvO+lp77TLC0lsYgiXF37zBgiZKc=; b=xW/HgEfuFzzzQ/KNZhSTF3F3wMKLF5ETRpCv+V03f+8NGOoWspfda9bpzK7p4TkiHKAtvc Pb5NaQvarTkSc6CAQi/V6l0n62s8HV1cb9hpm4+2DMZPIwqi2Trcqp7d/SjWOS1WmSzD2Y FSBnPUKvtDDS4+ztx0AkO8azwgfvwaw= From: Sasha Finkelstein Date: Mon, 03 Aug 2026 15:02:47 +0200 Subject: [PATCH v3 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: <20260803-t603x-spmi-v3-5-c17b506d91a1@chaosmail.tech> References: <20260803-t603x-spmi-v3-0-c17b506d91a1@chaosmail.tech> In-Reply-To: <20260803-t603x-spmi-v3-0-c17b506d91a1@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=1785762167; l=1319; i=k@chaosmail.tech; s=20241124; h=from:subject:message-id; bh=R5eyC9DfnU9OQAY/qaw5pqG1quhd+pGqseFeIWnwzeY=; b=/8f0Y4NXTrUVUUVggCYYD9IFuvH9l/eCCVhUznBVgvmU/uZdAYbIHBAMghpuHnomf17qEPMcK asBb4RNz/31BXUmPGcvZOOZNzOUaKYROjW4VWVDL4q5tx/VS0sfd8Bk 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 --- 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 8c9a70ba0422..74d4b5d98b11 100644 --- a/drivers/spmi/spmi-apple-controller.c +++ b/drivers/spmi/spmi-apple-controller.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include =20 @@ -35,6 +36,7 @@ =20 struct apple_spmi { void __iomem *regs; + struct mutex fifo_lock; }; =20 #define poll_reg(spmi, reg, val, cond) \ @@ -87,6 +89,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); + writel(spmi_cmd, spmi->regs + SPMI_CMD_REG); =20 while (i < len) { @@ -193,6 +197,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 08:29:12 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 B6C0740C5D4; Mon, 3 Aug 2026 13:02:59 +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=1785762181; cv=none; b=lI1pRyS/9fZD+8ZPVDghtIHsdekRioeou4F61lnX4Vg+JvUnv7CnpJE+BsIszMEzf9norf/JdhbG/Q5GFBtFJHMRBLOMoKsvbiTNpBJqv+sdAmVjbJwRllwKUaeHwYVi9CP7uOI4UNGydYNSGbO7taLLefKQiro/UGXOZft3WXA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785762181; c=relaxed/simple; bh=hr+CPR1UU6foBFfCJBFFMf2a4YS6s9byUc55G4Egc6Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uVly9YJ0fqHSH3T7NnMXH7VeWYQpp114afeL4kJg0yqxbBJ+IixA85+NYP9m5bm/G/iCx8wcyKmXjVU1gkjgqwuRIJe1yZlv1y4KW7IIUM+0RbaJ0UAvY92rAaz0USGOo5UosTv4d7xxj2p+4gB0hVwQQv8I2jiUHZ3KR0waO7M= 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=pgcbpQmf; 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="pgcbpQmf" Received: by chaosmail.tech (Postfix) id B66C71C8806; Mon, 03 Aug 2026 13:02:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chaosmail.tech; s=mail; t=1785762172; 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=NDdb+CMyRhdTUcdH4qnkn1fyvyG2mS8cNVpb/kFCn34=; b=pgcbpQmfckyhAPZ+JzSpP/whzXbnRCKfr/FCLLqBWFcPyFbCNCRGQmo0ZnhBdS2+vw6Tiw D6Bokx+NkLOzGs06H4HMQfMI/qiWju8yTZ5OE37diaC/FelEmvTcX5tvySvUXY0gebf642 U+8hfEbJ/PKtzPGg5/pOv44qd89oSnc= From: Sasha Finkelstein Date: Mon, 03 Aug 2026 15:02:48 +0200 Subject: [PATCH v3 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: <20260803-t603x-spmi-v3-6-c17b506d91a1@chaosmail.tech> References: <20260803-t603x-spmi-v3-0-c17b506d91a1@chaosmail.tech> In-Reply-To: <20260803-t603x-spmi-v3-0-c17b506d91a1@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=1785762167; l=10962; i=k@chaosmail.tech; s=20241124; h=from:subject:message-id; bh=SK5uE8tlc22L33jCoq5YmeRc0BeSKCcE8lj1k+A3AAc=; b=TkTQHQFmdZyQFviSf6RVgYzzBbSx4BbpBsp4mAU6NpxWs3nxOf6144I7H9gmA/6J0D5tr2hzY HKwXew2wDSZCuUbkq2xn9l147ebuJnHbZ3obrrshOGgjV5llkICGa99 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 --- drivers/spmi/Kconfig | 3 +- drivers/spmi/spmi-apple-controller.c | 251 +++++++++++++++++++++++++++++++= +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++= +++++++++++++++++++++++++++++++++- 2 files changed, 252 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 74d4b5d98b11..340d28126b3d 100644 --- a/drivers/spmi/spmi-apple-controller.c +++ b/drivers/spmi/spmi-apple-controller.c @@ -11,11 +11,17 @@ * spmi-pmic-arb.c Copyright (c) 2021, The Linux Foundation. */ =20 +#include +#include #include #include +#include +#include +#include #include #include #include +#include #include =20 /* SPMI Controller Registers */ @@ -23,6 +29,13 @@ #define SPMI_CMD_REG 0x4 #define SPMI_RSP_REG 0x8 =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_FIFO_RX 256 + /* SPMI_RSP_REG reply word */ #define SPMI_REPLY_FRAME_PARITY_STATUS GENMASK(31, 16) #define SPMI_REPLY_ACK BIT(15) @@ -37,6 +50,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 fifo_rx_irq; }; =20 #define poll_reg(spmi, reg, val, cond) \ @@ -55,7 +74,19 @@ static int apple_spmi_wait_rx_not_empty(struct spmi_cont= roller *ctrl) int ret; u32 status; =20 - ret =3D poll_reg(spmi, SPMI_STATUS_REG, status, !(status & SPMI_RX_FIFO_E= MPTY)); + if (spmi->fifo_rx_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) { dev_err(&ctrl->dev, "failed to wait for RX FIFO not empty\n"); @@ -91,6 +122,8 @@ static int spmi_raw_cmd(struct spmi_controller *ctrl, u8= opc, u8 sid, =20 guard(mutex)(&spmi->fifo_lock); =20 + reinit_completion(&spmi->fifo_rx); + writel(spmi_cmd, spmi->regs + SPMI_CMD_REG); =20 while (i < len) { @@ -186,6 +219,203 @@ static int spmi_cmd(struct spmi_controller *ctrl, u8 = opc, u8 sid) return -EINVAL; } =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 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_FIFO_RX / 32) * = 4); + if (val & BIT(SPMI_IRQ_FIFO_RX % 32)) { + apple_spmi_irq_ack_raw(spmi, SPMI_IRQ_FIFO_RX); + 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 int apple_spmi_init_irq(struct platform_device *pdev, + struct apple_spmi *spmi, int irq) +{ + 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->fifo_rx_irq =3D true; + apple_spmi_irq_unmask_raw(spmi, SPMI_IRQ_FIFO_RX); + + irq_set_chained_handler_and_data(spmi->irq, apple_spmi_irq_handler, spmi); + + return 0; +} + static int apple_spmi_probe(struct platform_device *pdev) { struct apple_spmi *spmi; @@ -198,6 +428,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)) @@ -209,6 +441,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, @@ -217,6 +458,13 @@ static int apple_spmi_probe(struct platform_device *pd= ev) return 0; } =20 +static void apple_spmi_remove(struct platform_device *pdev) +{ + struct apple_spmi *spmi =3D platform_get_drvdata(pdev); + + irq_set_chained_handler_and_data(spmi->irq, NULL, NULL); +} + static const struct of_device_id apple_spmi_match_table[] =3D { { .compatible =3D "apple,t8103-spmi", }, { .compatible =3D "apple,spmi", }, @@ -226,6 +474,7 @@ MODULE_DEVICE_TABLE(of, apple_spmi_match_table); =20 static struct platform_driver apple_spmi_driver =3D { .probe =3D apple_spmi_probe, + .remove =3D apple_spmi_remove, .driver =3D { .name =3D "apple-spmi", .of_match_table =3D apple_spmi_match_table, --=20 2.55.0