From: Lizhi Hou <lizhi.hou@amd.com>
To: <tumic@gpxsee.org>, Brian Xu <brian.xu@amd.com>,
Raj Kumar Rampelli <raj.kumar.rampelli@amd.com>,
Vinod Koul <vkoul@kernel.org>, Frank Li <Frank.Li@kernel.org>,
Michal Simek <michal.simek@amd.com>
Cc: dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
"Martin Tůma" <martin.tuma@digiteqautomotive.com>
Subject: Re: [PATCH v3 1/1] dmaengine: xilinx: xdma: Fix broken PM suspend/resume
Date: Fri, 20 Nov 2026 13:40:08 -0800 [thread overview]
Message-ID: <754c498c-7252-3f2b-54e6-3ebfdf0181ff@amd.com> (raw)
In-Reply-To: <20261120172356.5858-2-tumic@gpxsee.org>
On 11/20/26 09:23, tumic@gpxsee.org wrote:
> 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.
Just wondering if we could destroy xdma platform device in your PCIe
suspend routine and re-create xdna device in PCIe resume?
Lizhi
>
> Signed-off-by: Martin Tůma <martin.tuma@digiteqautomotive.com>
> ---
> drivers/dma/xilinx/xdma.c | 147 ++++++++++++++++++++++++++++++++------
> 1 file changed, 124 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/dma/xilinx/xdma.c b/drivers/dma/xilinx/xdma.c
> index 9d827c9a1267..d6772b38d8f7 100644
> --- a/drivers/dma/xilinx/xdma.c
> +++ b/drivers/dma/xilinx/xdma.c
> @@ -123,6 +123,7 @@ struct xdma_desc {
> * @irq_start: Start IRQ assigned to device
> * @irq_num: Number of IRQ assigned to device
> * @status: Initialization status
> + * @usr_irq_mask: User IRQ mask for PM suspend/resume
> */
> struct xdma_device {
> struct platform_device *pdev;
> @@ -135,6 +136,7 @@ struct xdma_device {
> u32 irq_start;
> u32 irq_num;
> u32 status;
> + u32 usr_irq_mask;
> };
>
> #define xdma_err(xdev, fmt, args...) \
> @@ -398,6 +400,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
> + * @chan_num: number of channels
> + */
> +static int xdma_reconfig_channels(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 +1041,55 @@ static int xdma_set_vector_reg(struct xdma_device *xdev, u32 vec_tbl_start,
> return 0;
> }
>
> +/**
> + * xdma_irq_config - Configure IRQs
> + * @xdev: DMA device pointer
> + */
> +static int xdma_irq_config(struct xdma_device *xdev)
> +{
> + u32 user_irq_start;
> + int ret;
> +
> + /* configure 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;
> + }
> +
> + /* configure 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 channels interrupts */
> + ret = regmap_write(xdev->rmap, XDMA_IRQ_CHAN_INT_EN_W1S, ~0);
> + if (ret) {
> + xdma_err(xdev, "failed to enable channel IRQs: %d", ret);
> + return ret;
> + }
> +
> + /* enable user interrupts if needed */
> + if (xdev->irq_num > user_irq_start) {
> + ret = regmap_write(xdev->rmap, XDMA_IRQ_USER_INT_EN_W1S,
> + xdev->usr_irq_mask);
> + if (ret) {
> + xdma_err(xdev, "failed to enable user IRQs: %d", ret);
> + return ret;
> + }
> + }
> +
> + return 0;
> +}
> +
> /**
> * xdma_irq_init - initialize IRQs
> * @xdev: DMA device pointer
> @@ -1025,7 +1097,6 @@ static int xdma_set_vector_reg(struct xdma_device *xdev, u32 vec_tbl_start,
> static int xdma_irq_init(struct xdma_device *xdev)
> {
> u32 irq = xdev->irq_start;
> - u32 user_irq_start;
> int i, j, ret;
>
> /* return failure if there are not enough IRQs */
> @@ -1060,28 +1131,8 @@ static int xdma_irq_init(struct xdma_device *xdev)
> irq++;
> }
>
> - /* 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);
> - goto failed_init_c2h;
> - }
> -
> - /* 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);
> - goto failed_init_c2h;
> - }
> - }
> -
> - /* enable interrupt */
> - ret = regmap_write(xdev->rmap, XDMA_IRQ_CHAN_INT_EN_W1S, ~0);
> + /* configure all HW IRQ registers */
> + ret = xdma_irq_config(xdev);
> if (ret)
> goto failed_init_c2h;
>
> @@ -1297,15 +1348,65 @@ 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);
> + int ret;
> +
> + ret = regmap_read(xdev->rmap, XDMA_IRQ_USER_INT_EN,
> + &xdev->usr_irq_mask);
> + if (ret) {
> + xdma_err(xdev, "User IRQ vector backup failed: %d", ret);
> + return ret;
> + }
> +
> + ret = regmap_write(xdev->rmap, XDMA_IRQ_CHAN_INT_EN_W1C, ~0);
> + if (ret)
> + xdma_err(xdev, "DMA channels IRQ disable failed: %d", ret);
> +
> + return ret;
> +}
> +
> +/**
> + * 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->h2c_chans, xdev->h2c_chan_num);
> + if (ret) {
> + xdma_err(xdev, "H2C channels reconfiguration failed: %d", ret);
> + return ret;
> + }
> +
> + ret = xdma_reconfig_channels(xdev->c2h_chans, xdev->c2h_chan_num);
> + if (ret) {
> + xdma_err(xdev, "C2H channels reconfiguration failed: %d", ret);
> + return ret;
> + }
> +
> + return xdma_irq_config(xdev);
> +}
> +
> static const struct platform_device_id xdma_id_table[] = {
> { "xdma", 0},
> { },
> };
> MODULE_DEVICE_TABLE(platform, xdma_id_table);
>
> +static DEFINE_NOIRQ_DEV_PM_OPS(xdma_dev_pm_ops, xdma_suspend, xdma_resume);
> +
> static struct platform_driver xdma_driver = {
> .driver = {
> .name = "xdma",
> + .pm = pm_sleep_ptr(&xdma_dev_pm_ops),
> },
> .id_table = xdma_id_table,
> .probe = xdma_probe,
prev parent reply other threads:[~2026-11-20 21:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-20 17:23 [PATCH v3 0/1] dmaengine: xilinx: xdma: Fix broken PM suspend/resume tumic
2026-11-20 17:23 ` [PATCH v3 1/1] " tumic
2026-11-20 17:32 ` Frank Li
2026-11-20 17:50 ` Martin Tůma
2026-11-20 17:32 ` sashiko-bot
2026-11-20 21:40 ` Lizhi Hou [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=754c498c-7252-3f2b-54e6-3ebfdf0181ff@amd.com \
--to=lizhi.hou@amd.com \
--cc=Frank.Li@kernel.org \
--cc=brian.xu@amd.com \
--cc=dmaengine@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=martin.tuma@digiteqautomotive.com \
--cc=michal.simek@amd.com \
--cc=raj.kumar.rampelli@amd.com \
--cc=tumic@gpxsee.org \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox