Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c52f51c authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' into next 

* pci/misc:
  PCI: Stop clearing bridge Secondary Status when setting up I/O aperture
  PCI: Prevent bus conflicts while checking for bridge apertures
  PCI: Drop "irq" param from *_restore_msi_irqs()
  PCI/portdrv: Remove superfluous name cast
  PCI: Clear NumVFs when disabling SR-IOV in sriov_init()
parents fa437804 5b764b83

arch/x86/include/asm/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ extern void pci_iommu_alloc(void); 
struct msi_desc;

int native_setup_msi_irqs(struct pci_dev *dev, int nvec, int type);

void native_teardown_msi_irq(unsigned int irq);

void native_restore_msi_irqs(struct pci_dev *dev, int irq);

void native_restore_msi_irqs(struct pci_dev *dev);

int setup_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc,

		  unsigned int irq_base, unsigned int irq_offset);

#else

arch/x86/include/asm/x86_init.h

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ struct x86_msi_ops { 
			       u8 hpet_id);

	void (*teardown_msi_irq)(unsigned int irq);

	void (*teardown_msi_irqs)(struct pci_dev *dev);

	void (*restore_msi_irqs)(struct pci_dev *dev, int irq);

	void (*restore_msi_irqs)(struct pci_dev *dev);

	int  (*setup_hpet_msi)(unsigned int irq, unsigned int id);

	u32 (*msi_mask_irq)(struct msi_desc *desc, u32 mask, u32 flag);

	u32 (*msix_mask_irq)(struct msi_desc *desc, u32 flag);

arch/x86/kernel/x86_init.c

+2 −2
Original line number Diff line number Diff line
@@ -136,9 +136,9 @@ void arch_teardown_msi_irq(unsigned int irq) 
	x86_msi.teardown_msi_irq(irq);

}



void arch_restore_msi_irqs(struct pci_dev *dev, int irq)

void arch_restore_msi_irqs(struct pci_dev *dev)

{

	x86_msi.restore_msi_irqs(dev, irq);

	x86_msi.restore_msi_irqs(dev);

}

u32 arch_msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag)

{

arch/x86/pci/xen.c

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) 
	return ret;

}



static void xen_initdom_restore_msi_irqs(struct pci_dev *dev, int irq)

static void xen_initdom_restore_msi_irqs(struct pci_dev *dev)

{

	int ret = 0;

drivers/pci/iov.c

+1 −0
Original line number Diff line number Diff line
@@ -441,6 +441,7 @@ static int sriov_init(struct pci_dev *dev, int pos) 


found:

	pci_write_config_word(dev, pos + PCI_SRIOV_CTRL, ctrl);

	pci_write_config_word(dev, pos + PCI_SRIOV_NUM_VF, 0);

	pci_read_config_word(dev, pos + PCI_SRIOV_VF_OFFSET, &offset);

	pci_read_config_word(dev, pos + PCI_SRIOV_VF_STRIDE, &stride);

	if (!offset || (total > 1 && !stride))