Skip to content

L
linux
Commit ce23b234 authored by Ben Skeggs's avatar Ben Skeggs
Browse files
Options

drm/nouveau/bios: fix shadowing from PROM on big-endian systems 

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent a3d0b121
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
drivers/gpu/drm/nouveau/core/subdev/bios/base.c
View file @ ce23b234
...@@ -168,7 +168,8 @@ nouveau_bios_shadow_prom(struct nouveau_bios *bios) ...@@ -168,7 +168,8 @@ nouveau_bios_shadow_prom(struct nouveau_bios *bios)
*/ */
i = 16; i = 16;
do { do {
if ((nv_rd32(bios, 0x300000) & 0xffff) == 0xaa55) u32 data = le32_to_cpu(nv_rd32(bios, 0x300000)) & 0xffff;
if (data == 0xaa55)
break; break;
} while (i--); } while (i--);
...@@ -176,14 +177,15 @@ nouveau_bios_shadow_prom(struct nouveau_bios *bios) ...@@ -176,14 +177,15 @@ nouveau_bios_shadow_prom(struct nouveau_bios *bios)
goto out; goto out;
/* read entire bios image to system memory */ /* read entire bios image to system memory */
bios->size = ((nv_rd32(bios, 0x300000) >> 16) & 0xff) * 512; bios->size = (le32_to_cpu(nv_rd32(bios, 0x300000)) >> 16) & 0xff;
bios->size = bios->size * 512;
if (!bios->size) if (!bios->size)
goto out; goto out;
bios->data = kmalloc(bios->size, GFP_KERNEL); bios->data = kmalloc(bios->size, GFP_KERNEL);
if (bios->data) { if (bios->data) {
for (i = 0; i < bios->size; i+=4) for (i = 0; i < bios->size; i += 4)
nv_wo32(bios, i, nv_rd32(bios, 0x300000 + i)); ((u32 *)bios->data)[i/4] = nv_rd32(bios, 0x300000 + i);
} }
/* check the PCI record header */ /* check the PCI record header */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7