iommu: Fix compiler warning on pr_debug
PATCH 1/1 iommu: Fix compiler warning on pr_debug
--- drivers/iommu/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/iommu.c +1 -1
@@ -820,7 +820,7 @@ int iommu_map(struct iommu_domain *domain, unsigned long iova,size_t pgsize =iommu_pgsize (domain, iova | paddr, size);pr_debug ("mapping: iova 0x%lx pa 0x%lx pgsize %lu\n" , iova, - (unsigned long )paddr, pgsize); + (unsigned long )paddr, (unsigned long )pgsize); ret = domain->ops->map (domain, iova, paddr, pgsize, prot);if (ret)
Quoted 10 lines · Alex Williamson
Signed-off-by Alex Williamson <[email protected]>--- drivers/iommu/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/iommu/iommu.c +0
-0
drivers/iommu/iommu.c int iommu_map(struct iommu_domain *domain, unsigned long iova, · line 826
Quoted 8 lines
drivers/iommu/iommu.c +1
-1@@ -820,7 +820,7 @@ int iommu_map(struct iommu_domain *domain, unsigned long iova,size_t pgsize =iommu_pgsize (domain, iova | paddr, size);pr_debug ("mapping: iova 0x%lx pa 0x%lx pgsize %lu\n" , iova, - (unsigned long )paddr, pgsize); + (unsigned long )paddr, (unsigned long )pgsize); ret = domain->ops->map (domain, iova, paddr, pgsize, prot);if (ret)
Applied to core branch, thanks.
PATCH 1/1 iommu: Use %zx instead %lx and cast to unsigned long
printf support size_t hex type %zx so use that
instead of %lx and a cast to unsigned long.
Other miscellaneous changes around this:
Always use 0x%zx for size instead of one use of decimal. Coalesce format and align arguments.
--- drivers/iommu/iommu.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
drivers/iommu/iommu.c +11 -13
@@ -807,20 +807,19 @@ int iommu_map(struct iommu_domain *domain, unsigned long iova,* size of the smallest page supported by the hardware */ if (!IS_ALIGNED (iova | paddr | size, min_pagesz)) { -pr_err ("unaligned: iova 0x%lx pa 0x%lx size 0x%lx min_pagesz " -"0x%x\n" , iova, (unsigned long )paddr, - (unsigned long )size, min_pagesz); +pr_err ("unaligned: iova 0x%lx pa 0x%lx size 0x%zx min_pagesz 0x%x\n" , + iova, (unsigned long )paddr, size, min_pagesz);return -EINVAL ; } -pr_debug ("map: iova 0x%lx pa 0x%lx size 0x%lx\n" , iova, - (unsigned long )paddr, (unsigned long )size); +pr_debug ("map: iova 0x%lx pa 0x%lx size 0x%zx\n" , + iova, (unsigned long )paddr, size);while (size) {size_t pgsize =iommu_pgsize (domain, iova | paddr, size); -pr_debug ("mapping: iova 0x%lx pa 0x%lx pgsize %lu\n" , iova, - (unsigned long )paddr, (unsigned long )pgsize); +pr_debug ("mapping: iova 0x%lx pa 0x%lx pgsize 0x%zx\n" , + iova, (unsigned long )paddr, pgsize); ret = domain->ops->map (domain, iova, paddr, pgsize, prot);if (ret)
@@ -857,13 +856,12 @@ size_t iommu_unmap(struct iommu_domain *domain, unsigned long iova, size_t size)* by the hardware */ if (!IS_ALIGNED (iova | size, min_pagesz)) { -pr_err ("unaligned: iova 0x%lx size 0x%lx min_pagesz 0x%x\n" , - iova, (unsigned long )size, min_pagesz); +pr_err ("unaligned: iova 0x%lx size 0x%zx min_pagesz 0x%x\n" , + iova, size, min_pagesz);return -EINVAL ; } -pr_debug ("unmap this: iova 0x%lx size 0x%lx\n" , iova, - (unsigned long )size); +pr_debug ("unmap this: iova 0x%lx size 0x%zx\n" , iova, size);/* * Keep iterating until we either unmap 'size' bytes (or more)
@@ -876,8 +874,8 @@ size_t iommu_unmap(struct iommu_domain *domain, unsigned long iova, size_t size)if (!unmapped_page)break ; -pr_debug ("unmapped: iova 0x%lx size %lx\n" , iova, - (unsigned long )unmapped_page); +pr_debug ("unmapped: iova 0x%lx size 0x%zx\n" , + iova, unmapped_page); iova += unmapped_page; unmapped += unmapped_page;
Re: [PATCH] iommu: Use %zx instead %lx and cast to unsigned long
drivers/iommu/iommu.c int iommu_map(struct iommu_domain *domain, unsigned long iova, · line 811
Quoted 11 lines · Joe Perches
drivers/iommu/iommu.c +2
-3@@ -807,20 +807,19 @@ int iommu_map(struct iommu_domain *domain, unsigned long iova,* size of the smallest page supported by the hardware */ if (!IS_ALIGNED (iova | paddr | size, min_pagesz)) { -pr_err ("unaligned: iova 0x%lx pa 0x%lx size 0x%lx min_pagesz " -"0x%x\n" , iova, (unsigned long )paddr, - (unsigned long )size, min_pagesz); +pr_err ("unaligned: iova 0x%lx pa 0x%lx size 0x%zx min_pagesz 0x%x\n" , + iova, (unsigned long )paddr, size, min_pagesz);
While we're at it, paddr is phys_addr_t (which can be 32-bit or 64-bit), so it should be cast to unsigned long long (instead of unsigned long), and printed using %llx (instead of %lx).
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
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
PATCH v2 1/1 iommu: Use %pa and %zx instead of casting
printk supports using %pa for phys_addr_t and
%zx for size_t so use those instead of %lx and
casts to unsigned long.
Other miscellaneous changes around this:
Always use 0x%zx for size instead of one use of decimal. Coalesce format and align arguments.
---
Quoted 3 lines
While we're at it, paddr is
phys_addr_t(which can be 32-bit or 64-bit), so it should be cast to unsigned long long (instead of unsigned long), and printed using %llx (instead of %lx).
Sounds good to me, except using %pa instead is better still.
drivers/iommu/iommu.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)
drivers/iommu/iommu.c +10 -13
@@ -807,20 +807,18 @@ int iommu_map(struct iommu_domain *domain, unsigned long iova,* size of the smallest page supported by the hardware */ if (!IS_ALIGNED (iova | paddr | size, min_pagesz)) { -pr_err ("unaligned: iova 0x%lx pa 0x%lx size 0x%lx min_pagesz " -"0x%x\n" , iova, (unsigned long )paddr, - (unsigned long )size, min_pagesz); +pr_err ("unaligned: iova 0x%lx pa 0x%pa size 0x%zx min_pagesz 0x%x\n" , + iova, &paddr, size, min_pagesz);return -EINVAL ; } -pr_debug ("map: iova 0x%lx pa 0x%lx size 0x%lx\n" , iova, - (unsigned long )paddr, (unsigned long )size); +pr_debug ("map: iova 0x%lx pa 0x%pa size 0x%zx\n" , iova, &paddr, size);while (size) {size_t pgsize =iommu_pgsize (domain, iova | paddr, size); -pr_debug ("mapping: iova 0x%lx pa 0x%lx pgsize %lu\n" , iova, - (unsigned long )paddr, (unsigned long )pgsize); +pr_debug ("mapping: iova 0x%lx pa 0x%pa pgsize 0x%zx\n" , + iova, &paddr, pgsize); ret = domain->ops->map (domain, iova, paddr, pgsize, prot);if (ret)
@@ -857,13 +855,12 @@ size_t iommu_unmap(struct iommu_domain *domain, unsigned long iova, size_t size)* by the hardware */ if (!IS_ALIGNED (iova | size, min_pagesz)) { -pr_err ("unaligned: iova 0x%lx size 0x%lx min_pagesz 0x%x\n" , - iova, (unsigned long )size, min_pagesz); +pr_err ("unaligned: iova 0x%lx size 0x%zx min_pagesz 0x%x\n" , + iova, size, min_pagesz);return -EINVAL ; } -pr_debug ("unmap this: iova 0x%lx size 0x%lx\n" , iova, - (unsigned long )size); +pr_debug ("unmap this: iova 0x%lx size 0x%zx\n" , iova, size);/* * Keep iterating until we either unmap 'size' bytes (or more)
@@ -876,8 +873,8 @@ size_t iommu_unmap(struct iommu_domain *domain, unsigned long iova, size_t size)if (!unmapped_page)break ; -pr_debug ("unmapped: iova 0x%lx size %lx\n" , iova, - (unsigned long )unmapped_page); +pr_debug ("unmapped: iova 0x%lx size 0x%zx\n" , + iova, unmapped_page); iova += unmapped_page; unmapped += unmapped_page;
Re: [PATCH V2] iommu: Use %pa and %zx instead of casting
Quoted 5 lines · Joe Perches
Quoted 3 lines
While we're at it, paddr is
phys_addr_t(which can be 32-bit or 64-bit), so it should be cast to unsigned long long (instead of unsigned long), and printed using %llx (instead of %lx).Sounds good to me, except using %pa instead is better still.
Thanks, you're right. Still not used to this newish %pa...
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
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
Re: [PATCH V2] iommu: Use %pa and %zx instead of casting
In reply to Joe PerchesQuoted 10 lines · Joe Perches
printk supports using %pa for
phys_addr_tand
%zx forsize_tso use those instead of %lx and
casts to unsigned long.Other miscellaneous changes around this:
Always use 0x%zx for size instead of one use of decimal. Coalesce format and align arguments.
Signed-off-by Joe Perches <[email protected]>
Applied to core, thanks.