| Message ID | 20191203194859.917-1-wsa@the-dreams.de (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | a0fb3fc8af01436df45cc501c41f280025c1dfe8 |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | mmc: renesas_sdhi: remove whitelist for internal DMAC | expand |
On Tue, Dec 3, 2019 at 8:49 PM Wolfram Sang <wsa@the-dreams.de> wrote: > From: Wolfram Sang <wsa+renesas@sang-engineering.com> > > We know now that there won't be Gen3 SoCs with both, SYS-DMAC and > internal DMAC. We removed the blacklisting for SYS-DMAC already, so we > can remove the whitelisting for internal DMAC, too. This makes adding > new SoCs easier. We keep the quirk handling, of course. > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert
Hi Wolfram, Thanks for your work. On 2019-12-03 20:48:59 +0100, Wolfram Sang wrote: > From: Wolfram Sang <wsa+renesas@sang-engineering.com> > > We know now that there won't be Gen3 SoCs with both, SYS-DMAC and > internal DMAC. We removed the blacklisting for SYS-DMAC already, so we > can remove the whitelisting for internal DMAC, too. This makes adding > new SoCs easier. We keep the quirk handling, of course. > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> > --- > drivers/mmc/host/renesas_sdhi_internal_dmac.c | 23 ++++--------------- > 1 file changed, 4 insertions(+), 19 deletions(-) > > diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c > index 68fb39a74b8b..47ac53e91241 100644 > --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c > +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c > @@ -298,38 +298,23 @@ static const struct tmio_mmc_dma_ops renesas_sdhi_internal_dmac_dma_ops = { > * Whitelist of specific R-Car Gen3 SoC ES versions to use this DMAC > * implementation as others may use a different implementation. > */ > -static const struct soc_device_attribute soc_whitelist[] = { > - /* specific ones */ > +static const struct soc_device_attribute soc_dma_quirks[] = { > { .soc_id = "r7s9210", > .data = (void *)BIT(SDHI_INTERNAL_DMAC_ADDR_MODE_FIXED_ONLY) }, > { .soc_id = "r8a7795", .revision = "ES1.*", > .data = (void *)BIT(SDHI_INTERNAL_DMAC_ONE_RX_ONLY) }, > { .soc_id = "r8a7796", .revision = "ES1.0", > .data = (void *)BIT(SDHI_INTERNAL_DMAC_ONE_RX_ONLY) }, > - /* generic ones */ > - { .soc_id = "r8a774a1" }, > - { .soc_id = "r8a774b1" }, > - { .soc_id = "r8a774c0" }, > - { .soc_id = "r8a77470" }, > - { .soc_id = "r8a7795" }, > - { .soc_id = "r8a7796" }, > - { .soc_id = "r8a77965" }, > - { .soc_id = "r8a77970" }, > - { .soc_id = "r8a77980" }, > - { .soc_id = "r8a77990" }, > - { .soc_id = "r8a77995" }, > { /* sentinel */ } > }; > > static int renesas_sdhi_internal_dmac_probe(struct platform_device *pdev) > { > - const struct soc_device_attribute *soc = soc_device_match(soc_whitelist); > + const struct soc_device_attribute *soc = soc_device_match(soc_dma_quirks); > struct device *dev = &pdev->dev; > > - if (!soc) > - return -ENODEV; > - > - global_flags |= (unsigned long)soc->data; > + if (soc) > + global_flags |= (unsigned long)soc->data; > > dev->dma_parms = devm_kzalloc(dev, sizeof(*dev->dma_parms), GFP_KERNEL); > if (!dev->dma_parms) > -- > 2.20.1 >
Hi Wolfram-san, > From: Wolfram Sang, Sent: Wednesday, December 4, 2019 4:49 AM > > We know now that there won't be Gen3 SoCs with both, SYS-DMAC and > internal DMAC. We removed the blacklisting for SYS-DMAC already, so we > can remove the whitelisting for internal DMAC, too. This makes adding > new SoCs easier. We keep the quirk handling, of course. > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Thank you for the patch! Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Best regards, Yoshihiro Shimoda
On Tue, 3 Dec 2019 at 20:49, Wolfram Sang <wsa@the-dreams.de> wrote: > > From: Wolfram Sang <wsa+renesas@sang-engineering.com> > > We know now that there won't be Gen3 SoCs with both, SYS-DMAC and > internal DMAC. We removed the blacklisting for SYS-DMAC already, so we > can remove the whitelisting for internal DMAC, too. This makes adding > new SoCs easier. We keep the quirk handling, of course. > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/host/renesas_sdhi_internal_dmac.c | 23 ++++--------------- > 1 file changed, 4 insertions(+), 19 deletions(-) > > diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c > index 68fb39a74b8b..47ac53e91241 100644 > --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c > +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c > @@ -298,38 +298,23 @@ static const struct tmio_mmc_dma_ops renesas_sdhi_internal_dmac_dma_ops = { > * Whitelist of specific R-Car Gen3 SoC ES versions to use this DMAC > * implementation as others may use a different implementation. > */ > -static const struct soc_device_attribute soc_whitelist[] = { > - /* specific ones */ > +static const struct soc_device_attribute soc_dma_quirks[] = { > { .soc_id = "r7s9210", > .data = (void *)BIT(SDHI_INTERNAL_DMAC_ADDR_MODE_FIXED_ONLY) }, > { .soc_id = "r8a7795", .revision = "ES1.*", > .data = (void *)BIT(SDHI_INTERNAL_DMAC_ONE_RX_ONLY) }, > { .soc_id = "r8a7796", .revision = "ES1.0", > .data = (void *)BIT(SDHI_INTERNAL_DMAC_ONE_RX_ONLY) }, > - /* generic ones */ > - { .soc_id = "r8a774a1" }, > - { .soc_id = "r8a774b1" }, > - { .soc_id = "r8a774c0" }, > - { .soc_id = "r8a77470" }, > - { .soc_id = "r8a7795" }, > - { .soc_id = "r8a7796" }, > - { .soc_id = "r8a77965" }, > - { .soc_id = "r8a77970" }, > - { .soc_id = "r8a77980" }, > - { .soc_id = "r8a77990" }, > - { .soc_id = "r8a77995" }, > { /* sentinel */ } > }; > > static int renesas_sdhi_internal_dmac_probe(struct platform_device *pdev) > { > - const struct soc_device_attribute *soc = soc_device_match(soc_whitelist); > + const struct soc_device_attribute *soc = soc_device_match(soc_dma_quirks); > struct device *dev = &pdev->dev; > > - if (!soc) > - return -ENODEV; > - > - global_flags |= (unsigned long)soc->data; > + if (soc) > + global_flags |= (unsigned long)soc->data; > > dev->dma_parms = devm_kzalloc(dev, sizeof(*dev->dma_parms), GFP_KERNEL); > if (!dev->dma_parms) > -- > 2.20.1 >
diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c index 68fb39a74b8b..47ac53e91241 100644 --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c @@ -298,38 +298,23 @@ static const struct tmio_mmc_dma_ops renesas_sdhi_internal_dmac_dma_ops = { * Whitelist of specific R-Car Gen3 SoC ES versions to use this DMAC * implementation as others may use a different implementation. */ -static const struct soc_device_attribute soc_whitelist[] = { - /* specific ones */ +static const struct soc_device_attribute soc_dma_quirks[] = { { .soc_id = "r7s9210", .data = (void *)BIT(SDHI_INTERNAL_DMAC_ADDR_MODE_FIXED_ONLY) }, { .soc_id = "r8a7795", .revision = "ES1.*", .data = (void *)BIT(SDHI_INTERNAL_DMAC_ONE_RX_ONLY) }, { .soc_id = "r8a7796", .revision = "ES1.0", .data = (void *)BIT(SDHI_INTERNAL_DMAC_ONE_RX_ONLY) }, - /* generic ones */ - { .soc_id = "r8a774a1" }, - { .soc_id = "r8a774b1" }, - { .soc_id = "r8a774c0" }, - { .soc_id = "r8a77470" }, - { .soc_id = "r8a7795" }, - { .soc_id = "r8a7796" }, - { .soc_id = "r8a77965" }, - { .soc_id = "r8a77970" }, - { .soc_id = "r8a77980" }, - { .soc_id = "r8a77990" }, - { .soc_id = "r8a77995" }, { /* sentinel */ } }; static int renesas_sdhi_internal_dmac_probe(struct platform_device *pdev) { - const struct soc_device_attribute *soc = soc_device_match(soc_whitelist); + const struct soc_device_attribute *soc = soc_device_match(soc_dma_quirks); struct device *dev = &pdev->dev; - if (!soc) - return -ENODEV; - - global_flags |= (unsigned long)soc->data; + if (soc) + global_flags |= (unsigned long)soc->data; dev->dma_parms = devm_kzalloc(dev, sizeof(*dev->dma_parms), GFP_KERNEL); if (!dev->dma_parms)