GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-03-17 20:54:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

block: sed-opal: fix u64 short atom length

Browse source 
The length must be given as bytes and not as 4 bit tuples.

Reviewed-by: Scott Bauer <scott.bauer@intel.com>
Signed-off-by: Jonas Rabenstein <jonas.rabenstein@studium.uni-erlangen.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jonas Rabenstein 2018-03-07 17:55:56 +01:00 • committed by Jens Axboe
parent 17cb960f29
commit 5f990d3160
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
block/sed-opal.c
View file

@ -554,15 +554,14 @@ static void add_token_u64(int *err, struct opal_dev *cmd, u64 number)
size_t len; size_t len;
int msb; int msb;
u8 n;
if (!(number & ~TINY_ATOM_DATA_MASK)) { if (!(number & ~TINY_ATOM_DATA_MASK)) {
add_token_u8(err, cmd, number); add_token_u8(err, cmd, number);
return; return;
} }
msb = fls(number); msb = fls64(number);
len = DIV_ROUND_UP(msb, 4); len = DIV_ROUND_UP(msb, 8);
if (cmd->pos >= IO_BUFFER_LENGTH - len - 1) { if (cmd->pos >= IO_BUFFER_LENGTH - len - 1) {
pr_debug("Error adding u64: end of buffer.\n"); pr_debug("Error adding u64: end of buffer.\n");
@ -570,10 +569,8 @@ static void add_token_u64(int *err, struct opal_dev *cmd, u64 number)
return; return;
} }
add_short_atom_header(cmd, false, false, len); add_short_atom_header(cmd, false, false, len);
while (len--) { while (len--)
n = number >> (len * 8); add_token_u8(err, cmd, number >> (len * 8));
add_token_u8(err, cmd, n);
}
} }
static void add_token_bytestring(int *err, struct opal_dev *cmd, static void add_token_bytestring(int *err, struct opal_dev *cmd,