dw_dmac: adjust slave_id accordingly to request line base
PATCH v2 1/1 dw_dmac: adjust slave_id accordingly to request line base
On some hardware configurations we have got the request line with the offset. The patch introduces convert_slave_id() helper for that cases. The request line base is came from the driver data provided by the platform_device_id table.
---
Since v1:
- use driver_data instead of parsing IORESOURCE_DMA
drivers/dma/dw_dmac.c | 17 ++++++++++++++++- drivers/dma/dw_dmac_regs.h | 1 + 2 files changed, 17 insertions(+), 1 deletion(-)
drivers/dma/dw_dmac.c +16 -1
@@ -994,6 +994,13 @@ static inline void convert_burst(u32 *maxburst) *maxburst =0 ; } +static inline void convert_slave_id (struct dw_dma_chan *dwc) +{ +struct dw_dma *dw =to_dw_dma (dwc->chan.device); + + dwc->dma_sconfig.slave_id -= dw->request_line_base; +} +static int set_runtime_config (struct dma_chan *chan,struct dma_slave_config *sconfig) {
@@ -1008,6 +1015,7 @@ set_runtime_config(struct dma_chan *chan, struct dma_slave_config *sconfig)convert_burst (&dwc->dma_sconfig.src_maxburst);convert_burst (&dwc->dma_sconfig.dst_maxburst); +convert_slave_id (dwc);return 0 ; }
@@ -1637,6 +1645,7 @@ dw_dma_parse_dt(struct platform_device *pdev)static int dw_probe (struct platform_device *pdev) { +const struct platform_device_id *match;struct dw_dma_platform_data *pdata;struct resource *io;struct dw_dma *dw;
@@ -1722,6 +1731,11 @@ static int dw_probe(struct platform_device *pdev)memcpy (dw->data_width, pdata->data_width,4 ); } +/* Get the base request line if set */ + match =platform_get_device_id (pdev); +if (match) + dw->request_line_base = (unsigned int )match->driver_data; +/* Calculate all channel mask before DMA setup */ dw->all_chan_mask = (1 << nr_channels) -1 ;
@@ -1907,7 +1921,8 @@ MODULE_DEVICE_TABLE(of, dw_dma_id_table);#endif static const struct platform_device_id dw_dma_ids[] = { - {"INTL9C60" ,0 }, +/* Name, Request Line Base */ + {"INTL9C60" , (kernel_ulong_t )16 }, { } };
drivers/dma/dw_dmac_regs.h +1 -0
@@ -248,6 +248,7 @@ struct dw_dma {/* hardware configuration */ unsigned char nr_masters;unsigned char data_width[4 ]; +unsigned int request_line_base;struct dw_dma_chan chan[0 ]; };
Signature · 1 line
1.7.10.4
Quoted 7 lines · Andy Shevchenko
On some hardware configurations we have got the request line with the offset. The patch introduces
convert_slave_id()helper for that cases. The request line base is came from the driver data provided by theplatform_device_idtable.Signed-off-by Mika Westerberg <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>Cc Viresh Kumar <[email protected]>
Quoted 7 lines · Andy Shevchenko
On some hardware configurations we have got the request line with the offset. The patch introduces
convert_slave_id()helper for that cases. The request line base is came from the driver data provided by theplatform_device_idtable.Signed-off-by Mika Westerberg <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>Cc Viresh Kumar <[email protected]>
Vinod, is it okay to go with this version?
Signature · 2 lines
With Best Regards, Andy Shevchenko
Vinod Koul
AppliedQuoted 7 lines · Andy Shevchenko
On some hardware configurations we have got the request line with the offset. The patch introduces
convert_slave_id()helper for that cases. The request line base is came from the driver data provided by theplatform_device_idtable.Signed-off-by Mika Westerberg <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>Cc Viresh Kumar <[email protected]>
Applied, Thanks
Quoted 78 lines
---
Since v1:
- usedriver_datainstead of parsingIORESOURCE_DMAdrivers/dma/dw_dmac.c | 17 ++++++++++++++++- drivers/dma/dw_dmac_regs.h | 1 + 2 files changed, 17 insertions(+), 1 deletion(-)drivers/dma/dw_dmac.c +16
-1@@ -994,6 +994,13 @@ static inline void convert_burst(u32 *maxburst) *maxburst =0 ; } +static inline void convert_slave_id (struct dw_dma_chan *dwc) +{ +struct dw_dma *dw =to_dw_dma (dwc->chan.device); + + dwc->dma_sconfig.slave_id -= dw->request_line_base; +} +static int set_runtime_config (struct dma_chan *chan,struct dma_slave_config *sconfig) {@@ -1008,6 +1015,7 @@ set_runtime_config(struct dma_chan *chan, struct dma_slave_config *sconfig)convert_burst (&dwc->dma_sconfig.src_maxburst);convert_burst (&dwc->dma_sconfig.dst_maxburst); +convert_slave_id (dwc);return 0 ; }@@ -1637,6 +1645,7 @@ dw_dma_parse_dt(struct platform_device *pdev)static int dw_probe (struct platform_device *pdev) { +const struct platform_device_id *match;struct dw_dma_platform_data *pdata;struct resource *io;struct dw_dma *dw;@@ -1722,6 +1731,11 @@ static int dw_probe(struct platform_device *pdev)memcpy (dw->data_width, pdata->data_width,4 ); } +/* Get the base request line if set */ + match =platform_get_device_id (pdev); +if (match) + dw->request_line_base = (unsigned int )match->driver_data; +/* Calculate all channel mask before DMA setup */ dw->all_chan_mask = (1 << nr_channels) -1 ;@@ -1907,7 +1921,8 @@ MODULE_DEVICE_TABLE(of, dw_dma_id_table);#endif static const struct platform_device_id dw_dma_ids[] = { - {"INTL9C60" ,0 }, +/* Name, Request Line Base */ + {"INTL9C60" , (kernel_ulong_t )16 }, { } };drivers/dma/dw_dmac_regs.h +1
-0@@ -248,6 +248,7 @@ struct dw_dma {/* hardware configuration */ unsigned char nr_masters;unsigned char data_width[4 ]; +unsigned int request_line_base;struct dw_dma_chan chan[0 ]; };Signature · 1 line
1.7.10.4