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

Commit 1a21ee1a authored by Joerg Roedel's avatar Joerg Roedel
Browse files

iommu/amd: Fix line-break in error log reporting 



With the switch to dev_err for reporting errors from the
iommu log there was an unwanted newline introduced. The
reason was that the reporting was done in multiple dev_err()
calls, and dev_err adds a newline after every call.

Fix it by printing the log messages with only one dev_err()
call.

Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 101fa037

drivers/iommu/amd_iommu.c

+10 −12
Original line number Diff line number Diff line
@@ -540,7 +540,7 @@ static void amd_iommu_report_page_fault(u16 devid, u16 domain_id, 
		dev_data = get_dev_data(&pdev->dev);



	if (dev_data && __ratelimit(&dev_data->rs)) {

		dev_err(&pdev->dev, "AMD-Vi: Event logged [IO_PAGE_FAULT domain=0x%04x address=0x%016llx flags=0x%04x]\n",

		dev_err(&pdev->dev, "Event logged [IO_PAGE_FAULT domain=0x%04x address=0x%016llx flags=0x%04x]\n",

			domain_id, address, flags);

	} else if (printk_ratelimit()) {

		pr_err("Event logged [IO_PAGE_FAULT device=%02x:%02x.%x domain=0x%04x address=0x%016llx flags=0x%04x]\n",
@@ -580,43 +580,41 @@ static void iommu_print_event(struct amd_iommu *iommu, void *__evt) 
	if (type == EVENT_TYPE_IO_FAULT) {

		amd_iommu_report_page_fault(devid, pasid, address, flags);

		return;

	} else {

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

	}



	switch (type) {

	case EVENT_TYPE_ILL_DEV:

		dev_err(dev, "ILLEGAL_DEV_TABLE_ENTRY device=%02x:%02x.%x pasid=0x%05x address=0x%016llx flags=0x%04x]\n",

		dev_err(dev, "Event logged [ILLEGAL_DEV_TABLE_ENTRY device=%02x:%02x.%x pasid=0x%05x address=0x%016llx flags=0x%04x]\n",

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

			pasid, address, flags);

		dump_dte_entry(devid);

		break;

	case EVENT_TYPE_DEV_TAB_ERR:

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

		dev_err(dev, "Event logged [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:

		dev_err(dev, "PAGE_TAB_HARDWARE_ERROR device=%02x:%02x.%x domain=0x%04x address=0x%016llx flags=0x%04x]\n",

		dev_err(dev, "Event logged [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),

			pasid, address, flags);

		break;

	case EVENT_TYPE_ILL_CMD:

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

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

		dump_command(address);

		break;

	case EVENT_TYPE_CMD_HARD_ERR:

		dev_err(dev, "COMMAND_HARDWARE_ERROR address=0x%016llx flags=0x%04x]\n",

		dev_err(dev, "Event logged [COMMAND_HARDWARE_ERROR address=0x%016llx flags=0x%04x]\n",

			address, flags);

		break;

	case EVENT_TYPE_IOTLB_INV_TO:

		dev_err(dev, "IOTLB_INV_TIMEOUT device=%02x:%02x.%x address=0x%016llx]\n",

		dev_err(dev, "Event logged [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:

		dev_err(dev, "INVALID_DEVICE_REQUEST device=%02x:%02x.%x pasid=0x%05x address=0x%016llx flags=0x%04x]\n",

		dev_err(dev, "Event logged [INVALID_DEVICE_REQUEST device=%02x:%02x.%x pasid=0x%05x address=0x%016llx flags=0x%04x]\n",

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

			pasid, address, flags);

		break;
@@ -624,12 +622,12 @@ static void iommu_print_event(struct amd_iommu *iommu, void *__evt) 
		pasid = ((event[0] >> 16) & 0xFFFF)

			| ((event[1] << 6) & 0xF0000);

		tag = event[1] & 0x03FF;

		dev_err(dev, "INVALID_PPR_REQUEST device=%02x:%02x.%x pasid=0x%05x address=0x%016llx flags=0x%04x]\n",

		dev_err(dev, "Event logged [INVALID_PPR_REQUEST device=%02x:%02x.%x pasid=0x%05x address=0x%016llx flags=0x%04x]\n",

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

			pasid, address, flags);

		break;

	default:

		dev_err(dev, "UNKNOWN event[0]=0x%08x event[1]=0x%08x event[2]=0x%08x event[3]=0x%08x\n",

		dev_err(dev, "Event logged [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]);

	}