1 files changed, 12 insertions, 3 deletions

diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c
index 289c0b37d845..0dc1865c84ce 100644
--- a/arch/powerpc/kernel/eeh.c
+++ b/arch/powerpc/kernel/eeh.c
@@ -367,10 +367,19 @@ static inline unsigned long eeh_token_to_phys(unsigned long token)
         ptep = find_init_mm_pte(token, &hugepage_shift);
         if (!ptep)
                 return token;
-        WARN_ON(hugepage_shift);
-        pa = pte_pfn(*ptep) << PAGE_SHIFT;
 
-        return pa | (token & (PAGE_SIZE-1));
+        pa = pte_pfn(*ptep);
+
+        /* On radix we can do hugepage mappings for io, so handle that */
+        if (hugepage_shift) {
+                pa <<= hugepage_shift;
+                pa |= token & ((1ul << hugepage_shift) - 1);
+        } else {
+                pa <<= PAGE_SHIFT;
+                pa |= token & (PAGE_SIZE - 1);
+        }
+
+        return pa;
 }
 
 /*