hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[PATCH] IB: Fix pack/unpack when size_bits == 64 

Fix handling of fields with size_bits == 64.  Pointed out by Hal Rosenstock.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Roland Dreier 2005-06-27 14:36:47 -07:00 committed by Linus Torvalds
parent dae4c1d236
commit 48442962eb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/infiniband/core/packer.c
View File

@ -96,7 +96,7 @@ void ib_pack(const struct ib_field *desc,
else else
val = 0; val = 0;
mask = cpu_to_be64(((1ull << desc[i].size_bits) - 1) << shift); mask = cpu_to_be64((~0ull >> (64 - desc[i].size_bits)) << shift);
addr = (__be64 *) ((__be32 *) buf + desc[i].offset_words); addr = (__be64 *) ((__be32 *) buf + desc[i].offset_words);
*addr = (*addr & ~mask) | (cpu_to_be64(val) & mask); *addr = (*addr & ~mask) | (cpu_to_be64(val) & mask);
} else { } else {
@ -176,7 +176,7 @@ void ib_unpack(const struct ib_field *desc,
__be64 *addr; __be64 *addr;
shift = 64 - desc[i].offset_bits - desc[i].size_bits; shift = 64 - desc[i].offset_bits - desc[i].size_bits;
mask = ((1ull << desc[i].size_bits) - 1) << shift; mask = (~0ull >> (64 - desc[i].size_bits)) << shift;
addr = (__be64 *) buf + desc[i].offset_words; addr = (__be64 *) buf + desc[i].offset_words;
val = (be64_to_cpup(addr) & mask) >> shift; val = (be64_to_cpup(addr) & mask) >> shift;
value_write(desc[i].struct_offset_bytes, value_write(desc[i].struct_offset_bytes,