Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90ca3859 authored by Gary R Hook's avatar Gary R Hook Committed by Joerg Roedel
Browse files

iommu/amd: Use dev_err to send events to the system log 



Remove printk and use a more preferable error logging function.

Signed-off-by: default avatarGary R Hook <gary.hook@amd.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent eb5ecd1a

drivers/iommu/amd_iommu.c

+28 −27
Original line number Diff line number Diff line
@@ -547,6 +547,7 @@ static void amd_iommu_report_page_fault(u16 devid, u16 domain_id, 


static void iommu_print_event(struct amd_iommu *iommu, void *__evt)

{

	struct device *dev = iommu->iommu.dev;

	int type, devid, domid, flags;

	volatile u32 *event = __evt;

	int count = 0;
@@ -573,53 +574,53 @@ static void iommu_print_event(struct amd_iommu *iommu, void *__evt) 
		amd_iommu_report_page_fault(devid, domid, address, flags);

		return;

	} else {

		printk(KERN_ERR "AMD-Vi: Event logged [");

		dev_err(dev, "AMD-Vi: Event logged [");

	}



	switch (type) {

	case EVENT_TYPE_ILL_DEV:

		printk("ILLEGAL_DEV_TABLE_ENTRY device=%02x:%02x.%x "

		dev_err(dev, "ILLEGAL_DEV_TABLE_ENTRY device=%02x:%02x.%x "

			"address=0x%016llx flags=0x%04x]\n",

			PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),

			address, flags);

		dump_dte_entry(devid);

		break;

	case EVENT_TYPE_DEV_TAB_ERR:

		printk("DEV_TAB_HARDWARE_ERROR device=%02x:%02x.%x "

		dev_err(dev, "DEV_TAB_HARDWARE_ERROR device=%02x:%02x.%x "

			"address=0x%016llx flags=0x%04x]\n",

			PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),

			address, flags);

		break;

	case EVENT_TYPE_PAGE_TAB_ERR:

		printk("PAGE_TAB_HARDWARE_ERROR device=%02x:%02x.%x "

		dev_err(dev, "PAGE_TAB_HARDWARE_ERROR device=%02x:%02x.%x "

			"domain=0x%04x address=0x%016llx flags=0x%04x]\n",

			PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),

			domid, address, flags);

		break;

	case EVENT_TYPE_ILL_CMD:

		printk("ILLEGAL_COMMAND_ERROR address=0x%016llx]\n", address);

		dev_err(dev, "ILLEGAL_COMMAND_ERROR address=0x%016llx]\n", address);

		dump_command(address);

		break;

	case EVENT_TYPE_CMD_HARD_ERR:

		printk("COMMAND_HARDWARE_ERROR address=0x%016llx "

		dev_err(dev, "COMMAND_HARDWARE_ERROR address=0x%016llx "

			"flags=0x%04x]\n", address, flags);

		break;

	case EVENT_TYPE_IOTLB_INV_TO:

		printk("IOTLB_INV_TIMEOUT device=%02x:%02x.%x "

		dev_err(dev, "IOTLB_INV_TIMEOUT device=%02x:%02x.%x "

			"address=0x%016llx]\n",

			PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),

			address);

		break;

	case EVENT_TYPE_INV_DEV_REQ:

		printk("INVALID_DEVICE_REQUEST device=%02x:%02x.%x "

		dev_err(dev, "INVALID_DEVICE_REQUEST device=%02x:%02x.%x "

			"address=0x%016llx flags=0x%04x]\n",

			PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),

			address, flags);

		break;

	default:

		printk(KERN_ERR "UNKNOWN type=0x%02x event[0]=0x%08x "

		       "event[1]=0x%08x event[2]=0x%08x event[3]=0x%08x\n",

		       type, event[0], event[1], event[2], event[3]);

		dev_err(dev, KERN_ERR "UNKNOWN event[0]=0x%08x event[1]=0x%08x "

			"event[2]=0x%08x event[3]=0x%08x\n",

			event[0], event[1], event[2], event[3]);

	}



	memset(__evt, 0, 4 * sizeof(u32));