From nobody Sat Jul 25 04:54:27 2026 Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) (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 390F41C84BC for ; Sat, 18 Jul 2026 00:38:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784335114; cv=none; b=tKuro+Nh07EKc/p0sAE0CAR+oJk0BvGteEDXIJzpdLEcWCq4JqihpJrCoO/hjannNSLRAjuBI9nEHsrdc16Ab0saQZNp7yHwSJq+Tqc9O3SDd+dIBuzOY+cmKb1mH618EgaNl5LBMnKFdYJp/YJ1GdnanWRlvYDDQV5SgrVwOFk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784335114; c=relaxed/simple; bh=NVlQq/0ienIKK4mUYtZaXaxaziRDpv1e2YwiiqahKGs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=maee+dBQ74S2s8OLR8Al/aU0737pZcVY/A0eTX9aUptrhYMEPqqxy7y4TcJAvD2FmHc45ysMMUpyRdNxV1qIOLjQ+OmLmO6LK9djpKdeOYf/kfdD92wvX1ziAOt68Dlr2rL26PN4vHPzpS5JpzFYBFD5AzWxhXi5+hleZJtcxyM= 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.215.177 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-pg1-f177.google.com with SMTP id 41be03b00d2f7-ca766c1c9ccso4973467a12.0 for ; Fri, 17 Jul 2026 17:38:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784335112; x=1784939912; 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=dKbP12yEVAd+t/2flnwPCW+I+ZRSTt8lopaLIRWMHHQ=; b=BseoUA+MLpolKYHdyBJo6ep2UpSdFzdH30WCQfvL9hMLyxhxuU1eqlNxUOzx5b61RM QiVkwGNH0CmpQ06nqTH+4zz4aH7lviDfsdz+5wxlWmaG/YIpUZY0HXMHqGE/V36nByIP 2Kka1SkiwIZ6gkuy580VpTKVK+GYQdcpne3+hsHfLsuhQsGrGhobgMiTkWNwA14qs2dO 0lj5U8KQQhuSIhHaifR6nIQj89NyEM6Hbs/7hX267GZ8FL2VvtQs4lhBUbZoHPdaqAa0 oOO9U0MHj8eyIgCTCkgkGFC4pXgE22+X2G4y/QQ2xg9BnfnfN4TYaDnSPN0cTdlzOlK5 Fsww== X-Forwarded-Encrypted: i=1; AHgh+RpwAgF3hjJGpPpiP1U7rK2yAMemHGWQLAlDaymijy6dbmSKiczNH5pYf0Qu3Qu1eyntNVHrzdXy5Y0+hmw=@vger.kernel.org X-Gm-Message-State: AOJu0YygQ0gxHyw7BlPbZkI4D8BTC7mhfpJNwckUtpVTpO9iRIkyRQ9H p7DW1G6AMKUajoJDh6qqZNvUUlH/3LHpmLbFpP2wotMqg32NvpJM/qs= X-Gm-Gg: AfdE7cku6belh5v7rmm2qGNebCFREgonwt7QBqck38xPQcyFc/F/1iUf924e6NcGz7T UFHZaBrYJoh8XjwUvcxjGIjK1Sz4zBIupWYT1T4Rne/Hh6MbOdUxMS4+VQSC5adTK2Q2cxoQwjt waCPY+zWonz1XG4V/vkj+Nf5fz3izrgrbFZw/e31HEF/Up1+oSZIi6KO1iMwhzY3OG18DSkkxz2 eW8lS9yuGWidMCBPwLVhA/qifZqdcTyXjp4NJK9+NYdtz9guhgFcbHyGlWYPssjvPVA+iYBfXPw 2sX+Xe+Oj23AFkb9K1ZjEKS+EwCFNoOnq5F2fNHUSKz4WlfFn5cyfC9qvjxyHSDAFMQeja77Uy5 JGMrM8qXNMSsOMfrx1Mx2Q2fODj3FRW6IhpYZZRkDGu9egZ0kQkP6ElZ/boDeLuRUaCtYbqyJGP bAQeLDx01rW0Xc01tqG6pCm6Gr1LupaWHbbvw3uv+hDJtzyvdRnOf6sf3nkCjEP1hkKN14oaQb9 UU5wnAKaiz+2cs= X-Received: by 2002:a05:6a20:ce4d:b0:3c0:9c19:65a3 with SMTP id adf61e73a8af0-3c3adaa8bf4mr5499821637.75.1784335112479; Fri, 17 Jul 2026 17:38:32 -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 41be03b00d2f7-cb519aeb334sm1564893a12.18.2026.07.17.17.38.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2026 17:38:32 -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 v5 1/2] spi: pxa2xx: disable DMA and fix runtime PM for Apple MacBook8,1 Date: Sat, 18 Jul 2026 08:38:20 +0800 Message-Id: <20260718003821.23334-2-fourdollars@debian.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260718003821.23334-1-fourdollars@debian.org> References: <20260718003821.23334-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 has two related problems: DMA handshake/interrupt routing fails, and runtime PM autosuspend clock-gates the LPSS block, triggering PCIe Completion Timeouts. Move the force-PIO DMI quirk to spi-pxa2xx-pci.c (the LPSS host controller driver) to avoid layering violations in the client driver. To prevent the PCIe Completion Timeout crash when operating in PIO mode: - If DMA is disabled (either statically via the DMI quirk / module parameter or dynamically due to channel exhaustion), call pm_runtime_get_noresume() in pxa2xx_spi_probe() to hold a runtime PM reference, and release it via pm_runtime_put_noidle() in the remove/error paths. This keeps the PM cou= nt above 0 and permanently locks the device out of autosuspend, preventing userspace tools (like PowerTOP) or udev rules from overriding it. - Implement helper functions pxa2xx_spi_clk_enable() and pxa2xx_spi_clk_dis= able() to track clock state via drv_data->clk_enabled, preventing clock disable count underflows and framework warnings on resume/autosuspend error paths. - Check device status in the shared interrupt handler ssp_int() using pm_runtime_get_if_active() and drv_data->suspended. If the device is suspended, suspending (RPM_SUSPENDING), or clock-disabled, ssp_int() immediately returns IRQ_NONE to avoid reading unclocked MMIO registers. - Initialize drv_data->suspended to true early in probe, and clear it only after the clock is successfully enabled, preventing shared interrupt hand= ler races during device initialization. - In pxa2xx_spi_runtime_suspend() and pxa2xx_spi_suspend(), set drv_data->s= uspended to true and call synchronize_irq() to wait for any active handlers on the shared interrupt line to finish before disabling the clock. - Adjust the driver teardown order in pxa2xx_spi_remove() and probe error p= aths: always call free_irq() to unregister the handler before calling clk_disable_unprepare() to turn off the clock, preventing concurrent interrupts from reading registers while the clock is disabled. Avoid duplicate can-DMA pci_info() logging by checking the pre-computed enable_dma status in probe and passing a verbose flag to can_dma(). Link: https://bugzilla.kernel.org/show_bug.cgi?id=3D108331 Signed-off-by: Shih-Yuan Lee --- drivers/spi/spi-pxa2xx-pci.c | 37 ++++++++++- drivers/spi/spi-pxa2xx.c | 115 +++++++++++++++++++++++++++-------- drivers/spi/spi-pxa2xx.h | 3 + 3 files changed, 129 insertions(+), 26 deletions(-) diff --git a/drivers/spi/spi-pxa2xx-pci.c b/drivers/spi/spi-pxa2xx-pci.c index cae77ac18520..79642fd811a1 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,34 @@ 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, bool verbose) +{ + if (spi_pxa2xx_force_pio) { + if (verbose) + pci_info(dev, "Forcing PIO mode (disabling DMA)\n"); + return false; + } + + if (dmi_check_system(pxa2xx_spi_pci_dmi_table)) { + if (verbose) + 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 +199,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, true); return 0; } =20 @@ -238,7 +271,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, true); return 0; } =20 diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 6291d7c2e06f..1ba239d28d74 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -713,20 +713,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) + return IRQ_NONE; + + active =3D pm_runtime_get_if_active(drv_data->ssp->dev); + if (active =3D=3D 0) return IRQ_NONE; =20 /* @@ -737,7 +759,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 +772,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 +780,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; + } + + 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); } =20 - return drv_data->transfer_handler(drv_data); + return ret; } =20 /* @@ -1288,6 +1319,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; @@ -1351,11 +1383,16 @@ 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; =20 + drv_data->suspended =3D false; + controller->max_speed_hz =3D clk_get_rate(ssp->clk); /* * Set minimum speed for all other platforms than Intel Quark which is @@ -1449,11 +1486,18 @@ int pxa2xx_spi_probe(struct device *dev, struct ssp= _device *ssp, return status; =20 out_error_clock_enabled: - clk_disable_unprepare(ssp->clk); + free_irq(ssp->irq, drv_data); + pxa2xx_spi_clk_disable(drv_data); + pxa2xx_spi_dma_release(drv_data); + goto out_error_pm_forbid; =20 out_error_dma_irq_alloc: - pxa2xx_spi_dma_release(drv_data); free_irq(ssp->irq, drv_data); + pxa2xx_spi_dma_release(drv_data); + +out_error_pm_forbid: + if (!platform_info->enable_dma) + pm_runtime_put_noidle(dev); =20 return status; } @@ -1466,16 +1510,19 @@ void pxa2xx_spi_remove(struct device *dev) =20 spi_unregister_controller(drv_data->controller); =20 + /* Release IRQ first so handler won't access registers after clock is dis= abled */ + free_irq(ssp->irq, drv_data); + /* Disable the SSP at the peripheral and SOC level */ pxa_ssp_disable(ssp); - clk_disable_unprepare(ssp->clk); + pxa2xx_spi_clk_disable(drv_data); =20 /* Release DMA */ - if (drv_data->controller_info->enable_dma) + if (drv_data->controller_info->enable_dma) { pxa2xx_spi_dma_release(drv_data); - - /* Release IRQ */ - free_irq(ssp->irq, drv_data); + } else { + pm_runtime_put_noidle(dev); + } } EXPORT_SYMBOL_NS_GPL(pxa2xx_spi_remove, "SPI_PXA2xx"); =20 @@ -1489,10 +1536,13 @@ static int pxa2xx_spi_suspend(struct device *dev) if (status) return status; =20 + drv_data->suspended =3D true; + synchronize_irq(ssp->irq); + pxa_ssp_disable(ssp); =20 if (!pm_runtime_suspended(dev)) - clk_disable_unprepare(ssp->clk); + pxa2xx_spi_clk_disable(drv_data); =20 return 0; } @@ -1505,28 +1555,45 @@ 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 + 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; + 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); + 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:54:27 2026 Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.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 067E31E5201 for ; Sat, 18 Jul 2026 00:38:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784335116; cv=none; b=oixw6UvUGX1b2h77YPRAwtUPj0i8++9EQpeoAaR2M3xXJHGPWboBB/FFsChQ61RaBBwTgpE6skM5o2nIzfUSkXGXoAhdsH8JYam9SI7VOcdNixAb5gEHnnsCyShX/20lPjwGSMBHoLr69xkzIiHqJ15U/jmnin9nwPRj05bogXI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784335116; c=relaxed/simple; bh=gGAwGk8gds8iaqjE97/cnDQgwF5uW4fn/WjQ4kwG+kE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mVSA66gmznVofJYPqyaeyhV+nzB9IvLmwjwvBqdKfrKoiSqKnHkZ69UgWpu2WdHHJYu07h2d+H7s8sS9CAQ2x2jlYMfe4Xsx09T+aR8NEqIlKfjqj1ak2HHIJBOwxgXc1NHUsE8CaziEz3ocnlK0wUgLJSsZvHOm9lexuIy4Dw0= 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.215.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-pg1-f174.google.com with SMTP id 41be03b00d2f7-c96c92c0980so3339581a12.3 for ; Fri, 17 Jul 2026 17:38:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784335114; x=1784939914; 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=kUDXIRchJDsaph8A7Yc8ldO3JY8TN6RDSEk2pPx+8T8=; b=sefS6A+ob4f+0Ci0/gW8lCgRJ9pCPguvkELBb6AaJGyBbF2FEKQQRuA5hXLOlyVcm1 oGzuFupLunjLJTTb+qfgSJD1gTiJbzY+5jRfz8BIUbv6yJtceJKduew/OZ/vi+IqUonN CFXUoVo1YZx+DO202FLd/Y+LIOlqc3E6TfDY+AfhRbLOIvE88IyBUwu1v4j2crkKgZyV jNQEC6mrGjxV6gLyDS9nhF6sUuV6Q0ial0L4yu69PRux094wjzN6hqgncSfMXvqOuJjq 87FDSbzxHomdLpfi34jI0skaXCjURD0lNSNN/4BmtpTgWdNtTHW8BQ3cXWfEIUT6NxIB 2ppQ== X-Forwarded-Encrypted: i=1; AHgh+Ro+cmd+Brx2rsrncIvD/4rg4BU0a8BKci3LsGq35FrK2iNx9bWdzleT01xvVnPT+WjxHk7trVV4ZedUoGU=@vger.kernel.org X-Gm-Message-State: AOJu0YyTVE+TKeV9zNE/4Nam3yy+FnWW6tO41YOxpdYEXSUs3varbIAC ocQrsdTZSZEbVdAfvaysi2oM7agmAQJ7yChz5NZLGY2tnwe9XVc2l+o= X-Gm-Gg: AfdE7claKbztx/KplMpXw2tQ6xcOd1tewywePwOBDfJwfA6bpLF24414fmVF6m6JV1Q iP92ZCzrjlYgUWdkdbiSCGxSPfOCAz/PJ/b16Sqm/HQb5EZc4DxEU4IIAeUhnrr1tJbdfp/WHlh aClmN+AVqkMJ8YqRHtERPZRQpIiSQvGg6mCQd2EEvMDZsJJnD86Ba2/ElRn1PHOZvCfw8dpM2Wk 2r8Ng3XRsfWHtSnZ84FY7SzefuAYacVoFn+aYmPKfSW7e/kpshJrsKtujoWfZIJOEKEGc1+Q2tY 1ZYNwZRFFKbDNsMIbkvushEtjXQwA0bN8WcfYaoD8m04I7n/m072uEEWlAbFA7NZpNAzht9UzFF pHTMDIDG52urobbJyJ9N9hzQB2B5cv2b2E4sdLgxJmqTTnuFOFmn6Ake2+b9m1QSa9R5hWNq2FK d4Xjb6FOnXaXls0flRMLqGl9WputFQSqHdhcq94byZg/sUvZycqsf4HuSXaEgdscrCwNbwW7bAN 8aMPECAuO7cAsI= X-Received: by 2002:a05:6a21:b97:b0:3b3:241f:66c6 with SMTP id adf61e73a8af0-3c3ad857fd7mr5471577637.26.1784335114211; Fri, 17 Jul 2026 17:38:34 -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 41be03b00d2f7-cb519aeb334sm1564893a12.18.2026.07.17.17.38.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2026 17:38:33 -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 v5 2/2] spi: pxa2xx: restore LPSS private register state on S3 resume Date: Sat, 18 Jul 2026 08:38:21 +0800 Message-Id: <20260718003821.23334-3-fourdollars@debian.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260718003821.23334-1-fourdollars@debian.org> References: <20260718003821.23334-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() respectively. This ensures that if the device was runtime-suspended, it is temporarily resumed to active state prior to suspend. This guarantees that the clock and power domain are active during MMIO register access, and that the private registers are consistently saved and restored across S3 sleep cycles. - On S3 suspend success path, return 0 directly without dropping the PM reference. This preserves the acquired PM reference across suspend. On S3 resume, release it via pm_runtime_put_autosuspend(), and ensure all error paths in resume (clock enable failure or spi_controller_resume failure) jump to out_put to correctly release the reference, preventing reference count underflow and leaks. - Save only the first 6 LPSS private registers (offsets 0x00 to 0x14) via drv_data->lpss_base during suspend. Offsets beyond 0x14 (except CS control at 0x18, which is re-initialised by lpss_ssp_setup()) are reserved/unimplemented on LPT platforms (such as MacBook8,1), and writing to them triggers a PCIe Completion Timeout causing a system freeze. - Clear drv_data->suspended only after de-asserting the resets and restoring the private registers on resume. This prevents shared interrupt handlers from performing unclocked/held-in-reset MMIO accesses if an interrupt fires during the resume process. - Revert drv_data->suspended to true on spi_controller_resume() failure to ensure subsequent interrupts do not attempt register reads after the clock is disabled. - Store the saved context in drv_data->lpss_priv_ctx[6] (inside struct driver_data) which is private to the core driver. This avoids changing the layout of struct pxa2xx_spi_controller, preventing ABI symbol version mismatches with uncompiled platform drivers (e.g., spi-pxa2xx-platform.ko). On resume, de-assert resets first, restore all other saved registers, then call lpss_ssp_setup() to re-initialise CS. Signed-off-by: Shih-Yuan Lee --- drivers/spi/spi-pxa2xx.c | 88 +++++++++++++++++++++++++++++++++++----- drivers/spi/spi-pxa2xx.h | 1 + 2 files changed, 79 insertions(+), 10 deletions(-) diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 1ba239d28d74..f99eff359e46 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 @@ -1532,19 +1537,43 @@ static int pxa2xx_spi_suspend(struct device *dev) struct ssp_device *ssp =3D drv_data->ssp; int status; =20 + status =3D pm_runtime_resume_and_get(dev); + if (status < 0) + return status; + status =3D spi_controller_suspend(drv_data->controller); if (status) - return status; + goto out_put; =20 + /* Mark as suspended and synchronize IRQ before disabling clock */ drv_data->suspended =3D true; synchronize_irq(ssp->irq); =20 pxa_ssp_disable(ssp); =20 - if (!pm_runtime_suspended(dev)) - pxa2xx_spi_clk_disable(drv_data); + if (is_lpss_ssp(drv_data)) { + unsigned int i; =20 + /* + * 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 +1583,46 @@ static int pxa2xx_spi_resume(struct device *dev) int status; =20 /* Enable the SSP clock */ - if (!pm_runtime_suspended(dev)) { - status =3D pxa2xx_spi_clk_enable(drv_data); - if (status) - return status; + status =3D pxa2xx_spi_clk_enable(drv_data); + if (status) + goto out_put; + + if (is_lpss_ssp(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); + } + + /* + * 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 */ @@ -1567,10 +1630,15 @@ static int pxa2xx_spi_resume(struct device *dev) if (status) { drv_data->suspended =3D true; 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