From nobody Sat Jul 25 04:17:19 2026 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 1562E26ED3A for ; Sat, 18 Jul 2026 15:32:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784388779; cv=none; b=ZtKlEpGhav3ykapKxfAFvRS5JhgWM4faFO2fyhMhVU5LDCmcHZ3kQJxbxctP6I0GQeZmzM3dy7bovL8crXzjTObktnEyeulMpnEQ8TBbNeGwGi4ZIpQFzQX3xsffQAqVfi5vTvnPfbyB8GFfjQwGYg7v5R0bmNuMhm0HPquqW4s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784388779; c=relaxed/simple; bh=vMxi0GBCmk6kSxxY3msXn6b8DUdRebKtLoidNsiWryg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=MHbGjlxG8KGjf5ory3b+u1Vwwf6lgel+dJe911ntDI0y3yy6WpI3VLpdCu5la8kiEghVsZPU/0J5XM35POdg/pFREXamuP3rMjBjjdLsM1IGMwtG2+licaB1Dzu+Fjydt1rebsNU6/y+dFuLA9eiqsyLwQwqnAWLarFm051kmvY= 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.180 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-f180.google.com with SMTP id d9443c01a7336-2cae1a3a744so66733335ad.3 for ; Sat, 18 Jul 2026 08:32:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784388777; x=1784993577; 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=BH0/nwJOI0H2txVlgeRU1SHbfWiLCQYuoz7GzC1k5xXPkZqpRwTtW+Kv1mDmhvj1Q2 EAJCgFLsXok8DVVDpdiIakWqOlUQThLB4wUBx3uK4lmIyvzuBPpR8xuUpNSYtAbfgJ9U +U8YUAlig7e9qO/i55xQtk9PNZLTodH8WH2cyVskVvt0ADzcmHQmDve+YzmJr42ywolS XvwojukV2/dc2G+Bl9THkWuj79tvovZsj/38/K7/4bLGwQxNXWbiUDxl3Bc3xB02noNm ciCvXfh97SfgD3LpVqLWGy4+3nlXORd/+BK6sfeUky+fRFOYxbdgA8Koow0QRh9xod8v QHhQ== X-Forwarded-Encrypted: i=1; AHgh+RqrSWl7wcQdPSpPWtJs6oxkwELzNOxwHevqGkjyO44rpYTBPWwWSopXzYyvt/N5FUvbR2gaX/9aqiCrcXI=@vger.kernel.org X-Gm-Message-State: AOJu0YzO8Hln5ci8LmB1lF+r+AcxYYcfMdmENJdAcy4SKwuyJ3sHJOjM SUXNqCSnfNHcU9LW1MZiXB+KPz4DNHa8wz//DNTHmfmVQFk5mT4o38k= X-Gm-Gg: AfdE7ckUEQJ4Qvd9NdKQuCyNvo3Ja96Ph8HQP3zkAF1uTE9aBCz3n/K2nqxAmaCks+x 4Dw/26erSU7c3oTC6pV/hgCoiHq4luQsGdNMpdGCe5kG0WU1Q+hOxpYs89TlwDWo16phQBC5xtf KuCcmEtHIar+L8MHOW2A2KJj4/KU07/FHOnp/3bVlzF9fd95WlX3K+KY3NWHX5PyZB/zSX2T8UZ RJP1hiBDD4WT8ZPD0HNEF/zKjvHV6/9H/4xZTuceevDzCIlmT2NqRXvcDjGQfEl2UQ6zty4GHvI 3aMYV1B3Uab4g+J/jGDP/2Ywc8I7CstKhn+n/rUdL7ftYutBbkshMeU8hQ2T1UTNX4NWvxkxs6x I8vatHCKCsjwmqHdQ+CSIGfVZWVWAucZ5v3zsMSUdotOi7dhg1mxhaLGfGRwPEb4KoPkSSIJvWU cm3cj7IA7/AZ9WQ3J7R3VbzEZ/szcnHENwgFWsqUT464E5tG5C61+JB3E1Xv6Wt6IEvDvGlGNLM xBHcQx7Zg+HZ84= X-Received: by 2002:a17:902:ce0d:b0:2cc:9a86:9c42 with SMTP id d9443c01a7336-2cf349eb316mr75462215ad.45.1784388777183; Sat, 18 Jul 2026 08:32:57 -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-2cf344bd3aesm28731535ad.26.2026.07.18.08.32.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jul 2026 08:32:56 -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 v13 1/3] spi: pxa2xx: disable DMA for Apple MacBook8,1 Date: Sat, 18 Jul 2026 23:32:49 +0800 Message-Id: <20260718153251.7353-2-fourdollars@debian.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260718153251.7353-1-fourdollars@debian.org> References: <20260718153251.7353-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:17:19 2026 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 C06BC2C11E8 for ; Sat, 18 Jul 2026 15:32:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784388781; cv=none; b=IA3Wxc8pLsjvfUOAzd88wXm6iObpZ2amW7kdCCoFxoEekJwjSmZd9yNVhTvbM1rsA7agkKjIIbawCNBnVWWwFj/AWZr1WwZSx6AcLQhnzPEtp4S7f2VQ40ckqyhOmDHuQffCTF+OQhUV/UqWJSbQHP3SXWuYqUwj2bMNCMnHWiA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784388781; c=relaxed/simple; bh=j1VdhiR8aYaQLKwfSgwwoPOaC0Y4qh6/plOT/8eUtcQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=S6Fvq54omA8eOfiqXKuTnoT3rc5XMboIk9HoVPkHy0VraSrtAd5QkU3vFaaYVZhcMkHRdUqfBcTm9Zi6I+698kh1wiZUXZy/NSw3WWqlAdszD4sWbJV3/04WvaFDCOWYyTuqi5cVkMIAV9uXHgq369VNwPDbm84fAhpSwgEgGyI= 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.174 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-f174.google.com with SMTP id d9443c01a7336-2cf41bab353so15069995ad.0 for ; Sat, 18 Jul 2026 08:32:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784388779; x=1784993579; 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=8WfMjGOxfuM1U2/Yw/DDP44y5VWIdO5yPXCnLZY6pLo=; b=AfEuqHhkclNxj++mFYzf3uxdeFN/vgObPiHumn76RZ+yQRgpOM35O5+NKPiVdzcIcm Wdeidbv2M7rkJDoI7fVNVWvF+9Rh7G9yNJPwl4qMSkbCXVEu5Qr6DqD69u0OfHy+U80M MWax37ILnWGB5Qo3BqSolnTRNIr2zSTetQxSG02MB8nUcVUYNpUeMq2VGWYg+bCmUsfy iAMIzDUCGGml6qJ4f0pPOzrhT8xolE2VaKyc8EvN9JqWbZO/yXQfYrzPrlBvdxarhaMZ pDW0XMwvrfvyNmyGSq2l3viVJsX3jxS8/ESr/9VkHfw6iZAn+3b8f6YEAQUBSVRPOie4 evyA== X-Forwarded-Encrypted: i=1; AHgh+RrSB8R/WjDTOqQ76d3dm+r5itJOnhWFShL8EOWGv2HzhVS3hZPiku2Fjr0SpKbqpDjgTE//RjS5LvTFWlY=@vger.kernel.org X-Gm-Message-State: AOJu0YwDITjBxoY/vaCwoz00ppuM+VVC27g+qfxginmkD0Rl7+xFkze1 x3CoEDf58EUHpoENje5w261pClCn/gXkbMV9NKXx5DCmnGRy7NYgskA= X-Gm-Gg: AfdE7cmQB/cNPwxPx2349FPn9rkrCA1ckrEcuxSg118yLYZS5h3/jfkC7eDy1aOM5Jl sZ3BzZOrlTgLuwbcxsCqd1dpzz31MRymDMJ6BeWsj/DA5Wv4kyLcrnL/U2L2Ej9IrpqW178BFUR y6yMqh/fC6psXyuFN8itw3lSKWkCakDYCxE8sSMqu7eD4rq67uG7BusHDeR3UgIoxfZvgexG2uI nwjM11TEESMVtkPeJZS56x1iHvg3s+Zb32Vhg+UaSo2Rap4guPvT9v7/ivHPS9b9IgFcstoBEek Rcv395EfPvU5PcJNFVuemgAwLvTAL8nmZubBscJbq6UsTKfpqcKpx9OarE+zPAtASSIM6MW/jNE bflC9IywiWu7vO5L6oGSZ4pUQBfK0HEuf45cnuKcJ0lkW+PBw21CzQZbcATqXExa13eHaQD+m5B DspfXJbcle2PX2Qvr5CaYavJx6mVlToTWGErrz6Zc2EzI9fcP2WtJzF9htVQh4GB/1daPYzR2hL ncqG92tJR/Mj7g= X-Received: by 2002:a17:903:1c8:b0:2be:3850:297e with SMTP id d9443c01a7336-2cf349bff53mr68185405ad.31.1784388779000; Sat, 18 Jul 2026 08:32:59 -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-2cf344bd3aesm28731535ad.26.2026.07.18.08.32.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jul 2026 08:32:58 -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 v13 2/3] spi: pxa2xx: fix runtime PM and interrupt handling in PIO mode Date: Sat, 18 Jul 2026 23:32:50 +0800 Message-Id: <20260718153251.7353-3-fourdollars@debian.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260718153251.7353-1-fourdollars@debian.org> References: <20260718153251.7353-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, drv_data->suspended, and checking pm_runtime_get_if_active() =3D=3D 0 to return IRQ_NONE immediate= ly, avoiding 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 | 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:17:19 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 99780296BAF for ; Sat, 18 Jul 2026 15:33:01 +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=1784388793; cv=none; b=ZmQf/4w2BfVfZNaHSFaDjxRenGjkbdXWMV1DyJfExywCR87WIKVYX443tTCULdMwbYS3TZherZ3XErCemzgVby7Wb9uF2BDX09l87ExOhNZ5QqoImth9F0Ny6bWLk2Tl1QhnS5idJh15Wb0hvpR4eWWdK6LlgxK0yI1k/UdpvvI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784388793; c=relaxed/simple; bh=hoX/TWo6r/94eyI3ahhuk2BDP1Nd7ZgqQk6yVk0sUDM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=K5UB+fPXvoJOIxcZdrjf6uX3kLcVqwq7BOJOB8l7qeKAQiBkotYBGyMdFZlfObuoyR7iOqSTi+vJSS0/HuMmy05SqD+LpAFPk4jXQZEZAeeAcSQ/pJTOVvyx9SezsapLOjD/BPWBg8cQfpMXE/gjRNaerIclZZ5V3N+WAbZ6fsY= 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-2cc73e322dbso105127555ad.1 for ; Sat, 18 Jul 2026 08:33:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784388781; x=1784993581; 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=gEeiQmKDSHrccaXIlMS6kZNA493d3qHYpd2N7W1+vvAHSv0OcATiCCCHyNkQHJr65c f2Zs/6bgQ7qoNNphz57qRyrATnnh8xdc03Xsph7vKNuKyUyFt0fSJEhVXbj19IMxYcVM c91oD1Z80/F7PxLW3oL6JnmJG2GYqi4InkWNt5DnUo9zyo+WibLabpZFGY3FLiswW/Ee cm5116oWBOdPrB0El0eqVfu3EsejCYlWU9DRx5q8px9NDqDfLTRZN4Od+zAObkSZmOaV FhDWtjH75+z4IN6OADHJCAcysiFIpPSDG/LX4PipKCCEr6oo2m1exIIkzP8yvhV1bDeu AbFQ== X-Forwarded-Encrypted: i=1; AHgh+RpB5s23ZSvkRMv9QAw3PLG1lG/CzU9fVt5aVAE8vy8EzCGbJS4X7Nkm8uEY2yE7dNbuhuFpT5qVNgb9l+k=@vger.kernel.org X-Gm-Message-State: AOJu0YzbJOxF5c0PSh4VZtR+VaRdJh1oz3qzoCQLdSOA6cNaSOBsiF+K k8ZR/X7dKdN8NJKjW0+d0ZZ2r0c4a/iUBCEFFJuSrz8VBYjqlrbG7zLqPCYIOqxGEQ== X-Gm-Gg: AfdE7cl2ef/FrHQexksNih1PGYldfSUqxqRPbDbS4gzoxHv2Z+cwxWbXQg32cMhLHfa vmXaO9SR5OSaZOUNiW4MJDn/qDc9pbWhfgW+vCGEb4L/nlx3PbSeTNKaNqLoYE0mHzACxiWWS27 A9IGHn4Ju+dNwgPXvrHtg1cs2CeOtE5cjty+0ikgKYMO6X9BXMNerfcJOqESpK9q5YHKrGy8Yhw f6++eovra87VGVvd1S9x3qc+VDuiiZaE0rbSQXZq7sLmBqj0EzZQE1xBs4lPHS8y7W0I9aByfBb d6vfjNarfWFz77iGyo70KC8kDUv110A81wEJOywKGq4k+sqnY8cBDlAXBfVQCyHXQVdykHQlohw /D6Tw2Qb8Fn+JN/3Ma5UzNfNn+xwnimib/h9N0uWAErd9rs4wRJeFtH+XCXXbd7vwJIDh4EkSPl 5PbATBSSGCYzwD043LWEyc4iuDqXUB/TAy0gf1B/RNLg9Yns8n8Uv9ANZuteXQuGxSVDuS/tYKO 4rQQsVbEEB1YA0= X-Received: by 2002:a17:902:f70d:b0:2c6:9f6a:9f6f with SMTP id d9443c01a7336-2cf349b8d41mr77809585ad.28.1784388780771; Sat, 18 Jul 2026 08:33:00 -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-2cf344bd3aesm28731535ad.26.2026.07.18.08.32.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jul 2026 08:33:00 -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 v13 3/3] spi: pxa2xx: restore LPSS private register state on S3 resume Date: Sat, 18 Jul 2026 23:32:51 +0800 Message-Id: <20260718153251.7353-4-fourdollars@debian.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260718153251.7353-1-fourdollars@debian.org> References: <20260718153251.7353-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