WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] Re: [PATCH 06/10] x86/PCI: Enable scanning of all pci functi

To: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
Subject: [Xen-devel] Re: [PATCH 06/10] x86/PCI: Enable scanning of all pci functions
From: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Date: Thu, 14 May 2009 11:45:47 -0700
Cc: Xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxx>, Joerg Roedel <joerg.roedel@xxxxxxx>, the arch/x86 maintainers <x86@xxxxxxxxxx>, Linux Kernel Mailing List <linux-kernel@xxxxxxxxxxxxxxx>, FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>, Alex Nixon <alex.nixon@xxxxxxxxxx>, Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>, Matthew Wilcox <willy@xxxxxxxxxxxxxxx>, Ingo Molnar <mingo@xxxxxxx>
Delivery-date: Thu, 14 May 2009 11:46:20 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <20090513102316.5ef3ce4e@jbarnes-g45>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
References: <1242164891-3859-1-git-send-email-jeremy@xxxxxxxx> <1242164891-3859-7-git-send-email-jeremy@xxxxxxxx> <20090513095535.140134e1@jbarnes-g45> <4A0AFE84.2040805@xxxxxxxx> <20090513102316.5ef3ce4e@jbarnes-g45>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Thunderbird 2.0.0.21 (X11/20090320)
Jesse Barnes wrote:
Anyway it's not a big deal, this code is already ugly (a 0 define for
all arches?  why?) so you shouldn't have to spend too much time
cleaning it up.

OK, how's this as a delta (I can fold it into the previous patch if you're OK with it):

Subject: [PATCH] pci: add HAVE_ARCH_PCIBIOS_SCAN_ALL_FNS

Jesse objected to the "#undef pcibios_scan_all_fns"'s ugliness,
so replace it with the more common HAVE_ARCH_ idiom.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>

diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index 092706e..cabea93 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -134,8 +134,8 @@ extern void pci_iommu_alloc(void);
#include <asm-generic/pci-dma-compat.h>

/* generic pci stuff */
+#define HAVE_ARCH_PCIBIOS_SCAN_ALL_FNS
#include <asm-generic/pci.h>
-#undef pcibios_scan_all_fns

#ifdef CONFIG_NUMA
/* Returns the node based on pci bus */
diff --git a/include/asm-generic/pci.h b/include/asm-generic/pci.h
index c36a77d..9ad9cb7 100644
--- a/include/asm-generic/pci.h
+++ b/include/asm-generic/pci.h
@@ -43,7 +43,9 @@ pcibios_select_root(struct pci_dev *pdev, struct resource 
*res)
        return root;
}

+#ifndef HAVE_ARCH_PCIBIOS_SCAN_ALL_FNS
#define pcibios_scan_all_fns(a, b)      0
+#endif

#ifndef HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)



Thanks,
   J

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel

<Prev in Thread] Current Thread [Next in Thread>