D53209.id164564.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D53209.id164564.diff
View Options

	diff --git a/sys/dev/iommu/busdma_iommu.c b/sys/dev/iommu/busdma_iommu.c
	--- a/sys/dev/iommu/busdma_iommu.c
	+++ b/sys/dev/iommu/busdma_iommu.c
	@@ -295,7 +295,6 @@
	} else {
	iommu_free_ctx_locked(unit, ctx);
	}
	- ctx = NULL;
	}
	return (ctx);
	}
	@@ -303,6 +302,7 @@
	struct iommu_ctx *
	iommu_get_dev_ctx(device_t dev)
	{
	+ struct iommu_ctx *ctx;
	struct iommu_unit *unit;

	unit = iommu_find(dev, bootverbose);
	@@ -313,7 +313,10 @@
	return (NULL);

	iommu_unit_pre_instantiate_ctx(unit);
	- return (iommu_instantiate_ctx(unit, dev, false));
	+ ctx = iommu_instantiate_ctx(unit, dev, false);
	+ if (ctx != NULL && (ctx->flags & IOMMU_CTX_DISABLED) != 0)
	+ ctx = NULL;
	+ return (ctx);
	}

	bus_dma_tag_t
	diff --git a/sys/x86/iommu/amd_intrmap.c b/sys/x86/iommu/amd_intrmap.c
	--- a/sys/x86/iommu/amd_intrmap.c
	+++ b/sys/x86/iommu/amd_intrmap.c
	@@ -223,9 +223,9 @@
	amdiommu_ir_find(device_t src, uint16_t ridp, bool is_iommu)
	{
	devclass_t src_class;
	- device_t requester;
	struct amdiommu_unit *unit;
	struct amdiommu_ctx *ctx;
	+ struct iommu_ctx *ioctx;
	uint32_t edte;
	uint16_t rid;
	uint8_t dte;
	@@ -255,10 +255,9 @@
	error = amdiommu_find_unit(src, &unit, &rid, &dte, &edte,
	bootverbose);
	if (error == 0) {
	- error = iommu_get_requester(src, &requester, &rid);
	- MPASS(error == 0);
	- ctx = amdiommu_get_ctx_for_dev(unit, src,
	- rid, 0, false /* XXXKIB */, false, dte, edte);
	+ ioctx = iommu_instantiate_ctx(AMD2IOMMU(unit), src, false);
	+ if (ioctx != NULL)
	+ ctx = IOCTX2CTX(ioctx);
	}
	}
	if (ridp != NULL)