From patchwork Sun Mar 8 00:56:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 447657 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 91F511400F1 for ; Sun, 8 Mar 2015 11:58:42 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752518AbbCHA5v (ORCPT ); Sat, 7 Mar 2015 19:57:51 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:44859 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752366AbbCHA5s (ORCPT ); Sat, 7 Mar 2015 19:57:48 -0500 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t280vUov011491 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 8 Mar 2015 00:57:31 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by ucsinet22.oracle.com (8.14.5+Sun/8.14.5) with ESMTP id t280vUmI015630 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 8 Mar 2015 00:57:30 GMT Received: from abhmp0001.oracle.com (abhmp0001.oracle.com [141.146.116.7]) by aserv0122.oracle.com (8.13.8/8.13.8) with ESMTP id t280vTK4014605; Sun, 8 Mar 2015 00:57:30 GMT Received: from linux-siqj.lan (/162.250.208.86) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sat, 07 Mar 2015 16:57:24 -0800 From: Yinghai Lu To: Matt Fleming , "H. Peter Anvin" , Ingo Molnar , Borislav Petkov , Bjorn Helgaas Cc: Thomas Gleixner , Jiri Kosina , "Chun-Yi Lee" , linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, linux-pci@vger.kernel.org, Yinghai Lu Subject: [PATCH v3 6/8] x86, boot, PCI: Convert SETUP_PCI data to list Date: Sat, 7 Mar 2015 16:56:19 -0800 Message-Id: <1425776181-10219-7-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1425776181-10219-1-git-send-email-yinghai@kernel.org> References: <1425776181-10219-1-git-send-email-yinghai@kernel.org> X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org So we could avoid ioremap every time later. Cc: Bjorn Helgaas Cc: linux-pci@vger.kernel.org Signed-off-by: Yinghai Lu --- arch/x86/include/asm/pci.h | 2 ++ arch/x86/kernel/setup.c | 1 + arch/x86/pci/common.c | 77 +++++++++++++++++++++++++++++++++++++--------- 3 files changed, 65 insertions(+), 15 deletions(-) diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index 7fbd5f3..99b261f 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -88,9 +88,11 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev, *strategy_parameter = ~0UL; } void add_pci(u64 pa_data); +int fill_setup_pci_entries(void); #else static inline void early_quirks(void) { } static inline void add_pci(u64 pa_data) { } +static inline int fill_setup_pci_entries(void) { } #endif extern void pci_iommu_alloc(void); diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index a7e688c..39940a7 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -1195,6 +1195,7 @@ void __init setup_arch(char **cmdline_p) acpi_boot_init(); sfi_init(); x86_dtb_init(); + fill_setup_pci_entries(); /* * get boot-time SMP configuration: diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index f40df5c..67dc2a9 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -668,7 +668,7 @@ unsigned int pcibios_assign_all_busses(void) return (pci_probe & PCI_ASSIGN_ALL_BUSSES) ? 1 : 0; } -static u64 pci_setup_data; +static u64 pci_setup_data __initdata; void __init add_pci(u64 pa_data) { struct setup_data *data; @@ -683,36 +683,83 @@ void __init add_pci(u64 pa_data) early_memunmap(data, sizeof(*data)); } -int pcibios_add_device(struct pci_dev *dev) +struct firmware_setup_pci_entry { + struct list_head list; + uint16_t vendor; + uint16_t devid; + uint64_t pcilen; + unsigned long segment; + unsigned long bus; + unsigned long device; + unsigned long function; + phys_addr_t romdata; +}; + +static LIST_HEAD(setup_pci_entries); + +int __init fill_setup_pci_entries(void) { struct setup_data *data; struct pci_setup_rom *rom; + struct firmware_setup_pci_entry *entry; + phys_addr_t pa_entry; u64 pa_data; pa_data = pci_setup_data; while (pa_data) { - data = ioremap(pa_data, sizeof(*rom)); + data = early_memremap(pa_data, sizeof(*rom)); if (!data) return -ENOMEM; - rom = (struct pci_setup_rom *)data; - if ((pci_domain_nr(dev->bus) == rom->segment) && - (dev->bus->number == rom->bus) && - (PCI_SLOT(dev->devfn) == rom->device) && - (PCI_FUNC(dev->devfn) == rom->function) && - (dev->vendor == rom->vendor) && - (dev->device == rom->devid)) { - dev->rom = pa_data + - offsetof(struct pci_setup_rom, romdata); - dev->romlen = rom->pcilen; + pa_entry = memblock_alloc(sizeof(*entry), sizeof(long)); + if (!pa_entry) { + early_memunmap(data, sizeof(*rom)); + return -ENOMEM; + } + + entry = phys_to_virt(pa_entry); + entry->segment = rom->segment; + entry->bus = rom->bus; + entry->device = rom->device; + entry->function = rom->function; + entry->vendor = rom->vendor; + entry->devid = rom->devid; + entry->pcilen = rom->pcilen; + entry->romdata = pa_data + + offsetof(struct pci_setup_rom, romdata); + + list_add(&entry->list, &setup_pci_entries); + + memblock_free(pa_data, sizeof(*rom)); + pa_data = data->next; + early_memunmap(data, sizeof(*rom)); + } + + pci_setup_data = 0; + + return 0; +} + +int pcibios_add_device(struct pci_dev *dev) +{ + struct firmware_setup_pci_entry *entry; + + list_for_each_entry(entry, &setup_pci_entries, list) { + if ((pci_domain_nr(dev->bus) == entry->segment) && + (dev->bus->number == entry->bus) && + (PCI_SLOT(dev->devfn) == entry->device) && + (PCI_FUNC(dev->devfn) == entry->function) && + (dev->vendor == entry->vendor) && + (dev->device == entry->devid)) { + dev->rom = entry->romdata; + dev->romlen = entry->pcilen; dev_printk(KERN_DEBUG, &dev->dev, "set rom to [%#010lx, %#010lx] via SETUP_PCI\n", (unsigned long)dev->rom, (unsigned long)(dev->rom + dev->romlen - 1)); } - pa_data = data->next; - iounmap(data); } + return 0; }