Skip to content

Commit

Permalink
[PATCH] x86_64: Fix zero mcfg entry workaround on x86-64
Browse files Browse the repository at this point in the history
I broke this earlier when moving the patch from i386 to x86-64.
Need to return the virtual address here, not the physical address.
This fixes some boot time crashes on x86-64.

Cc: [email protected]

Signed-off-by: Andi Kleen <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Andi Kleen authored and Linus Torvalds committed Feb 5, 2006
1 parent d22fe80 commit 1de6bf3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/x86_64/pci/mmconfig.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ static char __iomem *get_virt(unsigned int seg, unsigned bus)
if (pci_mmcfg_config_num == 1 &&
cfg->pci_segment_group_number == 0 &&
(cfg->start_bus_number | cfg->end_bus_number) == 0)
return cfg->base_address;
return pci_mmcfg_virt[0].virt;

/* Fall back to type 0 */
return 0;
Expand Down

0 comments on commit 1de6bf3

Please sign in to comment.