* [PATCH v5 0/2] spi: pxa2xx: Adjust DMA burst size per platform @ 2019-03-19 15:48 Andy Shevchenko 2019-03-19 15:48 ` [PATCH v5 1/2] spi: pxa2xx: Introduce DMA burst size support Andy Shevchenko 2019-03-19 15:48 ` [PATCH v5 2/2] spi: pxa2xx: Debug print DMA burst size Andy Shevchenko 0 siblings, 2 replies; 6+ messages in thread From: Andy Shevchenko @ 2019-03-19 15:48 UTC (permalink / raw) To: Daniel Mack, Haojian Zhuang, Robert Jarzmik, linux-arm-kernel, Mark Brown, linux-spi, Jarkko Nikula Cc: Andy Shevchenko 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(-) -- 2.20.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v5 1/2] spi: pxa2xx: Introduce DMA burst size support 2019-03-19 15:48 [PATCH v5 0/2] spi: pxa2xx: Adjust DMA burst size per platform Andy Shevchenko @ 2019-03-19 15:48 ` Andy Shevchenko 2019-03-20 7:19 ` Jarkko Nikula 2019-03-20 17:30 ` Applied "spi: pxa2xx: Introduce DMA burst size support" to the spi tree Mark Brown 2019-03-19 15:48 ` [PATCH v5 2/2] spi: pxa2xx: Debug print DMA burst size Andy Shevchenko 1 sibling, 2 replies; 6+ messages in thread From: Andy Shevchenko @ 2019-03-19 15:48 UTC (permalink / raw) To: Daniel Mack, Haojian Zhuang, Robert Jarzmik, linux-arm-kernel, Mark Brown, linux-spi, Jarkko Nikula Cc: 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. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- 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(-) diff --git a/drivers/spi/spi-pxa2xx-dma.c b/drivers/spi/spi-pxa2xx-dma.c index 15592598273e..e5c26c1779ab 100644 --- a/drivers/spi/spi-pxa2xx-dma.c +++ b/drivers/spi/spi-pxa2xx-dma.c @@ -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); diff --git a/drivers/spi/spi-pxa2xx-pci.c b/drivers/spi/spi-pxa2xx-pci.c index 1727fdfbac28..33029ca0687a 100644 --- a/drivers/spi/spi-pxa2xx-pci.c +++ b/drivers/spi/spi-pxa2xx-pci.c @@ -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); diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index b6ddba833d02..461c6b796b8f 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -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; } diff --git a/include/linux/spi/pxa2xx_spi.h b/include/linux/spi/pxa2xx_spi.h index c1c59473cef9..6005f0126631 100644 --- a/include/linux/spi/pxa2xx_spi.h +++ b/include/linux/spi/pxa2xx_spi.h @@ -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 */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v5 1/2] spi: pxa2xx: Introduce DMA burst size support 2019-03-19 15:48 ` [PATCH v5 1/2] spi: pxa2xx: Introduce DMA burst size support Andy Shevchenko @ 2019-03-20 7:19 ` Jarkko Nikula 2019-03-20 17:30 ` Applied "spi: pxa2xx: Introduce DMA burst size support" to the spi tree Mark Brown 1 sibling, 0 replies; 6+ messages in thread From: Jarkko Nikula @ 2019-03-20 7:19 UTC (permalink / raw) To: Andy Shevchenko, Daniel Mack, Haojian Zhuang, Robert Jarzmik, linux-arm-kernel, Mark Brown, linux-spi On 3/19/19 5:48 PM, Andy Shevchenko wrote: > 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. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > 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(-) > Tested-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Reviewed-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> ^ permalink raw reply [flat|nested] 6+ messages in thread
* Applied "spi: pxa2xx: Introduce DMA burst size support" to the spi tree 2019-03-19 15:48 ` [PATCH v5 1/2] spi: pxa2xx: Introduce DMA burst size support Andy Shevchenko 2019-03-20 7:19 ` Jarkko Nikula @ 2019-03-20 17:30 ` Mark Brown 1 sibling, 0 replies; 6+ messages in thread From: Mark Brown @ 2019-03-20 17:30 UTC (permalink / raw) To: Andy Shevchenko Cc: Haojian Zhuang, linux-spi, Mark Brown, Jarkko Nikula, Daniel Mack, Robert Jarzmik, linux-arm-kernel The 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 >From 37821a82e6789eaaa81dd32a67edc3511ebfd5aa Mon Sep 17 00:00:00 2001 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> 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. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Tested-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Reviewed-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org> --- 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(-) diff --git a/drivers/spi/spi-pxa2xx-dma.c b/drivers/spi/spi-pxa2xx-dma.c index 15592598273e..e5c26c1779ab 100644 --- a/drivers/spi/spi-pxa2xx-dma.c +++ b/drivers/spi/spi-pxa2xx-dma.c @@ -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); diff --git a/drivers/spi/spi-pxa2xx-pci.c b/drivers/spi/spi-pxa2xx-pci.c index 4b162fdca35f..d456c5251b5d 100644 --- a/drivers/spi/spi-pxa2xx-pci.c +++ b/drivers/spi/spi-pxa2xx-pci.c @@ -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); diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index b6ddba833d02..461c6b796b8f 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -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; } diff --git a/include/linux/spi/pxa2xx_spi.h b/include/linux/spi/pxa2xx_spi.h index c1c59473cef9..6005f0126631 100644 --- a/include/linux/spi/pxa2xx_spi.h +++ b/include/linux/spi/pxa2xx_spi.h @@ -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 */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v5 2/2] spi: pxa2xx: Debug print DMA burst size 2019-03-19 15:48 [PATCH v5 0/2] spi: pxa2xx: Adjust DMA burst size per platform Andy Shevchenko 2019-03-19 15:48 ` [PATCH v5 1/2] spi: pxa2xx: Introduce DMA burst size support Andy Shevchenko @ 2019-03-19 15:48 ` Andy Shevchenko 2019-03-20 7:19 ` Jarkko Nikula 1 sibling, 1 reply; 6+ messages in thread From: Andy Shevchenko @ 2019-03-19 15:48 UTC (permalink / raw) To: Daniel Mack, Haojian Zhuang, Robert Jarzmik, linux-arm-kernel, Mark Brown, linux-spi, Jarkko Nikula Cc: Andy Shevchenko It's useful during debug to see what DMA burst size is. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/spi/spi-pxa2xx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 461c6b796b8f..f008836f7e27 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -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) { -- 2.20.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v5 2/2] spi: pxa2xx: Debug print DMA burst size 2019-03-19 15:48 ` [PATCH v5 2/2] spi: pxa2xx: Debug print DMA burst size Andy Shevchenko @ 2019-03-20 7:19 ` Jarkko Nikula 0 siblings, 0 replies; 6+ messages in thread From: Jarkko Nikula @ 2019-03-20 7:19 UTC (permalink / raw) To: Andy Shevchenko, Daniel Mack, Haojian Zhuang, Robert Jarzmik, linux-arm-kernel, Mark Brown, linux-spi On 3/19/19 5:48 PM, Andy Shevchenko wrote: > It's useful during debug to see what DMA burst size is. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > drivers/spi/spi-pxa2xx.c | 3 +++ > 1 file changed, 3 insertions(+) > Tested-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Reviewed-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-03-20 17:30 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-03-19 15:48 [PATCH v5 0/2] spi: pxa2xx: Adjust DMA burst size per platform Andy Shevchenko 2019-03-19 15:48 ` [PATCH v5 1/2] spi: pxa2xx: Introduce DMA burst size support Andy Shevchenko 2019-03-20 7:19 ` Jarkko Nikula 2019-03-20 17:30 ` Applied "spi: pxa2xx: Introduce DMA burst size support" to the spi tree Mark Brown 2019-03-19 15:48 ` [PATCH v5 2/2] spi: pxa2xx: Debug print DMA burst size Andy Shevchenko 2019-03-20 7:19 ` Jarkko Nikula
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).