From mboxrd@z Thu Jan 1 00:00:00 1970 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: 8bit 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=108331 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) } } +static bool pxa2xx_spi_need_lpss_restore(const struct driver_data *drv_data) +{ + 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 == QUARK_X1000_SSP; @@ -1532,16 +1544,46 @@ static int pxa2xx_spi_suspend(struct device *dev) struct ssp_device *ssp = drv_data->ssp; int status; - status = spi_controller_suspend(drv_data->controller); - if (status) + status = pm_runtime_resume_and_get(dev); + if (status < 0) return status; + status = 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 active */ pxa_ssp_disable(ssp); + + /* Mark as suspended and synchronize IRQ before disabling clock */ drv_data->suspended = true; synchronize_irq(ssp->irq); + 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 = 0; i < 6; i++) + drv_data->lpss_priv_ctx[i] = readl(drv_data->lpss_base + i * 4); + } + pxa2xx_spi_clk_disable(drv_data); return 0; + +out_put: + pm_runtime_put_noidle(dev); + return status; } 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 = pxa2xx_spi_clk_enable(drv_data); if (status) - return status; + goto out_put; } - 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 = 0; i < 6; i++) { + if (i == 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); + } + /* + * Now that resets are de-asserted and registers are restored, + * it is safe to handle interrupts. + */ drv_data->suspended = false; /* Start the queue running */ @@ -1568,10 +1645,15 @@ static int pxa2xx_spi_resume(struct device *dev) drv_data->suspended = true; synchronize_irq(ssp->irq); pxa2xx_spi_clk_disable(drv_data); - return status; + goto out_put; } - return 0; +out_put: + /* Let runtime PM autosuspend again if needed */ + pm_runtime_mark_last_busy(dev); + pm_runtime_put_autosuspend(dev); + + return status; } 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); void __iomem *lpss_base; + u32 lpss_priv_ctx[6]; bool suspended; bool clk_enabled; -- 2.39.5