D52406.1794809482.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D52406.1794809482.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
	@@ -141,16 +141,33 @@
	*/
	for (;;) {
	pci = device_get_parent(l);
	- KASSERT(pci != NULL, ("iommu_get_requester(%s): NULL parent "
	- "for %s", device_get_name(dev), device_get_name(l)));
	- KASSERT(device_get_devclass(pci) == pci_class,
	- ("iommu_get_requester(%s): non-pci parent %s for %s",
	- device_get_name(dev), device_get_name(pci),
	- device_get_name(l)));
	+ if (pci == NULL) {
	+ if (bootverbose) {
	+ printf(
	+ "iommu_get_requester(%s): NULL parent for %s\n",
	+ device_get_name(dev), device_get_name(l));
	+ }
	+ return (requester);
	+ }
	+ if (device_get_devclass(pci) != pci_class) {
	+ if (bootverbose) {
	+ printf(
	+ "iommu_get_requester(%s): non-pci parent %s for %s\n",
	+ device_get_name(dev), device_get_name(pci),
	+ device_get_name(l));
	+ }
	+ return (requester);
	+ }

	pcib = device_get_parent(pci);
	- KASSERT(pcib != NULL, ("iommu_get_requester(%s): NULL bridge "
	- "for %s", device_get_name(dev), device_get_name(pci)));
	+ if (pcib == NULL) {
	+ if (bootverbose) {
	+ printf(
	+ "iommu_get_requester(%s): NULL bridge for %s\n",
	+ device_get_name(dev), device_get_name(pci));
	+ }
	+ return (requester);
	+ }

	/*
	* The parent of our "bridge" isn't another PCI bus,