Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e3da00c authored by Yinghai Lu's avatar Yinghai Lu Committed by H. Peter Anvin
Browse files

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



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: default avatarYinghai Lu <yinghai@kernel.org>
LKML-Reference: <1265793639-15071-6-git-send-email-yinghai@kernel.org>
Acked-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent b74fd238

arch/x86/pci/amd_bus.c

+4 −3
Original line number Diff line number Diff line
@@ -87,11 +87,12 @@ static int __init early_fill_mp_bus_info(void) 
	struct range range[RANGE_NUM];

	u64 val;

	u32 address;

	bool found;



	if (!early_pci_allowed())

		return -1;



	found_all_numa_early = 0;

	found = false;

	for (i = 0; i < ARRAY_SIZE(pci_probes); i++) {

		u32 id;

		u16 device;
@@ -105,12 +106,12 @@ static int __init early_fill_mp_bus_info(void) 
		device = (id>>16) & 0xffff;

		if (pci_probes[i].vendor == vendor &&

		    pci_probes[i].device == device) {

			found_all_numa_early = 1;

			found = true;

			break;

		}

	}



	if (!found_all_numa_early)

	if (!found)

		return 0;



	pci_root_num = 0;

arch/x86/pci/bus_numa.c

+0 −5
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 


int pci_root_num;

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)

{
@@ -21,10 +20,6 @@ void x86_pci_root_bus_res_quirks(struct pci_bus *b) 
	if (!pci_root_num)

		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++) {

		if (pci_root_info[i].bus_min == b->number)

			break;

arch/x86/pci/bus_numa.h

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ struct pci_root_info { 
#define PCI_ROOT_NR 4

extern int pci_root_num;

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,

		      resource_size_t end, unsigned long flags, int merge);