IB/ipath: Allow more flexible user register alignments

User registers have different alignments on different chips (4KB on
older, 64KB on 7220).  Allow mapping the user registers on kernels with
page sizes up to 64K.

Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/drivers/infiniband/hw/ipath/ipath_iba6120.c b/drivers/infiniband/hw/ipath/ipath_iba6120.c
index 66925b255ccd..23de8da0f16b 100644
--- a/drivers/infiniband/hw/ipath/ipath_iba6120.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba6120.c
@@ -613,6 +613,14 @@ static int ipath_pe_boardname(struct ipath_devdata *dd, char *name,
                         dd->ipath_f_put_tid = ipath_pe_put_tid_2;
         }
 
+
+        /*
+         * set here, not in ipath_init_*_funcs because we have to do
+         * it after we can read chip registers.
+         */
+        dd->ipath_ureg_align =
+                ipath_read_kreg32(dd, dd->ipath_kregs->kr_pagealign);
+
         return ret;
 }