diff options
| author | Jonas Rabenstein <jonas.rabenstein@studium.uni-erlangen.de> | 2018-03-07 17:55:56 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-03-16 10:15:27 -0600 |
| commit | 5f990d316085aca11b04dc0f63d6df5e508d73c7 (patch) | |
| tree | 0565059ac20c983ab7c0a2bf487407123d5d59c5 /block/sed-opal.c | |
| parent | 17cb960f29c29ee07bf6848ada3265f4be55972e (diff) | |
| download | linux-stable-5f990d316085aca11b04dc0f63d6df5e508d73c7.tar.gz linux-stable-5f990d316085aca11b04dc0f63d6df5e508d73c7.tar.bz2 linux-stable-5f990d316085aca11b04dc0f63d6df5e508d73c7.zip | |
block: sed-opal: fix u64 short atom length
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>
Diffstat (limited to 'block/sed-opal.c')
| -rw-r--r-- | block/sed-opal.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/block/sed-opal.c b/block/sed-opal.c index 36842bfa572e..38411c5c477f 100644 --- a/block/sed-opal.c +++ b/block/sed-opal.c @@ -554,15 +554,14 @@ static void add_token_u64(int *err, struct opal_dev *cmd, u64 number) size_t len; int msb; - u8 n; if (!(number & ~TINY_ATOM_DATA_MASK)) { add_token_u8(err, cmd, number); return; } - msb = fls(number); - len = DIV_ROUND_UP(msb, 4); + msb = fls64(number); + len = DIV_ROUND_UP(msb, 8); if (cmd->pos >= IO_BUFFER_LENGTH - len - 1) { 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; } add_short_atom_header(cmd, false, false, len); - while (len--) { - n = number >> (len * 8); - add_token_u8(err, cmd, n); - } + while (len--) + add_token_u8(err, cmd, number >> (len * 8)); } static void add_token_bytestring(int *err, struct opal_dev *cmd, |