Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1434453

[PATCH v3 7/7] PCI: Add a macro to set default alignment for all PCI devices

Show all headers | View raw

Now we can use something like "pci=resource_alignment=*:*:*.*:noresize"
to enforce the alignment of all MMIO BARs to be at least PAGE_SIZE so
that we can passthrough sub-page(size < PAGE_SIZE) BARs to guest in
VFIO module.

But sometimes we may want to enable this feature by default on
some platforms such as PowerNV platform which would easily see those
sub-page BARs because of its 64K page. To achieve that, we add a
macro PCIBIOS_DEFAULT_ALIGNMENT to set default alignment for all
PCI devices and define it on PowerNV platform.

Signed-off-by: Yongji Xie <xyjxie@linux.vnet.ibm.com>
---
 arch/powerpc/include/asm/pci.h |    4 ++++
 drivers/pci/pci.c              |    4 ++++
 2 files changed, 8 insertions(+)

diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h
index a6f3ac0..b0d76b8 100644
--- a/arch/powerpc/include/asm/pci.h
+++ b/arch/powerpc/include/asm/pci.h
@@ -28,6 +28,10 @@
 #define PCIBIOS_MIN_IO		0x1000
 #define PCIBIOS_MIN_MEM		0x10000000
 
+#ifdef CONFIG_PPC_POWERNV
+#define PCIBIOS_DEFAULT_ALIGNMENT	PAGE_SIZE
+#endif
+
 struct pci_dev;
 
 /* Values for the `which' argument to sys_pciconfig_iobase syscall.  */
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 2e15ac8..dde0cce 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -4761,6 +4761,10 @@ static resource_size_t pci_specified_resource_alignment(struct pci_dev *dev,
 	char *p;
 	bool invalid = false;
 
+#ifdef PCIBIOS_DEFAULT_ALIGNMENT
+	align = PCIBIOS_DEFAULT_ALIGNMENT;
+	*resize = false;
+#endif
 	spin_lock(&resource_alignment_lock);
 	p = resource_alignment_param;
 	if (pci_has_flag(PCI_PROBE_ONLY)) {
-- 
1.7.9.5

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 0/7] PCI: Add support for enforcing all MMIO BARs not to share PAGE_SIZE Yongji Xie <xyjxie@linux.vnet.ibm.com> - 2016-06-30 13:00 +0200
  [PATCH v3 3/7] PCI: Do not disable memory decoding in pci_reassigndev_resource_alignment() Yongji Xie <xyjxie@linux.vnet.ibm.com> - 2016-06-30 13:00 +0200
    Re: [PATCH v3 3/7] PCI: Do not disable memory decoding in  pci_reassigndev_resource_alignment() Gavin Shan <gwshan@linux.vnet.ibm.com> - 2016-07-01 03:00 +0200
      Re: [PATCH v3 3/7] PCI: Do not disable memory decoding in  pci_reassigndev_resource_alignment() Yongji Xie <xyjxie@linux.vnet.ibm.com> - 2016-07-01 10:10 +0200
  [PATCH v3 1/7] PCI: Ignore enforced alignment when kernel uses existing firmware setup Yongji Xie <xyjxie@linux.vnet.ibm.com> - 2016-06-30 13:00 +0200
    Re: [PATCH v3 1/7] PCI: Ignore enforced alignment when kernel uses  existing firmware setup Gavin Shan <gwshan@linux.vnet.ibm.com> - 2016-07-01 02:30 +0200
      Re: [PATCH v3 1/7] PCI: Ignore enforced alignment when kernel uses  existing firmware setup Yongji Xie <xyjxie@linux.vnet.ibm.com> - 2016-07-01 06:50 +0200
  [PATCH v3 2/7] PCI: Ignore enforced alignment to VF BARs Yongji Xie <xyjxie@linux.vnet.ibm.com> - 2016-06-30 13:00 +0200
    Re: [PATCH v3 2/7] PCI: Ignore enforced alignment to VF BARs Gavin Shan <gwshan@linux.vnet.ibm.com> - 2016-07-01 02:50 +0200
      Re: [PATCH v3 2/7] PCI: Ignore enforced alignment to VF BARs Yongji Xie <xyjxie@linux.vnet.ibm.com> - 2016-07-01 07:30 +0200
        Re: [PATCH v3 2/7] PCI: Ignore enforced alignment to VF BARs Gavin Shan <gwshan@linux.vnet.ibm.com> - 2016-07-01 08:10 +0200
          Re: [PATCH v3 2/7] PCI: Ignore enforced alignment to VF BARs Yongji Xie <xyjxie@linux.vnet.ibm.com> - 2016-07-01 08:50 +0200
            Re: [PATCH v3 2/7] PCI: Ignore enforced alignment to VF BARs Gavin Shan <gwshan@linux.vnet.ibm.com> - 2016-07-02 02:40 +0200
  [PATCH v3 7/7] PCI: Add a macro to set default alignment for all PCI devices Yongji Xie <xyjxie@linux.vnet.ibm.com> - 2016-06-30 13:00 +0200
  [PATCH v3 4/7] PCI: Add a new option for resource_alignment to reassign alignment Yongji Xie <xyjxie@linux.vnet.ibm.com> - 2016-06-30 13:00 +0200
    Re: [PATCH v3 4/7] PCI: Add a new option for resource_alignment to  reassign alignment Gavin Shan <gwshan@linux.vnet.ibm.com> - 2016-07-01 05:40 +0200
      Re: [PATCH v3 4/7] PCI: Add a new option for resource_alignment to  reassign alignment Yongji Xie <xyjxie@linux.vnet.ibm.com> - 2016-07-01 09:00 +0200
  [PATCH v3 6/7] PCI: Add support for enforcing all MMIO BARs to be page aligned Yongji Xie <xyjxie@linux.vnet.ibm.com> - 2016-06-30 13:00 +0200
  [PATCH v3 5/7] PCI: Do not use IORESOURCE_STARTALIGN to identify bridge resources Yongji Xie <xyjxie@linux.vnet.ibm.com> - 2016-06-30 13:00 +0200
    Re: [PATCH v3 5/7] PCI: Do not use IORESOURCE_STARTALIGN to identify  bridge resources Gavin Shan <gwshan@linux.vnet.ibm.com> - 2016-07-01 04:40 +0200
      Re: [PATCH v3 5/7] PCI: Do not use IORESOURCE_STARTALIGN to identify  bridge resources Yongji Xie <xyjxie@linux.vnet.ibm.com> - 2016-07-01 09:10 +0200
        Re: [PATCH v3 5/7] PCI: Do not use IORESOURCE_STARTALIGN to identify  bridge resources Gavin Shan <gwshan@linux.vnet.ibm.com> - 2016-07-02 02:40 +0200

csiph-web