* [PATCH v3 0/2] spi: pxa2xx: Adjust DMA burst size per platform
@ 2019-03-18 14:41 Andy Shevchenko
2019-03-18 14:41 ` [PATCH v3 1/2] spi: pxa2xx: Introduce DMA burst size support Andy Shevchenko
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Andy Shevchenko @ 2019-03-18 14:41 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 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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v3 1/2] spi: pxa2xx: Introduce DMA burst size support
2019-03-18 14:41 [PATCH v3 0/2] spi: pxa2xx: Adjust DMA burst size per platform Andy Shevchenko
@ 2019-03-18 14:41 ` Andy Shevchenko
2019-03-18 14:41 ` [PATCH v3 2/2] spi: pxa2xx: Debug print DMA burst size Andy Shevchenko
2019-03-18 16:33 ` [PATCH v3 0/2] spi: pxa2xx: Adjust DMA burst size per platform Andy Shevchenko
2 siblings, 0 replies; 4+ messages in thread
From: Andy Shevchenko @ 2019-03-18 14:41 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..17424cc98006 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->master_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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v3 2/2] spi: pxa2xx: Debug print DMA burst size
2019-03-18 14:41 [PATCH v3 0/2] spi: pxa2xx: Adjust DMA burst size per platform Andy Shevchenko
2019-03-18 14:41 ` [PATCH v3 1/2] spi: pxa2xx: Introduce DMA burst size support Andy Shevchenko
@ 2019-03-18 14:41 ` Andy Shevchenko
2019-03-18 16:33 ` [PATCH v3 0/2] spi: pxa2xx: Adjust DMA burst size per platform Andy Shevchenko
2 siblings, 0 replies; 4+ messages in thread
From: Andy Shevchenko @ 2019-03-18 14:41 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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v3 0/2] spi: pxa2xx: Adjust DMA burst size per platform
2019-03-18 14:41 [PATCH v3 0/2] spi: pxa2xx: Adjust DMA burst size per platform Andy Shevchenko
2019-03-18 14:41 ` [PATCH v3 1/2] spi: pxa2xx: Introduce DMA burst size support Andy Shevchenko
2019-03-18 14:41 ` [PATCH v3 2/2] spi: pxa2xx: Debug print DMA burst size Andy Shevchenko
@ 2019-03-18 16:33 ` Andy Shevchenko
2 siblings, 0 replies; 4+ messages in thread
From: Andy Shevchenko @ 2019-03-18 16:33 UTC (permalink / raw)
To: Daniel Mack, Haojian Zhuang, Robert Jarzmik, linux-arm-kernel,
Mark Brown, linux-spi, Jarkko Nikula
On Mon, Mar 18, 2019 at 04:41:42PM +0200, Andy Shevchenko wrote:
> On some platforms DMA burst size is not the same as hard coded default.
> Fix the driver to support them.
>
> 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)
Forgot to rebase.
It will not compile on v5.1-rc1 due to s/master/controller/g changes.
>
> 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
>
--
With Best Regards,
Andy Shevchenko
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-03-18 16:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-18 14:41 [PATCH v3 0/2] spi: pxa2xx: Adjust DMA burst size per platform Andy Shevchenko
2019-03-18 14:41 ` [PATCH v3 1/2] spi: pxa2xx: Introduce DMA burst size support Andy Shevchenko
2019-03-18 14:41 ` [PATCH v3 2/2] spi: pxa2xx: Debug print DMA burst size Andy Shevchenko
2019-03-18 16:33 ` [PATCH v3 0/2] spi: pxa2xx: Adjust DMA burst size per platform Andy Shevchenko
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).