| Message ID | 20181112152221.10053-1-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | RFC |
| Headers | show |
| Series | [PATCH/RFC] dmaengine: sh: Remove R-Mobile APE6 support | expand |
CC SuperH On Mon, Nov 12, 2018 at 4:22 PM Geert Uytterhoeven <geert+renesas@glider.be> wrote: > Renesas R-Mobile APE6 support is currently unused: > - DMA slaves were never enabled in r8a73a4.dtsi, > - The driver relies on legacy filter matching and describing all > slaves and MID/RIDs in a table, unlike modern DMA engine drivers for > similar hardware like rcar-dmac, > - The driver doesn't seem to work well. > > Remove the driver, it can be resurrected from git history when needed. > > As this was the last user of SH_DMAE_BASE on Renesas ARM SoCs, the > sh-dma-engine driver core is now used on SuperH only. > > Note that the DT bindings are still present, as r8a73a4.dtsi uses them. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > Notes: > 1. As Renesas ARM SoCs no longer use drivers/dma/sh/shdma-base.c, the > task to remove use of the deprecated dma_slave_config.direction > field gets thrown into the SuperH maintainers' basket ;-) > 2. This affects shmobile_defconfig and renesas_defconfig > (CONFIG_SH_DMAE_BASE and CONFIG_SH_DMAE are no longer enabled by > default). > 3. I tried to get SCIFA DMA to work by: > - Applying the DT and driver patches below, > - Reverting 219fb0c1436e4893 ("serial: sh-sci: Remove the > platform data dma slave rx/tx channel IDs"). > After that, serial console output using DMA seems to work, but the > system locks up when receiving any serial console input. > Probably it is easier to add r8a73a4 support to rcar-dmac. > > ignore --- a/arch/arm/boot/dts/r8a73a4.dtsi > ignore +++ b/arch/arm/boot/dts/r8a73a4.dtsi > @@ -453,6 +453,8 @@ > interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>; > clocks = <&mstp2_clks R8A73A4_CLK_SCIFA0>; > clock-names = "fck"; > + dmas = <&dmac 0x21>, <&dmac 0x22>; > + dma-names = "tx", "rx"; > power-domains = <&pd_a3sp>; > status = "disabled"; > }; > ignore --- a/drivers/dma/sh/shdma-r8a73a4.c > ignore +++ b/drivers/dma/sh/shdma-r8a73a4.c > @@ -12,6 +12,12 @@ static const unsigned int dma_ts_shift[] = SH_DMAE_TS_SHIFT; > > static const struct sh_dmae_slave_config dma_slaves[] = { > { > + .chcr = CHCR_TX(XMIT_SZ_8BIT), > + .mid_rid = 0x21, /* SCIFA0 Tx */ > + }, { > + .chcr = CHCR_RX(XMIT_SZ_8BIT), > + .mid_rid = 0x22, /* SCIFA0 Rx */ > + }, { > .chcr = CHCR_TX(XMIT_SZ_32BIT), > .mid_rid = 0xd1, /* MMC0 Tx */ > }, { > --- > drivers/dma/sh/Kconfig | 11 +---- > drivers/dma/sh/Makefile | 1 - > drivers/dma/sh/shdma-r8a73a4.c | 74 ---------------------------------- > drivers/dma/sh/shdma.h | 7 ---- > drivers/dma/sh/shdmac.c | 7 ---- > 5 files changed, 1 insertion(+), 99 deletions(-) > delete mode 100644 drivers/dma/sh/shdma-r8a73a4.c > > diff --git a/drivers/dma/sh/Kconfig b/drivers/dma/sh/Kconfig > index 6e0685f1a83814f4..b728cfaf4d700f96 100644 > --- a/drivers/dma/sh/Kconfig > +++ b/drivers/dma/sh/Kconfig > @@ -12,7 +12,7 @@ config RENESAS_DMA > > config SH_DMAE_BASE > bool "Renesas SuperH DMA Engine support" > - depends on SUPERH || ARCH_RENESAS || COMPILE_TEST > + depends on SUPERH || COMPILE_TEST > depends on !SUPERH || SH_DMA > depends on !SH_DMA_API > default y > @@ -30,15 +30,6 @@ config SH_DMAE > help > Enable support for the Renesas SuperH DMA controllers. > > -if SH_DMAE > - > -config SH_DMAE_R8A73A4 > - def_bool y > - depends on ARCH_R8A73A4 > - depends on OF > - > -endif > - > config RCAR_DMAC > tristate "Renesas R-Car Gen2 DMA Controller" > depends on ARCH_RENESAS || COMPILE_TEST > diff --git a/drivers/dma/sh/Makefile b/drivers/dma/sh/Makefile > index 7d7c9491ade1216d..42110dd57a56fda8 100644 > --- a/drivers/dma/sh/Makefile > +++ b/drivers/dma/sh/Makefile > @@ -10,7 +10,6 @@ obj-$(CONFIG_SH_DMAE_BASE) += shdma-base.o shdma-of.o > # > > shdma-y := shdmac.o > -shdma-$(CONFIG_SH_DMAE_R8A73A4) += shdma-r8a73a4.o > shdma-objs := $(shdma-y) > obj-$(CONFIG_SH_DMAE) += shdma.o > > diff --git a/drivers/dma/sh/shdma-r8a73a4.c b/drivers/dma/sh/shdma-r8a73a4.c > deleted file mode 100644 > index ddc9a35783534bdd..0000000000000000 > --- a/drivers/dma/sh/shdma-r8a73a4.c > +++ /dev/null > @@ -1,74 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0 > -/* > - * Renesas SuperH DMA Engine support for r8a73a4 (APE6) SoCs > - * > - * Copyright (C) 2013 Renesas Electronics, Inc. > - */ > -#include <linux/sh_dma.h> > - > -#include "shdma-arm.h" > - > -static const unsigned int dma_ts_shift[] = SH_DMAE_TS_SHIFT; > - > -static const struct sh_dmae_slave_config dma_slaves[] = { > - { > - .chcr = CHCR_TX(XMIT_SZ_32BIT), > - .mid_rid = 0xd1, /* MMC0 Tx */ > - }, { > - .chcr = CHCR_RX(XMIT_SZ_32BIT), > - .mid_rid = 0xd2, /* MMC0 Rx */ > - }, { > - .chcr = CHCR_TX(XMIT_SZ_32BIT), > - .mid_rid = 0xe1, /* MMC1 Tx */ > - }, { > - .chcr = CHCR_RX(XMIT_SZ_32BIT), > - .mid_rid = 0xe2, /* MMC1 Rx */ > - }, > -}; > - > -#define DMAE_CHANNEL(a, b) \ > - { \ > - .offset = (a) - 0x20, \ > - .dmars = (a) - 0x20 + 0x40, \ > - .chclr_bit = (b), \ > - .chclr_offset = 0x80 - 0x20, \ > - } > - > -static const struct sh_dmae_channel dma_channels[] = { > - DMAE_CHANNEL(0x8000, 0), > - DMAE_CHANNEL(0x8080, 1), > - DMAE_CHANNEL(0x8100, 2), > - DMAE_CHANNEL(0x8180, 3), > - DMAE_CHANNEL(0x8200, 4), > - DMAE_CHANNEL(0x8280, 5), > - DMAE_CHANNEL(0x8300, 6), > - DMAE_CHANNEL(0x8380, 7), > - DMAE_CHANNEL(0x8400, 8), > - DMAE_CHANNEL(0x8480, 9), > - DMAE_CHANNEL(0x8500, 10), > - DMAE_CHANNEL(0x8580, 11), > - DMAE_CHANNEL(0x8600, 12), > - DMAE_CHANNEL(0x8680, 13), > - DMAE_CHANNEL(0x8700, 14), > - DMAE_CHANNEL(0x8780, 15), > - DMAE_CHANNEL(0x8800, 16), > - DMAE_CHANNEL(0x8880, 17), > - DMAE_CHANNEL(0x8900, 18), > - DMAE_CHANNEL(0x8980, 19), > -}; > - > -const struct sh_dmae_pdata r8a73a4_dma_pdata = { > - .slave = dma_slaves, > - .slave_num = ARRAY_SIZE(dma_slaves), > - .channel = dma_channels, > - .channel_num = ARRAY_SIZE(dma_channels), > - .ts_low_shift = TS_LOW_SHIFT, > - .ts_low_mask = TS_LOW_BIT << TS_LOW_SHIFT, > - .ts_high_shift = TS_HI_SHIFT, > - .ts_high_mask = TS_HI_BIT << TS_HI_SHIFT, > - .ts_shift = dma_ts_shift, > - .ts_shift_num = ARRAY_SIZE(dma_ts_shift), > - .dmaor_init = DMAOR_DME, > - .chclr_present = 1, > - .chclr_bitwise = 1, > -}; > diff --git a/drivers/dma/sh/shdma.h b/drivers/dma/sh/shdma.h > index bfb69909bd192759..9c121a4b33ad829c 100644 > --- a/drivers/dma/sh/shdma.h > +++ b/drivers/dma/sh/shdma.h > @@ -58,11 +58,4 @@ struct sh_dmae_desc { > #define to_sh_dev(chan) container_of(chan->shdma_chan.dma_chan.device,\ > struct sh_dmae_device, shdma_dev.dma_dev) > > -#ifdef CONFIG_SH_DMAE_R8A73A4 > -extern const struct sh_dmae_pdata r8a73a4_dma_pdata; > -#define r8a73a4_shdma_devid (&r8a73a4_dma_pdata) > -#else > -#define r8a73a4_shdma_devid NULL > -#endif > - > #endif /* __DMA_SHDMA_H */ > diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c > index 7971ea2753877486..5aafe548ca5f3082 100644 > --- a/drivers/dma/sh/shdmac.c > +++ b/drivers/dma/sh/shdmac.c > @@ -665,12 +665,6 @@ static const struct shdma_ops sh_dmae_shdma_ops = { > .get_partial = sh_dmae_get_partial, > }; > > -static const struct of_device_id sh_dmae_of_match[] = { > - {.compatible = "renesas,shdma-r8a73a4", .data = r8a73a4_shdma_devid,}, > - {} > -}; > -MODULE_DEVICE_TABLE(of, sh_dmae_of_match); > - > static int sh_dmae_probe(struct platform_device *pdev) > { > const enum dma_slave_buswidth widths = > @@ -915,7 +909,6 @@ static struct platform_driver sh_dmae_driver = { > .driver = { > .pm = &sh_dmae_pm, > .name = SH_DMAE_DRV_NAME, > - .of_match_table = sh_dmae_of_match, > }, > .remove = sh_dmae_remove, > }; > -- > 2.17.1
Thank you for your patch. > On November 12, 2018 at 4:22 PM Geert Uytterhoeven <geert+renesas@glider.be> wrote: > > > Renesas R-Mobile APE6 support is currently unused: > - DMA slaves were never enabled in r8a73a4.dtsi, > - The driver relies on legacy filter matching and describing all > slaves and MID/RIDs in a table, unlike modern DMA engine drivers for > similar hardware like rcar-dmac, > - The driver doesn't seem to work well. > > Remove the driver, it can be resurrected from git history when needed. > > As this was the last user of SH_DMAE_BASE on Renesas ARM SoCs, the > sh-dma-engine driver core is now used on SuperH only. > > Note that the DT bindings are still present, as r8a73a4.dtsi uses them. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > Notes: > 1. As Renesas ARM SoCs no longer use drivers/dma/sh/shdma-base.c, the > task to remove use of the deprecated dma_slave_config.direction > field gets thrown into the SuperH maintainers' basket ;-) > 2. This affects shmobile_defconfig and renesas_defconfig > (CONFIG_SH_DMAE_BASE and CONFIG_SH_DMAE are no longer enabled by > default). > 3. I tried to get SCIFA DMA to work by: > - Applying the DT and driver patches below, > - Reverting 219fb0c1436e4893 ("serial: sh-sci: Remove the > platform data dma slave rx/tx channel IDs"). > After that, serial console output using DMA seems to work, but the > system locks up when receiving any serial console input. > Probably it is easier to add r8a73a4 support to rcar-dmac. > > ignore --- a/arch/arm/boot/dts/r8a73a4.dtsi > ignore +++ b/arch/arm/boot/dts/r8a73a4.dtsi > @@ -453,6 +453,8 @@ > interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>; > clocks = <&mstp2_clks R8A73A4_CLK_SCIFA0>; > clock-names = "fck"; > + dmas = <&dmac 0x21>, <&dmac 0x22>; > + dma-names = "tx", "rx"; > power-domains = <&pd_a3sp>; > status = "disabled"; > }; > ignore --- a/drivers/dma/sh/shdma-r8a73a4.c > ignore +++ b/drivers/dma/sh/shdma-r8a73a4.c > @@ -12,6 +12,12 @@ static const unsigned int dma_ts_shift[] = SH_DMAE_TS_SHIFT; > > static const struct sh_dmae_slave_config dma_slaves[] = { > { > + .chcr = CHCR_TX(XMIT_SZ_8BIT), > + .mid_rid = 0x21, /* SCIFA0 Tx */ > + }, { > + .chcr = CHCR_RX(XMIT_SZ_8BIT), > + .mid_rid = 0x22, /* SCIFA0 Rx */ > + }, { > .chcr = CHCR_TX(XMIT_SZ_32BIT), > .mid_rid = 0xd1, /* MMC0 Tx */ > }, { > --- > drivers/dma/sh/Kconfig | 11 +---- > drivers/dma/sh/Makefile | 1 - > drivers/dma/sh/shdma-r8a73a4.c | 74 ---------------------------------- > drivers/dma/sh/shdma.h | 7 ---- > drivers/dma/sh/shdmac.c | 7 ---- > 5 files changed, 1 insertion(+), 99 deletions(-) > delete mode 100644 drivers/dma/sh/shdma-r8a73a4.c > > diff --git a/drivers/dma/sh/Kconfig b/drivers/dma/sh/Kconfig > index 6e0685f1a83814f4..b728cfaf4d700f96 100644 > --- a/drivers/dma/sh/Kconfig > +++ b/drivers/dma/sh/Kconfig > @@ -12,7 +12,7 @@ config RENESAS_DMA > > config SH_DMAE_BASE > bool "Renesas SuperH DMA Engine support" > - depends on SUPERH || ARCH_RENESAS || COMPILE_TEST > + depends on SUPERH || COMPILE_TEST > depends on !SUPERH || SH_DMA > depends on !SH_DMA_API > default y > @@ -30,15 +30,6 @@ config SH_DMAE > help > Enable support for the Renesas SuperH DMA controllers. > > -if SH_DMAE > - > -config SH_DMAE_R8A73A4 > - def_bool y > - depends on ARCH_R8A73A4 > - depends on OF > - > -endif > - > config RCAR_DMAC > tristate "Renesas R-Car Gen2 DMA Controller" > depends on ARCH_RENESAS || COMPILE_TEST > diff --git a/drivers/dma/sh/Makefile b/drivers/dma/sh/Makefile > index 7d7c9491ade1216d..42110dd57a56fda8 100644 > --- a/drivers/dma/sh/Makefile > +++ b/drivers/dma/sh/Makefile > @@ -10,7 +10,6 @@ obj-$(CONFIG_SH_DMAE_BASE) += shdma-base.o shdma-of.o > # > > shdma-y := shdmac.o > -shdma-$(CONFIG_SH_DMAE_R8A73A4) += shdma-r8a73a4.o > shdma-objs := $(shdma-y) > obj-$(CONFIG_SH_DMAE) += shdma.o > > diff --git a/drivers/dma/sh/shdma-r8a73a4.c b/drivers/dma/sh/shdma-r8a73a4.c > deleted file mode 100644 > index ddc9a35783534bdd..0000000000000000 > --- a/drivers/dma/sh/shdma-r8a73a4.c > +++ /dev/null > @@ -1,74 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0 > -/* > - * Renesas SuperH DMA Engine support for r8a73a4 (APE6) SoCs > - * > - * Copyright (C) 2013 Renesas Electronics, Inc. > - */ > -#include <linux/sh_dma.h> > - > -#include "shdma-arm.h" > - > -static const unsigned int dma_ts_shift[] = SH_DMAE_TS_SHIFT; > - > -static const struct sh_dmae_slave_config dma_slaves[] = { > - { > - .chcr = CHCR_TX(XMIT_SZ_32BIT), > - .mid_rid = 0xd1, /* MMC0 Tx */ > - }, { > - .chcr = CHCR_RX(XMIT_SZ_32BIT), > - .mid_rid = 0xd2, /* MMC0 Rx */ > - }, { > - .chcr = CHCR_TX(XMIT_SZ_32BIT), > - .mid_rid = 0xe1, /* MMC1 Tx */ > - }, { > - .chcr = CHCR_RX(XMIT_SZ_32BIT), > - .mid_rid = 0xe2, /* MMC1 Rx */ > - }, > -}; > - > -#define DMAE_CHANNEL(a, b) \ > - { \ > - .offset = (a) - 0x20, \ > - .dmars = (a) - 0x20 + 0x40, \ > - .chclr_bit = (b), \ > - .chclr_offset = 0x80 - 0x20, \ > - } > - > -static const struct sh_dmae_channel dma_channels[] = { > - DMAE_CHANNEL(0x8000, 0), > - DMAE_CHANNEL(0x8080, 1), > - DMAE_CHANNEL(0x8100, 2), > - DMAE_CHANNEL(0x8180, 3), > - DMAE_CHANNEL(0x8200, 4), > - DMAE_CHANNEL(0x8280, 5), > - DMAE_CHANNEL(0x8300, 6), > - DMAE_CHANNEL(0x8380, 7), > - DMAE_CHANNEL(0x8400, 8), > - DMAE_CHANNEL(0x8480, 9), > - DMAE_CHANNEL(0x8500, 10), > - DMAE_CHANNEL(0x8580, 11), > - DMAE_CHANNEL(0x8600, 12), > - DMAE_CHANNEL(0x8680, 13), > - DMAE_CHANNEL(0x8700, 14), > - DMAE_CHANNEL(0x8780, 15), > - DMAE_CHANNEL(0x8800, 16), > - DMAE_CHANNEL(0x8880, 17), > - DMAE_CHANNEL(0x8900, 18), > - DMAE_CHANNEL(0x8980, 19), > -}; > - > -const struct sh_dmae_pdata r8a73a4_dma_pdata = { > - .slave = dma_slaves, > - .slave_num = ARRAY_SIZE(dma_slaves), > - .channel = dma_channels, > - .channel_num = ARRAY_SIZE(dma_channels), > - .ts_low_shift = TS_LOW_SHIFT, > - .ts_low_mask = TS_LOW_BIT << TS_LOW_SHIFT, > - .ts_high_shift = TS_HI_SHIFT, > - .ts_high_mask = TS_HI_BIT << TS_HI_SHIFT, > - .ts_shift = dma_ts_shift, > - .ts_shift_num = ARRAY_SIZE(dma_ts_shift), > - .dmaor_init = DMAOR_DME, > - .chclr_present = 1, > - .chclr_bitwise = 1, > -}; > diff --git a/drivers/dma/sh/shdma.h b/drivers/dma/sh/shdma.h > index bfb69909bd192759..9c121a4b33ad829c 100644 > --- a/drivers/dma/sh/shdma.h > +++ b/drivers/dma/sh/shdma.h > @@ -58,11 +58,4 @@ struct sh_dmae_desc { > #define to_sh_dev(chan) container_of(chan->shdma_chan.dma_chan.device,\ > struct sh_dmae_device, shdma_dev.dma_dev) > > -#ifdef CONFIG_SH_DMAE_R8A73A4 > -extern const struct sh_dmae_pdata r8a73a4_dma_pdata; > -#define r8a73a4_shdma_devid (&r8a73a4_dma_pdata) > -#else > -#define r8a73a4_shdma_devid NULL > -#endif > - > #endif /* __DMA_SHDMA_H */ > diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c > index 7971ea2753877486..5aafe548ca5f3082 100644 > --- a/drivers/dma/sh/shdmac.c > +++ b/drivers/dma/sh/shdmac.c > @@ -665,12 +665,6 @@ static const struct shdma_ops sh_dmae_shdma_ops = { > .get_partial = sh_dmae_get_partial, > }; > > -static const struct of_device_id sh_dmae_of_match[] = { > - {.compatible = "renesas,shdma-r8a73a4", .data = r8a73a4_shdma_devid,}, > - {} > -}; > -MODULE_DEVICE_TABLE(of, sh_dmae_of_match); > - > static int sh_dmae_probe(struct platform_device *pdev) > { > const enum dma_slave_buswidth widths = > @@ -915,7 +909,6 @@ static struct platform_driver sh_dmae_driver = { > .driver = { > .pm = &sh_dmae_pm, > .name = SH_DMAE_DRV_NAME, > - .of_match_table = sh_dmae_of_match, > }, > .remove = sh_dmae_remove, > }; > -- > 2.17.1 > Reviewed-by: Ulrich Hecht <uli+renesas@fpond.eu> CU Uli
On Mon, Nov 12, 2018 at 04:30:29PM +0100, Geert Uytterhoeven wrote: > CC SuperH > > On Mon, Nov 12, 2018 at 4:22 PM Geert Uytterhoeven > <geert+renesas@glider.be> wrote: > > Renesas R-Mobile APE6 support is currently unused: > > - DMA slaves were never enabled in r8a73a4.dtsi, > > - The driver relies on legacy filter matching and describing all > > slaves and MID/RIDs in a table, unlike modern DMA engine drivers for > > similar hardware like rcar-dmac, > > - The driver doesn't seem to work well. > > > > Remove the driver, it can be resurrected from git history when needed. > > > > As this was the last user of SH_DMAE_BASE on Renesas ARM SoCs, the > > sh-dma-engine driver core is now used on SuperH only. > > > > Note that the DT bindings are still present, as r8a73a4.dtsi uses them. > > > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > > --- > > Notes: > > 1. As Renesas ARM SoCs no longer use drivers/dma/sh/shdma-base.c, the > > task to remove use of the deprecated dma_slave_config.direction > > field gets thrown into the SuperH maintainers' basket ;-) > > 2. This affects shmobile_defconfig and renesas_defconfig > > (CONFIG_SH_DMAE_BASE and CONFIG_SH_DMAE are no longer enabled by > > default). > > 3. I tried to get SCIFA DMA to work by: > > - Applying the DT and driver patches below, > > - Reverting 219fb0c1436e4893 ("serial: sh-sci: Remove the > > platform data dma slave rx/tx channel IDs"). > > After that, serial console output using DMA seems to work, but the > > system locks up when receiving any serial console input. > > Probably it is easier to add r8a73a4 support to rcar-dmac. Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
On 11/12/18 9:30 AM, Geert Uytterhoeven wrote: > CC SuperH > > On Mon, Nov 12, 2018 at 4:22 PM Geert Uytterhoeven > <geert+renesas@glider.be> wrote: >> Renesas R-Mobile APE6 support is currently unused: >> - DMA slaves were never enabled in r8a73a4.dtsi, >> - The driver relies on legacy filter matching and describing all >> slaves and MID/RIDs in a table, unlike modern DMA engine drivers for >> similar hardware like rcar-dmac, >> - The driver doesn't seem to work well. >> >> Remove the driver, it can be resurrected from git history when needed. >> >> As this was the last user of SH_DMAE_BASE on Renesas ARM SoCs, the >> sh-dma-engine driver core is now used on SuperH only. I'm trying to add dma support to smc91x on an sh7760 board: https://www.spinics.net/lists/linux-sh/msg53400.html I missed the ship window for the previous iteration so we had to use PIO, but DMA's a huge speedup and it's cycling back around on my todo list... Unfortunately due to a flash corruption bug we were stuck at 4.14 for that release. I'm trying to track that down now, then need to redo this work on top of 4.20 or 4.21. Kernel board support patches are at the lawyers being frowned at expensively before release, but it won't include DMA this time because I only got the first half of it working. (Board's hooked up and can do memory-to-memory, but the ethernet card couldn't use it because the smc91x claims of using dmaengine are lies, it's hardwired to a specific arm chip ("mainstone" I think?), and when I got QEMU to emulate that ARM board and tried to enable DMA: packet timeouts. I dunno if it's broken in the kernel or QEMU doesn't emulate the DMA...) >> Notes: >> 1. As Renesas ARM SoCs no longer use drivers/dma/sh/shdma-base.c, the >> task to remove use of the deprecated dma_slave_config.direction >> field gets thrown into the SuperH maintainers' basket ;-) At least in 4.14 there were two DMA apis, once of which is obsolete and unused, and the other is modern dmaengine support which at least passes its self-test. I left off boggling at the "slave API", I think... >> 3. I tried to get SCIFA DMA to work by: >> - Applying the DT and driver patches below, >> - Reverting 219fb0c1436e4893 ("serial: sh-sci: Remove the >> platform data dma slave rx/tx channel IDs"). The board I'm using is platform data, never got converted to device tree. (If I can ever convince them to mail a board to Rich Felker I might try to hire him to convert it _myself_. Or I could just get him an old board on ebay, current cheapest one looks like https://www.ebay.com/p/Johnson-Controls-Ms-nae3511-2-Metasys-Controller-NAE-and-2x-Unt1108/567230953?iid=283254042308 at the moment? Dead battery's fine for a dev/test system...) But it's not happening this month. >> After that, serial console output using DMA seems to work, but the >> system locks up when receiving any serial console input. >> Probably it is easier to add r8a73a4 support to rcar-dmac. What _is_ the status of dmaengine? I thought it was the generic dma API the kernel was moving towards? (The youtube videos suggested such...) Rob
Hi Rob, On Tue, Nov 13, 2018 at 8:32 PM Rob Landley <rob@landley.net> wrote: > On 11/12/18 9:30 AM, Geert Uytterhoeven wrote: > > CC SuperH > > > > On Mon, Nov 12, 2018 at 4:22 PM Geert Uytterhoeven > > <geert+renesas@glider.be> wrote: > >> Renesas R-Mobile APE6 support is currently unused: > >> - DMA slaves were never enabled in r8a73a4.dtsi, > >> - The driver relies on legacy filter matching and describing all > >> slaves and MID/RIDs in a table, unlike modern DMA engine drivers for > >> similar hardware like rcar-dmac, > >> - The driver doesn't seem to work well. > >> > >> Remove the driver, it can be resurrected from git history when needed. > >> > >> As this was the last user of SH_DMAE_BASE on Renesas ARM SoCs, the > >> sh-dma-engine driver core is now used on SuperH only. > > I'm trying to add dma support to smc91x on an sh7760 board: > > https://www.spinics.net/lists/linux-sh/msg53400.html > > I missed the ship window for the previous iteration so we had to use PIO, but > DMA's a huge speedup and it's cycling back around on my todo list... > > Unfortunately due to a flash corruption bug we were stuck at 4.14 for that > release. I'm trying to track that down now, then need to redo this work on top > of 4.20 or 4.21. > > Kernel board support patches are at the lawyers being frowned at expensively > before release, but it won't include DMA this time because I only got the first > half of it working. (Board's hooked up and can do memory-to-memory, but the > ethernet card couldn't use it because the smc91x claims of using dmaengine are > lies, it's hardwired to a specific arm chip ("mainstone" I think?), and when I > got QEMU to emulate that ARM board and tried to enable DMA: packet timeouts. I > dunno if it's broken in the kernel or QEMU doesn't emulate the DMA...) > > >> Notes: > >> 1. As Renesas ARM SoCs no longer use drivers/dma/sh/shdma-base.c, the > >> task to remove use of the deprecated dma_slave_config.direction > >> field gets thrown into the SuperH maintainers' basket ;-) > > At least in 4.14 there were two DMA apis, once of which is obsolete and unused, > and the other is modern dmaengine support which at least passes its self-test. > > I left off boggling at the "slave API", I think... Yes, there's SH_DMA_API and the "new" DMA_ENGINE API. > >> 3. I tried to get SCIFA DMA to work by: > >> - Applying the DT and driver patches below, > >> - Reverting 219fb0c1436e4893 ("serial: sh-sci: Remove the > >> platform data dma slave rx/tx channel IDs"). > > The board I'm using is platform data, never got converted to device tree. (If I > can ever convince them to mail a board to Rich Felker I might try to hire him to > convert it _myself_. Or I could just get him an old board on ebay, current > cheapest one looks like > https://www.ebay.com/p/Johnson-Controls-Ms-nae3511-2-Metasys-Controller-NAE-and-2x-Unt1108/567230953?iid=283254042308 > at the moment? Dead battery's fine for a dev/test system...) > > But it's not happening this month. > > >> After that, serial console output using DMA seems to work, but the > >> system locks up when receiving any serial console input. > >> Probably it is easier to add r8a73a4 support to rcar-dmac. > > What _is_ the status of dmaengine? I thought it was the generic dma API the > kernel was moving towards? (The youtube videos suggested such...) Dmaengine is working on the Renesas R-Car Gen2 and Gen3 SoCs, using rcar-dmac and usb-dmac. But that's ARM (32/64-bit), not SuperH. I'm afraid you're on your own on SuperH... Good luck! Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
diff --git a/drivers/dma/sh/Kconfig b/drivers/dma/sh/Kconfig index 6e0685f1a83814f4..b728cfaf4d700f96 100644 --- a/drivers/dma/sh/Kconfig +++ b/drivers/dma/sh/Kconfig @@ -12,7 +12,7 @@ config RENESAS_DMA config SH_DMAE_BASE bool "Renesas SuperH DMA Engine support" - depends on SUPERH || ARCH_RENESAS || COMPILE_TEST + depends on SUPERH || COMPILE_TEST depends on !SUPERH || SH_DMA depends on !SH_DMA_API default y @@ -30,15 +30,6 @@ config SH_DMAE help Enable support for the Renesas SuperH DMA controllers. -if SH_DMAE - -config SH_DMAE_R8A73A4 - def_bool y - depends on ARCH_R8A73A4 - depends on OF - -endif - config RCAR_DMAC tristate "Renesas R-Car Gen2 DMA Controller" depends on ARCH_RENESAS || COMPILE_TEST diff --git a/drivers/dma/sh/Makefile b/drivers/dma/sh/Makefile index 7d7c9491ade1216d..42110dd57a56fda8 100644 --- a/drivers/dma/sh/Makefile +++ b/drivers/dma/sh/Makefile @@ -10,7 +10,6 @@ obj-$(CONFIG_SH_DMAE_BASE) += shdma-base.o shdma-of.o # shdma-y := shdmac.o -shdma-$(CONFIG_SH_DMAE_R8A73A4) += shdma-r8a73a4.o shdma-objs := $(shdma-y) obj-$(CONFIG_SH_DMAE) += shdma.o diff --git a/drivers/dma/sh/shdma-r8a73a4.c b/drivers/dma/sh/shdma-r8a73a4.c deleted file mode 100644 index ddc9a35783534bdd..0000000000000000 --- a/drivers/dma/sh/shdma-r8a73a4.c +++ /dev/null @@ -1,74 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Renesas SuperH DMA Engine support for r8a73a4 (APE6) SoCs - * - * Copyright (C) 2013 Renesas Electronics, Inc. - */ -#include <linux/sh_dma.h> - -#include "shdma-arm.h" - -static const unsigned int dma_ts_shift[] = SH_DMAE_TS_SHIFT; - -static const struct sh_dmae_slave_config dma_slaves[] = { - { - .chcr = CHCR_TX(XMIT_SZ_32BIT), - .mid_rid = 0xd1, /* MMC0 Tx */ - }, { - .chcr = CHCR_RX(XMIT_SZ_32BIT), - .mid_rid = 0xd2, /* MMC0 Rx */ - }, { - .chcr = CHCR_TX(XMIT_SZ_32BIT), - .mid_rid = 0xe1, /* MMC1 Tx */ - }, { - .chcr = CHCR_RX(XMIT_SZ_32BIT), - .mid_rid = 0xe2, /* MMC1 Rx */ - }, -}; - -#define DMAE_CHANNEL(a, b) \ - { \ - .offset = (a) - 0x20, \ - .dmars = (a) - 0x20 + 0x40, \ - .chclr_bit = (b), \ - .chclr_offset = 0x80 - 0x20, \ - } - -static const struct sh_dmae_channel dma_channels[] = { - DMAE_CHANNEL(0x8000, 0), - DMAE_CHANNEL(0x8080, 1), - DMAE_CHANNEL(0x8100, 2), - DMAE_CHANNEL(0x8180, 3), - DMAE_CHANNEL(0x8200, 4), - DMAE_CHANNEL(0x8280, 5), - DMAE_CHANNEL(0x8300, 6), - DMAE_CHANNEL(0x8380, 7), - DMAE_CHANNEL(0x8400, 8), - DMAE_CHANNEL(0x8480, 9), - DMAE_CHANNEL(0x8500, 10), - DMAE_CHANNEL(0x8580, 11), - DMAE_CHANNEL(0x8600, 12), - DMAE_CHANNEL(0x8680, 13), - DMAE_CHANNEL(0x8700, 14), - DMAE_CHANNEL(0x8780, 15), - DMAE_CHANNEL(0x8800, 16), - DMAE_CHANNEL(0x8880, 17), - DMAE_CHANNEL(0x8900, 18), - DMAE_CHANNEL(0x8980, 19), -}; - -const struct sh_dmae_pdata r8a73a4_dma_pdata = { - .slave = dma_slaves, - .slave_num = ARRAY_SIZE(dma_slaves), - .channel = dma_channels, - .channel_num = ARRAY_SIZE(dma_channels), - .ts_low_shift = TS_LOW_SHIFT, - .ts_low_mask = TS_LOW_BIT << TS_LOW_SHIFT, - .ts_high_shift = TS_HI_SHIFT, - .ts_high_mask = TS_HI_BIT << TS_HI_SHIFT, - .ts_shift = dma_ts_shift, - .ts_shift_num = ARRAY_SIZE(dma_ts_shift), - .dmaor_init = DMAOR_DME, - .chclr_present = 1, - .chclr_bitwise = 1, -}; diff --git a/drivers/dma/sh/shdma.h b/drivers/dma/sh/shdma.h index bfb69909bd192759..9c121a4b33ad829c 100644 --- a/drivers/dma/sh/shdma.h +++ b/drivers/dma/sh/shdma.h @@ -58,11 +58,4 @@ struct sh_dmae_desc { #define to_sh_dev(chan) container_of(chan->shdma_chan.dma_chan.device,\ struct sh_dmae_device, shdma_dev.dma_dev) -#ifdef CONFIG_SH_DMAE_R8A73A4 -extern const struct sh_dmae_pdata r8a73a4_dma_pdata; -#define r8a73a4_shdma_devid (&r8a73a4_dma_pdata) -#else -#define r8a73a4_shdma_devid NULL -#endif - #endif /* __DMA_SHDMA_H */ diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c index 7971ea2753877486..5aafe548ca5f3082 100644 --- a/drivers/dma/sh/shdmac.c +++ b/drivers/dma/sh/shdmac.c @@ -665,12 +665,6 @@ static const struct shdma_ops sh_dmae_shdma_ops = { .get_partial = sh_dmae_get_partial, }; -static const struct of_device_id sh_dmae_of_match[] = { - {.compatible = "renesas,shdma-r8a73a4", .data = r8a73a4_shdma_devid,}, - {} -}; -MODULE_DEVICE_TABLE(of, sh_dmae_of_match); - static int sh_dmae_probe(struct platform_device *pdev) { const enum dma_slave_buswidth widths = @@ -915,7 +909,6 @@ static struct platform_driver sh_dmae_driver = { .driver = { .pm = &sh_dmae_pm, .name = SH_DMAE_DRV_NAME, - .of_match_table = sh_dmae_of_match, }, .remove = sh_dmae_remove, };
Renesas R-Mobile APE6 support is currently unused: - DMA slaves were never enabled in r8a73a4.dtsi, - The driver relies on legacy filter matching and describing all slaves and MID/RIDs in a table, unlike modern DMA engine drivers for similar hardware like rcar-dmac, - The driver doesn't seem to work well. Remove the driver, it can be resurrected from git history when needed. As this was the last user of SH_DMAE_BASE on Renesas ARM SoCs, the sh-dma-engine driver core is now used on SuperH only. Note that the DT bindings are still present, as r8a73a4.dtsi uses them. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- Notes: 1. As Renesas ARM SoCs no longer use drivers/dma/sh/shdma-base.c, the task to remove use of the deprecated dma_slave_config.direction field gets thrown into the SuperH maintainers' basket ;-) 2. This affects shmobile_defconfig and renesas_defconfig (CONFIG_SH_DMAE_BASE and CONFIG_SH_DMAE are no longer enabled by default). 3. I tried to get SCIFA DMA to work by: - Applying the DT and driver patches below, - Reverting 219fb0c1436e4893 ("serial: sh-sci: Remove the platform data dma slave rx/tx channel IDs"). After that, serial console output using DMA seems to work, but the system locks up when receiving any serial console input. Probably it is easier to add r8a73a4 support to rcar-dmac. ignore --- a/arch/arm/boot/dts/r8a73a4.dtsi ignore +++ b/arch/arm/boot/dts/r8a73a4.dtsi @@ -453,6 +453,8 @@ interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp2_clks R8A73A4_CLK_SCIFA0>; clock-names = "fck"; + dmas = <&dmac 0x21>, <&dmac 0x22>; + dma-names = "tx", "rx"; power-domains = <&pd_a3sp>; status = "disabled"; }; ignore --- a/drivers/dma/sh/shdma-r8a73a4.c ignore +++ b/drivers/dma/sh/shdma-r8a73a4.c @@ -12,6 +12,12 @@ static const unsigned int dma_ts_shift[] = SH_DMAE_TS_SHIFT; static const struct sh_dmae_slave_config dma_slaves[] = { { + .chcr = CHCR_TX(XMIT_SZ_8BIT), + .mid_rid = 0x21, /* SCIFA0 Tx */ + }, { + .chcr = CHCR_RX(XMIT_SZ_8BIT), + .mid_rid = 0x22, /* SCIFA0 Rx */ + }, { .chcr = CHCR_TX(XMIT_SZ_32BIT), .mid_rid = 0xd1, /* MMC0 Tx */ }, { --- drivers/dma/sh/Kconfig | 11 +---- drivers/dma/sh/Makefile | 1 - drivers/dma/sh/shdma-r8a73a4.c | 74 ---------------------------------- drivers/dma/sh/shdma.h | 7 ---- drivers/dma/sh/shdmac.c | 7 ---- 5 files changed, 1 insertion(+), 99 deletions(-) delete mode 100644 drivers/dma/sh/shdma-r8a73a4.c