Commit 03f56e42 authored by Yijing Wang's avatar Yijing Wang Committed by Bjorn Helgaas
Browse files

Revert "PCI: Add x86_msi.msi_mask_irq() and msix_mask_irq()" 



The problem fixed by 0e4ccb15 ("PCI: Add x86_msi.msi_mask_irq() and
msix_mask_irq()") has been fixed in a simpler way by a previous commit
("PCI/MSI: Add pci_msi_ignore_mask to prevent writes to MSI/MSI-X Mask
Bits").

The msi_mask_irq() and msix_mask_irq() x86_msi_ops added by 0e4ccb15
are no longer needed, so revert the commit.

default_msi_mask_irq() and default_msix_mask_irq() were added by
0e4ccb15 and are still used by s390, so keep them for now.

[bhelgaas: changelog]
Signed-off-by: default avatarYijing Wang <wangyijing@huawei.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
CC: xen-devel@lists.xenproject.org
parent 38737d82

arch/x86/include/asm/x86_init.h

+0 −3
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ struct x86_platform_ops { 


struct pci_dev;

struct msi_msg;

struct msi_desc;



struct x86_msi_ops {

	int (*setup_msi_irqs)(struct pci_dev *dev, int nvec, int type);
@@ -183,8 +182,6 @@ struct x86_msi_ops { 
	void (*teardown_msi_irqs)(struct pci_dev *dev);

	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);

};



struct IO_APIC_route_entry;

arch/x86/kernel/x86_init.c

+0 −10
Original line number Diff line number Diff line
@@ -116,8 +116,6 @@ struct x86_msi_ops x86_msi = { 
	.teardown_msi_irqs	= default_teardown_msi_irqs,

	.restore_msi_irqs	= default_restore_msi_irqs,

	.setup_hpet_msi		= default_setup_hpet_msi,

	.msi_mask_irq		= default_msi_mask_irq,

	.msix_mask_irq		= default_msix_mask_irq,

};



/* MSI arch specific hooks */
@@ -140,14 +138,6 @@ void arch_restore_msi_irqs(struct pci_dev *dev) 
{

	x86_msi.restore_msi_irqs(dev);

}

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

{

	return x86_msi.msi_mask_irq(desc, mask, flag);

}

u32 arch_msix_mask_irq(struct msi_desc *desc, u32 flag)

{

	return x86_msi.msix_mask_irq(desc, flag);

}

#endif



struct x86_io_apic_ops x86_io_apic_ops = {

arch/x86/pci/xen.c

+1 −12
Original line number Diff line number Diff line
@@ -394,14 +394,7 @@ static void xen_teardown_msi_irq(unsigned int irq) 
{

	xen_destroy_irq(irq);

}

static u32 xen_nop_msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag)

{

	return 0;

}

static u32 xen_nop_msix_mask_irq(struct msi_desc *desc, u32 flag)

{

	return 0;

}



#endif



int __init pci_xen_init(void)
@@ -425,8 +418,6 @@ int __init pci_xen_init(void) 
	x86_msi.setup_msi_irqs = xen_setup_msi_irqs;

	x86_msi.teardown_msi_irq = xen_teardown_msi_irq;

	x86_msi.teardown_msi_irqs = xen_teardown_msi_irqs;

	x86_msi.msi_mask_irq = xen_nop_msi_mask_irq;

	x86_msi.msix_mask_irq = xen_nop_msix_mask_irq;

	pci_msi_ignore_mask = 1;

#endif

	return 0;
@@ -507,8 +498,6 @@ int __init pci_xen_initial_domain(void) 
	x86_msi.setup_msi_irqs = xen_initdom_setup_msi_irqs;

	x86_msi.teardown_msi_irq = xen_teardown_msi_irq;

	x86_msi.restore_msi_irqs = xen_initdom_restore_msi_irqs;

	x86_msi.msi_mask_irq = xen_nop_msi_mask_irq;

	x86_msi.msix_mask_irq = xen_nop_msix_mask_irq;

	pci_msi_ignore_mask = 1;

#endif

	xen_setup_acpi_sci();

drivers/pci/msi.c

+6 −16
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static inline __attribute_const__ u32 msi_mask(unsigned x) 
 * reliably as devices without an INTx disable bit will then generate a

 * level IRQ which will never be cleared.

 */

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

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

{

	u32 mask_bits = desc->masked;
@@ -178,14 +178,9 @@ u32 default_msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag) 
	return mask_bits;

}



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

{

	return default_msi_mask_irq(desc, mask, flag);

}



static void msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag)

{

	desc->masked = arch_msi_mask_irq(desc, mask, flag);

	desc->masked = __msi_mask_irq(desc, mask, flag);

}



/*
@@ -195,7 +190,7 @@ static void msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag) 
 * file.  This saves a few milliseconds when initialising devices with lots

 * of MSI-X interrupts.

 */

u32 default_msix_mask_irq(struct msi_desc *desc, u32 flag)

u32 __msix_mask_irq(struct msi_desc *desc, u32 flag)

{

	u32 mask_bits = desc->masked;

	unsigned offset = desc->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +
@@ -212,14 +207,9 @@ u32 default_msix_mask_irq(struct msi_desc *desc, u32 flag) 
	return mask_bits;

}



__weak u32 arch_msix_mask_irq(struct msi_desc *desc, u32 flag)

{

	return default_msix_mask_irq(desc, flag);

}



static void msix_mask_irq(struct msi_desc *desc, u32 flag)

{

	desc->masked = arch_msix_mask_irq(desc, flag);

	desc->masked = __msix_mask_irq(desc, flag);

}



static void msi_set_mask_bit(struct irq_data *data, u32 flag)
@@ -874,7 +864,7 @@ void pci_msi_shutdown(struct pci_dev *dev) 
	/* Return the device with MSI unmasked as initial states */

	mask = msi_mask(desc->msi_attrib.multi_cap);

	/* Keep cached state to be restored */

	arch_msi_mask_irq(desc, mask, ~mask);

	__msi_mask_irq(desc, mask, ~mask);



	/* Restore dev->irq to its default pin-assertion irq */

	dev->irq = desc->msi_attrib.default_irq;
@@ -972,7 +962,7 @@ void pci_msix_shutdown(struct pci_dev *dev) 
	/* Return the device with MSI-X masked as initial states */

	list_for_each_entry(entry, &dev->msi_list, list) {

		/* Keep cached states to be restored */

		arch_msix_mask_irq(entry, 1);

		__msix_mask_irq(entry, 1);

	}



	msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_ENABLE, 0);

include/linux/msi.h

+4 −2
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ void __write_msi_msg(struct msi_desc *entry, struct msi_msg *msg); 
void read_msi_msg(unsigned int irq, struct msi_msg *msg);

void get_cached_msi_msg(unsigned int irq, struct msi_msg *msg);

void write_msi_msg(unsigned int irq, struct msi_msg *msg);

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

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



struct msi_desc {

	struct {
@@ -62,8 +64,8 @@ void arch_restore_msi_irqs(struct pci_dev *dev); 


void default_teardown_msi_irqs(struct pci_dev *dev);

void default_restore_msi_irqs(struct pci_dev *dev);

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

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

#define default_msi_mask_irq  __msi_mask_irq

#define default_msix_mask_irq  __msix_mask_irq



struct msi_chip {

	struct module *owner;

CRA Git | Maintained and supported by SUSTech CRA and CCSE