* [PATCH v2] iommu: rockchip: Fix physical address decoding
@ 2021-06-18 13:00 ` Benjamin Gaignard
0 siblings, 0 replies; 9+ messages in thread
From: Benjamin Gaignard @ 2021-06-18 13:00 UTC (permalink / raw)
To: will, robh+dt, heiko, xxm, robin.murphy, joro, dan.carpenter
Cc: iommu, devicetree, linux-arm-kernel, kernel, Benjamin Gaignard
Restore bits 39 to 32 at correct position.
It reverses the operation done in rk_dma_addr_dte_v2().
Fixes: c55356c534aa ("iommu: rockchip: Add support for iommu v2")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
---
drivers/iommu/rockchip-iommu.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index 94b9d8e5b9a40..9febfb7f3025b 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -544,12 +544,14 @@ static inline u32 rk_dma_addr_dte(dma_addr_t dt_dma)
}
#define DT_HI_MASK GENMASK_ULL(39, 32)
+#define DTE_BASE_HI_MASK GENMASK(11, 4)
#define DT_SHIFT 28
static inline phys_addr_t rk_dte_addr_phys_v2(u32 addr)
{
- return (phys_addr_t)(addr & RK_DTE_PT_ADDRESS_MASK) |
- ((addr & DT_HI_MASK) << DT_SHIFT);
+ u64 addr64 = addr;
+ return (phys_addr_t)(addr64 & RK_DTE_PT_ADDRESS_MASK) |
+ ((addr64 & DTE_BASE_HI_MASK) << DT_SHIFT);
}
static inline u32 rk_dma_addr_dte_v2(dma_addr_t dt_dma)
--
2.25.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2] iommu: rockchip: Fix physical address decoding
@ 2021-06-18 13:00 ` Benjamin Gaignard
0 siblings, 0 replies; 9+ messages in thread
From: Benjamin Gaignard @ 2021-06-18 13:00 UTC (permalink / raw)
To: will, robh+dt, heiko, xxm, robin.murphy, joro, dan.carpenter
Cc: iommu, devicetree, linux-arm-kernel, kernel, Benjamin Gaignard
Restore bits 39 to 32 at correct position.
It reverses the operation done in rk_dma_addr_dte_v2().
Fixes: c55356c534aa ("iommu: rockchip: Add support for iommu v2")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
---
drivers/iommu/rockchip-iommu.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index 94b9d8e5b9a40..9febfb7f3025b 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -544,12 +544,14 @@ static inline u32 rk_dma_addr_dte(dma_addr_t dt_dma)
}
#define DT_HI_MASK GENMASK_ULL(39, 32)
+#define DTE_BASE_HI_MASK GENMASK(11, 4)
#define DT_SHIFT 28
static inline phys_addr_t rk_dte_addr_phys_v2(u32 addr)
{
- return (phys_addr_t)(addr & RK_DTE_PT_ADDRESS_MASK) |
- ((addr & DT_HI_MASK) << DT_SHIFT);
+ u64 addr64 = addr;
+ return (phys_addr_t)(addr64 & RK_DTE_PT_ADDRESS_MASK) |
+ ((addr64 & DTE_BASE_HI_MASK) << DT_SHIFT);
}
static inline u32 rk_dma_addr_dte_v2(dma_addr_t dt_dma)
--
2.25.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] 9+ messages in thread* [PATCH v2] iommu: rockchip: Fix physical address decoding
@ 2021-06-18 13:00 ` Benjamin Gaignard
0 siblings, 0 replies; 9+ messages in thread
From: Benjamin Gaignard @ 2021-06-18 13:00 UTC (permalink / raw)
To: will, robh+dt, heiko, xxm, robin.murphy, joro, dan.carpenter
Cc: devicetree, iommu, kernel, Benjamin Gaignard, linux-arm-kernel
Restore bits 39 to 32 at correct position.
It reverses the operation done in rk_dma_addr_dte_v2().
Fixes: c55356c534aa ("iommu: rockchip: Add support for iommu v2")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
---
drivers/iommu/rockchip-iommu.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index 94b9d8e5b9a40..9febfb7f3025b 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -544,12 +544,14 @@ static inline u32 rk_dma_addr_dte(dma_addr_t dt_dma)
}
#define DT_HI_MASK GENMASK_ULL(39, 32)
+#define DTE_BASE_HI_MASK GENMASK(11, 4)
#define DT_SHIFT 28
static inline phys_addr_t rk_dte_addr_phys_v2(u32 addr)
{
- return (phys_addr_t)(addr & RK_DTE_PT_ADDRESS_MASK) |
- ((addr & DT_HI_MASK) << DT_SHIFT);
+ u64 addr64 = addr;
+ return (phys_addr_t)(addr64 & RK_DTE_PT_ADDRESS_MASK) |
+ ((addr64 & DTE_BASE_HI_MASK) << DT_SHIFT);
}
static inline u32 rk_dma_addr_dte_v2(dma_addr_t dt_dma)
--
2.25.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2] iommu: rockchip: Fix physical address decoding
2021-06-18 13:00 ` Benjamin Gaignard
(?)
@ 2021-07-05 11:40 ` Benjamin Gaignard
-1 siblings, 0 replies; 9+ messages in thread
From: Benjamin Gaignard @ 2021-07-05 11:40 UTC (permalink / raw)
To: will, robh+dt, heiko, xxm, robin.murphy, joro, dan.carpenter
Cc: iommu, devicetree, linux-arm-kernel, kernel
Le 18/06/2021 à 15:00, Benjamin Gaignard a écrit :
> Restore bits 39 to 32 at correct position.
> It reverses the operation done in rk_dma_addr_dte_v2().
>
> Fixes: c55356c534aa ("iommu: rockchip: Add support for iommu v2")
>
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
Gentle ping on this patch :-)
Regards,
Benjamin
> ---
> drivers/iommu/rockchip-iommu.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
> index 94b9d8e5b9a40..9febfb7f3025b 100644
> --- a/drivers/iommu/rockchip-iommu.c
> +++ b/drivers/iommu/rockchip-iommu.c
> @@ -544,12 +544,14 @@ static inline u32 rk_dma_addr_dte(dma_addr_t dt_dma)
> }
>
> #define DT_HI_MASK GENMASK_ULL(39, 32)
> +#define DTE_BASE_HI_MASK GENMASK(11, 4)
> #define DT_SHIFT 28
>
> static inline phys_addr_t rk_dte_addr_phys_v2(u32 addr)
> {
> - return (phys_addr_t)(addr & RK_DTE_PT_ADDRESS_MASK) |
> - ((addr & DT_HI_MASK) << DT_SHIFT);
> + u64 addr64 = addr;
> + return (phys_addr_t)(addr64 & RK_DTE_PT_ADDRESS_MASK) |
> + ((addr64 & DTE_BASE_HI_MASK) << DT_SHIFT);
> }
>
> static inline u32 rk_dma_addr_dte_v2(dma_addr_t dt_dma)
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v2] iommu: rockchip: Fix physical address decoding
@ 2021-07-05 11:40 ` Benjamin Gaignard
0 siblings, 0 replies; 9+ messages in thread
From: Benjamin Gaignard @ 2021-07-05 11:40 UTC (permalink / raw)
To: will, robh+dt, heiko, xxm, robin.murphy, joro, dan.carpenter
Cc: iommu, devicetree, linux-arm-kernel, kernel
Le 18/06/2021 à 15:00, Benjamin Gaignard a écrit :
> Restore bits 39 to 32 at correct position.
> It reverses the operation done in rk_dma_addr_dte_v2().
>
> Fixes: c55356c534aa ("iommu: rockchip: Add support for iommu v2")
>
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
Gentle ping on this patch :-)
Regards,
Benjamin
> ---
> drivers/iommu/rockchip-iommu.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
> index 94b9d8e5b9a40..9febfb7f3025b 100644
> --- a/drivers/iommu/rockchip-iommu.c
> +++ b/drivers/iommu/rockchip-iommu.c
> @@ -544,12 +544,14 @@ static inline u32 rk_dma_addr_dte(dma_addr_t dt_dma)
> }
>
> #define DT_HI_MASK GENMASK_ULL(39, 32)
> +#define DTE_BASE_HI_MASK GENMASK(11, 4)
> #define DT_SHIFT 28
>
> static inline phys_addr_t rk_dte_addr_phys_v2(u32 addr)
> {
> - return (phys_addr_t)(addr & RK_DTE_PT_ADDRESS_MASK) |
> - ((addr & DT_HI_MASK) << DT_SHIFT);
> + u64 addr64 = addr;
> + return (phys_addr_t)(addr64 & RK_DTE_PT_ADDRESS_MASK) |
> + ((addr64 & DTE_BASE_HI_MASK) << DT_SHIFT);
> }
>
> static inline u32 rk_dma_addr_dte_v2(dma_addr_t dt_dma)
_______________________________________________
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] 9+ messages in thread* Re: [PATCH v2] iommu: rockchip: Fix physical address decoding
@ 2021-07-05 11:40 ` Benjamin Gaignard
0 siblings, 0 replies; 9+ messages in thread
From: Benjamin Gaignard @ 2021-07-05 11:40 UTC (permalink / raw)
To: will, robh+dt, heiko, xxm, robin.murphy, joro, dan.carpenter
Cc: devicetree, iommu, kernel, linux-arm-kernel
Le 18/06/2021 à 15:00, Benjamin Gaignard a écrit :
> Restore bits 39 to 32 at correct position.
> It reverses the operation done in rk_dma_addr_dte_v2().
>
> Fixes: c55356c534aa ("iommu: rockchip: Add support for iommu v2")
>
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
Gentle ping on this patch :-)
Regards,
Benjamin
> ---
> drivers/iommu/rockchip-iommu.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
> index 94b9d8e5b9a40..9febfb7f3025b 100644
> --- a/drivers/iommu/rockchip-iommu.c
> +++ b/drivers/iommu/rockchip-iommu.c
> @@ -544,12 +544,14 @@ static inline u32 rk_dma_addr_dte(dma_addr_t dt_dma)
> }
>
> #define DT_HI_MASK GENMASK_ULL(39, 32)
> +#define DTE_BASE_HI_MASK GENMASK(11, 4)
> #define DT_SHIFT 28
>
> static inline phys_addr_t rk_dte_addr_phys_v2(u32 addr)
> {
> - return (phys_addr_t)(addr & RK_DTE_PT_ADDRESS_MASK) |
> - ((addr & DT_HI_MASK) << DT_SHIFT);
> + u64 addr64 = addr;
> + return (phys_addr_t)(addr64 & RK_DTE_PT_ADDRESS_MASK) |
> + ((addr64 & DTE_BASE_HI_MASK) << DT_SHIFT);
> }
>
> static inline u32 rk_dma_addr_dte_v2(dma_addr_t dt_dma)
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v2] iommu: rockchip: Fix physical address decoding
2021-07-05 11:40 ` Benjamin Gaignard
(?)
@ 2021-07-08 9:39 ` Joerg Roedel
-1 siblings, 0 replies; 9+ messages in thread
From: Joerg Roedel @ 2021-07-08 9:39 UTC (permalink / raw)
To: Benjamin Gaignard
Cc: will, robh+dt, heiko, xxm, robin.murphy, dan.carpenter, iommu,
devicetree, linux-arm-kernel, kernel
Hi Benjamin,
On Mon, Jul 05, 2021 at 01:40:24PM +0200, Benjamin Gaignard wrote:
> Gentle ping on this patch :-)
Please fix the subject to match the IOMMU tree conventions. This would
be:
iommu/rockchip: Fix physical address decoding
Re-send the patch after the merge window is closed.
Thanks,
Joerg
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2] iommu: rockchip: Fix physical address decoding
@ 2021-07-08 9:39 ` Joerg Roedel
0 siblings, 0 replies; 9+ messages in thread
From: Joerg Roedel @ 2021-07-08 9:39 UTC (permalink / raw)
To: Benjamin Gaignard
Cc: will, robh+dt, heiko, xxm, robin.murphy, dan.carpenter, iommu,
devicetree, linux-arm-kernel, kernel
Hi Benjamin,
On Mon, Jul 05, 2021 at 01:40:24PM +0200, Benjamin Gaignard wrote:
> Gentle ping on this patch :-)
Please fix the subject to match the IOMMU tree conventions. This would
be:
iommu/rockchip: Fix physical address decoding
Re-send the patch after the merge window is closed.
Thanks,
Joerg
_______________________________________________
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] 9+ messages in thread
* Re: [PATCH v2] iommu: rockchip: Fix physical address decoding
@ 2021-07-08 9:39 ` Joerg Roedel
0 siblings, 0 replies; 9+ messages in thread
From: Joerg Roedel @ 2021-07-08 9:39 UTC (permalink / raw)
To: Benjamin Gaignard
Cc: devicetree, heiko, will, iommu, robh+dt, linux-arm-kernel,
kernel, robin.murphy, dan.carpenter
Hi Benjamin,
On Mon, Jul 05, 2021 at 01:40:24PM +0200, Benjamin Gaignard wrote:
> Gentle ping on this patch :-)
Please fix the subject to match the IOMMU tree conventions. This would
be:
iommu/rockchip: Fix physical address decoding
Re-send the patch after the merge window is closed.
Thanks,
Joerg
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-07-08 9:41 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-18 13:00 [PATCH v2] iommu: rockchip: Fix physical address decoding Benjamin Gaignard
2021-06-18 13:00 ` Benjamin Gaignard
2021-06-18 13:00 ` Benjamin Gaignard
2021-07-05 11:40 ` Benjamin Gaignard
2021-07-05 11:40 ` Benjamin Gaignard
2021-07-05 11:40 ` Benjamin Gaignard
2021-07-08 9:39 ` Joerg Roedel
2021-07-08 9:39 ` Joerg Roedel
2021-07-08 9:39 ` Joerg Roedel
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.