Commit c94f732e authored by Nirmal Patel's avatar Nirmal Patel Committed by Lorenzo Pieralisi
Browse files

PCI: vmd: Revert 2565e5b6 ("PCI: vmd: Do not disable MSI-X remapping if... 

PCI: vmd: Revert 2565e5b6 ("PCI: vmd: Do not disable MSI-X remapping if interrupt remapping is enabled by IOMMU.")

Revert 2565e5b6 ("PCI: vmd: Do not disable MSI-X remapping if
interrupt remapping is enabled by IOMMU.")

The commit 2565e5b6 was added as a workaround to keep MSI-X
remapping enabled if IOMMU enables interrupt remapping. VMD would keep
running in low performance mode. There is no dependency between MSI-X
remapping by VMD and interrupt remapping by IOMMU.

Link: https://lore.kernel.org/r/20220511095707.25403-3-nirmal.patel@linux.intel.com


Signed-off-by: default avatarNirmal Patel <nirmal.patel@linux.intel.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
parent 886e6710

drivers/pci/controller/vmd.c

+1 −3
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 


#include <linux/device.h>

#include <linux/interrupt.h>

#include <linux/iommu.h>

#include <linux/irq.h>

#include <linux/kernel.h>

#include <linux/module.h>
@@ -813,8 +812,7 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) 
	 * acceptable because the guest is usually CPU-limited and MSI

	 * remapping doesn't become a performance bottleneck.

	 */

	if (iommu_capable(vmd->dev->dev.bus, IOMMU_CAP_INTR_REMAP) ||

	    !(features & VMD_FEAT_CAN_BYPASS_MSI_REMAP) ||

	if (!(features & VMD_FEAT_CAN_BYPASS_MSI_REMAP) ||

	    offset[0] || offset[1]) {

		ret = vmd_alloc_irqs(vmd);

		if (ret)