Commit e433110e authored by Inochi Amaoto's avatar Inochi Amaoto Committed by Bjorn Helgaas
Browse files

PCI: vmd: Override irq_startup()/irq_shutdown() in vmd_init_dev_msi_info() 



Since commit 54f45a30 ("PCI/MSI: Add startup/shutdown for per
device domains") set callback irq_startup() and irq_shutdown() of
the struct pci_msi[x]_template, __irq_startup() will always invokes
irq_startup() callback instead of irq_enable() callback overridden
in vmd_init_dev_msi_info(). This will not start the IRQ correctly.

Also override irq_startup()/irq_shutdown() in vmd_init_dev_msi_info(),
so the irq_startup() can invoke the real logic.

Fixes: 54f45a30 ("PCI/MSI: Add startup/shutdown for per device domains")
Reported-by: default avatarKenneth Crudup <kenny@panix.com>
Closes: https://lore.kernel.org/r/8a923590-5b3a-406f-a324-7bd1cf894d8f@panix.com/


Reported-by: default avatarGenes Lists <lists@sapience.com>
Closes: https://lore.kernel.org/r/4b392af8847cc19720ffcd53865f60ab3edc56b3.camel@sapience.com


Reported-by: default avatarTodd Brandt <todd.e.brandt@intel.com>
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=220658


Reported-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Closes: https://lore.kernel.org/r/8d6887a5-60bc-423c-8f7a-87b4ab739f6a@hartkopp.net


Reported-by: default avatarHervé <herve@dxcv.net>
Signed-off-by: default avatarInochi Amaoto <inochiama@gmail.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Tested-by: default avatarKenneth R. Crudup <kenny@panix.com>
Tested-by: default avatarGenes Lists <lists@sapience.com>
Tested-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Tested-by: default avatarTodd Brandt <todd.e.brandt@linux.intel.com>
Tested-by: default avatarHervé <herve@dxcv.net>
Cc: stable@vger.kernel.org
Link: https://patch.msgid.link/20251014014607.612586-1-inochiama@gmail.com
parent 469276c0

drivers/pci/controller/vmd.c

+13 −0
Original line number Diff line number Diff line
@@ -192,6 +192,12 @@ static void vmd_pci_msi_enable(struct irq_data *data) 
	data->chip->irq_unmask(data);

}



static unsigned int vmd_pci_msi_startup(struct irq_data *data)

{

	vmd_pci_msi_enable(data);

	return 0;

}



static void vmd_irq_disable(struct irq_data *data)

{

	struct vmd_irq *vmdirq = data->chip_data;
@@ -210,6 +216,11 @@ static void vmd_pci_msi_disable(struct irq_data *data) 
	vmd_irq_disable(data->parent_data);

}



static void vmd_pci_msi_shutdown(struct irq_data *data)

{

	vmd_pci_msi_disable(data);

}



static struct irq_chip vmd_msi_controller = {

	.name			= "VMD-MSI",

	.irq_compose_msi_msg	= vmd_compose_msi_msg,
@@ -309,6 +320,8 @@ static bool vmd_init_dev_msi_info(struct device *dev, struct irq_domain *domain, 
	if (!msi_lib_init_dev_msi_info(dev, domain, real_parent, info))

		return false;



	info->chip->irq_startup		= vmd_pci_msi_startup;

	info->chip->irq_shutdown	= vmd_pci_msi_shutdown;

	info->chip->irq_enable		= vmd_pci_msi_enable;

	info->chip->irq_disable		= vmd_pci_msi_disable;

	return true;