From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758074Ab2CSFoE (ORCPT ); Mon, 19 Mar 2012 01:44:04 -0400 Received: from rcsinet15.oracle.com ([148.87.113.117]:27626 "EHLO rcsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756936Ab2CSFn6 (ORCPT ); Mon, 19 Mar 2012 01:43:58 -0400 From: Yinghai Lu To: Jesse Barnes , Benjamin Herrenschmidt , Tony Luck , David Miller , x86 Cc: Bjorn Helgaas , Dominik Brodowski , Andrew Morton , Linus Torvalds , Greg Kroah-Hartman , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu Subject: [PATCH -v11 02/30] x86, PCI: Allocate temp range array in amd_bus pci_root_info probing Date: Sun, 18 Mar 2012 22:42:33 -0700 Message-Id: <1332135781-13695-3-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1332135781-13695-1-git-send-email-yinghai@kernel.org> References: <1332135781-13695-1-git-send-email-yinghai@kernel.org> X-Source-IP: acsinet22.oracle.com [141.146.126.238] X-CT-RefId: str=0001.0A090209.4F66C795.009C,ss=1,re=0.000,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Yinghai Lu --- arch/x86/pci/amd_bus.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c index 5f30a98..aff155d 100644 --- a/arch/x86/pci/amd_bus.c +++ b/arch/x86/pci/amd_bus.c @@ -30,7 +30,7 @@ static struct pci_hostbridge_probe pci_probes[] __initdata = { { 0, 0x18, PCI_VENDOR_ID_AMD, 0x1300 }, }; -#define RANGE_NUM 16 +#define RANGE_NUM 128 static struct pci_root_info __init *find_pci_root_info(int node, int link) { @@ -64,7 +64,7 @@ static int __init early_fill_mp_bus_info(void) u32 reg; u64 start; u64 end; - struct range range[RANGE_NUM]; + struct range *range; u64 val; u32 address; bool found; @@ -125,7 +125,10 @@ static int __init early_fill_mp_bus_info(void) reg = read_pci_config(bus, slot, 0, 0x64); def_link = (reg >> 8) & 0x03; - memset(range, 0, sizeof(range)); + range = kcalloc(RANGE_NUM, sizeof(struct range), GFP_KERNEL); + if (!range) + return -ENOMEM; + add_range(range, RANGE_NUM, 0, 0, 0xffff + 1); /* io port resource */ for (i = 0; i < 4; i++) { @@ -291,6 +294,8 @@ static int __init early_fill_mp_bus_info(void) } } + kfree(range); + print_all_pci_root_info("ht link", true); return 0; -- 1.7.7