Commit 1de6bf33 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

[PATCH] x86_64: Fix zero mcfg entry workaround on x86-64

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: gregkh@suse.de
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d22fe808
...@@ -46,7 +46,7 @@ static char __iomem *get_virt(unsigned int seg, unsigned bus) ...@@ -46,7 +46,7 @@ static char __iomem *get_virt(unsigned int seg, unsigned bus)
if (pci_mmcfg_config_num == 1 && if (pci_mmcfg_config_num == 1 &&
cfg->pci_segment_group_number == 0 && cfg->pci_segment_group_number == 0 &&
(cfg->start_bus_number | cfg->end_bus_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 */ /* Fall back to type 0 */
return 0; return 0;
......
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