From nobody Sat Jul 25 04:30:07 2026 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 7A27D2FF164 for ; Sat, 18 Jul 2026 06:11:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784355074; cv=none; b=V37cKP+h6Q+DiUaTaSJHicwCKbZVOsVKq1SsarBlbGrdNEClM0+6FS4To/6hC0X2FB+vQj0qzCFyZ570wWSD82jIKCZ5+4bHwkTz0uesPzVTG5xzSHtXm35B345If71L5s8gxg7RqHPzB//PozYXSLiJc/pz52IXMLIq9MRlU68= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784355074; c=relaxed/simple; bh=vMxi0GBCmk6kSxxY3msXn6b8DUdRebKtLoidNsiWryg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ONV9P9tCClCYZoc74vxu63O0wwHXaI14A9QwH0hUNcCEZ3OcJZ3gF5a3drXwj5d97kR8UrZFeYZ8Uo+uNve9fUQt4Q7Mj6q5Agu06dLTkzRGKB48DhCjalaBAOiWzODCOa+q8xC0ZBJde/o3uWPpU42jakgUpwXaTE5tP3ktTpQ= 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.176 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-f176.google.com with SMTP id d9443c01a7336-2cab973140bso105282455ad.3 for ; Fri, 17 Jul 2026 23:11:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784355073; x=1784959873; 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=FzuaVSoxMq05eU2BJwnzECOGtqQq1o9MhOmVHByL1oWXAgwNGS8Ueyv2BYVfSfbAwS UzszSwCBwNw6xiPmL8+23gVbfJuT/7P8kUpPp4Q8e3bV7jzeVMBzuXh+Ri9MDyKhQ+m/ sWmeC5Hv9ry/Irc3AjNSoE2WHIGynRDQeusEBdOTJH7casr4PmqondQ4ZZJ/i+6fsPaT /sn9Md6HAqgTYHwKQBiJHrJPjaDAyLp+ze3K6KdcWugYIoo6cA766mybKwN56iukvEBE i3qDwV1vJupL0YUSvjAu7THPSiX5Rx9NvMdou1wyTwF02vCMPgVwHyf2rtsumHESe0wm AOLA== X-Forwarded-Encrypted: i=1; AHgh+RrN2qSSN9FUOSj266Jr4FMJapuCrz84/MT0uzftCfFmxxmvfwdw1msO51jx1aMFpI1lf3F9CW+sPTlbG60=@vger.kernel.org X-Gm-Message-State: AOJu0YyATDPQFmBlkgciUd1kn3iwXq/q94TggKmhjunOM4LetxJJ73r4 0QrDxo/7AID9KmU2BtR3F20Bur1sb6BBWW9u9QMSEWcBlqhnv368wQJgwd7U8iRcmw== X-Gm-Gg: AfdE7cmB5uhs9NQ2+Fyvwv7BdLpBFNsDH6fPzQWAHVAZCkF5ClgdzB6Vel9/6I4g8xv rd9fMKNq077+zKEZvTHS42bPw4usDZhRycIndwoPPNaW1671KeFhm5walJqwsl/8eQJBy2Adz+q NvACSKUwVi/d9+CT5SSmzk48EeaiGihhFWWKAJvsA5okI947Ebh8/DQjfTJiGANa6wg2lflkR4F yroiTgztXaSUVAxSOkS6Du8gUtUmGUb9UoQKuDdf0wUQjlImfEm8vmOvIezRp6iG/LXSJ78tZ2y LhN+0m66K3/igdF6x/+XfYffHzfHeBuxljDLitlZynfQrVTY5ur/uITLcJJAp5L2/bTqsClAyFL hsFDmH8EdcmYueHK7vrPS0k77AY3Xg4mTCJMTdnRk7LbP7an5AKthYXDv/EkXS0aFvly6J0n2Yp UnGmFpPb8GwJ/55CuBHiOkmtdUhvCAPW/zsS0zUzYOcB+pRsLR4vsIZkMq5Txthtb58XK3zf0IF IaBjtiDAYi0gWM= X-Received: by 2002:a17:903:1c8:b0:2cc:f7c6:834e with SMTP id d9443c01a7336-2cf349a3e33mr62796625ad.32.1784355072648; Fri, 17 Jul 2026 23:11: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-2cf346db04csm22799025ad.42.2026.07.17.23.11.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2026 23:11:12 -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 v9 1/3] spi: pxa2xx: disable DMA for Apple MacBook8,1 Date: Sat, 18 Jul 2026 14:10:54 +0800 Message-Id: <20260718061056.30961-2-fourdollars@debian.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260718061056.30961-1-fourdollars@debian.org> References: <20260718061056.30961-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:30:07 2026 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 1C69235B62C for ; Sat, 18 Jul 2026 06:11:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784355077; cv=none; b=qV4PiuQu0hvhO1GygYksJ3II0ma9wu0XP7/jxKx9JLXXIQovPM7h+/teLgnS1hqxsRQYqVFWcM/fLH6EI7VBwwyrUu7+DupeqKqGsTguCXlEbOpKn8DdjuigTWYsL3XEGPOCVVCGiHInb6L/e+D4PIg9BLBwCLn/XplhKaGXgz4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784355077; c=relaxed/simple; bh=qV/p2+XkNVwVkJSEt92jFP9tfNk6pbvI/hvveSN3nZs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tjcauWLXRJ9Ym/v1Z8B5VTgrMQwQgXuzvU8p8I0lhKVH19jOxtaa2gj0ovRDVNhnQoWQWbRi87x9cdKRw0eIecUMgvOCeHbJUwdTb5Ol4x1Dxugx8anvjn3JieWGNsgojLdZ8ghRxbgXON7TfHdisPTIsl/cniYUn2UBwSQx/BM= 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.181 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-f181.google.com with SMTP id d9443c01a7336-2cf27856f9cso27413195ad.2 for ; Fri, 17 Jul 2026 23:11:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784355074; x=1784959874; 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=T8Rq1JpfQ8zra8E3axpyRApcqas+zAJicSHtMtGOCGg=; b=sdDDM4fTng0i2SASxRJbW7QoP7kNkDXELjPDp4/XjWAtHx7n6EHSfqIMCi9mcGIaLL +BHFM9fswT7si2cFrL5NQfotry3K/W5Ydw8Zf1l8PXLGuN24WG0pH0+QW3zYEhJbOwm5 s/2B9q0X2N8mjo4igk/L3PJmD1eg2ig/b/tOLiaQlOBLNjWTgP/gH5Z5+B/sWGvYq4mK Naj2RFmOrCmpM3apsMcBxHHOQJuFXrkTOMvUawq4W3Cyqjh3nZevQWmy4kZYKtvDLHdA RvY4HvXlq7xcydBoX0+jWUelPKMl8uVX/v7i7+SkF/LqNv5Fq2HnqNd/LUp5+Llg+aKu xoEQ== X-Forwarded-Encrypted: i=1; AHgh+Rqc+6N/nIU1png/+LZ1rgloOSImgyg/i6drqBjYOuu7t4j9owkEPE1QYfSa/EHL3dbG+OaMi43UTtBwAWY=@vger.kernel.org X-Gm-Message-State: AOJu0Yxyb6FLHtI9PgMpd3zQIkxQ+yc+5XL2x27NAOI6Z/dMh58oRJ0K 9/WDlav7e5IK1KtMJQ6/qe0u2VNHKffVXnFS7Y6dy5ghii5Og2+VCso= X-Gm-Gg: AfdE7cmf96/M0XgzYti4R6k0Ifyuflcr5ItbWhFUSCTQhRZWZnSJ5yHN3A2+DLOWFMv rTGl/GDj5LXiMgmcj59OVapC6AVmRDk02CkUS4HGkJoPmFgfP/r/3hoHmQocpQPGi8ri+Yh5JnK fh+qzMfxnzwVIK9Jrl9H4Yi1TiDsMCmjAZAK5sOTJy3NK9sFkIdwDcyUHfN72wkA6fbUp3VwGPp ikskHEWdy9vH9as7JDJFNX55kj1yAYC8HjYzNbxooY9l7JoNwhvRwVWIHiJ4mS8jZeMG7QVIMT5 ywpO4IbEmKKD1gGC23f3MeuNO8WklSYR4pU2p3A6oKEmHGz3oDYKOIwQzom8Ym+Ib1dNrwdhKgW gCIIFNpnLyf7MXd76JZOgS0jfZ3owce7dzMYvDXKeLqhYH2TFoR2wH8uPLkHucP/6pF4koLGlLo DSQEnzx4CrA2lL1UD6Ze8s9r6BeFKmwHJCYvg6Ayc3A2ASua27MxAth6nsiN/REgg0ELejC17ga 2M2evhjJKn3UD/6ttTS7GgwhA== X-Received: by 2002:a17:902:e752:b0:2cc:85a7:36ee with SMTP id d9443c01a7336-2cf349910d3mr61240535ad.32.1784355074379; Fri, 17 Jul 2026 23:11:14 -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-2cf346db04csm22799025ad.42.2026.07.17.23.11.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2026 23:11:13 -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 v9 2/3] spi: pxa2xx: fix runtime PM and interrupt handling in PIO mode Date: Sat, 18 Jul 2026 14:10:55 +0800 Message-Id: <20260718061056.30961-3-fourdollars@debian.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260718061056.30961-1-fourdollars@debian.org> References: <20260718061056.30961-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_noidle()) to LPSS controllers via is_lpss_ssp(), preserving autosuspend for non-LPSS SoCs. - 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 avoid unclocked MMIO reads and level-triggered shared IRQ storms. - Register IRQ in probe only after enabling the clock and clearing suspended. - Overhaul pxa2xx_spi_remove() teardown sequence: disable SSP hardware IRQ, set suspended flag, synchronize IRQ, free IRQ, and 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 | 161 +++++++++++++++++++++++++++++---------- drivers/spi/spi-pxa2xx.h | 3 + 2 files changed, 125 insertions(+), 39 deletions(-) diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 6291d7c2e06f..4491ae0ee8ac 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,22 +718,42 @@ static void handle_bad_msg(struct driver_data *drv_da= ta) 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; u32 sccr1_reg; u32 mask =3D drv_data->mask_sr; u32 status; + int active; + irqreturn_t ret =3D IRQ_NONE; =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). - */ - if (pm_runtime_suspended(drv_data->ssp->dev)) + if (drv_data->suspended || !drv_data->clk_enabled) return IRQ_NONE; =20 + active =3D pm_runtime_get_if_active(drv_data->ssp->dev); + /* * 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 @@ -737,7 +762,7 @@ static irqreturn_t ssp_int(int irq, void *dev_id) */ status =3D pxa2xx_spi_read(drv_data, SSSR); if (status =3D=3D ~0) - return IRQ_NONE; + goto out_put; =20 sccr1_reg =3D pxa2xx_spi_read(drv_data, SSCR1); =20 @@ -750,7 +775,7 @@ static irqreturn_t ssp_int(int irq, void *dev_id) mask &=3D ~SSSR_TINT; =20 if (!(status & mask)) - return IRQ_NONE; + goto out_put; =20 pxa2xx_spi_write(drv_data, SSCR1, sccr1_reg & ~drv_data->int_cr1); pxa2xx_spi_write(drv_data, SSCR1, sccr1_reg); @@ -758,10 +783,19 @@ static irqreturn_t ssp_int(int irq, void *dev_id) if (!drv_data->controller->cur_msg) { handle_bad_msg(drv_data); /* Never fail */ - return IRQ_HANDLED; + ret =3D IRQ_HANDLED; + goto out_put; } =20 - return drv_data->transfer_handler(drv_data); + ret =3D drv_data->transfer_handler(drv_data); + +out_put: + if (active > 0) { + pm_runtime_mark_last_busy(drv_data->ssp->dev); + pm_runtime_put_autosuspend(drv_data->ssp->dev); + } + + return ret; } =20 /* @@ -1288,6 +1322,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 +1365,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) { @@ -1351,10 +1382,22 @@ int pxa2xx_spi_probe(struct device *dev, struct ssp= _device *ssp, } } =20 + if (!platform_info->enable_dma) + pm_runtime_get_noresume(dev); + /* 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,26 +1477,33 @@ int pxa2xx_spi_probe(struct device *dev, struct ssp= _device *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 + if (is_lpss_ssp(drv_data) && !platform_info->enable_dma) + pm_runtime_get_noresume(dev); + /* Register with the SPI framework */ dev_set_drvdata(dev, drv_data); 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 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); + if (is_lpss_ssp(drv_data) && !platform_info->enable_dma) + pm_runtime_put_noidle(dev); =20 return status; } @@ -1466,16 +1516,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_noidle(dev); } EXPORT_SYMBOL_NS_GPL(pxa2xx_spi_remove, "SPI_PXA2xx"); =20 @@ -1490,10 +1550,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 @@ -1504,29 +1564,52 @@ static int pxa2xx_spi_resume(struct device *dev) int status; =20 /* Enable the SSP clock */ - if (!pm_runtime_suspended(dev)) { - status =3D clk_prepare_enable(ssp->clk); - if (status) - return status; - } + status =3D pxa2xx_spi_clk_enable(drv_data); + if (status) + return status; + + if (is_lpss_ssp(drv_data)) + lpss_ssp_setup(drv_data); + + drv_data->suspended =3D false; =20 /* 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; =20 - return clk_prepare_enable(drv_data->ssp->clk); + status =3D pxa2xx_spi_clk_enable(drv_data); + if (status) + return status; + + 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:30:07 2026 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 E6BA22FF164 for ; Sat, 18 Jul 2026 06:11:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784355078; cv=none; b=GNj1vO185ZGhR3655A4QnDrYb9S2u4oz3WIK03Pf9wyDVM5vzzfqLh3NeVIdvfyNA1BJ2fATDtL/nid1itFHD/yJ0wuP3fAMNGnUl7F+GrgHA8ZFYI0/8JSxg2z+EZjz6DE5/VaIF3eDg4ZfNU6OrclVsFObpt381l8j+aY5JAg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784355078; c=relaxed/simple; bh=3GHDDT1iswNpwNci50QkmgI1Go9op0vnJSwshGF5zgY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=clV4tWsWPtYPn63QOMaq1q89jkiLBanz4iqSo4Vs47AR9BwLE59vIAwQa7851cJT2/315e8in5GxPNrjcSxCLxasV7xUnyidXZlDpqTNNEfV2EEDQqHoQNmZooXqh+EuScgUKqWKD1gt/nOn9ZtRdegHvshuui0eqPTilBP+MPw= 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.176 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-f176.google.com with SMTP id d9443c01a7336-2cf41bab353so11533355ad.0 for ; Fri, 17 Jul 2026 23:11:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784355076; x=1784959876; 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=nQhu6pw5V2qag+PYi1ahP1YA4EumDFpNa6am6qFhMTU=; b=S8AfyIk0CS5LM70+WWDDfyzQFHbtYdqNKCONibeWK9X3SVaY2RcD6mdFC9/AEikOao Iv7Gthmi4iSBZmib4ZPsxY5MIGClj7EoriEKc8ozDPjmOovT3oyQ6PwiQpS9+mMw12uP PunlNEkcNQ+p9RgU2QwMxThi8FrW0TRVm8GZ5KWtkRtTACJmR4ciwUqs0iWwWEy0Z5j5 oKIgH5S0JYAUUy/Mm9iF5z59WVUHVFylH937WBZCjcB/w2rHGqQ8L7pi/75gYnGpv7bs tfhojal4bADAYgqxmO4lD5fFDhFjpZ/QFEOrhdlJxuZmERpiEt/MYUT4+RP2/v9z4flr 6yog== X-Forwarded-Encrypted: i=1; AHgh+RrWi0gKJiwQRrgAiT1ZOF+G6S/fXRyIdKEi7zSjPyjs14LBgteGt0VPbH1Yv0GBFrCbzDp0zORmX8d68hk=@vger.kernel.org X-Gm-Message-State: AOJu0Yyqvfbhe6YzpTBMe61uUpfhEjP4FO3PiiKTEHFEy2bVa+MwCrjO hONikJZW5SK9remSuBmJAhMityzwySweoiPn1FN7ybygavyx52kEuIo= X-Gm-Gg: AfdE7cm4j4h45gaYVkM6yMuzywm/e1YWDmwXCb7QgO4Z/Nwcc6mRH1e6T5QeuJfFTzk PQBtk3By/Dtyz+4INaAdAbmeLW+8NZiMAlqVOngHm5MOewun/IPJgl6eDLjnnw4A2/epu7nc2ZH u0ms+pQMM0VZKbB0Pba9IYHCY4O90lQnzL5xr7D135l5nHQDBAQio0A/bPbbyCdSjQAjrFGGJl7 6hDCIbgO0t9DzeBE78AK1Iku1HaS4U0znenywl89obsR/e4D5D2t6fiqjN+NYE3l2K5VrmUjAcM piL94uMjJq1i3Ahc4cOFRYZZnw5mdT6l3r8Y8HI3G6BNfJvKxQ3EeqKwvYeahPzl4ebRqGg0XpV RczHK4uy5F6lbcIdONvED4rwRc8edaC05OfrRPdJfUkC+Yl8sa/ujhQoRw/uLu5E7H1mYDzQGGR QMDE3dcb1IJ8O9vIocrRNU65E5N9JCtkgI2M7Etd8IonUba1kVymS+uev0hb9Vq9IF21nRL7jQc rRyeaOZOf2T7Io= X-Received: by 2002:a17:903:11c3:b0:2cc:6817:d9b1 with SMTP id d9443c01a7336-2cf34a00b94mr65948715ad.41.1784355076221; Fri, 17 Jul 2026 23:11:16 -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-2cf346db04csm22799025ad.42.2026.07.17.23.11.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2026 23:11:15 -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 v9 3/3] spi: pxa2xx: restore LPSS private register state on S3 resume Date: Sat, 18 Jul 2026 14:10:56 +0800 Message-Id: <20260718061056.30961-4-fourdollars@debian.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260718061056.30961-1-fourdollars@debian.org> References: <20260718061056.30961-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 4491ae0ee8ac..e9a181147268 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; @@ -1545,16 +1557,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) @@ -1566,11 +1608,46 @@ static int pxa2xx_spi_resume(struct device *dev) /* Enable the SSP clock */ 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 */ @@ -1579,10 +1656,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