diff options
author | Roland Dreier <rolandd@cisco.com> | 2006-12-15 14:01:49 -0800 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2006-12-15 14:01:49 -0800 |
commit | bf628dc22a09ed2022abb32c76011ae5f99ad6b0 (patch) | |
tree | c29aff97085d9426dffe1e648e09d4aca0ead024 /drivers/infiniband/ulp/srp/ib_srp.c | |
parent | c59a3da1342ff456e5123361739bc331446cda21 (diff) | |
download | op-kernel-dev-bf628dc22a09ed2022abb32c76011ae5f99ad6b0.zip op-kernel-dev-bf628dc22a09ed2022abb32c76011ae5f99ad6b0.tar.gz |
IB/srp: Fix FMR mapping for 32-bit kernels and addresses above 4G
struct srp_device.fmr_page_mask was unsigned long, which means that
the top part of addresses above 4G was being chopped off on 32-bit
architectures. Of course nothing good happens when data from SRP
targets is DMAed to the wrong place.
Fix this by changing fmr_page_mask to u64, to match the addresses
actually used by IB devices.
Thanks to Brian Cain <Brian.Cain@ge.com> and David McMillen
<davem@systemfabricworks.com> for help diagnosing the bug and testing
the fix.
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband/ulp/srp/ib_srp.c')
-rw-r--r-- | drivers/infiniband/ulp/srp/ib_srp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c index e9b6a6f..cdecbf5 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c @@ -1898,7 +1898,7 @@ static void srp_add_one(struct ib_device *device) */ srp_dev->fmr_page_shift = max(9, ffs(dev_attr->page_size_cap) - 1); srp_dev->fmr_page_size = 1 << srp_dev->fmr_page_shift; - srp_dev->fmr_page_mask = ~((unsigned long) srp_dev->fmr_page_size - 1); + srp_dev->fmr_page_mask = ~((u64) srp_dev->fmr_page_size - 1); INIT_LIST_HEAD(&srp_dev->dev_list); |