From nobody Sat Jul 25 04:15:51 2026 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF9FC3E0235 for ; Sat, 18 Jul 2026 16:07:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784390846; cv=none; b=PNpYZoEXGkSezdugeZiH/XKz36pow6k5d1xAl+bIqZk6/0ttDfHjtJlXct8RJfNZYG9kVTt1Re4SQLogqoaOTU+ZDzRKxZDvN+tk1QxnSzjI6tlR7W1uyvkrB/oMqvKQz44Kfdh7sv4HHbDXzLuOy2iEIV5TLU685OO0+GPJ+Ww= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784390846; c=relaxed/simple; bh=vMxi0GBCmk6kSxxY3msXn6b8DUdRebKtLoidNsiWryg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tut6Mxecxh77LWUIG3xkY7wO8PTmjKKkFDAPlfKo9OFqk3yWkR4ZSPKoEdRiToRoq42cYColLkVzj94/F5K7JRknNFyySQKCFwABGbDH2xioVT+NfD9LlwxICvfzZ09cr7j39uH46kB2neBUqz2vBu+Ro5KvS+QUuLXppCw1duQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.214.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2cc61541f8cso28563025ad.0 for ; Sat, 18 Jul 2026 09:07:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784390829; x=1784995629; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=lgLs8NK0XHHTysnGduh8WTtXMi/Zls+hjiJh2kwYBOI=; b=eISoi5qNqKKCRqL+Klzeg+eQhGIyXhTFb5nK4Xxmnk4va+lWjt0xY3DkTkLGurSISk QxG5UO8Z6zdyfk5YsVUV2FOMUSA7b2JOyt4b+GJqVxT6nCgPm3HBo4iYCgD5nerHe9pl VxIvdNnok0pNcB19gjJXaSfs6sDRF7xNoLew/Ab3rGONhdez79KAN6YrE19c445DdhtQ XyqwtTw/WvG0XwlTLvYykwVCnFdfBGQ8dLTpAqg0yYkdxfrPDYSl0RGlIOsUPPI3GBK6 9r+6pI2uzNlkxsYpMT/HeSLlNd34mXhfgFJzNLTyo7COWQaewVmhi64N3itsclvv2TVh vm2g== X-Forwarded-Encrypted: i=1; AHgh+RrEOPpHVmTPhf4W4GdPhyQzFSmKLMUZsSP9xi1EzgD8YJ6mB2PH4hSzlJQylc3H30q8UU9mj0p4bYozff0=@vger.kernel.org X-Gm-Message-State: AOJu0YySMcdYFLGWVIk45dLyp7X251teOOjsULG/lrqps6/dWACCUL2C sAwMv8oYwZmxdhc1pX226wQg7GkhV/8N6L46i8HE9ubH57fXg4TZDxo5WlSqybEbfg== X-Gm-Gg: AfdE7cny7SQAj5V+zGRs2URCtfvPE9HmlYbZPqIBzsvn+cetgzeo/Ll3bLI/52lA0lS 7KNR13/Cp97ioiKkglcu2AGh8CHtcNuXvxCcbtZcS6G9+GvnRhgoKzhoEJ60WYR0E5BAA720LiV aesYr+90jXc9v20+EtgnA908XAxCjFvvrurbOc1xNQdoREtRKtzkpxuDXCZlziranR8wNktKP76 KZSynANiZIqh+y8YfqhDEC7Z943LuxJKhkSk//k3zTzhNsUThwreL+uiDbWVxxe6WQalY+F0+bO WMSGei6wrujQv6B4waIEDplyN2ODH53ujeYR20/SAKIAixMpuZNTBKb9fAObwMm5s2r1grtAPRo 4k6J/XgnDW4aKVwkHfQcpxKdSC7KNMpAxSR5A4+cZDNcQ6oo7PAazj4+KgaIsH01EfNVsX7zUjN Z9Y8GC0I8PA2xG6ITRty/WMC7g3JnVmr3Q2U3BORoEApkmhu5o2hIml2zXbauCIm3Sn8i1rc/tG z6UjH+G1WGCEbQ= X-Received: by 2002:a17:902:f683:b0:2cc:db7a:251 with SMTP id d9443c01a7336-2cf1f2561eemr117409905ad.2.1784390828783; Sat, 18 Jul 2026 09:07:08 -0700 (PDT) Received: from penguin.tail0a1999.ts.net (61-228-48-72.dynamic-ip.hinet.net. [61.228.48.72]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cf344b16d4sm28996715ad.20.2026.07.18.09.07.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jul 2026 09:07:08 -0700 (PDT) From: Shih-Yuan Lee To: Mark Brown Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Shih-Yuan Lee Subject: [PATCH v14 1/3] spi: pxa2xx: disable DMA for Apple MacBook8,1 Date: Sun, 19 Jul 2026 00:07:00 +0800 Message-Id: <20260718160702.7861-2-fourdollars@debian.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260718160702.7861-1-fourdollars@debian.org> References: <20260718160702.7861-1-fourdollars@debian.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" On MacBook8,1 (early 2015 12" MacBook), the LPSS SPI controller at 00:15.4 suffers from hardware DMA handshake failures and interrupt routing bugs, causing keyboard/touchpad transactions to fail when DMA is enabled. Move the forced PIO mode DMI quirk to spi-pxa2xx-pci.c (the LPSS host controller PCI glue driver) to avoid layering violations in client drivers (such as applespi). Add an explicit DMI match table for MacBook8,1 and a module parameter spi_pxa2xx_force_pio to allow forcing PIO mode on demand. Link: https://bugzilla.kernel.org/show_bug.cgi?id=3D108331 Signed-off-by: Shih-Yuan Lee --- drivers/spi/spi-pxa2xx-pci.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-pxa2xx-pci.c b/drivers/spi/spi-pxa2xx-pci.c index cae77ac18520..31bdaa096d9e 100644 --- a/drivers/spi/spi-pxa2xx-pci.c +++ b/drivers/spi/spi-pxa2xx-pci.c @@ -18,9 +18,14 @@ =20 #include #include +#include =20 #include "spi-pxa2xx.h" =20 +static bool spi_pxa2xx_force_pio; +module_param_named(force_pio, spi_pxa2xx_force_pio, bool, 0444); +MODULE_PARM_DESC(force_pio, "Force PIO mode (disables DMA) for SPI transfe= rs. ([0] =3D disabled, 1 =3D enabled)"); + #define PCI_DEVICE_ID_INTEL_QUARK_X1000 0x0935 #define PCI_DEVICE_ID_INTEL_BYT 0x0f0e #define PCI_DEVICE_ID_INTEL_MRFLD 0x1194 @@ -93,6 +98,32 @@ static void lpss_dma_put_device(void *dma_dev) pci_dev_put(dma_dev); } =20 +static const struct dmi_system_id pxa2xx_spi_pci_dmi_table[] =3D { + { + .ident =3D "Apple MacBook8,1", + .matches =3D { + DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "MacBook8,1"), + }, + }, + { } +}; + +static bool pxa2xx_spi_pci_can_dma(struct pci_dev *dev) +{ + if (spi_pxa2xx_force_pio) { + pci_info(dev, "Forcing PIO mode (disabling DMA)\n"); + return false; + } + + if (dmi_check_system(pxa2xx_spi_pci_dmi_table)) { + pci_info(dev, "MacBook8,1 detected: disabling DMA to force PIO mode\n"); + return false; + } + + return true; +} + static int lpss_spi_setup(struct pci_dev *dev, struct pxa2xx_spi_controlle= r *c) { struct ssp_device *ssp =3D &c->ssp; @@ -166,7 +197,7 @@ static int lpss_spi_setup(struct pci_dev *dev, struct p= xa2xx_spi_controller *c) =20 c->dma_filter =3D lpss_dma_filter; c->dma_burst_size =3D 1; - c->enable_dma =3D 1; + c->enable_dma =3D pxa2xx_spi_pci_can_dma(dev); return 0; } =20 @@ -238,7 +269,7 @@ static int mrfld_spi_setup(struct pci_dev *dev, struct = pxa2xx_spi_controller *c) =20 c->dma_filter =3D lpss_dma_filter; c->dma_burst_size =3D 8; - c->enable_dma =3D 1; + c->enable_dma =3D pxa2xx_spi_pci_can_dma(dev); return 0; } =20 --=20 2.39.5 From nobody Sat Jul 25 04:15:51 2026 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 106B83DA7F8 for ; Sat, 18 Jul 2026 16:07:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784390842; cv=none; b=L3dvMNWTW/bA/8JH2sRE7RSn4b+5m2oScHgLSn+ZqnLFMEM9a/Z4eM6pNCuW4wNBRDuF+2FN0SaFBCD+JVEr8yS2mZCzwB+lTF4/K1XUa7jbOiMHF3WWArXtvbHTHtdkvypvBm+CdLByGuVRFgdxAP/n8ezRAKmh12OazHQZk4Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784390842; c=relaxed/simple; bh=YDnQFdPwCBW7eH/vBC0Y2pUr/Vy/Yrn1cOoNSxM0cQo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZBlz+9HCQJrlsFjgs7yRUzMHRavvYRx2PryqpzxC4aclde3AJuDQZH92/AMt5y5VipEiUmuxK2Jwj4p64OYCMUT3U6En/LiQHtNzA4WNH6nsLtaZDbSu1h8OBWNqcpA5J/R5bgd8wI2IhceugXazy+oKEHgTakJKC9Ufn0kZJsQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2cc7e86e7aeso59833755ad.2 for ; Sat, 18 Jul 2026 09:07:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784390831; x=1784995631; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=uM0tAwthgToT3VeGfMSnfwhxjrFH6rpjiLJxkB0QbHM=; b=CFcJFhQWUuRGP1Tzhh1i+4tlnPaKNWYZ1GmQgsSAamvNF4nNz7hs/vLL4N/7TrWvId kHSkz6G2BkXxj9H8OBb8bVGFnIF1PGIOp5TErv0YAb3X+pq1qz0GgEquJvuY+nQ3Xc1N 2K2xQczA6Ki0s2KjQVZYqCn3IezjrAVn6xPy7chI+MuJrN+l8mnH29dWdhW6HdeRnV4Q RpoYJ0fSePdKgEY96xup8pAOn8zXxevSUsW/JE9fQZ5NjBQoHALUeeAc6VxdDoCwF4RJ T/e8JEPxSZKZoMgkP+qcK4+/5LfYor9BF87MIICdBapupuJdcRS2tE1R73dWHdPMOzQ4 gggg== X-Forwarded-Encrypted: i=1; AHgh+Rp4BP2oFSh9TEixR/2+SBBNfvHE/zGO1fsP1kNXzUbQ/6OFlHqGbB0rEd2eqtMVKOdoFcZUHvePPclzyFo=@vger.kernel.org X-Gm-Message-State: AOJu0Yzi2jTue6It/Cl7wAOnd5CXgW9lNgFl50g1eZIIdnkRXlw6/K+i MxIvzq8Tmi6SI/F8Rn/LbqhYbRiRuZqtQihZe4LTzgDczI8uGQHloAa3YNPg8+DZ4Q== X-Gm-Gg: AfdE7ckP3zsB2PQnlW8EYLk+lw1oW666amhMJrwVIFzHh3p1RVdvcX4AvA0mn+qxrUD 98msnBYtnouQzRguX5l4rlenEWeZz7Vjw3WcVM7MDoZq1xW43S/TgSgu5vdGv9B3DpXPQj2YQHI ueF2iq9+CQYDBKy6YlJYNI/7MNNjWqvcryyJ3sKKGxxD+nliAKxXnsYE1CPBjJz+oRlYl5e/7Jf agkT2z5Ir9hPk0zUUzia8Q9KLwMoU7/FrpLgt72+6W/8zPtsY6ghTv0cjto5fSmIBY7NtTXS+oa j6j1zIKJ7AYcan6xu+2QpNz1wc80sWzHyMduxAroHujteIZnV+HLPjnlWUZmFQWYJBP3wcgijix hayyHX97NfJCOx/PV9Ecv01w5BhsLtJ07/cGcPMVQv6x8IO13yVYjolRmy84/+FczqV/6t9kHc5 Tk6VdA41p7qY6Ah8J8e2PmkU76YnI1Mf1/gnzBWKAJ2fC+f1HAFaenbCNcR4qBFdV+0WGc5OCRY 7DlfgKvVwk2nCg= X-Received: by 2002:a17:903:1b2e:b0:2ca:281:27f9 with SMTP id d9443c01a7336-2cf349978f5mr77899165ad.27.1784390830506; Sat, 18 Jul 2026 09:07:10 -0700 (PDT) Received: from penguin.tail0a1999.ts.net (61-228-48-72.dynamic-ip.hinet.net. [61.228.48.72]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cf344b16d4sm28996715ad.20.2026.07.18.09.07.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jul 2026 09:07:10 -0700 (PDT) From: Shih-Yuan Lee To: Mark Brown Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Shih-Yuan Lee Subject: [PATCH v14 2/3] spi: pxa2xx: fix runtime PM and interrupt handling in PIO mode Date: Sun, 19 Jul 2026 00:07:01 +0800 Message-Id: <20260718160702.7861-3-fourdollars@debian.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260718160702.7861-1-fourdollars@debian.org> References: <20260718160702.7861-1-fourdollars@debian.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When operating in PIO mode on Intel LPSS SPI controllers, runtime PM autosuspend clock-gates the hardware block, causing PCIe Completion Timeouts on subsequent MMIO accesses. To fix this: - Scope PIO mode autosuspend lockout (pm_runtime_get_noresume() / put_sync()) strictly to LPSS controllers via is_lpss_ssp(), preserving autosuspend for non-LPSS SoCs. - Acquire pm_runtime_get_noresume() exactly once in pxa2xx_spi_probe() after spi_register_controller() succeeds, and release it via pm_runtime_put_sync() in pxa2xx_spi_remove(). Using pm_runtime_put_sync() ensures the runtime PM state machine transitions to RPM_SUSPENDED upon driver unbind, preventing active child count leaks on the parent LPSS power domain. - Track clock state using drv_data->clk_enabled in helper functions pxa2xx_spi_clk_enable/disable() to prevent clock count underflows on error paths. - Protect ssp_int() using drv_data->clk_enabled and drv_data->suspended flags to return IRQ_NONE immediately if the device is suspended or unclocked, avoiding unclocked MMIO reads and level-triggered shared IRQ storms. Active SPI transfers hold a PM reference via the SPI core, preventing autosuspend during FIFO transfers. - Register IRQ in probe only after enabling the clock and clearing suspended. - Overhaul teardown sequence in pxa2xx_spi_remove(), suspend, and runtime_suspend: first disable SSP hardware IRQ generation via pxa_ssp_disable(), set suspended flag, synchronize IRQ to drain in-flight handlers, and then disable clocks. - Guard MMIO access in pxa2xx_spi_runtime_suspend() with drv_data->clk_enabled check. Link: https://bugzilla.kernel.org/show_bug.cgi?id=3D108331 Signed-off-by: Shih-Yuan Lee --- drivers/spi/spi-pxa2xx.c | 138 +++++++++++++++++++++++++++++---------- drivers/spi/spi-pxa2xx.h | 3 + 2 files changed, 108 insertions(+), 33 deletions(-) diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 6291d7c2e06f..443800bffbeb 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -72,7 +72,12 @@ struct chip_data { #define LPSS_CAPS_CS_EN_SHIFT 9 #define LPSS_CAPS_CS_EN_MASK (0xf << LPSS_CAPS_CS_EN_SHIFT) =20 -#define LPSS_PRIV_CLOCK_GATE 0x38 +/* Offsets from drv_data->lpss_base */ +#define LPSS_PRIV_RESETS 0x04 +#define LPSS_PRIV_RESETS_IDMA BIT(2) +#define LPSS_PRIV_RESETS_FUNC 0x3 + +#define LPSS_PRIV_CLOCK_GATE 0x38 #define LPSS_PRIV_CLOCK_GATE_CLK_CTL_MASK 0x3 #define LPSS_PRIV_CLOCK_GATE_CLK_CTL_FORCE_ON 0x3 #define LPSS_PRIV_CLOCK_GATE_CLK_CTL_FORCE_OFF 0x0 @@ -713,6 +718,28 @@ static void handle_bad_msg(struct driver_data *drv_dat= a) dev_err(drv_data->ssp->dev, "bad message state in interrupt handler\n"); } =20 +static int pxa2xx_spi_clk_enable(struct driver_data *drv_data) +{ + int status; + + if (drv_data->clk_enabled) + return 0; + + status =3D clk_prepare_enable(drv_data->ssp->clk); + if (status =3D=3D 0) + drv_data->clk_enabled =3D true; + + return status; +} + +static void pxa2xx_spi_clk_disable(struct driver_data *drv_data) +{ + if (drv_data->clk_enabled) { + clk_disable_unprepare(drv_data->ssp->clk); + drv_data->clk_enabled =3D false; + } +} + static irqreturn_t ssp_int(int irq, void *dev_id) { struct driver_data *drv_data =3D dev_id; @@ -721,19 +748,18 @@ static irqreturn_t ssp_int(int irq, void *dev_id) u32 status; =20 /* - * The IRQ might be shared with other peripherals so we must first - * check that are we RPM suspended or not. If we are we assume that - * the IRQ was not for us (we shouldn't be RPM suspended when the - * interrupt is enabled). + * The IRQ might be shared with other peripherals or trigger during + * power state transitions. First check if device is suspended or if + * clock is disabled; if so, return IRQ_NONE immediately to avoid + * unclocked MMIO reads. */ - if (pm_runtime_suspended(drv_data->ssp->dev)) + if (drv_data->suspended || !drv_data->clk_enabled) return IRQ_NONE; =20 /* - * If the device is not yet in RPM suspended state and we get an - * interrupt that is meant for another device, check if status bits - * are all set to one. That means that the device is already - * powered off. + * If the device is not yet suspended and we get an interrupt that is + * meant for another device, check if status bits are all set to one. + * That means that the device is already powered off. */ status =3D pxa2xx_spi_read(drv_data, SSSR); if (status =3D=3D ~0) @@ -1288,6 +1314,7 @@ int pxa2xx_spi_probe(struct device *dev, struct ssp_d= evice *ssp, drv_data->controller =3D controller; drv_data->controller_info =3D platform_info; drv_data->ssp =3D ssp; + drv_data->suspended =3D true; /* Start suspended until clock is enabled */ =20 /* The spi->mode bits understood by this driver: */ controller->mode_bits =3D SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LOOP; @@ -1330,10 +1357,6 @@ int pxa2xx_spi_probe(struct device *dev, struct ssp_= device *ssp, | SSSR_ROR | SSSR_TUR; } =20 - status =3D request_irq(ssp->irq, ssp_int, IRQF_SHARED, dev_name(dev), - drv_data); - if (status < 0) - return dev_err_probe(dev, status, "cannot get IRQ %d\n", ssp->irq); =20 /* Setup DMA if requested */ if (platform_info->enable_dma) { @@ -1352,9 +1375,18 @@ int pxa2xx_spi_probe(struct device *dev, struct ssp_= device *ssp, } =20 /* Enable SOC clock */ - status =3D clk_prepare_enable(ssp->clk); + status =3D pxa2xx_spi_clk_enable(drv_data); if (status) - goto out_error_dma_irq_alloc; + goto out_error_dma_alloc; + + drv_data->suspended =3D false; + + status =3D request_irq(ssp->irq, ssp_int, IRQF_SHARED, dev_name(dev), + drv_data); + if (status < 0) { + status =3D dev_err_probe(dev, status, "cannot get IRQ %d\n", ssp->irq); + goto out_error_clock_enabled; + } =20 controller->max_speed_hz =3D clk_get_rate(ssp->clk); /* @@ -1434,7 +1466,7 @@ int pxa2xx_spi_probe(struct device *dev, struct ssp_d= evice *ssp, "ready", GPIOD_OUT_LOW); if (IS_ERR(drv_data->gpiod_ready)) { status =3D PTR_ERR(drv_data->gpiod_ready); - goto out_error_clock_enabled; + goto out_error_irq_alloc; } } =20 @@ -1443,17 +1475,22 @@ int pxa2xx_spi_probe(struct device *dev, struct ssp= _device *ssp, status =3D spi_register_controller(controller); if (status) { dev_err_probe(dev, status, "problem registering SPI controller\n"); - goto out_error_clock_enabled; + goto out_error_irq_alloc; } =20 + if (is_lpss_ssp(drv_data) && !platform_info->enable_dma) + pm_runtime_get_noresume(dev); + return status; =20 +out_error_irq_alloc: + free_irq(ssp->irq, drv_data); + out_error_clock_enabled: - clk_disable_unprepare(ssp->clk); + pxa2xx_spi_clk_disable(drv_data); =20 -out_error_dma_irq_alloc: +out_error_dma_alloc: pxa2xx_spi_dma_release(drv_data); - free_irq(ssp->irq, drv_data); =20 return status; } @@ -1466,16 +1503,26 @@ void pxa2xx_spi_remove(struct device *dev) =20 spi_unregister_controller(drv_data->controller); =20 - /* Disable the SSP at the peripheral and SOC level */ + /* Disable SSP interrupt generation on hardware level while clock is acti= ve */ pxa_ssp_disable(ssp); - clk_disable_unprepare(ssp->clk); =20 - /* Release DMA */ - if (drv_data->controller_info->enable_dma) - pxa2xx_spi_dma_release(drv_data); + /* Mark as suspended to prevent further IRQ handling */ + drv_data->suspended =3D true; + + /* Wait for any pending interrupt handlers to complete */ + synchronize_irq(ssp->irq); =20 /* Release IRQ */ free_irq(ssp->irq, drv_data); + + /* Safe to disable the SSP clock now */ + pxa2xx_spi_clk_disable(drv_data); + + /* Release DMA */ + if (drv_data->controller_info->enable_dma) + pxa2xx_spi_dma_release(drv_data); + else if (is_lpss_ssp(drv_data)) + pm_runtime_put_sync(dev); } EXPORT_SYMBOL_NS_GPL(pxa2xx_spi_remove, "SPI_PXA2xx"); =20 @@ -1490,10 +1537,10 @@ static int pxa2xx_spi_suspend(struct device *dev) return status; =20 pxa_ssp_disable(ssp); + drv_data->suspended =3D true; + synchronize_irq(ssp->irq); =20 - if (!pm_runtime_suspended(dev)) - clk_disable_unprepare(ssp->clk); - + pxa2xx_spi_clk_disable(drv_data); return 0; } =20 @@ -1505,28 +1552,53 @@ static int pxa2xx_spi_resume(struct device *dev) =20 /* Enable the SSP clock */ if (!pm_runtime_suspended(dev)) { - status =3D clk_prepare_enable(ssp->clk); + status =3D pxa2xx_spi_clk_enable(drv_data); if (status) return status; } =20 + if (is_lpss_ssp(drv_data)) + lpss_ssp_setup(drv_data); + + drv_data->suspended =3D false; + /* Start the queue running */ - return spi_controller_resume(drv_data->controller); + status =3D spi_controller_resume(drv_data->controller); + if (status) { + drv_data->suspended =3D true; + synchronize_irq(ssp->irq); + pxa2xx_spi_clk_disable(drv_data); + return status; + } + + return 0; } =20 static int pxa2xx_spi_runtime_suspend(struct device *dev) { struct driver_data *drv_data =3D dev_get_drvdata(dev); =20 - clk_disable_unprepare(drv_data->ssp->clk); + if (!drv_data->clk_enabled) + return 0; + + pxa_ssp_disable(drv_data->ssp); + drv_data->suspended =3D true; + synchronize_irq(drv_data->ssp->irq); + pxa2xx_spi_clk_disable(drv_data); return 0; } =20 static int pxa2xx_spi_runtime_resume(struct device *dev) { struct driver_data *drv_data =3D dev_get_drvdata(dev); + int status; + + status =3D pxa2xx_spi_clk_enable(drv_data); + if (status) + return status; =20 - return clk_prepare_enable(drv_data->ssp->clk); + drv_data->suspended =3D false; + return 0; } =20 EXPORT_NS_GPL_DEV_PM_OPS(pxa2xx_spi_pm_ops, SPI_PXA2xx) =3D { diff --git a/drivers/spi/spi-pxa2xx.h b/drivers/spi/spi-pxa2xx.h index 447be0369384..44f37bf9c519 100644 --- a/drivers/spi/spi-pxa2xx.h +++ b/drivers/spi/spi-pxa2xx.h @@ -72,6 +72,9 @@ struct driver_data { =20 void __iomem *lpss_base; =20 + bool suspended; + bool clk_enabled; + /* Optional slave FIFO ready signal */ struct gpio_desc *gpiod_ready; }; --=20 2.39.5 From nobody Sat Jul 25 04:15:51 2026 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 178B23DCD9A for ; Sat, 18 Jul 2026 16:07:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784390843; cv=none; b=ajHScHjBw1oy72EURuCZaHM9FCw1SZxmTFTqYXy8gw+btSOI9Z0tKybRtTaPIdlmaHD/WOFYhZdbbogYu5R5oPZ3spgbDt078BYeMMrU0bSKoL8a/XuRWbh3P/15t2VJgWtLnnuBLVsxWDokwbx0sqC45/dvseV2ltJaPZfOu4E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784390843; c=relaxed/simple; bh=hoX/TWo6r/94eyI3ahhuk2BDP1Nd7ZgqQk6yVk0sUDM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ntspHsN4gsaSCf+YJf0kXqWf9djSQL2DAc0Qz59sE5RoGELb2aKalSK1oaafwZR6+KddT5wteahHdNlb63DiNDHhTR0V9pEMk0BjIipfDtxoK0boYxburgk8Cxb7jAA12n33f/aLwdUOweSsMF3LrL/VSSJQzYxWfA7nxjTdItw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.214.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2cacb8416a1so53688175ad.1 for ; Sat, 18 Jul 2026 09:07:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784390832; x=1784995632; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=O+m7QRADgnNK6LEYYEyJLdDHpqpIoQWfFeq6ZiuFaq8=; b=d8WfTn4i+4nGo2ukCURBobTwQNoSXLtRhOf8ppvBJOxt/gWd0JzAGEr+X5rm0/VeEt 2jJ2FespEZgY28VpAcYhhATg5c4mfxj7El2GiP4StUlp8xZRGPZKjjI10nWSHarEnnaR awxiZizAywLrqd3EOYu3y8DZ3TawrBFp4uS1thg2hNJA5cBlq7nMNW0ajqYwEb9ZNtCG s7lhqYbVmfcHBvLukB+fXjNmt7sOTs+WyOU5RhXCAKQ2agnDhtDaWDNn4J8dKMMFnZL5 z81RYUsL2uRufqaHU4bjzrG6oB9cZOLm7wQLZACLaMvW/Rt7ZjnrKiA8Q1dgpT83pCi3 HqsA== X-Forwarded-Encrypted: i=1; AHgh+RosN5c9cYTiQ7zi8uC1OCH/JLAJ1wVsc9Nk5UmZnFMs7pcL+IfNmRkSs0RsMoW8LD7svQqtdsY/BLZRAUY=@vger.kernel.org X-Gm-Message-State: AOJu0YyY+D7umbBUsyXTLfVju64AWS4dDSIlAHannzx36l37+b+3d/Uv IoInUgSPAmkd3DuWDRWcXYSZZY6WYbo3Gpel7n77lNIEglyAnjMtZ+Q= X-Gm-Gg: AfdE7clckE2zMoUVQtctRxdI6HbNgmDO5N4kmuHDOcXd1EKNaExZGNjFMQBaNyFOfJz 4IH3eg3oIarKFVXVw7lKKVsQyI4CGWMGw5r7U414XwsXrzINQmfAssWGSTPmVipoSkaCtMgh0FJ DKylZQI3Fz0UWUt5OgrUf08IFlGCgpEZgKz4tSP97gwOAXw2sM10LU0ONC9P/v7zMAm4yj/+r8g 3ZL1KjVCgbBjx2ZWs4TYp6R25Az6IxqR+h0lCna65/ffOmu7TSP3pq5yMZfRcBHDj926MfV41ix LZgwpnQdQEE5ELQpOo22Z9Ga7/+62SeQFMs1O85rJKpZWWkYk6a1T7ctYfthexWLcfcLka/j+bV UTewbaWFZUPttg3wVMaxhDvHxgNJphpYsfuL0vxfd8onJQhTNPrxg3wkJp9jkM1SYk5xvR1lSI8 JF5dbIV7XDTokoQy3Goyxsa8IgaZsXsnbez/IiuHr/evTVBuB8TspOGwUo+e1GoUb3eZVxv+uhO 7t2d/QCwu/0FJABFdOHQM32Pw== X-Received: by 2002:a17:902:ce84:b0:2ce:d957:59c4 with SMTP id d9443c01a7336-2cf348369cfmr78925025ad.6.1784390832468; Sat, 18 Jul 2026 09:07:12 -0700 (PDT) Received: from penguin.tail0a1999.ts.net (61-228-48-72.dynamic-ip.hinet.net. [61.228.48.72]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cf344b16d4sm28996715ad.20.2026.07.18.09.07.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jul 2026 09:07:11 -0700 (PDT) From: Shih-Yuan Lee To: Mark Brown Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Shih-Yuan Lee Subject: [PATCH v14 3/3] spi: pxa2xx: restore LPSS private register state on S3 resume Date: Sun, 19 Jul 2026 00:07:02 +0800 Message-Id: <20260718160702.7861-4-fourdollars@debian.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260718160702.7861-1-fourdollars@debian.org> References: <20260718160702.7861-1-fourdollars@debian.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Intel LPSS SPI controllers lose all private register state across S3 suspend because the LPSS power domain is fully removed. On resume the driver only re-enables the SSP clock, leaving the LPSS private registers in their power-on-reset state, which causes two problems: 1. LPSS_PRIV_RESETS (offset 0x04 within the LPSS private space) stays zero, keeping the functional block in reset. Any MMIO access while the block is held in reset causes a PCIe Completion Timeout and a watchdog-triggered system reset. LPSS_PRIV_RESETS_FUNC and LPSS_PRIV_RESETS_IDMA must be de-asserted before any other register access on resume. 2. The LPSS software chip-select control register must not be blindly restored from its suspend-time snapshot: if CS was asserted at the moment of suspend, restoring that state corrupts the first post-resume SPI transaction. Instead, call lpss_ssp_setup() which unconditionally writes SW_MODE | CS_HIGH (idle/deasserted), matching the state established at probe time. To resolve these issues safely: - Wrap S3 suspend/resume with pm_runtime_resume_and_get() and pm_runtime_put_autosuspend() to guarantee active clocks during MMIO access and preserve PM reference counting. - Restrict LPSS private register save/restore to LPT, BYT, and BSW platforms via pxa2xx_spi_need_lpss_restore() (newer platforms are handled by intel-lpss.c). - Save only the first 6 LPSS private registers (offsets 0x00..0x14) in drv_data during suspend, avoiding reserved offsets beyond 0x14. - On resume, de-assert resets first, restore saved registers, call lpss_ssp_setup(), and clear drv_data->suspended to prevent unclocked IRQ access. - Add error recovery paths for spi_controller_suspend/resume failures. Link: https://bugzilla.kernel.org/show_bug.cgi?id=3D108331 Signed-off-by: Shih-Yuan Lee --- drivers/spi/spi-pxa2xx.c | 94 +++++++++++++++++++++++++++++++++++++--- drivers/spi/spi-pxa2xx.h | 1 + 2 files changed, 89 insertions(+), 6 deletions(-) diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 443800bffbeb..864b9ca61bb2 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -194,6 +194,18 @@ static bool is_lpss_ssp(const struct driver_data *drv_= data) } } =20 +static bool pxa2xx_spi_need_lpss_restore(const struct driver_data *drv_dat= a) +{ + switch (drv_data->ssp_type) { + case LPSS_LPT_SSP: + case LPSS_BYT_SSP: + case LPSS_BSW_SSP: + return true; + default: + return false; + } +} + static bool is_quark_x1000_ssp(const struct driver_data *drv_data) { return drv_data->ssp_type =3D=3D QUARK_X1000_SSP; @@ -1532,16 +1544,46 @@ static int pxa2xx_spi_suspend(struct device *dev) struct ssp_device *ssp =3D drv_data->ssp; int status; =20 - status =3D spi_controller_suspend(drv_data->controller); - if (status) + status =3D pm_runtime_resume_and_get(dev); + if (status < 0) return status; =20 + status =3D spi_controller_suspend(drv_data->controller); + if (status) { + spi_controller_resume(drv_data->controller); + goto out_put; + } + + /* Disable SSP interrupt generation on hardware level while clock is acti= ve */ pxa_ssp_disable(ssp); + + /* Mark as suspended and synchronize IRQ before disabling clock */ drv_data->suspended =3D true; synchronize_irq(ssp->irq); =20 + if (pxa2xx_spi_need_lpss_restore(drv_data)) { + unsigned int i; + + /* + * Save the first 6 LPSS private registers (offsets 0x00 to 0x14) + * while the clock is still enabled. They are lost when the LPSS + * power domain is removed across S3 and must be restored on resume. + * Use drv_data->lpss_base so the correct per-platform offset + * is applied regardless of LPSS IP revision. + * Registers beyond 0x14 (except CS control at 0x18) are reserved + * or unimplemented on LPT, and accessing them triggers a PCIe + * Completion Timeout causing a system halt. + */ + for (i =3D 0; i < 6; i++) + drv_data->lpss_priv_ctx[i] =3D readl(drv_data->lpss_base + i * 4); + } + pxa2xx_spi_clk_disable(drv_data); return 0; + +out_put: + pm_runtime_put_noidle(dev); + return status; } =20 static int pxa2xx_spi_resume(struct device *dev) @@ -1554,12 +1596,47 @@ static int pxa2xx_spi_resume(struct device *dev) if (!pm_runtime_suspended(dev)) { status =3D pxa2xx_spi_clk_enable(drv_data); if (status) - return status; + goto out_put; } =20 - if (is_lpss_ssp(drv_data)) + if (pxa2xx_spi_need_lpss_restore(drv_data)) { + unsigned int i; + + /* + * The LPSS power domain is removed across S3, taking + * all private registers with it. De-assert the + * functional block and IDMA resets first; any MMIO + * access while the block is held in reset causes a + * PCIe Completion Timeout and a watchdog-triggered + * system reset. + */ + writel(LPSS_PRIV_RESETS_FUNC | LPSS_PRIV_RESETS_IDMA, + drv_data->lpss_base + LPSS_PRIV_RESETS); + + /* Restore the other 5 saved private registers */ + for (i =3D 0; i < 6; i++) { + if (i =3D=3D LPSS_PRIV_RESETS / 4) + continue; + writel(drv_data->lpss_priv_ctx[i], + drv_data->lpss_base + i * 4); + } + } + + if (is_lpss_ssp(drv_data)) { + /* + * Re-initialise the SW chip-select control register so + * CS starts deasserted (SW_MODE | CS_HIGH), regardless + * of the state it was in at suspend time. A stale + * asserted CS on the first post-resume transaction + * corrupts the write-status response from the device. + */ lpss_ssp_setup(drv_data); + } =20 + /* + * Now that resets are de-asserted and registers are restored, + * it is safe to handle interrupts. + */ drv_data->suspended =3D false; =20 /* Start the queue running */ @@ -1568,10 +1645,15 @@ static int pxa2xx_spi_resume(struct device *dev) drv_data->suspended =3D true; synchronize_irq(ssp->irq); pxa2xx_spi_clk_disable(drv_data); - return status; + goto out_put; } =20 - return 0; +out_put: + /* Let runtime PM autosuspend again if needed */ + pm_runtime_mark_last_busy(dev); + pm_runtime_put_autosuspend(dev); + + return status; } =20 static int pxa2xx_spi_runtime_suspend(struct device *dev) diff --git a/drivers/spi/spi-pxa2xx.h b/drivers/spi/spi-pxa2xx.h index 44f37bf9c519..48169494f74e 100644 --- a/drivers/spi/spi-pxa2xx.h +++ b/drivers/spi/spi-pxa2xx.h @@ -71,6 +71,7 @@ struct driver_data { irqreturn_t (*transfer_handler)(struct driver_data *drv_data); =20 void __iomem *lpss_base; + u32 lpss_priv_ctx[6]; =20 bool suspended; bool clk_enabled; --=20 2.39.5