powerpc/powernv: Use it_page_shift for TCE invalidation

This fixes IODA1/2 to use it_page_shift as it may be bigger than 4K.

This changes involved constant values to use "ull" modifier.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index de19edeaa7a75f1e21dedd0babbf57727c6d4afb..40f968e02d351ed48db3c7dfb5ef324df9793a82 100644 (file)
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -513,15 +513,16 @@ static void pnv_pci_ioda1_tce_invalidate(struct pnv_ioda_pe *pe,
                (__be64 __iomem *)pe->tce_inval_reg_phys :
                (__be64 __iomem *)tbl->it_index;
        unsigned long start, end, inc;
+       const unsigned shift = tbl->it_page_shift;
 
        start = __pa(startp);
        end = __pa(endp);
 
        /* BML uses this case for p6/p7/galaxy2: Shift addr and put in node */
        if (tbl->it_busno) {
-               start <<= 12;
-               end <<= 12;
-               inc = 128 << 12;
+               start <<= shift;
+               end <<= shift;
+               inc = 128ull << shift;
                start |= tbl->it_busno;
                end |= tbl->it_busno;
        } else if (tbl->it_type & TCE_PCI_SWINV_PAIR) {
@@ -559,18 +560,19 @@ static void pnv_pci_ioda2_tce_invalidate(struct pnv_ioda_pe *pe,
        __be64 __iomem *invalidate = rm ?
                (__be64 __iomem *)pe->tce_inval_reg_phys :
                (__be64 __iomem *)tbl->it_index;
+       const unsigned shift = tbl->it_page_shift;
 
        /* We'll invalidate DMA address in PE scope */
-       start = 0x2ul << 60;
+       start = 0x2ull << 60;
        start |= (pe->pe_number & 0xFF);
        end = start;
 
        /* Figure out the start, end and step */
        inc = tbl->it_offset + (((u64)startp - tbl->it_base) / sizeof(u64));
-       start |= (inc << 12);
+       start |= (inc << shift);
        inc = tbl->it_offset + (((u64)endp - tbl->it_base) / sizeof(u64));
-       end |= (inc << 12);
-       inc = (0x1ul << 12);
+       end |= (inc << shift);
+       inc = (0x1ull << shift);
        mb();
 
        while (start <= end) {