* [PATCH] mei: me: Use dma_set_mask_and_coherent() and simplify code
@ 2022-01-08 6:50 Christophe JAILLET
2022-01-09 6:05 ` Winkler, Tomas
0 siblings, 1 reply; 2+ messages in thread
From: Christophe JAILLET @ 2022-01-08 6:50 UTC (permalink / raw)
To: tomas.winkler, arnd, gregkh
Cc: linux-kernel, kernel-janitors, Christophe JAILLET
Use dma_set_mask_and_coherent() instead of unrolling it with some
dma_set_mask()+dma_set_coherent_mask().
Moreover, as stated in [1], dma_set_mask() with a 64-bit mask will never
fail if dev->dma_mask is non-NULL.
So, if it fails, the 32 bits case will also fail for the same reason.
Simplify code and remove some dead code accordingly.
While at it, include directly <linux/dma-mapping.h> instead on relying on
indirect inclusion.
[1]: https://lkml.org/lkml/2021/6/7/398
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
drivers/misc/mei/pci-me.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index 3a45aaf002ac..a05cdb25d0c4 100644
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -10,6 +10,7 @@
#include <linux/errno.h>
#include <linux/types.h>
#include <linux/pci.h>
+#include <linux/dma-mapping.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
@@ -192,14 +193,7 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
goto end;
}
- if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) ||
- dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
-
- err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
- if (err)
- err = dma_set_coherent_mask(&pdev->dev,
- DMA_BIT_MASK(32));
- }
+ err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
if (err) {
dev_err(&pdev->dev, "No usable DMA configuration, aborting\n");
goto end;
--
2.32.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* RE: [PATCH] mei: me: Use dma_set_mask_and_coherent() and simplify code
2022-01-08 6:50 [PATCH] mei: me: Use dma_set_mask_and_coherent() and simplify code Christophe JAILLET
@ 2022-01-09 6:05 ` Winkler, Tomas
0 siblings, 0 replies; 2+ messages in thread
From: Winkler, Tomas @ 2022-01-09 6:05 UTC (permalink / raw)
To: Christophe JAILLET, arnd, gregkh
Cc: linux-kernel, kernel-janitors, Usyskin, Alexander
>
> Use dma_set_mask_and_coherent() instead of unrolling it with some
> dma_set_mask()+dma_set_coherent_mask().
>
> Moreover, as stated in [1], dma_set_mask() with a 64-bit mask will never fail
> if dev->dma_mask is non-NULL.
> So, if it fails, the 32 bits case will also fail for the same reason.
>
> Simplify code and remove some dead code accordingly.
>
>
> While at it, include directly <linux/dma-mapping.h> instead on relying on
> indirect inclusion.
>
> [1]: https://lkml.org/lkml/2021/6/7/398
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: Tomas Winkler <tomas.winkler@intel.com>
> ---
> drivers/misc/mei/pci-me.c | 10 ++--------
> 1 file changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c index
> 3a45aaf002ac..a05cdb25d0c4 100644
> --- a/drivers/misc/mei/pci-me.c
> +++ b/drivers/misc/mei/pci-me.c
> @@ -10,6 +10,7 @@
> #include <linux/errno.h>
> #include <linux/types.h>
> #include <linux/pci.h>
> +#include <linux/dma-mapping.h>
> #include <linux/sched.h>
> #include <linux/interrupt.h>
>
> @@ -192,14 +193,7 @@ static int mei_me_probe(struct pci_dev *pdev,
> const struct pci_device_id *ent)
> goto end;
> }
>
> - if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) ||
> - dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
> -
> - err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
> - if (err)
> - err = dma_set_coherent_mask(&pdev->dev,
> - DMA_BIT_MASK(32));
> - }
> + err = dma_set_mask_and_coherent(&pdev->dev,
> DMA_BIT_MASK(64));
> if (err) {
> dev_err(&pdev->dev, "No usable DMA configuration,
> aborting\n");
> goto end;
> --
> 2.32.0
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-01-09 6:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-08 6:50 [PATCH] mei: me: Use dma_set_mask_and_coherent() and simplify code Christophe JAILLET
2022-01-09 6:05 ` Winkler, Tomas
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).