Commit 4a627a25 authored by Tina Zhang's avatar Tina Zhang Committed by Joerg Roedel
Browse files

iommu/vt-d: Remove BUG_ON in handling iotlb cache invalidation 



VT-d iotlb cache invalidation request with unexpected type is considered
as a bug to developers, which can be fixed. So, when such kind of issue
comes out, it needs to be reported through the kernel log, instead of
halting the system. Replacing BUG_ON with warning reporting.

Signed-off-by: default avatarTina Zhang <tina.zhang@intel.com>
Link: https://lore.kernel.org/r/20230406065944.2773296-4-tina.zhang@intel.com


Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 35dc5d89

drivers/iommu/intel/iommu.c

+8 −3
Original line number Diff line number Diff line
@@ -1272,7 +1272,9 @@ static void __iommu_flush_context(struct intel_iommu *iommu, 
			| DMA_CCMD_SID(source_id) | DMA_CCMD_FM(function_mask);

		break;

	default:

		BUG();

		pr_warn("%s: Unexpected context-cache invalidation type 0x%llx\n",

			iommu->name, type);

		return;

	}

	val |= DMA_CCMD_ICC;
@@ -1308,7 +1310,9 @@ static void __iommu_flush_iotlb(struct intel_iommu *iommu, u16 did, 
		val_iva = size_order | addr;

		break;

	default:

		BUG();

		pr_warn("%s: Unexpected iotlb invalidation type 0x%llx\n",

			iommu->name, type);

		return;

	}

	/* Note: set drain read/write */

#if 0
@@ -1483,7 +1487,8 @@ static void iommu_flush_iotlb_psi(struct intel_iommu *iommu, 
	uint64_t addr = (uint64_t)pfn << VTD_PAGE_SHIFT;

	u16 did = domain_id_iommu(domain, iommu);



	BUG_ON(pages == 0);

	if (WARN_ON(!pages))

		return;



	if (ih)

		ih = 1 << 6;