mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/pflash: use ldn_{be,le}_p and stn_{be,le}_p

Browse Source 
Use the helper functions we have to read/write multi-byte values
in correct byte order.

Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240108160900.104835-3-kraxel@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
(cherry picked from commit 5dd58358a5)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Gerd Hoffmann 2024-01-08 17:08:58 +01:00 committed by Michael Tokarev
parent 731783ff1e
commit 143d230d51
1 changed files with 8 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
hw/block/pflash_cfi01.c
View File

@ -225,34 +225,10 @@ static uint32_t pflash_data_read(PFlashCFI01 *pfl, hwaddr offset,
uint32_t ret; uint32_t ret;
p = pfl->storage; p = pfl->storage;
switch (width) { if (be) {
case 1: ret = ldn_be_p(p + offset, width);
ret = p[offset]; } else {
break; ret = ldn_le_p(p + offset, width);
case 2:
if (be) {
ret = p[offset] << 8;
ret |= p[offset + 1];
} else {
ret = p[offset];
ret |= p[offset + 1] << 8;
}
break;
case 4:
if (be) {
ret = p[offset] << 24;
ret |= p[offset + 1] << 16;
ret |= p[offset + 2] << 8;
ret |= p[offset + 3];
} else {
ret = p[offset];
ret |= p[offset + 1] << 8;
ret |= p[offset + 2] << 16;
ret |= p[offset + 3] << 24;
}
break;
default:
abort();
} }
trace_pflash_data_read(pfl->name, offset, width, ret); trace_pflash_data_read(pfl->name, offset, width, ret);
return ret; return ret;
@ -408,34 +384,11 @@ static inline void pflash_data_write(PFlashCFI01 *pfl, hwaddr offset,
trace_pflash_data_write(pfl->name, offset, width, value, pfl->counter); trace_pflash_data_write(pfl->name, offset, width, value, pfl->counter);
p = pfl->storage + offset; p = pfl->storage + offset;
switch (width) { if (be) {
case 1: stn_be_p(p, width, value);
p[0] = value; } else {
break; stn_le_p(p, width, value);
case 2:
if (be) {
p[0] = value >> 8;
p[1] = value;
} else {
p[0] = value;
p[1] = value >> 8;
}
break;
case 4:
if (be) {
p[0] = value >> 24;
p[1] = value >> 16;
p[2] = value >> 8;
p[3] = value;
} else {
p[0] = value;
p[1] = value >> 8;
p[2] = value >> 16;
p[3] = value >> 24;
}
break;
} }
} }
static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, static void pflash_write(PFlashCFI01 *pfl, hwaddr offset,