FAILED: patch "[PATCH] dmaengine: dw-edma: Add spinlock to protect DONE_INT_MASK and" failed to apply to 5.15-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x 8ffba0171c6bbce5f093c6dba5a02c0805b31203
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026072058-move-penny-29fb@gregkh' --subject-prefix 'PATCH 5.15.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 8ffba0171c6bbce5f093c6dba5a02c0805b31203 Mon Sep 17 00:00:00 2001
From: Frank Li <[email protected]>
Date: Thu, 21 May 2026 23:21:53 +0900
Subject: [PATCH] dmaengine: dw-edma: Add spinlock to protect DONE_INT_MASK and
ABORT_INT_MASK
The DONE_INT_MASK and ABORT_INT_MASK registers are shared by all DMA channels, and modifying them requires a read-modify-write sequence. Because this operation is not atomic, concurrent calls to dw_edma_v0_core_start() can introduce race conditions if two channels update these registers simultaneously.
Add a spinlock to serialize access to these registers and prevent race conditions.
drivers/dma/dw-edma/dw-edma-core.h +1 -1
@@ -109,7 +109,7 @@ struct dw_edma {struct dw_edma_chan *chan; -raw_spinlock_t lock;/* Only for legacy */ +raw_spinlock_t lock;/* Protect v0 shared registers */ struct dw_edma_chip *chip;
drivers/dma/dw-edma/dw-edma-v0-core.c +6 -0
@@ -364,6 +364,7 @@ static void dw_edma_v0_core_start(struct dw_edma_chunk *chunk, bool first) {struct dw_edma_chan *chan = chunk->chan;struct dw_edma *dw = chan->dw; +unsigned long flags;u32 tmp;dw_edma_v0_core_write_chunk (chunk);
@@ -408,6 +409,8 @@ static void dw_edma_v0_core_start(struct dw_edma_chunk *chunk, bool first) } }/* Interrupt unmask - done, abort */ +raw_spin_lock_irqsave (&dw->lock, flags); + tmp =GET_RW_32 (dw, chan->dir, int_mask); tmp &= ~FIELD_PREP (EDMA_V0_DONE_INT_MASK ,BIT (chan->id)); tmp &= ~FIELD_PREP (EDMA_V0_ABORT_INT_MASK ,BIT (chan->id));
@@ -416,6 +419,9 @@ static void dw_edma_v0_core_start(struct dw_edma_chunk *chunk, bool first) tmp =GET_RW_32 (dw, chan->dir, linked_list_err_en); tmp |=FIELD_PREP (EDMA_V0_LINKED_LIST_ERR_MASK ,BIT (chan->id));SET_RW_32 (dw, chan->dir, linked_list_err_en, tmp); + +raw_spin_unlock_irqrestore (&dw->lock, flags); +/* Channel control */ SET_CH_32 (dw, chan->dir, chan->id, ch_control1, (DW_EDMA_V0_CCS |DW_EDMA_V0_LLE ));
Sasha Levin
maintainerPATCH 1/3 dmaengine: dw-edma: Remove unused irq field in struct dw_edma_chip
From: Frank Li <[email protected]>
[ Upstream commit 5a0e4529d9aee8ce348f628ad476c9ddb6cf457d ]
The "irq" field of struct dw_edma_chip was never used. Remove it.
Stable-dep-of: 8ffba0171c6b ("dmaengine: dw-edma: Add spinlock to protect DONE_INT_MASK and ABORT_INT_MASK")
--- drivers/dma/dw-edma/dw-edma-pcie.c | 1 - include/linux/dma/edma.h | 2 -- 2 files changed, 3 deletions(-)
drivers/dma/dw-edma/dw-edma-pcie.c +0 -1
@@ -231,7 +231,6 @@ static int dw_edma_pcie_probe(struct pci_dev *pdev, chip->dw = dw; chip->dev = dev; chip->id = pdev->devfn; - chip->irq = pdev->irq; dw->mf = vsec_data.mf; dw->nr_irqs = nr_irqs;
include/linux/dma/edma.h +0 -2
@@ -18,13 +18,11 @@ struct dw_edma;* struct dw_edma_chip - representation of DesignWare eDMA controller hardware * @dev: struct device of the eDMA controller * @id: instance ID -* @irq: irq line * @dw: struct dw_edma that is filed by dw_edma_probe() */ struct dw_edma_chip {struct device *dev;int id; -int irq;struct dw_edma *dw; };
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/3 dmaengine: dw-edma: Detach the private data and chip info structures
From: Frank Li <[email protected]>
[ Upstream commit 203184571388a988283543f0fd7da1a0da7c3f91 ]
"struct dw_edma_chip" contains an internal structure "struct dw_edma" that is used by the eDMA core internally and should not be touched by the eDMA controller drivers themselves. But currently, the eDMA controller drivers like "dw-edma-pci" allocate and populate this internal structure before passing it on to the eDMA core. The eDMA core further populates the structure and uses it. This is wrong!
Hence, move all the "struct dw_edma" specifics from controller drivers to the eDMA core.
Stable-dep-of: 8ffba0171c6b ("dmaengine: dw-edma: Add spinlock to protect DONE_INT_MASK and ABORT_INT_MASK")
--- drivers/dma/dw-edma/dw-edma-core.c | 90 +++++++++++++----------- drivers/dma/dw-edma/dw-edma-core.h | 31 +------- drivers/dma/dw-edma/dw-edma-pcie.c | 82 +++++++++------------ drivers/dma/dw-edma/dw-edma-v0-core.c | 32 ++++----- drivers/dma/dw-edma/dw-edma-v0-core.h | 4 +- drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 18 ++--- drivers/dma/dw-edma/dw-edma-v0-debugfs.h | 8 +-- include/linux/dma/edma.h | 48 ++++++++++++- 8 files changed, 164 insertions(+), 149 deletions(-)
drivers/dma/dw-edma/dw-edma-core.c +49 -41
@@ -64,8 +64,8 @@ static struct dw_edma_burst *dw_edma_alloc_burst(struct dw_edma_chunk *chunk)static struct dw_edma_chunk *dw_edma_alloc_chunk (struct dw_edma_desc *desc) { +struct dw_edma_chip *chip = desc->chan->dw->chip;struct dw_edma_chan *chan = desc->chan; -struct dw_edma *dw = chan->chip->dw;struct dw_edma_chunk *chunk; chunk =kzalloc (sizeof (*chunk),GFP_NOWAIT );
@@ -82,11 +82,11 @@ static struct dw_edma_chunk *dw_edma_alloc_chunk(struct dw_edma_desc *desc)*/ chunk->cb = !(desc->chunks_alloc %2 );if (chan->dir ==EDMA_DIR_WRITE ) { - chunk->ll_region.paddr = dw->ll_region_wr[chan->id].paddr; - chunk->ll_region.vaddr = dw->ll_region_wr[chan->id].vaddr; + chunk->ll_region.paddr = chip->ll_region_wr[chan->id].paddr; + chunk->ll_region.vaddr = chip->ll_region_wr[chan->id].vaddr; }else { - chunk->ll_region.paddr = dw->ll_region_rd[chan->id].paddr; - chunk->ll_region.vaddr = dw->ll_region_rd[chan->id].vaddr; + chunk->ll_region.paddr = chip->ll_region_rd[chan->id].paddr; + chunk->ll_region.vaddr = chip->ll_region_rd[chan->id].vaddr; }if (desc->chunk) {
@@ -695,7 +695,7 @@ static int dw_edma_alloc_chan_resources(struct dma_chan *dchan)if (chan->status !=EDMA_ST_IDLE )return -EBUSY ; -pm_runtime_get (chan->chip->dev); +pm_runtime_get (chan->dw->chip->dev);return 0 ; }
@@ -717,15 +717,15 @@ static void dw_edma_free_chan_resources(struct dma_chan *dchan)cpu_relax (); } -pm_runtime_put (chan->chip->dev); +pm_runtime_put (chan->dw->chip->dev); } -static int dw_edma_channel_setup (struct dw_edma_chip *chip,bool write, +static int dw_edma_channel_setup (struct dw_edma *dw,bool write,u32 wr_alloc,u32 rd_alloc) { +struct dw_edma_chip *chip = dw->chip;struct dw_edma_region *dt_region;struct device *dev = chip->dev; -struct dw_edma *dw = chip->dw;struct dw_edma_chan *chan;struct dw_edma_irq *irq;struct dma_device *dma;
@@ -758,7 +758,7 @@ static int dw_edma_channel_setup(struct dw_edma_chip *chip, bool write, chan->vc.chan.private = dt_region; - chan->chip = chip; + chan->dw = dw; chan->id = j; chan->dir = write ?EDMA_DIR_WRITE :EDMA_DIR_READ ; chan->configured = false;
@@ -766,9 +766,9 @@ static int dw_edma_channel_setup(struct dw_edma_chip *chip, bool write, chan->status =EDMA_ST_IDLE ;if (write) - chan->ll_max = (dw->ll_region_wr[j].sz /EDMA_LL_SZ ); + chan->ll_max = (chip->ll_region_wr[j].sz /EDMA_LL_SZ );else - chan->ll_max = (dw->ll_region_rd[j].sz /EDMA_LL_SZ ); + chan->ll_max = (chip->ll_region_rd[j].sz /EDMA_LL_SZ ); chan->ll_max -=1 ; dev_vdbg(dev, "L. List:\tChannel %s[%u] max_cnt=%u\n",
@@ -798,13 +798,13 @@ static int dw_edma_channel_setup(struct dw_edma_chip *chip, bool write,vchan_init (&chan->vc, dma);if (write) { - dt_region->paddr = dw->dt_region_wr[j].paddr; - dt_region->vaddr = dw->dt_region_wr[j].vaddr; - dt_region->sz = dw->dt_region_wr[j].sz; + dt_region->paddr = chip->dt_region_wr[j].paddr; + dt_region->vaddr = chip->dt_region_wr[j].vaddr; + dt_region->sz = chip->dt_region_wr[j].sz; }else { - dt_region->paddr = dw->dt_region_rd[j].paddr; - dt_region->vaddr = dw->dt_region_rd[j].vaddr; - dt_region->sz = dw->dt_region_rd[j].sz; + dt_region->paddr = chip->dt_region_rd[j].paddr; + dt_region->vaddr = chip->dt_region_rd[j].vaddr; + dt_region->sz = chip->dt_region_rd[j].sz; }dw_edma_v0_core_device_config (chan);
@@ -858,11 +858,11 @@ static inline void dw_edma_add_irq_mask(u32 *mask, u32 alloc, u16 cnt) (*mask)++; } -static int dw_edma_irq_request (struct dw_edma_chip *chip, +static int dw_edma_irq_request (struct dw_edma *dw,u32 *wr_alloc,u32 *rd_alloc) { -struct device *dev = chip->dev; -struct dw_edma *dw = chip->dw; +struct dw_edma_chip *chip = dw->chip; +struct device *dev = dw->chip->dev;u32 wr_mask =1 ;u32 rd_mask =1 ;int i, err =0 ;
@@ -871,12 +871,16 @@ static int dw_edma_irq_request(struct dw_edma_chip *chip, ch_cnt = dw->wr_ch_cnt + dw->rd_ch_cnt; -if (dw->nr_irqs <1 ) +if (chip->nr_irqs <1 || !chip->ops->irq_vector)return -EINVAL ; -if (dw->nr_irqs ==1 ) { + dw->irq =devm_kcalloc (dev, chip->nr_irqs,sizeof (*dw->irq),GFP_KERNEL ); +if (!dw->irq) +return -ENOMEM ; + +if (chip->nr_irqs ==1 ) {/* Common IRQ shared among all channels */ - irq = dw->ops->irq_vector (dev,0 ); + irq = chip->ops->irq_vector (dev,0 ); err =request_irq (irq, dw_edma_interrupt_common,IRQF_SHARED , dw->name, &dw->irq[0 ]);if (err) {
@@ -886,9 +890,11 @@ static int dw_edma_irq_request(struct dw_edma_chip *chip,if (irq_get_msi_desc (irq))get_cached_msi_msg (irq, &dw->irq[0 ].msi); + + dw->nr_irqs =1 ; }else {/* Distribute IRQs equally among all channels */ -int tmp = dw->nr_irqs; +int tmp = chip->nr_irqs;while (tmp && (*wr_alloc + *rd_alloc) < ch_cnt) {dw_edma_dec_irq_alloc (&tmp, wr_alloc, dw->wr_ch_cnt);
@@ -899,7 +905,7 @@ static int dw_edma_irq_request(struct dw_edma_chip *chip,dw_edma_add_irq_mask (&rd_mask, *rd_alloc, dw->rd_ch_cnt);for (i =0 ; i < (*wr_alloc + *rd_alloc); i++) { - irq = dw->ops->irq_vector (dev, i); + irq = chip->ops->irq_vector (dev, i); err = request_irq(irq, i < *wr_alloc ? dw_edma_interrupt_write :
@@ -933,20 +939,22 @@ int dw_edma_probe(struct dw_edma_chip *chip)return -EINVAL ; dev = chip->dev; -if (!dev) +if (!dev || !chip->ops)return -EINVAL ; - dw = chip->dw; -if (!dw || !dw->irq || !dw->ops || !dw->ops->irq_vector) -return -EINVAL ; + dw =devm_kzalloc (dev,sizeof (*dw),GFP_KERNEL ); +if (!dw) +return -ENOMEM ; + + dw->chip = chip;raw_spin_lock_init (&dw->lock); - dw->wr_ch_cnt =min_t (u16, dw->wr_ch_cnt, + dw->wr_ch_cnt =min_t (u16, chip->wr_ch_cnt,dw_edma_v0_core_ch_count (dw,EDMA_DIR_WRITE )); dw->wr_ch_cnt =min_t (u16, dw->wr_ch_cnt,EDMA_MAX_WR_CH ); - dw->rd_ch_cnt =min_t (u16, dw->rd_ch_cnt, + dw->rd_ch_cnt =min_t (u16, chip->rd_ch_cnt,dw_edma_v0_core_ch_count (dw,EDMA_DIR_READ )); dw->rd_ch_cnt =min_t (u16, dw->rd_ch_cnt,EDMA_MAX_RD_CH );
@@ -968,17 +976,17 @@ int dw_edma_probe(struct dw_edma_chip *chip)dw_edma_v0_core_off (dw);/* Request IRQs */ - err =dw_edma_irq_request (chip, &wr_alloc, &rd_alloc); + err =dw_edma_irq_request (dw, &wr_alloc, &rd_alloc);if (err)return err;/* Setup write channels */ - err =dw_edma_channel_setup (chip, true, wr_alloc, rd_alloc); + err =dw_edma_channel_setup (dw, true, wr_alloc, rd_alloc);if (err) goto err_irq_free;/* Setup read channels */ - err =dw_edma_channel_setup (chip, false, wr_alloc, rd_alloc); + err =dw_edma_channel_setup (dw, false, wr_alloc, rd_alloc);if (err) goto err_irq_free;
@@ -986,15 +994,15 @@ int dw_edma_probe(struct dw_edma_chip *chip)pm_runtime_enable (dev);/* Turn debugfs on */ -dw_edma_v0_core_debugfs_on (chip); +dw_edma_v0_core_debugfs_on (dw); + + chip->dw = dw;return 0 ; err_irq_free:for (i = (dw->nr_irqs -1 ); i >=0 ; i--) -free_irq (dw->ops->irq_vector (dev, i), &dw->irq[i]); - - dw->nr_irqs =0 ; +free_irq (chip->ops->irq_vector (dev, i), &dw->irq[i]);return err; }
@@ -1012,7 +1020,7 @@ int dw_edma_remove(struct dw_edma_chip *chip)/* Free irqs */ for (i = (dw->nr_irqs -1 ); i >=0 ; i--) -free_irq (dw->ops->irq_vector (dev, i), &dw->irq[i]); +free_irq (chip->ops->irq_vector (dev, i), &dw->irq[i]);/* Power management */ pm_runtime_disable (dev);
@@ -1033,7 +1041,7 @@ int dw_edma_remove(struct dw_edma_chip *chip) }/* Turn debugfs off */ -dw_edma_v0_core_debugfs_off (chip); +dw_edma_v0_core_debugfs_off (dw);return 0 ; }
drivers/dma/dw-edma/dw-edma-core.h +3 -28
@@ -15,20 +15,12 @@#include "../virt-dma.h" #define EDMA_LL_SZ 24 -#define EDMA_MAX_WR_CH 8 -#define EDMA_MAX_RD_CH 8enum dw_edma_dir {EDMA_DIR_WRITE =0 ,EDMA_DIR_READ }; -enum dw_edma_map_format { -EDMA_MF_EDMA_LEGACY =0x0 , -EDMA_MF_EDMA_UNROLL =0x1 , -EDMA_MF_HDMA_COMPAT =0x5 -}; -enum dw_edma_request {EDMA_REQ_NONE =0 ,EDMA_REQ_STOP ,
@@ -57,12 +49,6 @@ struct dw_edma_burst {u32 sz; }; -struct dw_edma_region { -phys_addr_t paddr; -void __iomem *vaddr; -size_t sz; -}; -struct dw_edma_chunk {struct list_head list;struct dw_edma_chan *chan;
@@ -87,7 +73,7 @@ struct dw_edma_desc {struct dw_edma_chan {struct virt_dma_chan vc; -struct dw_edma_chip *chip; +struct dw_edma *dw;int id;enum dw_edma_dir dir;
@@ -109,10 +95,6 @@ struct dw_edma_irq {struct dw_edma *dw; }; -struct dw_edma_core_ops { -int (*irq_vector)(struct device *dev,unsigned int nr); -}; -struct dw_edma {char name[20 ];
@@ -122,21 +104,14 @@ struct dw_edma {struct dma_device rd_edma;u16 rd_ch_cnt; -struct dw_edma_region rg_region;/* Registers */ -struct dw_edma_region ll_region_wr[EDMA_MAX_WR_CH ]; -struct dw_edma_region ll_region_rd[EDMA_MAX_RD_CH ]; -struct dw_edma_region dt_region_wr[EDMA_MAX_WR_CH ]; -struct dw_edma_region dt_region_rd[EDMA_MAX_RD_CH ]; -struct dw_edma_irq *irq;int nr_irqs; -enum dw_edma_map_format mf; -struct dw_edma_chan *chan; -const struct dw_edma_core_ops *ops;raw_spinlock_t lock;/* Only for legacy */ + +struct dw_edma_chip *chip;#ifdef CONFIG_DEBUG_FS struct dentry *debugfs;#endif /* CONFIG_DEBUG_FS */
drivers/dma/dw-edma/dw-edma-pcie.c +34 -48
143 lines not on this page · raw message
drivers/dma/dw-edma/dw-edma-v0-core.c +16 -16
@@ -25,7 +25,7 @@ enum dw_edma_control {static inline struct dw_edma_v0_regs __iomem *__dw_regs (struct dw_edma *dw) { -return dw->rg_region.vaddr; +return dw->chip->rg_region.vaddr; }#define SET_32 (dw, name, value) \
@@ -96,7 +96,7 @@ static inline struct dw_edma_v0_regs __iomem *__dw_regs(struct dw_edma *dw)static inline struct dw_edma_v0_ch_regs __iomem *__dw_ch_regs (struct dw_edma *dw,enum dw_edma_dir dir,u16 ch) { -if (dw->mf ==EDMA_MF_EDMA_LEGACY ) +if (dw->chip->mf ==EDMA_MF_EDMA_LEGACY )return &(__dw_regs (dw)->type.legacy.ch);if (dir ==EDMA_DIR_WRITE )
@@ -108,7 +108,7 @@ __dw_ch_regs(struct dw_edma *dw, enum dw_edma_dir dir, u16 ch)static inline void writel_ch (struct dw_edma *dw,enum dw_edma_dir dir,u16 ch,u32 value,void __iomem *addr) { -if (dw->mf ==EDMA_MF_EDMA_LEGACY ) { +if (dw->chip->mf ==EDMA_MF_EDMA_LEGACY ) {u32 viewport_sel;unsigned long flags;
@@ -133,7 +133,7 @@ static inline u32 readl_ch(struct dw_edma *dw, enum dw_edma_dir dir, u16 ch, {u32 value; -if (dw->mf ==EDMA_MF_EDMA_LEGACY ) { +if (dw->chip->mf ==EDMA_MF_EDMA_LEGACY ) {u32 viewport_sel;unsigned long flags;
@@ -169,7 +169,7 @@ static inline u32 readl_ch(struct dw_edma *dw, enum dw_edma_dir dir, u16 ch,static inline void writeq_ch (struct dw_edma *dw,enum dw_edma_dir dir,u16 ch,u64 value,void __iomem *addr) { -if (dw->mf ==EDMA_MF_EDMA_LEGACY ) { +if (dw->chip->mf ==EDMA_MF_EDMA_LEGACY ) {u32 viewport_sel;unsigned long flags;
@@ -194,7 +194,7 @@ static inline u64 readq_ch(struct dw_edma *dw, enum dw_edma_dir dir, u16 ch, {u64 value; -if (dw->mf ==EDMA_MF_EDMA_LEGACY ) { +if (dw->chip->mf ==EDMA_MF_EDMA_LEGACY ) {u32 viewport_sel;unsigned long flags;
@@ -256,7 +256,7 @@ u16 dw_edma_v0_core_ch_count(struct dw_edma *dw, enum dw_edma_dir dir)enum dma_status dw_edma_v0_core_ch_status (struct dw_edma_chan *chan) { -struct dw_edma *dw = chan->chip->dw; +struct dw_edma *dw = chan->dw;u32 tmp; tmp = FIELD_GET(EDMA_V0_CH_STATUS_MASK,
@@ -272,7 +272,7 @@ enum dma_status dw_edma_v0_core_ch_status(struct dw_edma_chan *chan)void dw_edma_v0_core_clear_done_int (struct dw_edma_chan *chan) { -struct dw_edma *dw = chan->chip->dw; +struct dw_edma *dw = chan->dw;SET_RW_32 (dw, chan->dir, int_clear,FIELD_PREP (EDMA_V0_DONE_INT_MASK ,BIT (chan->id)));
@@ -280,7 +280,7 @@ void dw_edma_v0_core_clear_done_int(struct dw_edma_chan *chan)void dw_edma_v0_core_clear_abort_int (struct dw_edma_chan *chan) { -struct dw_edma *dw = chan->chip->dw; +struct dw_edma *dw = chan->dw;SET_RW_32 (dw, chan->dir, int_clear,FIELD_PREP (EDMA_V0_ABORT_INT_MASK ,BIT (chan->id)));
@@ -357,7 +357,7 @@ static void dw_edma_v0_core_write_chunk(struct dw_edma_chunk *chunk)void dw_edma_v0_core_start (struct dw_edma_chunk *chunk,bool first) {struct dw_edma_chan *chan = chunk->chan; -struct dw_edma *dw = chan->chip->dw; +struct dw_edma *dw = chan->dw;u32 tmp;dw_edma_v0_core_write_chunk (chunk);
@@ -365,7 +365,7 @@ void dw_edma_v0_core_start(struct dw_edma_chunk *chunk, bool first)if (first) {/* Enable engine */ SET_RW_32 (dw, chan->dir, engine_en,BIT (0 )); -if (dw->mf ==EDMA_MF_HDMA_COMPAT ) { +if (dw->chip->mf ==EDMA_MF_HDMA_COMPAT ) {switch (chan->id) {case 0 : SET_RW_COMPAT(dw, chan->dir, ch0_pwr_en,
@@ -434,7 +434,7 @@ void dw_edma_v0_core_start(struct dw_edma_chunk *chunk, bool first)int dw_edma_v0_core_device_config (struct dw_edma_chan *chan) { -struct dw_edma *dw = chan->chip->dw; +struct dw_edma *dw = chan->dw;u32 tmp =0 ;/* MSI done addr - low, high */
@@ -504,12 +504,12 @@ int dw_edma_v0_core_device_config(struct dw_edma_chan *chan) }/* eDMA debugfs callbacks */ -void dw_edma_v0_core_debugfs_on (struct dw_edma_chip *chip) +void dw_edma_v0_core_debugfs_on (struct dw_edma *dw) { -dw_edma_v0_debugfs_on (chip); +dw_edma_v0_debugfs_on (dw); } -void dw_edma_v0_core_debugfs_off (struct dw_edma_chip *chip) +void dw_edma_v0_core_debugfs_off (struct dw_edma *dw) { -dw_edma_v0_debugfs_off (chip); +dw_edma_v0_debugfs_off (dw); }
drivers/dma/dw-edma/dw-edma-v0-core.h +2 -2
@@ -22,7 +22,7 @@ u32 dw_edma_v0_core_status_abort_int(struct dw_edma *chan, enum dw_edma_dir dir)void dw_edma_v0_core_start (struct dw_edma_chunk *chunk,bool first);int dw_edma_v0_core_device_config (struct dw_edma_chan *chan);/* eDMA debug fs callbacks */ -void dw_edma_v0_core_debugfs_on (struct dw_edma_chip *chip); -void dw_edma_v0_core_debugfs_off (struct dw_edma_chip *chip); +void dw_edma_v0_core_debugfs_on (struct dw_edma *dw); +void dw_edma_v0_core_debugfs_off (struct dw_edma *dw);#endif /* _DW_EDMA_V0_CORE_H */
drivers/dma/dw-edma/dw-edma-v0-debugfs.c +9 -9
@@ -54,7 +54,7 @@ struct debugfs_entries {static int dw_edma_debugfs_u32_get (void *data,u64 *val) {void __iomem *reg = (void __force __iomem *)data; -if (dw->mf ==EDMA_MF_EDMA_LEGACY && +if (dw->chip->mf ==EDMA_MF_EDMA_LEGACY && reg >= (void __iomem *)®s->type.legacy.ch) {void __iomem *ptr = ®s->type.legacy.ch;u32 viewport_sel =0 ;
@@ -173,7 +173,7 @@ static void dw_edma_debugfs_regs_wr(struct dentry *dir) nr_entries =ARRAY_SIZE (debugfs_regs);dw_edma_debugfs_create_x32 (debugfs_regs, nr_entries, regs_dir); -if (dw->mf ==EDMA_MF_HDMA_COMPAT ) { +if (dw->chip->mf ==EDMA_MF_HDMA_COMPAT ) { nr_entries =ARRAY_SIZE (debugfs_unroll_regs);dw_edma_debugfs_create_x32 (debugfs_unroll_regs, nr_entries, regs_dir);
@@ -242,7 +242,7 @@ static void dw_edma_debugfs_regs_rd(struct dentry *dir) nr_entries =ARRAY_SIZE (debugfs_regs);dw_edma_debugfs_create_x32 (debugfs_regs, nr_entries, regs_dir); -if (dw->mf ==EDMA_MF_HDMA_COMPAT ) { +if (dw->chip->mf ==EDMA_MF_HDMA_COMPAT ) { nr_entries =ARRAY_SIZE (debugfs_unroll_regs);dw_edma_debugfs_create_x32 (debugfs_unroll_regs, nr_entries, regs_dir);
@@ -282,13 +282,13 @@ static void dw_edma_debugfs_regs(void)dw_edma_debugfs_regs_rd (regs_dir); } -void dw_edma_v0_debugfs_on (struct dw_edma_chip *chip) +void dw_edma_v0_debugfs_on (struct dw_edma *_dw) { - dw = chip->dw; + dw = _dw;if (!dw)return ; - regs = dw->rg_region.vaddr; + regs = dw->chip->rg_region.vaddr;if (!regs)return ;
@@ -296,16 +296,16 @@ void dw_edma_v0_debugfs_on(struct dw_edma_chip *chip)if (!dw->debugfs)return ; -debugfs_create_u32 ("mf" ,0444 , dw->debugfs, &dw->mf); +debugfs_create_u32 ("mf" ,0444 , dw->debugfs, &dw->chip->mf);debugfs_create_u16 ("wr_ch_cnt" ,0444 , dw->debugfs, &dw->wr_ch_cnt);debugfs_create_u16 ("rd_ch_cnt" ,0444 , dw->debugfs, &dw->rd_ch_cnt);dw_edma_debugfs_regs (); } -void dw_edma_v0_debugfs_off (struct dw_edma_chip *chip) +void dw_edma_v0_debugfs_off (struct dw_edma *_dw) { - dw = chip->dw; + dw = _dw;if (!dw)return ;
drivers/dma/dw-edma/dw-edma-v0-debugfs.h +4 -4
@@ -12,14 +12,14 @@#include <linux/dma/edma.h> #ifdef CONFIG_DEBUG_FS -void dw_edma_v0_debugfs_on (struct dw_edma_chip *chip); -void dw_edma_v0_debugfs_off (struct dw_edma_chip *chip); +void dw_edma_v0_debugfs_on (struct dw_edma *dw); +void dw_edma_v0_debugfs_off (struct dw_edma *dw);#else -static inline void dw_edma_v0_debugfs_on (struct dw_edma_chip *chip) +static inline void dw_edma_v0_debugfs_on (struct dw_edma *dw) { } -static inline void dw_edma_v0_debugfs_off (struct dw_edma_chip *chip) +static inline void dw_edma_v0_debugfs_off (struct dw_edma *dw) { }#endif /* CONFIG_DEBUG_FS */
include/linux/dma/edma.h +47 -1
64 lines not on this page · raw message
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 3/3 dmaengine: dw-edma: Add spinlock to protect DONE_INT_MASK and ABORT_INT_MASK
In reply to Sasha LevinFrom: Frank Li <[email protected]>
[ Upstream commit 8ffba0171c6bbce5f093c6dba5a02c0805b31203 ]
The DONE_INT_MASK and ABORT_INT_MASK registers are shared by all DMA channels, and modifying them requires a read-modify-write sequence. Because this operation is not atomic, concurrent calls to dw_edma_v0_core_start() can introduce race conditions if two channels update these registers simultaneously.
Add a spinlock to serialize access to these registers and prevent race conditions.
--- drivers/dma/dw-edma/dw-edma-core.h | 2 +- drivers/dma/dw-edma/dw-edma-v0-core.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-)
drivers/dma/dw-edma/dw-edma-core.h +1 -1
@@ -109,7 +109,7 @@ struct dw_edma {struct dw_edma_chan *chan; -raw_spinlock_t lock;/* Only for legacy */ +raw_spinlock_t lock;/* Protect v0 shared registers */ struct dw_edma_chip *chip;#ifdef CONFIG_DEBUG_FS
drivers/dma/dw-edma/dw-edma-v0-core.c +6 -0
@@ -358,6 +358,7 @@ void dw_edma_v0_core_start(struct dw_edma_chunk *chunk, bool first) {struct dw_edma_chan *chan = chunk->chan;struct dw_edma *dw = chan->dw; +unsigned long flags;u32 tmp;dw_edma_v0_core_write_chunk (chunk);
@@ -402,6 +403,8 @@ void dw_edma_v0_core_start(struct dw_edma_chunk *chunk, bool first) } }/* Interrupt unmask - done, abort */ +raw_spin_lock_irqsave (&dw->lock, flags); + tmp =GET_RW_32 (dw, chan->dir, int_mask); tmp &= ~FIELD_PREP (EDMA_V0_DONE_INT_MASK ,BIT (chan->id)); tmp &= ~FIELD_PREP (EDMA_V0_ABORT_INT_MASK ,BIT (chan->id));
@@ -410,6 +413,9 @@ void dw_edma_v0_core_start(struct dw_edma_chunk *chunk, bool first) tmp =GET_RW_32 (dw, chan->dir, linked_list_err_en); tmp |=FIELD_PREP (EDMA_V0_LINKED_LIST_ERR_MASK ,BIT (chan->id));SET_RW_32 (dw, chan->dir, linked_list_err_en, tmp); + +raw_spin_unlock_irqrestore (&dw->lock, flags); +/* Channel control */ SET_CH_32 (dw, chan->dir, chan->id, ch_control1, (DW_EDMA_V0_CCS |DW_EDMA_V0_LLE ));
Signature · 1 line
2.53.0