* [PATCH] dmaengine: xilinx: xdma: Fix broken PM suspend/resume
@ 2026-11-20 12:52 tumic
2026-11-20 13:10 ` sashiko-bot
0 siblings, 1 reply; 2+ messages in thread
From: tumic @ 2026-11-20 12:52 UTC (permalink / raw)
To: Lizhi Hou, Brian Xu, Raj Kumar Rampelli, Vinod Koul, Frank Li,
Michal Simek
Cc: Martin Tůma, dmaengine, linux-arm-kernel
From: Martin Tůma <martin.tuma@digiteqautomotive.com>
Add the missing PM suspend/resume callbacks that properly reconfigure
the XDMA HW on PCIe suspend/resume.
Signed-off-by: Martin Tůma <martin.tuma@digiteqautomotive.com>
---
drivers/dma/xilinx/xdma.c | 102 ++++++++++++++++++++++++++++++++++++++
1 file changed, 102 insertions(+)
diff --git a/drivers/dma/xilinx/xdma.c b/drivers/dma/xilinx/xdma.c
index 9d827c9a1267..779a5f4b9db7 100644
--- a/drivers/dma/xilinx/xdma.c
+++ b/drivers/dma/xilinx/xdma.c
@@ -398,6 +398,27 @@ static int xdma_xfer_stop(struct xdma_chan *xchan)
CHAN_CTRL_RUN_STOP);
}
+/**
+ * xdma_reconfig_channels - Reconfigure DMA channels
+ * @xdev: DMA device pointer
+ * @chans: channels configuration
+ */
+static int xdma_reconfig_channels(struct xdma_device *xdev,
+ struct xdma_chan *chans,
+ u32 chan_num)
+{
+ int i, ret;
+
+ for (i = 0; i < chan_num; i++) {
+ /* init channel hardware */
+ ret = xdma_channel_init(&(chans[i]));
+ if (ret)
+ return ret;
+ }
+
+ return 0;
+}
+
/**
* xdma_alloc_channels - Detect and allocate DMA channels
* @xdev: DMA device pointer
@@ -1018,6 +1039,45 @@ static int xdma_set_vector_reg(struct xdma_device *xdev, u32 vec_tbl_start,
return 0;
}
+/**
+ * xdma_irq_reconfig - Reconfigure IRQs
+ * @xdev: DMA device pointer
+ */
+static int xdma_irq_reconfig(struct xdma_device *xdev)
+{
+ u32 user_irq_start;
+ int ret;
+
+ /* config hardware IRQ registers */
+ ret = xdma_set_vector_reg(xdev, XDMA_IRQ_CHAN_VEC_NUM, 0,
+ XDMA_CHAN_NUM(xdev));
+ if (ret) {
+ xdma_err(xdev, "failed to set channel vectors: %d", ret);
+ return ret;
+ }
+
+ /* config user IRQ registers if needed */
+ user_irq_start = XDMA_CHAN_NUM(xdev);
+ if (xdev->irq_num > user_irq_start) {
+ ret = xdma_set_vector_reg(xdev, XDMA_IRQ_USER_VEC_NUM,
+ user_irq_start,
+ xdev->irq_num - user_irq_start);
+ if (ret) {
+ xdma_err(xdev, "failed to set user vectors: %d", ret);
+ return ret;
+ }
+ }
+
+ /* enable interrupt */
+ ret = regmap_write(xdev->rmap, XDMA_IRQ_CHAN_INT_EN_W1S, ~0);
+ if (ret) {
+ xdma_err(xdev, "failed to enable interrupt: %d", ret);
+ return ret;
+ }
+
+ return 0;
+}
+
/**
* xdma_irq_init - initialize IRQs
* @xdev: DMA device pointer
@@ -1297,15 +1357,57 @@ static int xdma_probe(struct platform_device *pdev)
return ret;
}
+/**
+ * xdma_suspend - PM suspend callback
+ * @dev: XDMA device pointer
+ */
+static int xdma_suspend(struct device *dev)
+{
+ struct xdma_device *xdev = dev_get_drvdata(dev);
+
+ regmap_write(xdev->rmap, XDMA_IRQ_CHAN_INT_EN_W1C, ~0);
+
+ return 0;
+}
+
+/**
+ * xdma_resume - PM resume callback
+ * @dev: XDMA device pointer
+ */
+static int xdma_resume(struct device *dev)
+{
+ struct xdma_device *xdev = dev_get_drvdata(dev);
+ int ret;
+
+ ret = xdma_reconfig_channels(xdev, xdev->h2c_chans, xdev->h2c_chan_num);
+ if (ret) {
+ xdma_err(xdev, "H2C channels reconfiguration failed: %d", ret);
+ return ret;
+ }
+
+ ret = xdma_reconfig_channels(xdev, xdev->c2h_chans, xdev->c2h_chan_num);
+ if (ret) {
+ xdma_err(xdev, "C2H channels reconfiguration failed: %d", ret);
+ return ret;
+ }
+
+ return xdma_irq_reconfig(xdev);
+}
+
static const struct platform_device_id xdma_id_table[] = {
{ "xdma", 0},
{ },
};
MODULE_DEVICE_TABLE(platform, xdma_id_table);
+static const struct dev_pm_ops xdma_dev_pm_ops = {
+ SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(xdma_suspend, xdma_resume)
+};
+
static struct platform_driver xdma_driver = {
.driver = {
.name = "xdma",
+ .pm = &xdma_dev_pm_ops,
},
.id_table = xdma_id_table,
.probe = xdma_probe,
base-commit: 65e4fd942f72a9dba0e4e257290c4fa1aa756854
--
2.56.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] dmaengine: xilinx: xdma: Fix broken PM suspend/resume
2026-11-20 12:52 [PATCH] dmaengine: xilinx: xdma: Fix broken PM suspend/resume tumic
@ 2026-11-20 13:10 ` sashiko-bot
0 siblings, 0 replies; 2+ messages in thread
From: sashiko-bot @ 2026-11-20 13:10 UTC (permalink / raw)
To: tumic; +Cc: dmaengine, vkoul, Frank.Li
Thank you for your contribution! Sashiko AI review found 4 potential
issues to consider:
- [High] dmaengine: xilinx: xdma: missing user IRQ mask restore in
xdma_irq_reconfig()
- [Low] dmaengine: xilinx: xdma: unused function warnings when
CONFIG_PM_SLEEP=n
- [Low] dmaengine: xilinx: xdma: incomplete kernel-doc on
xdma_reconfig_channels()
- [Low] dmaengine: xilinx: xdma: duplicated IRQ setup in
xdma_irq_reconfig()
--
commit 0974145b10560ba9aa27c85ae11ed4e81e50da07
Author: Martin Tůma <martin.tuma@digiteqautomotive.com>
dmaengine: xilinx: xdma: Fix broken PM suspend/resume
This commit adds system sleep PM suspend and resume callbacks to disable
XDMA channel interrupts on suspend and reconfigure the DMA channels and
IRQ registers on resume.
> diff --git a/drivers/dma/xilinx/xdma.c b/drivers/dma/xilinx/xdma.c
> index 9d827c9a12674..779a5f4b9db70 100644
> --- a/drivers/dma/xilinx/xdma.c
> +++ b/drivers/dma/xilinx/xdma.c
> @@ -398,6 +398,27 @@ static int xdma_xfer_stop(struct xdma_chan *xchan)
> CHAN_CTRL_RUN_STOP);
> }
>
> +/**
> + * xdma_reconfig_channels - Reconfigure DMA channels
> + * @xdev: DMA device pointer
> + * @chans: channels configuration
> + */
> +static int xdma_reconfig_channels(struct xdma_device *xdev,
> + struct xdma_chan *chans,
> + u32 chan_num)
> +{
> + int i, ret;
> +
> + for (i = 0; i < chan_num; i++) {
> + /* init channel hardware */
> + ret = xdma_channel_init(&(chans[i]));
> + if (ret)
> + return ret;
> + }
> +
> + return 0;
> +}
[Severity: Low]
The kernel-doc comment for xdma_reconfig_channels() omits @chan_num, which
causes a W=1 kernel-doc warning. Also, @xdev is unused here since
xdma_channel_init() retrieves it from chan->xdev_hdl.
> @@ -1018,6 +1039,45 @@ static int xdma_set_vector_reg(struct xdma_device *xdev, u32 vec_tbl_start,
> return 0;
> }
>
> +/**
> + * xdma_irq_reconfig - Reconfigure IRQs
> + * @xdev: DMA device pointer
> + */
> +static int xdma_irq_reconfig(struct xdma_device *xdev)
> +{
> + u32 user_irq_start;
> + int ret;
> +
> + /* config hardware IRQ registers */
> + ret = xdma_set_vector_reg(xdev, XDMA_IRQ_CHAN_VEC_NUM, 0,
> + XDMA_CHAN_NUM(xdev));
> + if (ret) {
> + xdma_err(xdev, "failed to set channel vectors: %d", ret);
> + return ret;
> + }
> +
> + /* config user IRQ registers if needed */
> + user_irq_start = XDMA_CHAN_NUM(xdev);
> + if (xdev->irq_num > user_irq_start) {
> + ret = xdma_set_vector_reg(xdev, XDMA_IRQ_USER_VEC_NUM,
> + user_irq_start,
> + xdev->irq_num - user_irq_start);
> + if (ret) {
> + xdma_err(xdev, "failed to set user vectors: %d", ret);
> + return ret;
> + }
> + }
> +
> + /* enable interrupt */
> + ret = regmap_write(xdev->rmap, XDMA_IRQ_CHAN_INT_EN_W1S, ~0);
[Severity: High]
Does xdma_irq_reconfig() leave user interrupts disabled after resume?
It reprograms XDMA_IRQ_USER_VEC_NUM and re-enables channel interrupts via
XDMA_IRQ_CHAN_INT_EN_W1S, but never restores XDMA_IRQ_USER_INT_EN (and
xdma_suspend() does not mask or save it). When the PCIe device loses
register state across suspend/resume, any user IRQs previously enabled via
xdma_enable_user_irq() (such as the SPI, I2C and video error IRQs enabled
during probe by mgb4) remain masked after resume.
> + if (ret) {
> + xdma_err(xdev, "failed to enable interrupt: %d", ret);
> + return ret;
> + }
> +
> + return 0;
> +}
[Severity: Low]
This isn't a bug, but xdma_irq_reconfig() duplicates the vector and
interrupt enable register setup at the end of xdma_irq_init(). Could
xdma_irq_init() call xdma_irq_reconfig() instead?
[ ... ]
> @@ -1297,15 +1357,57 @@ static int xdma_probe(struct platform_device *pdev)
[ ... ]
> +static const struct dev_pm_ops xdma_dev_pm_ops = {
> + SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(xdma_suspend, xdma_resume)
> +};
> +
> static struct platform_driver xdma_driver = {
> .driver = {
> .name = "xdma",
> + .pm = &xdma_dev_pm_ops,
> },
[Severity: Low]
When CONFIG_PM_SLEEP is disabled, SET_NOIRQ_SYSTEM_SLEEP_PM_OPS() expands
to nothing and leaves xdma_suspend() and xdma_resume() unused, triggering
-Wunused-function warnings. Using DEFINE_NOIRQ_DEV_PM_OPS() and
pm_sleep_ptr(&xdma_dev_pm_ops) avoids the warning.
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261120125254.8678-1-tumic@gpxsee.org?part=1
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-11-20 13:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-20 12:52 [PATCH] dmaengine: xilinx: xdma: Fix broken PM suspend/resume tumic
2026-11-20 13:10 ` sashiko-bot
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.