mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jeremy Fitzhardinge <jeremy@goop.org>
To: Ingo Molnar <mingo@elte.hu>
Cc: the arch/x86 maintainers <x86@kernel.org>,
	Matthew Wilcox <willy@linux.intel.com>,
	Joerg Roedel <joerg.roedel@amd.com>,
	FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Xen-devel <xen-devel@lists.xensource.com>,
	Alex Nixon <alex.nixon@citrix.com>,
	Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Subject: [PATCH 06/10] x86/PCI: Enable scanning of all pci functions
Date: Tue, 12 May 2009 14:48:07 -0700	[thread overview]
Message-ID: <1242164891-3859-7-git-send-email-jeremy@goop.org> (raw)
In-Reply-To: <1242164891-3859-1-git-send-email-jeremy@goop.org>

From: Alex Nixon <alex.nixon@citrix.com>

Xen may want to enable scanning of all pci functions - if for example
the device at function 0 is not passed through to the guest, but the
device at function 1 is.

[Impact: allow passthrough of just some PCI functions.]
Signed-off-by: Alex Nixon <alex.nixon@citrix.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Reviewed-by: "H. Peter Anvin" <hpa@zytor.com>
Reviewed-by: Matthew Wilcox <willy@linux.intel.com>
---
 arch/x86/include/asm/pci.h |    8 +++++++-
 arch/x86/pci/common.c      |    1 +
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index b51a1e8..092706e 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -21,6 +21,7 @@ struct pci_sysdata {
 extern int pci_routeirq;
 extern int noioapicquirk;
 extern int noioapicreroute;
+extern int pci_scan_all_fns;
 
 /* scan a bus after allocating a pci_sysdata for it */
 extern struct pci_bus *pci_scan_bus_on_node(int busno, struct pci_ops *ops,
@@ -48,7 +49,11 @@ extern unsigned int pcibios_assign_all_busses(void);
 #else
 #define pcibios_assign_all_busses()	0
 #endif
-#define pcibios_scan_all_fns(a, b)	0
+
+static inline int pcibios_scan_all_fns(struct pci_bus *bus, int devfn)
+{
+	return pci_scan_all_fns;
+}
 
 extern unsigned long pci_mem_start;
 #define PCIBIOS_MIN_IO		0x1000
@@ -130,6 +135,7 @@ extern void pci_iommu_alloc(void);
 
 /* generic pci stuff */
 #include <asm-generic/pci.h>
+#undef pcibios_scan_all_fns
 
 #ifdef CONFIG_NUMA
 /* Returns the node based on pci bus */
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 011ff45..6a522c2 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -22,6 +22,7 @@ unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2 |
 unsigned int pci_early_dump_regs;
 static int pci_bf_sort;
 int pci_routeirq;
+int pci_scan_all_fns;
 int noioapicquirk;
 #ifdef CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS
 int noioapicreroute = 0;
-- 
1.6.0.6


  parent reply	other threads:[~2009-05-13  3:14 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-12 21:48 [GIT PULL] xen dom0 PCI access Jeremy Fitzhardinge
2009-05-12 21:48 ` [PATCH 01/10] xen: Don't disable the I/O space Jeremy Fitzhardinge
2009-05-12 21:48 ` [PATCH 02/10] xen: Allow unprivileged Xen domains to create iomap pages Jeremy Fitzhardinge
2009-05-12 21:48 ` [PATCH 03/10] Xen: Rename the balloon lock Jeremy Fitzhardinge
2009-05-13  3:17   ` [Xen-devel] " Isaku Yamahata
2009-05-12 21:48 ` [PATCH 04/10] xen: Add xen_create_contiguous_region Jeremy Fitzhardinge
2009-05-12 21:48 ` [PATCH 05/10] x86/PCI: Clean up pci_cache_line_size Jeremy Fitzhardinge
2009-05-13 16:45   ` Jesse Barnes
2009-05-12 21:48 ` Jeremy Fitzhardinge [this message]
2009-05-13 16:55   ` [PATCH 06/10] x86/PCI: Enable scanning of all pci functions Jesse Barnes
2009-05-13 17:08     ` Jeremy Fitzhardinge
2009-05-13 17:23       ` Jesse Barnes
2009-05-13 20:32         ` Jeremy Fitzhardinge
2009-05-14 18:45         ` Jeremy Fitzhardinge
2009-05-14 19:15           ` Jesse Barnes
2009-05-15  0:07             ` Alex Chiang
2009-05-12 21:48 ` [PATCH 07/10] Xen/x86/PCI: Add support for the Xen PCI subsystem Jeremy Fitzhardinge
2009-05-12 21:48 ` [PATCH 08/10] x86/pci: make sure _PAGE_IOMAP it set on pci mappings Jeremy Fitzhardinge
2009-05-12 21:48 ` [PATCH 09/10] xen/pci: clean up Kconfig a bit Jeremy Fitzhardinge
2009-05-12 21:48 ` [PATCH 10/10] xen: define BIOVEC_PHYS_MERGEABLE() Jeremy Fitzhardinge
2009-05-27  7:24 [GIT PULL REPOST] xen/dom0/pci - Xen dom0 PCI access Jeremy Fitzhardinge
2009-05-27  7:24 ` [PATCH 06/10] x86/PCI: Enable scanning of all pci functions Jeremy Fitzhardinge

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1242164891-3859-7-git-send-email-jeremy@goop.org \
    --to=jeremy@goop.org \
    --cc=alex.nixon@citrix.com \
    --cc=fujita.tomonori@lab.ntt.co.jp \
    --cc=jeremy.fitzhardinge@citrix.com \
    --cc=joerg.roedel@amd.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=willy@linux.intel.com \
    --cc=x86@kernel.org \
    --cc=xen-devel@lists.xensource.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®