leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86/pci: AMD one chain system to use pci read out res

Browse Source 
Found MSI amd k8 based laptops is hiding [0x70000000, 0x80000000) RAM
from e820.

enable amd one chain even for all.

-v2: use bool for found, according to Andrew

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <1265793639-15071-6-git-send-email-yinghai@kernel.org>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
Yinghai Lu 2010-02-10 01:20:09 -08:00 committed by H. Peter Anvin
parent b74fd238a9
commit 3e3da00c01
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/x86/pci/amd_bus.c
View File

@ -87,11 +87,12 @@ static int __init early_fill_mp_bus_info(void)
struct range range[RANGE_NUM]; struct range range[RANGE_NUM];
u64 val; u64 val;
u32 address; u32 address;
bool found;
if (!early_pci_allowed()) if (!early_pci_allowed())
return -1; return -1;
found_all_numa_early = 0; found = false;
for (i = 0; i < ARRAY_SIZE(pci_probes); i++) { for (i = 0; i < ARRAY_SIZE(pci_probes); i++) {
u32 id; u32 id;
u16 device; u16 device;
@ -105,12 +106,12 @@ static int __init early_fill_mp_bus_info(void)
device = (id>>16) & 0xffff; device = (id>>16) & 0xffff;
if (pci_probes[i].vendor == vendor && if (pci_probes[i].vendor == vendor &&
pci_probes[i].device == device) { pci_probes[i].device == device) {
found_all_numa_early = 1; found = true;
break; break;
} }
} }
if (!found_all_numa_early) if (!found)
return 0; return 0;
pci_root_num = 0; pci_root_num = 0;

5
arch/x86/pci/bus_numa.c
View File

@ -5,7 +5,6 @@
int pci_root_num; int pci_root_num;
struct pci_root_info pci_root_info[PCI_ROOT_NR]; struct pci_root_info pci_root_info[PCI_ROOT_NR];
int found_all_numa_early;
void x86_pci_root_bus_res_quirks(struct pci_bus *b) void x86_pci_root_bus_res_quirks(struct pci_bus *b)
{ {
@ -21,10 +20,6 @@ void x86_pci_root_bus_res_quirks(struct pci_bus *b)
if (!pci_root_num) if (!pci_root_num)
return; return;
/* for amd, if only one root bus, don't need to do anything */
if (pci_root_num < 2 && found_all_numa_early)
return;
for (i = 0; i < pci_root_num; i++) { for (i = 0; i < pci_root_num; i++) {
if (pci_root_info[i].bus_min == b->number) if (pci_root_info[i].bus_min == b->number)
break; break;

1
arch/x86/pci/bus_numa.h
View File

@ -20,7 +20,6 @@ struct pci_root_info {
#define PCI_ROOT_NR 4 #define PCI_ROOT_NR 4
extern int pci_root_num; extern int pci_root_num;
extern struct pci_root_info pci_root_info[PCI_ROOT_NR]; extern struct pci_root_info pci_root_info[PCI_ROOT_NR];
extern int found_all_numa_early;
extern void update_res(struct pci_root_info *info, resource_size_t start, extern void update_res(struct pci_root_info *info, resource_size_t start,
resource_size_t end, unsigned long flags, int merge); resource_size_t end, unsigned long flags, int merge);