spi: pxa2xx: Adjust DMA burst size per platform
Subsystems (3)
Andy Shevchenko
reviewerv5 cover spi: pxa2xx: Adjust DMA burst size per platform
On some platforms DMA burst size is not the same as hard coded default Fix the driver to support them.
In v5:
- correct subject in cover letter
- correct the patches that have been sent
In v4:
- fix s/master/controller/g
In v3:
- drop threshold print since it's easy to calculate constant (Jarkko)
- split one more unrelated change to a separate patch,
but independent from this series (Jarkko)
In v2:
- drop unrelated changes (Jarkko, Robert)
- don't include Robert's tag due to changes in the patch
Andy Shevchenko (2):
spi: pxa2xx: Introduce DMA burst size support
spi: pxa2xx: Debug print DMA burst size
drivers/spi/spi-pxa2xx-dma.c | 4 +++- drivers/spi/spi-pxa2xx-pci.c | 4 ++++ drivers/spi/spi-pxa2xx.c | 4 ++++ include/linux/spi/pxa2xx_spi.h | 1 4 files changed, 12 insertions(+), 1 deletion(-)
Signature · 1 line
2.20.1
Andy Shevchenko
reviewerPATCH v5 1/2 spi: pxa2xx: Introduce DMA burst size support
Some masters may have different DMA burst size than hard coded default. In such case respect the value given by DMA burst size provided via platform data.
--- drivers/spi/spi-pxa2xx-dma.c | 4 +++- drivers/spi/spi-pxa2xx-pci.c | 4 ++++ drivers/spi/spi-pxa2xx.c | 1 + include/linux/spi/pxa2xx_spi.h | 1 + 4 files changed, 9 insertions(+), 1 deletion(-)
drivers/spi/spi-pxa2xx-dma.c +3 -1
@@ -239,13 +239,15 @@ int pxa2xx_spi_set_dma_burst_and_threshold(struct chip_data *chip, u32 *threshold) {struct pxa2xx_spi_chip *chip_info = spi->controller_data; +struct driver_data *drv_data =spi_controller_get_devdata (spi->controller); +u32 dma_burst_size = drv_data->controller_info->dma_burst_size;/* * If the DMA burst size is given in chip_info we use that, * otherwise we use the default. Also we use the default FIFO * thresholds for now. */ - *burst_code = chip_info ? chip_info->dma_burst_size :1 ; + *burst_code = chip_info ? chip_info->dma_burst_size : dma_burst_size; *threshold =SSCR1_RxTresh (RX_THRESH_DFLT ) |SSCR1_TxTresh (TX_THRESH_DFLT );
drivers/spi/spi-pxa2xx-pci.c +4 -0
@@ -35,6 +35,8 @@ struct pxa_spi_info {void *tx_param;void *rx_param; +int dma_burst_size; +int (*setup)(struct pci_dev *pdev,struct pxa_spi_info *c); };
@@ -133,6 +135,7 @@ static int mrfld_spi_setup(struct pci_dev *dev, struct pxa_spi_info *c) rx->dma_dev = &dma_dev->dev; c->dma_filter = lpss_dma_filter; + c->dma_burst_size =8 ;return 0 ; }
@@ -223,6 +226,7 @@ static int pxa2xx_spi_pci_probe(struct pci_dev *dev, spi_pdata.tx_param = c->tx_param; spi_pdata.rx_param = c->rx_param; spi_pdata.enable_dma = c->rx_param && c->tx_param; + spi_pdata.dma_burst_size = c->dma_burst_size ? c->dma_burst_size :1 ; ssp = &spi_pdata.ssp; ssp->phys_base =pci_resource_start (dev,0 );
drivers/spi/spi-pxa2xx.c +1 -0
@@ -1564,6 +1564,7 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev) pdata->is_slave =of_property_read_bool (pdev->dev.of_node,"spi-slave" ); pdata->num_chipselect =1 ; pdata->enable_dma = true; + pdata->dma_burst_size =1 ;return pdata; }
include/linux/spi/pxa2xx_spi.h +1 -0
@@ -25,6 +25,7 @@ struct dma_chan;struct pxa2xx_spi_controller {u16 num_chipselect;u8 enable_dma; +u8 dma_burst_size;bool is_slave;/* DMA engine specific config */
Signature · 1 line
2.20.1
Re: [PATCH v5 1/2] spi: pxa2xx: Introduce DMA burst size support
Quoted 4 lines · Andy Shevchenko
Some masters may have different DMA burst size than hard coded default. In such case respect the value given by DMA burst size provided via platform data.
Quoted 8 lines
Signed-off-by Andy Shevchenko <[email protected]>--- drivers/spi/spi-pxa2xx-dma.c | 4 +++- drivers/spi/spi-pxa2xx-pci.c | 4 ++++ drivers/spi/spi-pxa2xx.c | 1 + include/linux/spi/pxa2xx_spi.h | 1 + 4 files changed, 9 insertions(+), 1 deletion(-)
Mark Brown
maintainerApplied "spi: pxa2xx: Introduce DMA burst size support" to the spi tree
In reply to Andy ShevchenkoThe patch
spi: pxa2xx: Introduce DMA burst size support
has been applied to the spi tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
37821a82e6789eaaa81dd32a67edc3511ebfd5aaMon Sep 17 00:00:00 2001
From: Andy Shevchenko <[email protected]>
Date: Tue, 19 Mar 2019 17:48:42 +0200
Subject: [PATCH] spi: pxa2xx: Introduce DMA burst size support
Some masters may have different DMA burst size than hard coded default. In such case respect the value given by DMA burst size provided via platform data.
--- drivers/spi/spi-pxa2xx-dma.c | 4 +++- drivers/spi/spi-pxa2xx-pci.c | 4 ++++ drivers/spi/spi-pxa2xx.c | 1 + include/linux/spi/pxa2xx_spi.h | 1 + 4 files changed, 9 insertions(+), 1 deletion(-)
drivers/spi/spi-pxa2xx-dma.c +3 -1
@@ -239,13 +239,15 @@ int pxa2xx_spi_set_dma_burst_and_threshold(struct chip_data *chip, u32 *threshold) {struct pxa2xx_spi_chip *chip_info = spi->controller_data; +struct driver_data *drv_data =spi_controller_get_devdata (spi->controller); +u32 dma_burst_size = drv_data->controller_info->dma_burst_size;/* * If the DMA burst size is given in chip_info we use that, * otherwise we use the default. Also we use the default FIFO * thresholds for now. */ - *burst_code = chip_info ? chip_info->dma_burst_size :1 ; + *burst_code = chip_info ? chip_info->dma_burst_size : dma_burst_size; *threshold =SSCR1_RxTresh (RX_THRESH_DFLT ) |SSCR1_TxTresh (TX_THRESH_DFLT );
drivers/spi/spi-pxa2xx-pci.c +4 -0
@@ -34,6 +34,8 @@ struct pxa_spi_info {void *tx_param;void *rx_param; +int dma_burst_size; +int (*setup)(struct pci_dev *pdev,struct pxa_spi_info *c); };
@@ -132,6 +134,7 @@ static int mrfld_spi_setup(struct pci_dev *dev, struct pxa_spi_info *c) rx->dma_dev = &dma_dev->dev; c->dma_filter = lpss_dma_filter; + c->dma_burst_size =8 ;return 0 ; }
@@ -222,6 +225,7 @@ static int pxa2xx_spi_pci_probe(struct pci_dev *dev, spi_pdata.tx_param = c->tx_param; spi_pdata.rx_param = c->rx_param; spi_pdata.enable_dma = c->rx_param && c->tx_param; + spi_pdata.dma_burst_size = c->dma_burst_size ? c->dma_burst_size :1 ; ssp = &spi_pdata.ssp; ssp->phys_base =pci_resource_start (dev,0 );
drivers/spi/spi-pxa2xx.c +1 -0
@@ -1564,6 +1564,7 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev) pdata->is_slave =of_property_read_bool (pdev->dev.of_node,"spi-slave" ); pdata->num_chipselect =1 ; pdata->enable_dma = true; + pdata->dma_burst_size =1 ;return pdata; }
include/linux/spi/pxa2xx_spi.h +1 -0
@@ -25,6 +25,7 @@ struct dma_chan;struct pxa2xx_spi_controller {u16 num_chipselect;u8 enable_dma; +u8 dma_burst_size;bool is_slave;/* DMA engine specific config */
Signature · 1 line
2.20.1
Andy Shevchenko
reviewerPATCH v5 2/2 spi: pxa2xx: Debug print DMA burst size
In reply to Andy ShevchenkoIt's useful during debug to see what DMA burst size is.
--- drivers/spi/spi-pxa2xx.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/spi/spi-pxa2xx.c +3 -0
@@ -1333,6 +1333,9 @@ static int setup(struct spi_device *spi)dev_warn (&spi->dev,"in setup: DMA burst size reduced to match bits_per_word\n" ); } +dev_dbg (&spi->dev, +"in setup: DMA burst size set to %u\n" , + chip->dma_burst_size); }switch (drv_data->ssp_type) {
Signature · 1 line
2.20.1
Re: [PATCH v5 2/2] spi: pxa2xx: Debug print DMA burst size
Quoted 7 lines · Andy Shevchenko
It's useful during debug to see what DMA burst size is.
Signed-off-by Andy Shevchenko <[email protected]>--- drivers/spi/spi-pxa2xx.c | 3 +++ 1 file changed, 3 insertions(+)