提交 5f990d31 编写于 作者: J Jonas Rabenstein 提交者: Jens Axboe

block: sed-opal: fix u64 short atom length

The length must be given as bytes and not as 4 bit tuples.
Reviewed-by: NScott Bauer <scott.bauer@intel.com>
Signed-off-by: NJonas Rabenstein <jonas.rabenstein@studium.uni-erlangen.de>
Signed-off-by: NJens Axboe <axboe@kernel.dk>
上级 17cb960f
...@@ -554,15 +554,14 @@ static void add_token_u64(int *err, struct opal_dev *cmd, u64 number) ...@@ -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) ...@@ -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,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册