dmaengine: qcom_bam_dma: Generalize BAM register offset calculations
Subsystems (3)
PATCH 1/3 dmaengine: qcom_bam_dma: Generalize BAM register offset calculations
The BAM DMA IP comes in different versions. The register offset layout varies among these versions. The layouts depend on which generation/family of SoCs they belong to.
The current SoCs(like 8084, 8074) have a layout where the Top level registers come in the beginning of the address range, followed by pipe and event registers. The BAM revision numbers fall above 1.4.0.
The older SoCs (like 8064, 8960) have a layout where the pipe registers come first, and the top level come later. These have BAM revision numbers lesser than 1.4.0.
It isn't suitable to have macros provide the register offsets with the layouts changed. Future BAM revisions may have different register layouts too. The register addresses are now calculated by referring a table which contains a base offset and multipliers for pipe/evnt/ee registers.
We have a common function bam_addr() which computes addresses for all the registers. When computing address of top level/ee registers, we pass 0 to the pipe argument in addr() since they don't have any multiple instances.
Some of the unused register definitions are removed. We can add new registers as we need them.
--- drivers/dma/qcom_bam_dma.c | 176 +++++++++++++++++++++++++++++---------------- 1 file changed, 113 insertions(+), 63 deletions(-)
drivers/dma/qcom_bam_dma.c +113 -63
@@ -79,35 +79,68 @@ struct bam_async_desc {struct bam_desc_hw desc[0 ]; }; -#define BAM_CTRL 0x0000 -#define BAM_REVISION 0x0004 -#define BAM_SW_REVISION 0x0080 -#define BAM_NUM_PIPES 0x003C -#define BAM_TIMER 0x0040 -#define BAM_TIMER_CTRL 0x0044 -#define BAM_DESC_CNT_TRSHLD 0x0008 -#define BAM_IRQ_SRCS 0x000C -#define BAM_IRQ_SRCS_MSK 0x0010 -#define BAM_IRQ_SRCS_UNMASKED 0x0030 -#define BAM_IRQ_STTS 0x0014 -#define BAM_IRQ_CLR 0x0018 -#define BAM_IRQ_EN 0x001C -#define BAM_CNFG_BITS 0x007C -#define BAM_IRQ_SRCS_EE (ee) (0x0800 + ((ee) * 0x80)) -#define BAM_IRQ_SRCS_MSK_EE (ee) (0x0804 + ((ee) * 0x80)) -#define BAM_P_CTRL (pipe) (0x1000 + ((pipe) * 0x1000)) -#define BAM_P_RST (pipe) (0x1004 + ((pipe) * 0x1000)) -#define BAM_P_HALT (pipe) (0x1008 + ((pipe) * 0x1000)) -#define BAM_P_IRQ_STTS (pipe) (0x1010 + ((pipe) * 0x1000)) -#define BAM_P_IRQ_CLR (pipe) (0x1014 + ((pipe) * 0x1000)) -#define BAM_P_IRQ_EN (pipe) (0x1018 + ((pipe) * 0x1000)) -#define BAM_P_EVNT_DEST_ADDR (pipe) (0x182C + ((pipe) * 0x1000)) -#define BAM_P_EVNT_REG (pipe) (0x1818 + ((pipe) * 0x1000)) -#define BAM_P_SW_OFSTS (pipe) (0x1800 + ((pipe) * 0x1000)) -#define BAM_P_DATA_FIFO_ADDR (pipe) (0x1824 + ((pipe) * 0x1000)) -#define BAM_P_DESC_FIFO_ADDR (pipe) (0x181C + ((pipe) * 0x1000)) -#define BAM_P_EVNT_TRSHLD (pipe) (0x1828 + ((pipe) * 0x1000)) -#define BAM_P_FIFO_SIZES (pipe) (0x1820 + ((pipe) * 0x1000)) +enum bam_reg { +BAM_CTRL , +BAM_REVISION , +BAM_NUM_PIPES , +BAM_DESC_CNT_TRSHLD , +BAM_IRQ_SRCS , +BAM_IRQ_SRCS_MSK , +BAM_IRQ_SRCS_UNMASKED , +BAM_IRQ_STTS , +BAM_IRQ_CLR , +BAM_IRQ_EN , +BAM_CNFG_BITS , +BAM_IRQ_SRCS_EE , +BAM_IRQ_SRCS_MSK_EE , +BAM_P_CTRL , +BAM_P_RST , +BAM_P_HALT , +BAM_P_IRQ_STTS , +BAM_P_IRQ_CLR , +BAM_P_IRQ_EN , +BAM_P_EVNT_DEST_ADDR , +BAM_P_EVNT_REG , +BAM_P_SW_OFSTS , +BAM_P_DATA_FIFO_ADDR , +BAM_P_DESC_FIFO_ADDR , +BAM_P_EVNT_GEN_TRSHLD , +BAM_P_FIFO_SIZES , +}; + +struct reg_offset_data { +u32 base_offset; +unsigned int pipe_mult, evnt_mult, ee_mult; +}; + +static const struct reg_offset_data reg_info[] = { + [BAM_CTRL ] = {0x0000 ,0x00 ,0x00 ,0x00 }, + [BAM_REVISION ] = {0x0004 ,0x00 ,0x00 ,0x00 }, + [BAM_NUM_PIPES ] = {0x003C ,0x00 ,0x00 ,0x00 }, + [BAM_DESC_CNT_TRSHLD ] = {0x0008 ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_SRCS ] = {0x000C ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_SRCS_MSK ] = {0x0010 ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_SRCS_UNMASKED ] = {0x0030 ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_STTS ] = {0x0014 ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_CLR ] = {0x0018 ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_EN ] = {0x001C ,0x00 ,0x00 ,0x00 }, + [BAM_CNFG_BITS ] = {0x007C ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_SRCS_EE ] = {0x0800 ,0x00 ,0x00 ,0x80 }, + [BAM_IRQ_SRCS_MSK_EE ] = {0x0804 ,0x00 ,0x00 ,0x80 }, + [BAM_P_CTRL ] = {0x1000 ,0x1000 ,0x00 ,0x00 }, + [BAM_P_RST ] = {0x1004 ,0x1000 ,0x00 ,0x00 }, + [BAM_P_HALT ] = {0x1008 ,0x1000 ,0x00 ,0x00 }, + [BAM_P_IRQ_STTS ] = {0x1010 ,0x1000 ,0x00 ,0x00 }, + [BAM_P_IRQ_CLR ] = {0x1014 ,0x1000 ,0x00 ,0x00 }, + [BAM_P_IRQ_EN ] = {0x1018 ,0x1000 ,0x00 ,0x00 }, + [BAM_P_EVNT_DEST_ADDR ] = {0x102C ,0x00 ,0x1000 ,0x00 }, + [BAM_P_EVNT_REG ] = {0x1018 ,0x00 ,0x1000 ,0x00 }, + [BAM_P_SW_OFSTS ] = {0x1000 ,0x00 ,0x1000 ,0x00 }, + [BAM_P_DATA_FIFO_ADDR ] = {0x1824 ,0x00 ,0x1000 ,0x00 }, + [BAM_P_DESC_FIFO_ADDR ] = {0x181C ,0x00 ,0x1000 ,0x00 }, + [BAM_P_EVNT_GEN_TRSHLD ] = {0x1828 ,0x00 ,0x1000 ,0x00 }, + [BAM_P_FIFO_SIZES ] = {0x1820 ,0x00 ,0x1000 ,0x00 }, +};/* BAM CTRL */ #define BAM_SW_RST BIT(0)
@@ -305,6 +338,23 @@ struct bam_device { };/** +* bam_addr - returns BAM register address +* @bdev: bam device +* @pipe: pipe instance (ignored when register doesn't have multiple instances) +* @reg: register enum +*/ +static inline void __iomem *bam_addr (struct bam_device *bdev,u32 pipe, +enum bam_reg reg) +{ +const struct reg_offset_data r = reg_info[reg]; + +return bdev->regs + r.base_offset + + r.pipe_mult * pipe + + r.evnt_mult * pipe + + r.ee_mult * bdev->ee; +} + +/** * bam_reset_channel - Reset individual BAM DMA channel * @bchan: bam channel *
@@ -317,8 +367,8 @@ static void bam_reset_channel(struct bam_chan *bchan)lockdep_assert_held (&bchan->vc.lock);/* reset channel */ -writel_relaxed (1 , bdev->regs +BAM_P_RST (bchan->id)); -writel_relaxed (0 , bdev->regs +BAM_P_RST (bchan->id)); +writel_relaxed (1 ,bam_addr (bdev, bchan->id,BAM_P_RST )); +writel_relaxed (0 ,bam_addr (bdev, bchan->id,BAM_P_RST ));/* don't allow cpu to reorder BAM register accesses done after this */ wmb ();
@@ -347,17 +397,18 @@ static void bam_chan_init_hw(struct bam_chan *bchan,* because we allocated 1 more descriptor (8 bytes) than we can use */ writel_relaxed (ALIGN (bchan->fifo_phys,sizeof (struct bam_desc_hw )), - bdev->regs +BAM_P_DESC_FIFO_ADDR (bchan->id)); -writel_relaxed (BAM_DESC_FIFO_SIZE , bdev->regs + -BAM_P_FIFO_SIZES (bchan->id)); +bam_addr (bdev, bchan->id,BAM_P_DESC_FIFO_ADDR )); +writel_relaxed (BAM_DESC_FIFO_SIZE , +bam_addr (bdev, bchan->id,BAM_P_FIFO_SIZES ));/* enable the per pipe interrupts, enable EOT, ERR, and INT irqs */ -writel_relaxed (P_DEFAULT_IRQS_EN , bdev->regs +BAM_P_IRQ_EN (bchan->id)); +writel_relaxed (P_DEFAULT_IRQS_EN , +bam_addr (bdev, bchan->id,BAM_P_IRQ_EN ));/* unmask the specific pipe and EE combo */ - val =readl_relaxed (bdev->regs +BAM_IRQ_SRCS_MSK_EE (bdev->ee)); + val =readl_relaxed (bam_addr (bdev,0 ,BAM_IRQ_SRCS_MSK_EE )); val |=BIT (bchan->id); -writel_relaxed (val, bdev->regs +BAM_IRQ_SRCS_MSK_EE (bdev->ee)); +writel_relaxed (val,bam_addr (bdev,0 ,BAM_IRQ_SRCS_MSK_EE ));/* don't allow cpu to reorder the channel enable done below */ wmb ();
@@ -367,7 +418,7 @@ static void bam_chan_init_hw(struct bam_chan *bchan,if (dir ==DMA_DEV_TO_MEM ) val |=P_DIRECTION ; -writel_relaxed (val, bdev->regs +BAM_P_CTRL (bchan->id)); +writel_relaxed (val,bam_addr (bdev, bchan->id,BAM_P_CTRL )); bchan->initialized =1 ;
@@ -432,12 +483,12 @@ static void bam_free_chan(struct dma_chan *chan) bchan->fifo_virt =NULL ;/* mask irq for pipe/channel */ - val =readl_relaxed (bdev->regs +BAM_IRQ_SRCS_MSK_EE (bdev->ee)); + val =readl_relaxed (bam_addr (bdev,0 ,BAM_IRQ_SRCS_MSK_EE )); val &= ~BIT (bchan->id); -writel_relaxed (val, bdev->regs +BAM_IRQ_SRCS_MSK_EE (bdev->ee)); +writel_relaxed (val,bam_addr (bdev,0 ,BAM_IRQ_SRCS_MSK_EE ));/* disable irq */ -writel_relaxed (0 , bdev->regs +BAM_P_IRQ_EN (bchan->id)); +writel_relaxed (0 ,bam_addr (bdev, bchan->id,BAM_P_IRQ_EN )); }/**
@@ -583,14 +634,14 @@ static int bam_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,switch (cmd) {case DMA_PAUSE :spin_lock_irqsave (&bchan->vc.lock, flag); -writel_relaxed (1 , bdev->regs +BAM_P_HALT (bchan->id)); +writel_relaxed (1 ,bam_addr (bdev, bchan->id,BAM_P_HALT )); bchan->paused =1 ;spin_unlock_irqrestore (&bchan->vc.lock, flag);break ;case DMA_RESUME :spin_lock_irqsave (&bchan->vc.lock, flag); -writel_relaxed (0 , bdev->regs +BAM_P_HALT (bchan->id)); +writel_relaxed (0 ,bam_addr (bdev, bchan->id,BAM_P_HALT )); bchan->paused =0 ;spin_unlock_irqrestore (&bchan->vc.lock, flag);break ;
@@ -626,7 +677,7 @@ static u32 process_channel_irqs(struct bam_device *bdev)unsigned long flags;struct bam_async_desc *async_desc; - srcs =readl_relaxed (bdev->regs +BAM_IRQ_SRCS_EE (bdev->ee)); + srcs =readl_relaxed (bam_addr (bdev,0 ,BAM_IRQ_SRCS_EE ));/* return early if no pipe/channel interrupts are present */ if (!(srcs &P_IRQ ))
@@ -639,11 +690,9 @@ static u32 process_channel_irqs(struct bam_device *bdev)continue ;/* clear pipe irq */ - pipe_stts =readl_relaxed (bdev->regs + -BAM_P_IRQ_STTS (i)); + pipe_stts =readl_relaxed (bam_addr (bdev, i,BAM_P_IRQ_STTS )); -writel_relaxed (pipe_stts, bdev->regs + -BAM_P_IRQ_CLR (i)); +writel_relaxed (pipe_stts,bam_addr (bdev, i,BAM_P_IRQ_CLR ));spin_lock_irqsave (&bchan->vc.lock, flags); async_desc = bchan->curr_txd;
@@ -694,12 +743,12 @@ static irqreturn_t bam_dma_irq(int irq, void *data)tasklet_schedule (&bdev->task);if (srcs &BAM_IRQ ) - clr_mask =readl_relaxed (bdev->regs +BAM_IRQ_STTS ); + clr_mask =readl_relaxed (bam_addr (bdev,0 ,BAM_IRQ_STTS ));/* don't allow reorder of the various accesses to the BAM registers */ mb (); -writel_relaxed (clr_mask, bdev->regs +BAM_IRQ_CLR ); +writel_relaxed (clr_mask,bam_addr (bdev,0 ,BAM_IRQ_CLR ));return IRQ_HANDLED ; }
@@ -763,7 +812,7 @@ static void bam_apply_new_config(struct bam_chan *bchan,else maxburst = bchan->slave.dst_maxburst; -writel_relaxed (maxburst, bdev->regs +BAM_DESC_CNT_TRSHLD ); +writel_relaxed (maxburst,bam_addr (bdev,0 ,BAM_DESC_CNT_TRSHLD )); bchan->reconfigure =0 ; }
@@ -830,7 +879,7 @@ static void bam_start_dma(struct bam_chan *bchan)/* ensure descriptor writes and dma start not reordered */ wmb ();writel_relaxed (bchan->tail *sizeof (struct bam_desc_hw ), - bdev->regs +BAM_P_EVNT_REG (bchan->id)); +bam_addr (bdev, bchan->id,BAM_P_EVNT_REG )); }/**
@@ -918,43 +967,44 @@ static int bam_init(struct bam_device *bdev)u32 val;/* read revision and configuration information */ - val =readl_relaxed (bdev->regs +BAM_REVISION ) >>NUM_EES_SHIFT ; + val =readl_relaxed (bam_addr (bdev,0 ,BAM_REVISION )) >>NUM_EES_SHIFT ; val &=NUM_EES_MASK ;/* check that configured EE is within range */ if (bdev->ee >= val)return -EINVAL ; - val =readl_relaxed (bdev->regs +BAM_NUM_PIPES ); + val =readl_relaxed (bam_addr (bdev,0 ,BAM_NUM_PIPES )); bdev->num_channels = val &BAM_NUM_PIPES_MASK ;/* s/w reset bam */ /* after reset all pipes are disabled and idle */ - val =readl_relaxed (bdev->regs +BAM_CTRL ); + val =readl_relaxed (bam_addr (bdev,0 ,BAM_CTRL )); val |=BAM_SW_RST ; -writel_relaxed (val, bdev->regs +BAM_CTRL ); +writel_relaxed (val,bam_addr (bdev,0 ,BAM_CTRL )); val &= ~BAM_SW_RST ; -writel_relaxed (val, bdev->regs +BAM_CTRL ); +writel_relaxed (val,bam_addr (bdev,0 ,BAM_CTRL ));/* make sure previous stores are visible before enabling BAM */ wmb ();/* enable bam */ val |=BAM_EN ; -writel_relaxed (val, bdev->regs +BAM_CTRL ); +writel_relaxed (val,bam_addr (bdev,0 ,BAM_CTRL ));/* set descriptor threshhold, start with 4 bytes */ -writel_relaxed (DEFAULT_CNT_THRSHLD , bdev->regs +BAM_DESC_CNT_TRSHLD ); +writel_relaxed (DEFAULT_CNT_THRSHLD , +bam_addr (bdev,0 ,BAM_DESC_CNT_TRSHLD ));/* Enable default set of h/w workarounds, ie all except BAM_FULL_PIPE */ -writel_relaxed (BAM_CNFG_BITS_DEFAULT , bdev->regs +BAM_CNFG_BITS ); +writel_relaxed (BAM_CNFG_BITS_DEFAULT ,bam_addr (bdev,0 ,BAM_CNFG_BITS ));/* enable irqs for errors */ writel_relaxed (BAM_ERROR_EN |BAM_HRESP_ERR_EN , - bdev->regs +BAM_IRQ_EN ); +bam_addr (bdev,0 ,BAM_IRQ_EN ));/* unmask global bam interrupt */ -writel_relaxed (BAM_IRQ_MSK , bdev->regs +BAM_IRQ_SRCS_MSK_EE (bdev->ee)); +writel_relaxed (BAM_IRQ_MSK ,bam_addr (bdev,0 ,BAM_IRQ_SRCS_MSK_EE ));return 0 ; }
@@ -1084,7 +1134,7 @@ static int bam_dma_remove(struct platform_device *pdev)dma_async_device_unregister (&bdev->common);/* mask all interrupts for this execution environment */ -writel_relaxed (0 , bdev->regs +BAM_IRQ_SRCS_MSK_EE (bdev->ee)); +writel_relaxed (0 ,bam_addr (bdev,0 ,BAM_IRQ_SRCS_MSK_EE ));devm_free_irq (bdev->dev, bdev->irq, bdev);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH 2/3 dmaengine: qcom_bam_dma: Add BAM v1.3.0 support
We currently have register offset information only for BAM IPs with revision 1.4.0. We add register offset table entries for the legacy (v1.3.0) version of BAM IPs found on SoCs like APQ8064 and MSM8960.
The register offset table pointers are stored in DT data corresponding to the BAM IP version specified in the compatible string.
--- drivers/dma/qcom_bam_dma.c | 58 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 8 deletions(-)
drivers/dma/qcom_bam_dma.c +50 -8
@@ -113,7 +113,36 @@ struct reg_offset_data {unsigned int pipe_mult, evnt_mult, ee_mult; }; -static const struct reg_offset_data reg_info[] = { +static const struct reg_offset_data bam_v1_3_reg_info[] = { + [BAM_CTRL ] = {0x0F80 ,0x00 ,0x00 ,0x00 }, + [BAM_REVISION ] = {0x0F84 ,0x00 ,0x00 ,0x00 }, + [BAM_NUM_PIPES ] = {0x0FBC ,0x00 ,0x00 ,0x00 }, + [BAM_DESC_CNT_TRSHLD ] = {0x0F88 ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_SRCS ] = {0x0F8C ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_SRCS_MSK ] = {0x0F90 ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_SRCS_UNMASKED ] = {0x0FB0 ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_STTS ] = {0x0F94 ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_CLR ] = {0x0F98 ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_EN ] = {0x0F9C ,0x00 ,0x00 ,0x00 }, + [BAM_CNFG_BITS ] = {0x0FFC ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_SRCS_EE ] = {0x1800 ,0x00 ,0x00 ,0x80 }, + [BAM_IRQ_SRCS_MSK_EE ] = {0x1804 ,0x00 ,0x00 ,0x80 }, + [BAM_P_CTRL ] = {0x0000 ,0x80 ,0x00 ,0x00 }, + [BAM_P_RST ] = {0x0004 ,0x80 ,0x00 ,0x00 }, + [BAM_P_HALT ] = {0x0008 ,0x80 ,0x00 ,0x00 }, + [BAM_P_IRQ_STTS ] = {0x0010 ,0x80 ,0x00 ,0x00 }, + [BAM_P_IRQ_CLR ] = {0x0014 ,0x80 ,0x00 ,0x00 }, + [BAM_P_IRQ_EN ] = {0x0018 ,0x80 ,0x00 ,0x00 }, + [BAM_P_EVNT_DEST_ADDR ] = {0x102C ,0x00 ,0x40 ,0x00 }, + [BAM_P_EVNT_REG ] = {0x1018 ,0x00 ,0x40 ,0x00 }, + [BAM_P_SW_OFSTS ] = {0x1000 ,0x00 ,0x40 ,0x00 }, + [BAM_P_DATA_FIFO_ADDR ] = {0x1024 ,0x00 ,0x40 ,0x00 }, + [BAM_P_DESC_FIFO_ADDR ] = {0x101C ,0x00 ,0x40 ,0x00 }, + [BAM_P_EVNT_GEN_TRSHLD ] = {0x1028 ,0x00 ,0x40 ,0x00 }, + [BAM_P_FIFO_SIZES ] = {0x1020 ,0x00 ,0x40 ,0x00 }, +}; + +static const struct reg_offset_data bam_v1_4_reg_info[] = { [BAM_CTRL ] = {0x0000 ,0x00 ,0x00 ,0x00 }, [BAM_REVISION ] = {0x0004 ,0x00 ,0x00 ,0x00 }, [BAM_NUM_PIPES ] = {0x003C ,0x00 ,0x00 ,0x00 },
@@ -330,6 +359,8 @@ struct bam_device {/* execution environment ID, from DT */ u32 ee; +const struct reg_offset_data *layout; +struct clk *bamclk;int irq;
@@ -346,7 +377,7 @@ struct bam_device {static inline void __iomem *bam_addr (struct bam_device *bdev,u32 pipe,enum bam_reg reg) { -const struct reg_offset_data r = reg_info[reg]; +const struct reg_offset_data r = bdev->layout[reg];return bdev->regs + r.base_offset + r.pipe_mult * pipe +
@@ -1019,9 +1050,18 @@ static void bam_channel_init(struct bam_device *bdev, struct bam_chan *bchan, bchan->vc.desc_free = bam_dma_free_desc; } +static const struct of_device_id bam_of_match[] = { + { .compatible ="qcom,bam-v1.3.0" , .data = &bam_v1_3_reg_info }, + { .compatible ="qcom,bam-v1.4.0" , .data = &bam_v1_4_reg_info }, + {} +}; + +MODULE_DEVICE_TABLE (of, bam_of_match); +static int bam_dma_probe (struct platform_device *pdev) {struct bam_device *bdev; +const struct of_device_id *match;struct resource *iores;int ret, i;
@@ -1031,6 +1071,14 @@ static int bam_dma_probe(struct platform_device *pdev) bdev->dev = &pdev->dev; + match =of_match_node (bam_of_match, pdev->dev.of_node); +if (!match) { +dev_err (&pdev->dev,"Unsupported BAM module\n" ); +return -ENODEV ; + } + + bdev->layout = match->data; + iores =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); bdev->regs =devm_ioremap_resource (&pdev->dev, iores);if (IS_ERR (bdev->regs))
@@ -1154,12 +1202,6 @@ static int bam_dma_remove(struct platform_device *pdev)return 0 ; } -static const struct of_device_id bam_of_match[] = { - { .compatible ="qcom,bam-v1.4.0" , }, - {} -}; -MODULE_DEVICE_TABLE (of, bam_of_match); -static struct platform_driver bam_dma_driver = { .probe = bam_dma_probe, .remove = bam_dma_remove,
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH 2/3] dmaengine: qcom_bam_dma: Add BAM v1.3.0 support
Quoted 11 lines · Archit Taneja
We currently have register offset information only for BAM IPs with revision 1.4.0. We add register offset table entries for the legacy (v1.3.0) version of BAM IPs found on SoCs like APQ8064 and MSM8960.
The register offset table pointers are stored in DT data corresponding to the BAM IP version specified in the compatible string.
Signed-off-by Archit Taneja <[email protected]>---
drivers/dma/qcom_bam_dma.c| 58 +++++++++++++++++++++++++++++++++++++++-------1 file changed, 50 insertions(+), 8 deletions(-)
- k
Signature · 2 lines
Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH 2/3] dmaengine: qcom_bam_dma: Add BAM v1.3.0 support
In reply to Archit TanejaQuoted 8 lines · Archit Taneja
We currently have register offset information only for BAM IPs with revision 1.4.0. We add register offset table entries for the legacy (v1.3.0) version of BAM IPs found on SoCs like APQ8064 and MSM8960.
The register offset table pointers are stored in DT data corresponding to the BAM IP version specified in the compatible string.
Signed-off-by Archit Taneja <[email protected]>
Signature · 3 lines
sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH 3/3 dt/bindings: dmaengine: qcom_bam_dma: Add compatible string for BAM v1.3.0
In reply to Archit TanejaAdd compatible string for BAM v1.3.0 in the DT bindings documentation. Mentioned a few more SoCs which have BAM v1.4.0 in them.
--- Documentation/devicetree/bindings/dma/qcom_bam_dma.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/dma/qcom_bam_dma.txt +3 -1
@@ -1,7 +1,9 @@ QCOM BAM DMA controller Required properties: -- compatible: must contain "qcom,bam-v1.4.0" for MSM8974 +- compatible: must be one of the following: + * "qcom,bam-v1.4.0" for MSM8974, APQ8074 and APQ8084 + * "qcom,bam-v1.3.0" for APQ8064 and MSM8960 - reg: Address range for DMA registers - interrupts: Should contain the one interrupt shared by all channels - #dma-cells: must be <1>, the cell in the dmas property of the client device
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH 3/3] dt/bindings: dmaengine: qcom_bam_dma: Add compatible string for BAM v1.3.0
Quoted 8 lines · Archit Taneja
Add compatible string for BAM v1.3.0 in the DT bindings documentation. Mentioned a few more SoCs which have BAM v1.4.0 in them.
Signed-off-by Archit Taneja <[email protected]>---
Documentation/devicetree/bindings/dma/qcom_bam_dma.txt| 4 +++-1 file changed, 3 insertions(+), 1 deletion(-)
- k
Signature · 2 lines
Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH 3/3] dt/bindings: dmaengine: qcom_bam_dma: Add compatible string for BAM v1.3.0
In reply to Archit TanejaQuoted 14 lines · Archit Taneja
Add compatible string for BAM v1.3.0 in the DT bindings documentation. Mentioned a few more SoCs which have BAM v1.4.0 in them.
Signed-off-by Archit Taneja <[email protected]>--- Documentation/devicetree/bindings/dma/qcom_bam_dma.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/dma/qcom_bam_dma.txt +0
-0
Documentation/devicetree/bindings/dma/qcom_bam_dma.txt line 6
Quoted 7 lines
Documentation/devicetree/bindings/dma/qcom_bam_dma.txt +3
-1@@ -1,7 +1,9 @@ QCOM BAM DMA controller Required properties: -- compatible: must contain "qcom,bam-v1.4.0" for MSM8974 +- compatible: must be one of the following: + * "qcom,bam-v1.4.0" for MSM8974, APQ8074 and APQ8084 + * "qcom,bam-v1.3.0" for APQ8064 and MSM8960
Add in IPQ8064 as well for 1.3.0
Documentation/devicetree/bindings/dma/qcom_bam_dma.txt line 9
Quoted 3 lines
Documentation/devicetree/bindings/dma/qcom_bam_dma.txt +0
-0- reg: Address range for DMA registers - interrupts: Should contain the one interrupt shared by all channels - #dma-cells: must be <1>, the cell in the dmas property of the client device
Otherwise, looks good.
Signature · 3 lines
sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Hi Andy,
Does this patchset supersede "dmaengine: qcom_bam_dma: Add v1.3.0 ..."
https://lkml.org/lkml/2014/4/16/660
--srini
Quoted 4 lines · Archit Taneja
The BAM DMA IP comes in different versions. The register offset layout varies among these versions. The layouts depend on which generation/family of SoCs they belong to.
"dmaengine: qcom_bam_dma: Add v1.3.0 ..."
https://lkml.org/lkml/
Quoted 351 lines
The current
SoCs(like 8084, 8074)have a layout where the Top level registers come in the beginning of the address range, followed by pipe and event registers. The BAM revision numbers fall above 1.4.0.The older SoCs (like 8064, 8960) have a layout where the pipe registers come first, and the top level come later. These have BAM revision numbers lesser than 1.4.0.
-#defineBAM_CTRLIt isn't suitable to have macros provide the register offsets with the layouts changed. Future BAM revisions may have different register layouts too. The register addresses are now calculated by referring a table which contains a base offset and multipliers for pipe/evnt/ee registers.
We have a common function
bam_addr()which computes addresses for all the registers. When computing address of top level/ee registers, we pass 0 to the pipe argument inaddr()since they don't have any multiple instances.Some of the unused register definitions are removed. We can add new registers as we need them.
Signed-off-by Archit Taneja <[email protected]>--- drivers/dma/qcom_bam_dma.c | 176 +++++++++++++++++++++++++++++---------------- 1 file changed, 113 insertions(+), 63 deletions(-)drivers/dma/qcom_bam_dma.c +113
-63@@ -79,35 +79,68 @@ struct bam_async_desc {struct bam_desc_hw desc[0 ]; }; -#define BAM_CTRL 0x0000 -#define BAM_REVISION 0x0004 -#define BAM_SW_REVISION 0x0080 -#define BAM_NUM_PIPES 0x003C -#define BAM_TIMER 0x0040 -#define BAM_TIMER_CTRL 0x0044 -#define BAM_DESC_CNT_TRSHLD 0x0008 -#define BAM_IRQ_SRCS 0x000C -#define BAM_IRQ_SRCS_MSK 0x0010 -#define BAM_IRQ_SRCS_UNMASKED 0x0030 -#define BAM_IRQ_STTS 0x0014 -#define BAM_IRQ_CLR 0x0018 -#define BAM_IRQ_EN 0x001C -#define BAM_CNFG_BITS 0x007C -#define BAM_IRQ_SRCS_EE (ee) (0x0800 + ((ee) * 0x80)) -#define BAM_IRQ_SRCS_MSK_EE (ee) (0x0804 + ((ee) * 0x80)) -#define BAM_P_CTRL (pipe) (0x1000 + ((pipe) * 0x1000)) -#define BAM_P_RST (pipe) (0x1004 + ((pipe) * 0x1000)) -#define BAM_P_HALT (pipe) (0x1008 + ((pipe) * 0x1000)) -#define BAM_P_IRQ_STTS (pipe) (0x1010 + ((pipe) * 0x1000)) -#define BAM_P_IRQ_CLR (pipe) (0x1014 + ((pipe) * 0x1000)) -#define BAM_P_IRQ_EN (pipe) (0x1018 + ((pipe) * 0x1000)) -#define BAM_P_EVNT_DEST_ADDR (pipe) (0x182C + ((pipe) * 0x1000)) -#define BAM_P_EVNT_REG (pipe) (0x1818 + ((pipe) * 0x1000)) -#define BAM_P_SW_OFSTS (pipe) (0x1800 + ((pipe) * 0x1000)) -#define BAM_P_DATA_FIFO_ADDR (pipe) (0x1824 + ((pipe) * 0x1000)) -#define BAM_P_DESC_FIFO_ADDR (pipe) (0x181C + ((pipe) * 0x1000)) -#define BAM_P_EVNT_TRSHLD (pipe) (0x1828 + ((pipe) * 0x1000)) -#define BAM_P_FIFO_SIZES (pipe) (0x1820 + ((pipe) * 0x1000)) +enum bam_reg { +BAM_CTRL , +BAM_REVISION , +BAM_NUM_PIPES , +BAM_DESC_CNT_TRSHLD , +BAM_IRQ_SRCS , +BAM_IRQ_SRCS_MSK , +BAM_IRQ_SRCS_UNMASKED , +BAM_IRQ_STTS , +BAM_IRQ_CLR , +BAM_IRQ_EN , +BAM_CNFG_BITS , +BAM_IRQ_SRCS_EE , +BAM_IRQ_SRCS_MSK_EE , +BAM_P_CTRL , +BAM_P_RST , +BAM_P_HALT , +BAM_P_IRQ_STTS , +BAM_P_IRQ_CLR , +BAM_P_IRQ_EN , +BAM_P_EVNT_DEST_ADDR , +BAM_P_EVNT_REG , +BAM_P_SW_OFSTS , +BAM_P_DATA_FIFO_ADDR , +BAM_P_DESC_FIFO_ADDR , +BAM_P_EVNT_GEN_TRSHLD , +BAM_P_FIFO_SIZES , +}; + +struct reg_offset_data { +u32 base_offset; +unsigned int pipe_mult, evnt_mult, ee_mult; +}; + +static const struct reg_offset_data reg_info[] = { + [BAM_CTRL ] = {0x0000 ,0x00 ,0x00 ,0x00 }, + [BAM_REVISION ] = {0x0004 ,0x00 ,0x00 ,0x00 }, + [BAM_NUM_PIPES ] = {0x003C ,0x00 ,0x00 ,0x00 }, + [BAM_DESC_CNT_TRSHLD ] = {0x0008 ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_SRCS ] = {0x000C ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_SRCS_MSK ] = {0x0010 ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_SRCS_UNMASKED ] = {0x0030 ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_STTS ] = {0x0014 ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_CLR ] = {0x0018 ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_EN ] = {0x001C ,0x00 ,0x00 ,0x00 }, + [BAM_CNFG_BITS ] = {0x007C ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_SRCS_EE ] = {0x0800 ,0x00 ,0x00 ,0x80 }, + [BAM_IRQ_SRCS_MSK_EE ] = {0x0804 ,0x00 ,0x00 ,0x80 }, + [BAM_P_CTRL ] = {0x1000 ,0x1000 ,0x00 ,0x00 }, + [BAM_P_RST ] = {0x1004 ,0x1000 ,0x00 ,0x00 }, + [BAM_P_HALT ] = {0x1008 ,0x1000 ,0x00 ,0x00 }, + [BAM_P_IRQ_STTS ] = {0x1010 ,0x1000 ,0x00 ,0x00 }, + [BAM_P_IRQ_CLR ] = {0x1014 ,0x1000 ,0x00 ,0x00 }, + [BAM_P_IRQ_EN ] = {0x1018 ,0x1000 ,0x00 ,0x00 }, + [BAM_P_EVNT_DEST_ADDR ] = {0x102C ,0x00 ,0x1000 ,0x00 }, + [BAM_P_EVNT_REG ] = {0x1018 ,0x00 ,0x1000 ,0x00 }, + [BAM_P_SW_OFSTS ] = {0x1000 ,0x00 ,0x1000 ,0x00 }, + [BAM_P_DATA_FIFO_ADDR ] = {0x1824 ,0x00 ,0x1000 ,0x00 }, + [BAM_P_DESC_FIFO_ADDR ] = {0x181C ,0x00 ,0x1000 ,0x00 }, + [BAM_P_EVNT_GEN_TRSHLD ] = {0x1828 ,0x00 ,0x1000 ,0x00 }, + [BAM_P_FIFO_SIZES ] = {0x1820 ,0x00 ,0x1000 ,0x00 }, +};/* BAM CTRL */ #define BAM_SW_RST BIT(0)@@ -305,6 +338,23 @@ struct bam_device { };/** +* bam_addr - returns BAM register address +* @bdev: bam device +* @pipe: pipe instance (ignored when register doesn't have multiple instances) +* @reg: register enum +*/ +static inline void __iomem *bam_addr (struct bam_device *bdev,u32 pipe, +enum bam_reg reg) +{ +const struct reg_offset_data r = reg_info[reg]; + +return bdev->regs + r.base_offset + + r.pipe_mult * pipe + + r.evnt_mult * pipe + + r.ee_mult * bdev->ee; +} + +/** * bam_reset_channel - Reset individual BAM DMA channel * @bchan: bam channel * @@ -317,8 +367,8 @@ static void bam_reset_channel(struct bam_chan *bchan)lockdep_assert_held (&bchan->vc.lock);/* reset channel */ -writel_relaxed (1 , bdev->regs +BAM_P_RST (bchan->id)); -writel_relaxed (0 , bdev->regs +BAM_P_RST (bchan->id)); +writel_relaxed (1 ,bam_addr (bdev, bchan->id,BAM_P_RST )); +writel_relaxed (0 ,bam_addr (bdev, bchan->id,BAM_P_RST ));/* don't allow cpu to reorder BAM register accesses done after this */ wmb ();@@ -347,17 +397,18 @@ static void bam_chan_init_hw(struct bam_chan *bchan,* because we allocated 1 more descriptor (8 bytes) than we can use */ writel_relaxed (ALIGN (bchan->fifo_phys,sizeof (struct bam_desc_hw )), - bdev->regs +BAM_P_DESC_FIFO_ADDR (bchan->id)); -writel_relaxed (BAM_DESC_FIFO_SIZE , bdev->regs + -BAM_P_FIFO_SIZES (bchan->id)); +bam_addr (bdev, bchan->id,BAM_P_DESC_FIFO_ADDR )); +writel_relaxed (BAM_DESC_FIFO_SIZE , +bam_addr (bdev, bchan->id,BAM_P_FIFO_SIZES ));/* enable the per pipe interrupts, enable EOT, ERR, and INT irqs */ -writel_relaxed (P_DEFAULT_IRQS_EN , bdev->regs +BAM_P_IRQ_EN (bchan->id)); +writel_relaxed (P_DEFAULT_IRQS_EN , +bam_addr (bdev, bchan->id,BAM_P_IRQ_EN ));/* unmask the specific pipe and EE combo */ - val =readl_relaxed (bdev->regs +BAM_IRQ_SRCS_MSK_EE (bdev->ee)); + val =readl_relaxed (bam_addr (bdev,0 ,BAM_IRQ_SRCS_MSK_EE )); val |=BIT (bchan->id); -writel_relaxed (val, bdev->regs +BAM_IRQ_SRCS_MSK_EE (bdev->ee)); +writel_relaxed (val,bam_addr (bdev,0 ,BAM_IRQ_SRCS_MSK_EE ));/* don't allow cpu to reorder the channel enable done below */ wmb ();@@ -367,7 +418,7 @@ static void bam_chan_init_hw(struct bam_chan *bchan,if (dir ==DMA_DEV_TO_MEM ) val |=P_DIRECTION ; -writel_relaxed (val, bdev->regs +BAM_P_CTRL (bchan->id)); +writel_relaxed (val,bam_addr (bdev, bchan->id,BAM_P_CTRL )); bchan->initialized =1 ;@@ -432,12 +483,12 @@ static void bam_free_chan(struct dma_chan *chan) bchan->fifo_virt =NULL ;/* mask irq for pipe/channel */ - val =readl_relaxed (bdev->regs +BAM_IRQ_SRCS_MSK_EE (bdev->ee)); + val =readl_relaxed (bam_addr (bdev,0 ,BAM_IRQ_SRCS_MSK_EE )); val &= ~BIT (bchan->id); -writel_relaxed (val, bdev->regs +BAM_IRQ_SRCS_MSK_EE (bdev->ee)); +writel_relaxed (val,bam_addr (bdev,0 ,BAM_IRQ_SRCS_MSK_EE ));/* disable irq */ -writel_relaxed (0 , bdev->regs +BAM_P_IRQ_EN (bchan->id)); +writel_relaxed (0 ,bam_addr (bdev, bchan->id,BAM_P_IRQ_EN )); }/** @@ -583,14 +634,14 @@ static int bam_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,switch (cmd) {case DMA_PAUSE :spin_lock_irqsave (&bchan->vc.lock, flag); -writel_relaxed (1 , bdev->regs +BAM_P_HALT (bchan->id)); +writel_relaxed (1 ,bam_addr (bdev, bchan->id,BAM_P_HALT )); bchan->paused =1 ;spin_unlock_irqrestore (&bchan->vc.lock, flag);break ;case DMA_RESUME :spin_lock_irqsave (&bchan->vc.lock, flag); -writel_relaxed (0 , bdev->regs +BAM_P_HALT (bchan->id)); +writel_relaxed (0 ,bam_addr (bdev, bchan->id,BAM_P_HALT )); bchan->paused =0 ;spin_unlock_irqrestore (&bchan->vc.lock, flag);break ;@@ -626,7 +677,7 @@ static u32 process_channel_irqs(struct bam_device *bdev)unsigned long flags;struct bam_async_desc *async_desc; - srcs =readl_relaxed (bdev->regs +BAM_IRQ_SRCS_EE (bdev->ee)); + srcs =readl_relaxed (bam_addr (bdev,0 ,BAM_IRQ_SRCS_EE ));/* return early if no pipe/channel interrupts are present */ if (!(srcs &P_IRQ ))@@ -639,11 +690,9 @@ static u32 process_channel_irqs(struct bam_device *bdev)continue ;/* clear pipe irq */ - pipe_stts =readl_relaxed (bdev->regs + -BAM_P_IRQ_STTS (i)); + pipe_stts =readl_relaxed (bam_addr (bdev, i,BAM_P_IRQ_STTS )); -writel_relaxed (pipe_stts, bdev->regs + -BAM_P_IRQ_CLR (i)); +writel_relaxed (pipe_stts,bam_addr (bdev, i,BAM_P_IRQ_CLR ));spin_lock_irqsave (&bchan->vc.lock, flags); async_desc = bchan->curr_txd;@@ -694,12 +743,12 @@ static irqreturn_t bam_dma_irq(int irq, void *data)tasklet_schedule (&bdev->task);if (srcs &BAM_IRQ ) - clr_mask =readl_relaxed (bdev->regs +BAM_IRQ_STTS ); + clr_mask =readl_relaxed (bam_addr (bdev,0 ,BAM_IRQ_STTS ));/* don't allow reorder of the various accesses to the BAM registers */ mb (); -writel_relaxed (clr_mask, bdev->regs +BAM_IRQ_CLR ); +writel_relaxed (clr_mask,bam_addr (bdev,0 ,BAM_IRQ_CLR ));return IRQ_HANDLED ; }@@ -763,7 +812,7 @@ static void bam_apply_new_config(struct bam_chan *bchan,else maxburst = bchan->slave.dst_maxburst; -writel_relaxed (maxburst, bdev->regs +BAM_DESC_CNT_TRSHLD ); +writel_relaxed (maxburst,bam_addr (bdev,0 ,BAM_DESC_CNT_TRSHLD )); bchan->reconfigure =0 ; }@@ -830,7 +879,7 @@ static void bam_start_dma(struct bam_chan *bchan)/* ensure descriptor writes and dma start not reordered */ wmb ();writel_relaxed (bchan->tail *sizeof (struct bam_desc_hw ), - bdev->regs +BAM_P_EVNT_REG (bchan->id)); +bam_addr (bdev, bchan->id,BAM_P_EVNT_REG )); }/** @@ -918,43 +967,44 @@ static int bam_init(struct bam_device *bdev)u32 val;/* read revision and configuration information */ - val =readl_relaxed (bdev->regs +BAM_REVISION ) >>NUM_EES_SHIFT ; + val =readl_relaxed (bam_addr (bdev,0 ,BAM_REVISION )) >>NUM_EES_SHIFT ; val &=NUM_EES_MASK ;/* check that configured EE is within range */ if (bdev->ee >= val)return -EINVAL ; - val =readl_relaxed (bdev->regs +BAM_NUM_PIPES ); + val =readl_relaxed (bam_addr (bdev,0 ,BAM_NUM_PIPES )); bdev->num_channels = val &BAM_NUM_PIPES_MASK ;/* s/w reset bam */ /* after reset all pipes are disabled and idle */ - val =readl_relaxed (bdev->regs +BAM_CTRL ); + val =readl_relaxed (bam_addr (bdev,0 ,BAM_CTRL )); val |=BAM_SW_RST ; -writel_relaxed (val, bdev->regs +BAM_CTRL ); +writel_relaxed (val,bam_addr (bdev,0 ,BAM_CTRL )); val &= ~BAM_SW_RST ; -writel_relaxed (val, bdev->regs +BAM_CTRL ); +writel_relaxed (val,bam_addr (bdev,0 ,BAM_CTRL ));/* make sure previous stores are visible before enabling BAM */ wmb ();/* enable bam */ val |=BAM_EN ; -writel_relaxed (val, bdev->regs +BAM_CTRL ); +writel_relaxed (val,bam_addr (bdev,0 ,BAM_CTRL ));/* set descriptor threshhold, start with 4 bytes */ -writel_relaxed (DEFAULT_CNT_THRSHLD , bdev->regs +BAM_DESC_CNT_TRSHLD ); +writel_relaxed (DEFAULT_CNT_THRSHLD , +bam_addr (bdev,0 ,BAM_DESC_CNT_TRSHLD ));/* Enable default set of h/w workarounds, ie all except BAM_FULL_PIPE */ -writel_relaxed (BAM_CNFG_BITS_DEFAULT , bdev->regs +BAM_CNFG_BITS ); +writel_relaxed (BAM_CNFG_BITS_DEFAULT ,bam_addr (bdev,0 ,BAM_CNFG_BITS ));/* enable irqs for errors */ writel_relaxed (BAM_ERROR_EN |BAM_HRESP_ERR_EN , - bdev->regs +BAM_IRQ_EN ); +bam_addr (bdev,0 ,BAM_IRQ_EN ));/* unmask global bam interrupt */ -writel_relaxed (BAM_IRQ_MSK , bdev->regs +BAM_IRQ_SRCS_MSK_EE (bdev->ee)); +writel_relaxed (BAM_IRQ_MSK ,bam_addr (bdev,0 ,BAM_IRQ_SRCS_MSK_EE ));return 0 ; }@@ -1084,7 +1134,7 @@ static int bam_dma_remove(struct platform_device *pdev)dma_async_device_unregister (&bdev->common);/* mask all interrupts for this execution environment */ -writel_relaxed (0 , bdev->regs +BAM_IRQ_SRCS_MSK_EE (bdev->ee)); +writel_relaxed (0 ,bam_addr (bdev,0 ,BAM_IRQ_SRCS_MSK_EE ));devm_free_irq (bdev->dev, bdev->irq, bdev);
Quoted 4 lines · Srinivas Kandagatla
Hi Andy,
Does this patchset supersede "dmaengine:
qcom_bam_dma: Add v1.3.0 ..."
https://lkml.org/lkml/2014/4/16/660
Yes, this is intended to be used instead. We're abandoning my patch.
<snip>
Signature · 3 lines
sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Quoted 21 lines · Archit Taneja
The BAM DMA IP comes in different versions. The register offset layout varies among these versions. The layouts depend on which generation/family of SoCs they belong to.
The current
SoCs(like 8084, 8074)have a layout where the Top level registers come in the beginning of the address range, followed by pipe and event registers. The BAM revision numbers fall above 1.4.0.The older SoCs (like 8064, 8960) have a layout where the pipe registers come first, and the top level come later. These have BAM revision numbers lesser than 1.4.0.
It isn't suitable to have macros provide the register offsets with the layouts changed. Future BAM revisions may have different register layouts too. The register addresses are now calculated by referring a table which contains a base offset and multipliers for pipe/evnt/ee registers.
We have a common function
bam_addr()which computes addresses for all the registers. When computing address of top level/ee registers, we pass 0 to the pipe argument inaddr()since they don't have any multiple instances.
Quoted 7 lines
Some of the unused register definitions are removed. We can add new registers as we need them.
Signed-off-by Archit Taneja <[email protected]>---
drivers/dma/qcom_bam_dma.c| 176 +++++++++++++++++++++++++++++----------------1 file changed, 113 insertions(+), 63 deletions(-)
- k
Signature · 2 lines
Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Quoted 17 lines · Archit Taneja
The BAM DMA IP comes in different versions. The register offset layout varies among these versions. The layouts depend on which generation/family of SoCs they belong to.
The current
SoCs(like 8084, 8074)have a layout where the Top level registers come in the beginning of the address range, followed by pipe and event registers. The BAM revision numbers fall above 1.4.0.The older SoCs (like 8064, 8960) have a layout where the pipe registers come first, and the top level come later. These have BAM revision numbers lesser than 1.4.0.
It isn't suitable to have macros provide the register offsets with the layouts changed. Future BAM revisions may have different register layouts too. The register addresses are now calculated by referring a table which contains a base offset and multipliers for pipe/evnt/ee registers.
Quoted 8 lines
We have a common function
bam_addr()which computes addresses for all the registers. When computing address of top level/ee registers, we pass 0 to the pipe argument inaddr()since they don't have any multiple instances.Some of the unused register definitions are removed. We can add new registers as we need them.
Signed-off-by Archit Taneja <[email protected]>
Very very clean. I like it! I'll add my tested-bys when I get a chance to try it out.
Signature · 3 lines
sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 1/3 dmaengine: qcom_bam_dma: Generalize BAM register offset calculations
In reply to Archit TanejaThe BAM DMA IP comes in different versions. The register offset layout varies among these versions. The layouts depend on which generation/family of SoCs they belong to.
The current SoCs(like 8084, 8074) have a layout where the Top level registers come in the beginning of the address range, followed by pipe and event registers. The BAM revision numbers fall above 1.4.0.
The older SoCs (like 8064, 8960) have a layout where the pipe registers come first, and the top level come later. These have BAM revision numbers lesser than 1.4.0.
It isn't suitable to have macros provide the register offsets with the layouts changed. Future BAM revisions may have different register layouts too. The register addresses are now calculated by referring a table which contains a base offset and multipliers for pipe/evnt/ee registers.
We have a common function bam_addr() which computes addresses for all the registers. When computing address of top level/ee registers, we pass 0 to the pipe argument in addr() since they don't have any multiple instances.
Some of the unused register definitions are removed. We can add new registers as we need them.
--- drivers/dma/qcom_bam_dma.c | 176 +++++++++++++++++++++++++++++---------------- 1 file changed, 113 insertions(+), 63 deletions(-)
drivers/dma/qcom_bam_dma.c +113 -63
@@ -79,35 +79,68 @@ struct bam_async_desc {struct bam_desc_hw desc[0 ]; }; -#define BAM_CTRL 0x0000 -#define BAM_REVISION 0x0004 -#define BAM_SW_REVISION 0x0080 -#define BAM_NUM_PIPES 0x003C -#define BAM_TIMER 0x0040 -#define BAM_TIMER_CTRL 0x0044 -#define BAM_DESC_CNT_TRSHLD 0x0008 -#define BAM_IRQ_SRCS 0x000C -#define BAM_IRQ_SRCS_MSK 0x0010 -#define BAM_IRQ_SRCS_UNMASKED 0x0030 -#define BAM_IRQ_STTS 0x0014 -#define BAM_IRQ_CLR 0x0018 -#define BAM_IRQ_EN 0x001C -#define BAM_CNFG_BITS 0x007C -#define BAM_IRQ_SRCS_EE (ee) (0x0800 + ((ee) * 0x80)) -#define BAM_IRQ_SRCS_MSK_EE (ee) (0x0804 + ((ee) * 0x80)) -#define BAM_P_CTRL (pipe) (0x1000 + ((pipe) * 0x1000)) -#define BAM_P_RST (pipe) (0x1004 + ((pipe) * 0x1000)) -#define BAM_P_HALT (pipe) (0x1008 + ((pipe) * 0x1000)) -#define BAM_P_IRQ_STTS (pipe) (0x1010 + ((pipe) * 0x1000)) -#define BAM_P_IRQ_CLR (pipe) (0x1014 + ((pipe) * 0x1000)) -#define BAM_P_IRQ_EN (pipe) (0x1018 + ((pipe) * 0x1000)) -#define BAM_P_EVNT_DEST_ADDR (pipe) (0x182C + ((pipe) * 0x1000)) -#define BAM_P_EVNT_REG (pipe) (0x1818 + ((pipe) * 0x1000)) -#define BAM_P_SW_OFSTS (pipe) (0x1800 + ((pipe) * 0x1000)) -#define BAM_P_DATA_FIFO_ADDR (pipe) (0x1824 + ((pipe) * 0x1000)) -#define BAM_P_DESC_FIFO_ADDR (pipe) (0x181C + ((pipe) * 0x1000)) -#define BAM_P_EVNT_TRSHLD (pipe) (0x1828 + ((pipe) * 0x1000)) -#define BAM_P_FIFO_SIZES (pipe) (0x1820 + ((pipe) * 0x1000)) +enum bam_reg { +BAM_CTRL , +BAM_REVISION , +BAM_NUM_PIPES , +BAM_DESC_CNT_TRSHLD , +BAM_IRQ_SRCS , +BAM_IRQ_SRCS_MSK , +BAM_IRQ_SRCS_UNMASKED , +BAM_IRQ_STTS , +BAM_IRQ_CLR , +BAM_IRQ_EN , +BAM_CNFG_BITS , +BAM_IRQ_SRCS_EE , +BAM_IRQ_SRCS_MSK_EE , +BAM_P_CTRL , +BAM_P_RST , +BAM_P_HALT , +BAM_P_IRQ_STTS , +BAM_P_IRQ_CLR , +BAM_P_IRQ_EN , +BAM_P_EVNT_DEST_ADDR , +BAM_P_EVNT_REG , +BAM_P_SW_OFSTS , +BAM_P_DATA_FIFO_ADDR , +BAM_P_DESC_FIFO_ADDR , +BAM_P_EVNT_GEN_TRSHLD , +BAM_P_FIFO_SIZES , +}; + +struct reg_offset_data { +u32 base_offset; +unsigned int pipe_mult, evnt_mult, ee_mult; +}; + +static const struct reg_offset_data reg_info[] = { + [BAM_CTRL ] = {0x0000 ,0x00 ,0x00 ,0x00 }, + [BAM_REVISION ] = {0x0004 ,0x00 ,0x00 ,0x00 }, + [BAM_NUM_PIPES ] = {0x003C ,0x00 ,0x00 ,0x00 }, + [BAM_DESC_CNT_TRSHLD ] = {0x0008 ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_SRCS ] = {0x000C ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_SRCS_MSK ] = {0x0010 ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_SRCS_UNMASKED ] = {0x0030 ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_STTS ] = {0x0014 ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_CLR ] = {0x0018 ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_EN ] = {0x001C ,0x00 ,0x00 ,0x00 }, + [BAM_CNFG_BITS ] = {0x007C ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_SRCS_EE ] = {0x0800 ,0x00 ,0x00 ,0x80 }, + [BAM_IRQ_SRCS_MSK_EE ] = {0x0804 ,0x00 ,0x00 ,0x80 }, + [BAM_P_CTRL ] = {0x1000 ,0x1000 ,0x00 ,0x00 }, + [BAM_P_RST ] = {0x1004 ,0x1000 ,0x00 ,0x00 }, + [BAM_P_HALT ] = {0x1008 ,0x1000 ,0x00 ,0x00 }, + [BAM_P_IRQ_STTS ] = {0x1010 ,0x1000 ,0x00 ,0x00 }, + [BAM_P_IRQ_CLR ] = {0x1014 ,0x1000 ,0x00 ,0x00 }, + [BAM_P_IRQ_EN ] = {0x1018 ,0x1000 ,0x00 ,0x00 }, + [BAM_P_EVNT_DEST_ADDR ] = {0x102C ,0x00 ,0x1000 ,0x00 }, + [BAM_P_EVNT_REG ] = {0x1018 ,0x00 ,0x1000 ,0x00 }, + [BAM_P_SW_OFSTS ] = {0x1000 ,0x00 ,0x1000 ,0x00 }, + [BAM_P_DATA_FIFO_ADDR ] = {0x1824 ,0x00 ,0x1000 ,0x00 }, + [BAM_P_DESC_FIFO_ADDR ] = {0x181C ,0x00 ,0x1000 ,0x00 }, + [BAM_P_EVNT_GEN_TRSHLD ] = {0x1828 ,0x00 ,0x1000 ,0x00 }, + [BAM_P_FIFO_SIZES ] = {0x1820 ,0x00 ,0x1000 ,0x00 }, +};/* BAM CTRL */ #define BAM_SW_RST BIT(0)
@@ -305,6 +338,23 @@ struct bam_device { };/** +* bam_addr - returns BAM register address +* @bdev: bam device +* @pipe: pipe instance (ignored when register doesn't have multiple instances) +* @reg: register enum +*/ +static inline void __iomem *bam_addr (struct bam_device *bdev,u32 pipe, +enum bam_reg reg) +{ +const struct reg_offset_data r = reg_info[reg]; + +return bdev->regs + r.base_offset + + r.pipe_mult * pipe + + r.evnt_mult * pipe + + r.ee_mult * bdev->ee; +} + +/** * bam_reset_channel - Reset individual BAM DMA channel * @bchan: bam channel *
@@ -317,8 +367,8 @@ static void bam_reset_channel(struct bam_chan *bchan)lockdep_assert_held (&bchan->vc.lock);/* reset channel */ -writel_relaxed (1 , bdev->regs +BAM_P_RST (bchan->id)); -writel_relaxed (0 , bdev->regs +BAM_P_RST (bchan->id)); +writel_relaxed (1 ,bam_addr (bdev, bchan->id,BAM_P_RST )); +writel_relaxed (0 ,bam_addr (bdev, bchan->id,BAM_P_RST ));/* don't allow cpu to reorder BAM register accesses done after this */ wmb ();
@@ -347,17 +397,18 @@ static void bam_chan_init_hw(struct bam_chan *bchan,* because we allocated 1 more descriptor (8 bytes) than we can use */ writel_relaxed (ALIGN (bchan->fifo_phys,sizeof (struct bam_desc_hw )), - bdev->regs +BAM_P_DESC_FIFO_ADDR (bchan->id)); -writel_relaxed (BAM_DESC_FIFO_SIZE , bdev->regs + -BAM_P_FIFO_SIZES (bchan->id)); +bam_addr (bdev, bchan->id,BAM_P_DESC_FIFO_ADDR )); +writel_relaxed (BAM_DESC_FIFO_SIZE , +bam_addr (bdev, bchan->id,BAM_P_FIFO_SIZES ));/* enable the per pipe interrupts, enable EOT, ERR, and INT irqs */ -writel_relaxed (P_DEFAULT_IRQS_EN , bdev->regs +BAM_P_IRQ_EN (bchan->id)); +writel_relaxed (P_DEFAULT_IRQS_EN , +bam_addr (bdev, bchan->id,BAM_P_IRQ_EN ));/* unmask the specific pipe and EE combo */ - val =readl_relaxed (bdev->regs +BAM_IRQ_SRCS_MSK_EE (bdev->ee)); + val =readl_relaxed (bam_addr (bdev,0 ,BAM_IRQ_SRCS_MSK_EE )); val |=BIT (bchan->id); -writel_relaxed (val, bdev->regs +BAM_IRQ_SRCS_MSK_EE (bdev->ee)); +writel_relaxed (val,bam_addr (bdev,0 ,BAM_IRQ_SRCS_MSK_EE ));/* don't allow cpu to reorder the channel enable done below */ wmb ();
@@ -367,7 +418,7 @@ static void bam_chan_init_hw(struct bam_chan *bchan,if (dir ==DMA_DEV_TO_MEM ) val |=P_DIRECTION ; -writel_relaxed (val, bdev->regs +BAM_P_CTRL (bchan->id)); +writel_relaxed (val,bam_addr (bdev, bchan->id,BAM_P_CTRL )); bchan->initialized =1 ;
@@ -432,12 +483,12 @@ static void bam_free_chan(struct dma_chan *chan) bchan->fifo_virt =NULL ;/* mask irq for pipe/channel */ - val =readl_relaxed (bdev->regs +BAM_IRQ_SRCS_MSK_EE (bdev->ee)); + val =readl_relaxed (bam_addr (bdev,0 ,BAM_IRQ_SRCS_MSK_EE )); val &= ~BIT (bchan->id); -writel_relaxed (val, bdev->regs +BAM_IRQ_SRCS_MSK_EE (bdev->ee)); +writel_relaxed (val,bam_addr (bdev,0 ,BAM_IRQ_SRCS_MSK_EE ));/* disable irq */ -writel_relaxed (0 , bdev->regs +BAM_P_IRQ_EN (bchan->id)); +writel_relaxed (0 ,bam_addr (bdev, bchan->id,BAM_P_IRQ_EN )); }/**
@@ -583,14 +634,14 @@ static int bam_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,switch (cmd) {case DMA_PAUSE :spin_lock_irqsave (&bchan->vc.lock, flag); -writel_relaxed (1 , bdev->regs +BAM_P_HALT (bchan->id)); +writel_relaxed (1 ,bam_addr (bdev, bchan->id,BAM_P_HALT )); bchan->paused =1 ;spin_unlock_irqrestore (&bchan->vc.lock, flag);break ;case DMA_RESUME :spin_lock_irqsave (&bchan->vc.lock, flag); -writel_relaxed (0 , bdev->regs +BAM_P_HALT (bchan->id)); +writel_relaxed (0 ,bam_addr (bdev, bchan->id,BAM_P_HALT )); bchan->paused =0 ;spin_unlock_irqrestore (&bchan->vc.lock, flag);break ;
@@ -626,7 +677,7 @@ static u32 process_channel_irqs(struct bam_device *bdev)unsigned long flags;struct bam_async_desc *async_desc; - srcs =readl_relaxed (bdev->regs +BAM_IRQ_SRCS_EE (bdev->ee)); + srcs =readl_relaxed (bam_addr (bdev,0 ,BAM_IRQ_SRCS_EE ));/* return early if no pipe/channel interrupts are present */ if (!(srcs &P_IRQ ))
@@ -639,11 +690,9 @@ static u32 process_channel_irqs(struct bam_device *bdev)continue ;/* clear pipe irq */ - pipe_stts =readl_relaxed (bdev->regs + -BAM_P_IRQ_STTS (i)); + pipe_stts =readl_relaxed (bam_addr (bdev, i,BAM_P_IRQ_STTS )); -writel_relaxed (pipe_stts, bdev->regs + -BAM_P_IRQ_CLR (i)); +writel_relaxed (pipe_stts,bam_addr (bdev, i,BAM_P_IRQ_CLR ));spin_lock_irqsave (&bchan->vc.lock, flags); async_desc = bchan->curr_txd;
@@ -694,12 +743,12 @@ static irqreturn_t bam_dma_irq(int irq, void *data)tasklet_schedule (&bdev->task);if (srcs &BAM_IRQ ) - clr_mask =readl_relaxed (bdev->regs +BAM_IRQ_STTS ); + clr_mask =readl_relaxed (bam_addr (bdev,0 ,BAM_IRQ_STTS ));/* don't allow reorder of the various accesses to the BAM registers */ mb (); -writel_relaxed (clr_mask, bdev->regs +BAM_IRQ_CLR ); +writel_relaxed (clr_mask,bam_addr (bdev,0 ,BAM_IRQ_CLR ));return IRQ_HANDLED ; }
@@ -763,7 +812,7 @@ static void bam_apply_new_config(struct bam_chan *bchan,else maxburst = bchan->slave.dst_maxburst; -writel_relaxed (maxburst, bdev->regs +BAM_DESC_CNT_TRSHLD ); +writel_relaxed (maxburst,bam_addr (bdev,0 ,BAM_DESC_CNT_TRSHLD )); bchan->reconfigure =0 ; }
@@ -830,7 +879,7 @@ static void bam_start_dma(struct bam_chan *bchan)/* ensure descriptor writes and dma start not reordered */ wmb ();writel_relaxed (bchan->tail *sizeof (struct bam_desc_hw ), - bdev->regs +BAM_P_EVNT_REG (bchan->id)); +bam_addr (bdev, bchan->id,BAM_P_EVNT_REG )); }/**
@@ -918,43 +967,44 @@ static int bam_init(struct bam_device *bdev)u32 val;/* read revision and configuration information */ - val =readl_relaxed (bdev->regs +BAM_REVISION ) >>NUM_EES_SHIFT ; + val =readl_relaxed (bam_addr (bdev,0 ,BAM_REVISION )) >>NUM_EES_SHIFT ; val &=NUM_EES_MASK ;/* check that configured EE is within range */ if (bdev->ee >= val)return -EINVAL ; - val =readl_relaxed (bdev->regs +BAM_NUM_PIPES ); + val =readl_relaxed (bam_addr (bdev,0 ,BAM_NUM_PIPES )); bdev->num_channels = val &BAM_NUM_PIPES_MASK ;/* s/w reset bam */ /* after reset all pipes are disabled and idle */ - val =readl_relaxed (bdev->regs +BAM_CTRL ); + val =readl_relaxed (bam_addr (bdev,0 ,BAM_CTRL )); val |=BAM_SW_RST ; -writel_relaxed (val, bdev->regs +BAM_CTRL ); +writel_relaxed (val,bam_addr (bdev,0 ,BAM_CTRL )); val &= ~BAM_SW_RST ; -writel_relaxed (val, bdev->regs +BAM_CTRL ); +writel_relaxed (val,bam_addr (bdev,0 ,BAM_CTRL ));/* make sure previous stores are visible before enabling BAM */ wmb ();/* enable bam */ val |=BAM_EN ; -writel_relaxed (val, bdev->regs +BAM_CTRL ); +writel_relaxed (val,bam_addr (bdev,0 ,BAM_CTRL ));/* set descriptor threshhold, start with 4 bytes */ -writel_relaxed (DEFAULT_CNT_THRSHLD , bdev->regs +BAM_DESC_CNT_TRSHLD ); +writel_relaxed (DEFAULT_CNT_THRSHLD , +bam_addr (bdev,0 ,BAM_DESC_CNT_TRSHLD ));/* Enable default set of h/w workarounds, ie all except BAM_FULL_PIPE */ -writel_relaxed (BAM_CNFG_BITS_DEFAULT , bdev->regs +BAM_CNFG_BITS ); +writel_relaxed (BAM_CNFG_BITS_DEFAULT ,bam_addr (bdev,0 ,BAM_CNFG_BITS ));/* enable irqs for errors */ writel_relaxed (BAM_ERROR_EN |BAM_HRESP_ERR_EN , - bdev->regs +BAM_IRQ_EN ); +bam_addr (bdev,0 ,BAM_IRQ_EN ));/* unmask global bam interrupt */ -writel_relaxed (BAM_IRQ_MSK , bdev->regs +BAM_IRQ_SRCS_MSK_EE (bdev->ee)); +writel_relaxed (BAM_IRQ_MSK ,bam_addr (bdev,0 ,BAM_IRQ_SRCS_MSK_EE ));return 0 ; }
@@ -1084,7 +1134,7 @@ static int bam_dma_remove(struct platform_device *pdev)dma_async_device_unregister (&bdev->common);/* mask all interrupts for this execution environment */ -writel_relaxed (0 , bdev->regs +BAM_IRQ_SRCS_MSK_EE (bdev->ee)); +writel_relaxed (0 ,bam_addr (bdev,0 ,BAM_IRQ_SRCS_MSK_EE ));devm_free_irq (bdev->dev, bdev->irq, bdev);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 2/3 dmaengine: qcom_bam_dma: Add BAM v1.3.0 support
We currently have register offset information only for BAM IPs with revision 1.4.0. We add register offset table entries for the legacy (v1.3.0) version of BAM IPs found on SoCs like APQ8064 and MSM8960.
The register offset table pointers are stored in DT data corresponding to the BAM IP version specified in the compatible string.
--- drivers/dma/qcom_bam_dma.c | 58 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 8 deletions(-)
drivers/dma/qcom_bam_dma.c +50 -8
@@ -113,7 +113,36 @@ struct reg_offset_data {unsigned int pipe_mult, evnt_mult, ee_mult; }; -static const struct reg_offset_data reg_info[] = { +static const struct reg_offset_data bam_v1_3_reg_info[] = { + [BAM_CTRL ] = {0x0F80 ,0x00 ,0x00 ,0x00 }, + [BAM_REVISION ] = {0x0F84 ,0x00 ,0x00 ,0x00 }, + [BAM_NUM_PIPES ] = {0x0FBC ,0x00 ,0x00 ,0x00 }, + [BAM_DESC_CNT_TRSHLD ] = {0x0F88 ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_SRCS ] = {0x0F8C ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_SRCS_MSK ] = {0x0F90 ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_SRCS_UNMASKED ] = {0x0FB0 ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_STTS ] = {0x0F94 ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_CLR ] = {0x0F98 ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_EN ] = {0x0F9C ,0x00 ,0x00 ,0x00 }, + [BAM_CNFG_BITS ] = {0x0FFC ,0x00 ,0x00 ,0x00 }, + [BAM_IRQ_SRCS_EE ] = {0x1800 ,0x00 ,0x00 ,0x80 }, + [BAM_IRQ_SRCS_MSK_EE ] = {0x1804 ,0x00 ,0x00 ,0x80 }, + [BAM_P_CTRL ] = {0x0000 ,0x80 ,0x00 ,0x00 }, + [BAM_P_RST ] = {0x0004 ,0x80 ,0x00 ,0x00 }, + [BAM_P_HALT ] = {0x0008 ,0x80 ,0x00 ,0x00 }, + [BAM_P_IRQ_STTS ] = {0x0010 ,0x80 ,0x00 ,0x00 }, + [BAM_P_IRQ_CLR ] = {0x0014 ,0x80 ,0x00 ,0x00 }, + [BAM_P_IRQ_EN ] = {0x0018 ,0x80 ,0x00 ,0x00 }, + [BAM_P_EVNT_DEST_ADDR ] = {0x102C ,0x00 ,0x40 ,0x00 }, + [BAM_P_EVNT_REG ] = {0x1018 ,0x00 ,0x40 ,0x00 }, + [BAM_P_SW_OFSTS ] = {0x1000 ,0x00 ,0x40 ,0x00 }, + [BAM_P_DATA_FIFO_ADDR ] = {0x1024 ,0x00 ,0x40 ,0x00 }, + [BAM_P_DESC_FIFO_ADDR ] = {0x101C ,0x00 ,0x40 ,0x00 }, + [BAM_P_EVNT_GEN_TRSHLD ] = {0x1028 ,0x00 ,0x40 ,0x00 }, + [BAM_P_FIFO_SIZES ] = {0x1020 ,0x00 ,0x40 ,0x00 }, +}; + +static const struct reg_offset_data bam_v1_4_reg_info[] = { [BAM_CTRL ] = {0x0000 ,0x00 ,0x00 ,0x00 }, [BAM_REVISION ] = {0x0004 ,0x00 ,0x00 ,0x00 }, [BAM_NUM_PIPES ] = {0x003C ,0x00 ,0x00 ,0x00 },
@@ -330,6 +359,8 @@ struct bam_device {/* execution environment ID, from DT */ u32 ee; +const struct reg_offset_data *layout; +struct clk *bamclk;int irq;
@@ -346,7 +377,7 @@ struct bam_device {static inline void __iomem *bam_addr (struct bam_device *bdev,u32 pipe,enum bam_reg reg) { -const struct reg_offset_data r = reg_info[reg]; +const struct reg_offset_data r = bdev->layout[reg];return bdev->regs + r.base_offset + r.pipe_mult * pipe +
@@ -1019,9 +1050,18 @@ static void bam_channel_init(struct bam_device *bdev, struct bam_chan *bchan, bchan->vc.desc_free = bam_dma_free_desc; } +static const struct of_device_id bam_of_match[] = { + { .compatible ="qcom,bam-v1.3.0" , .data = &bam_v1_3_reg_info }, + { .compatible ="qcom,bam-v1.4.0" , .data = &bam_v1_4_reg_info }, + {} +}; + +MODULE_DEVICE_TABLE (of, bam_of_match); +static int bam_dma_probe (struct platform_device *pdev) {struct bam_device *bdev; +const struct of_device_id *match;struct resource *iores;int ret, i;
@@ -1031,6 +1071,14 @@ static int bam_dma_probe(struct platform_device *pdev) bdev->dev = &pdev->dev; + match =of_match_node (bam_of_match, pdev->dev.of_node); +if (!match) { +dev_err (&pdev->dev,"Unsupported BAM module\n" ); +return -ENODEV ; + } + + bdev->layout = match->data; + iores =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); bdev->regs =devm_ioremap_resource (&pdev->dev, iores);if (IS_ERR (bdev->regs))
@@ -1154,12 +1202,6 @@ static int bam_dma_remove(struct platform_device *pdev)return 0 ; } -static const struct of_device_id bam_of_match[] = { - { .compatible ="qcom,bam-v1.4.0" , }, - {} -}; -MODULE_DEVICE_TABLE (of, bam_of_match); -static struct platform_driver bam_dma_driver = { .probe = bam_dma_probe, .remove = bam_dma_remove,
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 3/3 dt/bindings: dmaengine: qcom_bam_dma: Add compatible string for BAM v1.3.0
In reply to Archit TanejaAdd compatible string for BAM v1.3.0 in the DT bindings documentation. Mentioned a few more SoCs which have BAM v1.4.0 in them.
---
Update in v2: Added IPQ8064 to the v1.3.0 list
Documentation/devicetree/bindings/dma/qcom_bam_dma.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/dma/qcom_bam_dma.txt +3 -1
@@ -1,7 +1,9 @@ QCOM BAM DMA controller Required properties: -- compatible: must contain "qcom,bam-v1.4.0" for MSM8974 +- compatible: must be one of the following: + * "qcom,bam-v1.4.0" for MSM8974, APQ8074 and APQ8084 + * "qcom,bam-v1.3.0" for APQ8064, IPQ8064 and MSM8960 - reg: Address range for DMA registers - interrupts: Should contain the one interrupt shared by all channels - #dma-cells: must be <1>, the cell in the dmas property of the client device
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Quoted 17 lines · Archit Taneja
The BAM DMA IP comes in different versions. The register offset layout varies among these versions. The layouts depend on which generation/family of SoCs they belong to.
The current
SoCs(like 8084, 8074)have a layout where the Top level registers come in the beginning of the address range, followed by pipe and event registers. The BAM revision numbers fall above 1.4.0.The older SoCs (like 8064, 8960) have a layout where the pipe registers come first, and the top level come later. These have BAM revision numbers lesser than 1.4.0.
It isn't suitable to have macros provide the register offsets with the layouts changed. Future BAM revisions may have different register layouts too. The register addresses are now calculated by referring a table which contains a base offset and multipliers for pipe/evnt/ee registers.
Quoted 6 lines
We have a common function
bam_addr()which computes addresses for all the registers. When computing address of top level/ee registers, we pass 0 to the pipe argument inaddr()since they don't have any multiple instances.Some of the unused register definitions are removed. We can add new registers as we need them.
Vinod,
These changes replace the patch set I had that implemented support for the v.1.3.0 register set.
Signature · 3 lines
sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Quoted 22 lines · Andy Gross
Quoted 21 lines · Archit Taneja
The BAM DMA IP comes in different versions. The register offset layout varies among these versions. The layouts depend on which generation/family of SoCs they belong to.
The current
SoCs(like 8084, 8074)have a layout where the Top level registers come in the beginning of the address range, followed by pipe and event registers. The BAM revision numbers fall above 1.4.0.The older SoCs (like 8064, 8960) have a layout where the pipe registers come first, and the top level come later. These have BAM revision numbers lesser than 1.4.0.
It isn't suitable to have macros provide the register offsets with the layouts changed. Future BAM revisions may have different register layouts too. The register addresses are now calculated by referring a table which contains a base offset and multipliers for pipe/evnt/ee registers.
We have a common function
bam_addr()which computes addresses for all the registers. When computing address of top level/ee registers, we pass 0 to the pipe argument inaddr()since they don't have any multiple instances.
Quoted 7 lines
Quoted 2 lines
Some of the unused register definitions are removed. We can add new registers as we need them.
Vinod,
These changes replace the patch set I had that implemented support for the v.1.3.0 register set.
Andy,
With your change "dmaengine: qcom_bam_dma: Add v1.3.0 driver support" and enabling qcom_bam_dma driver i was seeing some crashes in the kernel on IFC6410. But after reverting you change and applying these changes from Vinod I see IFC6410 booting fine.
Here are the crash logs in case it helps and if your changes are still planned by you for upstream.
http://paste.ubuntu.com/8471405/
Thanks
Pramod
Quoted 2 lines
Quoted 5 lines · Pramod Gurav
Andy,
With your change "dmaengine:qcom_bam_dma: Add v1.3.0 driver support" and enablingqcom_bam_dmadriver i was seeing some crashes in the kernel on IFC6410. But after reverting you change and applying these changes from Vinod I see IFC6410 booting fine.
We're dropping my changes in favor of these. So please do revert my change and pull in this.
Signature · 3 lines
sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Vinod Koul
AppliedQuoted 17 lines · Archit Taneja
The BAM DMA IP comes in different versions. The register offset layout varies among these versions. The layouts depend on which generation/family of SoCs they belong to.
The current
SoCs(like 8084, 8074)have a layout where the Top level registers come in the beginning of the address range, followed by pipe and event registers. The BAM revision numbers fall above 1.4.0.The older SoCs (like 8064, 8960) have a layout where the pipe registers come first, and the top level come later. These have BAM revision numbers lesser than 1.4.0.
It isn't suitable to have macros provide the register offsets with the layouts changed. Future BAM revisions may have different register layouts too. The register addresses are now calculated by referring a table which contains a base offset and multipliers for pipe/evnt/ee registers.
Quoted 6 lines
We have a common function
bam_addr()which computes addresses for all the registers. When computing address of top level/ee registers, we pass 0 to the pipe argument inaddr()since they don't have any multiple instances.Some of the unused register definitions are removed. We can add new registers as we need them.
Applied alll three, thanks
Signature · 1 line
~Vinod