diff options
| -rw-r--r-- | drivers/iommu/fsl_pamu.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c index 113fb7be8cfd..6ee947e41870 100644 --- a/drivers/iommu/fsl_pamu.c +++ b/drivers/iommu/fsl_pamu.c | |||
| @@ -352,7 +352,7 @@ int pamu_config_ppaace(int liodn, phys_addr_t win_addr, phys_addr_t win_size, | |||
| 352 | unsigned long fspi; | 352 | unsigned long fspi; |
| 353 | 353 | ||
| 354 | if ((win_size & (win_size - 1)) || win_size < PAMU_PAGE_SIZE) { | 354 | if ((win_size & (win_size - 1)) || win_size < PAMU_PAGE_SIZE) { |
| 355 | pr_debug("window size too small or not a power of two %llx\n", win_size); | 355 | pr_debug("window size too small or not a power of two %pa\n", &win_size); |
| 356 | return -EINVAL; | 356 | return -EINVAL; |
| 357 | } | 357 | } |
| 358 | 358 | ||
| @@ -1121,8 +1121,7 @@ static int __init fsl_pamu_probe(struct platform_device *pdev) | |||
| 1121 | spaact = (void *)ppaact + (PAGE_SIZE << get_order(PAACT_SIZE)); | 1121 | spaact = (void *)ppaact + (PAGE_SIZE << get_order(PAACT_SIZE)); |
| 1122 | omt = (void *)spaact + (PAGE_SIZE << get_order(SPAACT_SIZE)); | 1122 | omt = (void *)spaact + (PAGE_SIZE << get_order(SPAACT_SIZE)); |
| 1123 | 1123 | ||
| 1124 | dev_dbg(&pdev->dev, "ppaact virt=%p phys=0x%llx\n", ppaact, | 1124 | dev_dbg(&pdev->dev, "ppaact virt=%p phys=%pa\n", ppaact, &ppaact_phys); |
| 1125 | (unsigned long long) ppaact_phys); | ||
| 1126 | 1125 | ||
| 1127 | /* Check to see if we need to implement the work-around on this SOC */ | 1126 | /* Check to see if we need to implement the work-around on this SOC */ |
| 1128 | 1127 | ||
| @@ -1138,7 +1137,7 @@ static int __init fsl_pamu_probe(struct platform_device *pdev) | |||
| 1138 | 1137 | ||
| 1139 | if (csd_port_id) { | 1138 | if (csd_port_id) { |
| 1140 | dev_dbg(&pdev->dev, "creating coherency subdomain at address " | 1139 | dev_dbg(&pdev->dev, "creating coherency subdomain at address " |
| 1141 | "0x%llx, size %zu, port id 0x%08x", ppaact_phys, | 1140 | "%pa, size %zu, port id 0x%08x", &ppaact_phys, |
| 1142 | mem_size, csd_port_id); | 1141 | mem_size, csd_port_id); |
| 1143 | 1142 | ||
| 1144 | ret = create_csd(ppaact_phys, mem_size, csd_port_id); | 1143 | ret = create_csd(ppaact_phys, mem_size, csd_port_id); |
