iommu: amd: Use page mode macros in fetch_pte

[PATCH] iommu: amd: Use page mode macros in fetch_pte

Posted by Jerry Snitselaar 2 years, 8 months ago

Use the page mode macros instead of magic numbers in fetch_pte.

Cc: Robin Murphy <robin.murphy@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Cc: Joerg Roedel <joro@8bytes.org>
Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
---
 drivers/iommu/amd/io_pgtable.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/amd/io_pgtable.c b/drivers/iommu/amd/io_pgtable.c
index ace0e9b8b913..61a99d715b23 100644
--- a/drivers/iommu/amd/io_pgtable.c
+++ b/drivers/iommu/amd/io_pgtable.c
@@ -310,8 +310,8 @@ static u64 *fetch_pte(struct amd_io_pgtable *pgtable,
 			return NULL;
 
 		/* Large PTE */
-		if (PM_PTE_LEVEL(*pte) == 7 ||
-		    PM_PTE_LEVEL(*pte) == 0)
+		if (PM_PTE_LEVEL(*pte) == PAGE_MODE_7_LEVEL ||
+		    PM_PTE_LEVEL(*pte) == PAGE_MODE_NONE)
 			break;
 
 		/* No level skipping support yet */
-- 
2.38.1

Re: [PATCH] iommu: amd: Use page mode macros in fetch_pte

Posted by Joerg Roedel 2 years, 6 months ago

On Thu, Apr 20, 2023 at 01:07:18AM -0700, Jerry Snitselaar wrote:
>  drivers/iommu/amd/io_pgtable.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied, thanks.

Re: [PATCH] iommu: amd: Use page mode macros in fetch_pte

Posted by Vasant Hegde 2 years, 8 months ago

On 4/20/2023 1:37 PM, Jerry Snitselaar wrote:
> Use the page mode macros instead of magic numbers in fetch_pte.
> 
> Cc: Robin Murphy <robin.murphy@arm.com>
> Cc: Will Deacon <will@kernel.org>
> Cc: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
> Cc: Joerg Roedel <joro@8bytes.org>
> Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>

Thanks for the fix.

Reviewed-by: Vasant Hegde <vasant.hegde@amd.com>

-Vasant



> ---
>  drivers/iommu/amd/io_pgtable.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/iommu/amd/io_pgtable.c b/drivers/iommu/amd/io_pgtable.c
> index ace0e9b8b913..61a99d715b23 100644
> --- a/drivers/iommu/amd/io_pgtable.c
> +++ b/drivers/iommu/amd/io_pgtable.c
> @@ -310,8 +310,8 @@ static u64 *fetch_pte(struct amd_io_pgtable *pgtable,
>  			return NULL;
>  
>  		/* Large PTE */
> -		if (PM_PTE_LEVEL(*pte) == 7 ||
> -		    PM_PTE_LEVEL(*pte) == 0)
> +		if (PM_PTE_LEVEL(*pte) == PAGE_MODE_7_LEVEL ||
> +		    PM_PTE_LEVEL(*pte) == PAGE_MODE_NONE)
>  			break;
>  
>  		/* No level skipping support yet */