PCI/AER: Log messages with pci_dev, not pcie_device (9cc6f75b) · Commits · 戴 / test

drivers/pci/pcie/aer.c

+12 −7

Original line number	Diff line number	Diff line
		@@ -12,6 +12,9 @@
		* Andrew Patterson <andrew.patterson@hp.com>
		*/

		#define pr_fmt(fmt) "AER: " fmt
		#define dev_fmt pr_fmt

		#include <linux/cper.h>
		#include <linux/pci.h>
		#include <linux/pci-acpi.h>
		@@ -779,10 +782,11 @@ static void aer_print_port_info(struct pci_dev dev, struct aer_err_info info)
		u8 bus = info->id >> 8;
		u8 devfn = info->id & 0xff;

		pci_info(dev, "AER: %s%s error received: %04x:%02x:%02x.%d\n",
		pci_info(dev, "%s%s error received: %04x:%02x:%02x.%d\n",
		info->multi_error_valid ? "Multiple " : "",
		aer_error_severity_string[info->severity],
		pci_domain_nr(dev->bus), bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
		pci_domain_nr(dev->bus), bus, PCI_SLOT(devfn),
		PCI_FUNC(devfn));
		}

		#ifdef CONFIG_ACPI_APEI_PCIEAER
		@@ -1376,23 +1380,24 @@ static int aer_probe(struct pcie_device *dev)
		int status;
		struct aer_rpc *rpc;
		struct device *device = &dev->device;
		struct pci_dev *port = dev->port;

		rpc = devm_kzalloc(device, sizeof(struct aer_rpc), GFP_KERNEL);
		if (!rpc)
		return -ENOMEM;

		rpc->rpd = dev->port;
		rpc->rpd = port;
		set_service_data(dev, rpc);

		status = devm_request_threaded_irq(device, dev->irq, aer_irq, aer_isr,
		IRQF_SHARED, "aerdrv", dev);
		if (status) {
		dev_err(device, "request AER IRQ %d failed\n", dev->irq);
		pci_err(port, "request AER IRQ %d failed\n", dev->irq);
		return status;
		}

		aer_enable_rootport(rpc);
		dev_info(device, "AER enabled with IRQ %d\n", dev->irq);
		pci_info(port, "enabled with IRQ %d\n", dev->irq);
		return 0;
		}

drivers/pci/pcie/aer_inject.c

+10 −10

Original line number	Diff line number	Diff line
		@@ -12,6 +12,8 @@
		* Huang Ying <ying.huang@intel.com>
		*/

		#define dev_fmt(fmt) "aer_inject: " fmt

		#include <linux/module.h>
		#include <linux/init.h>
		#include <linux/irq.h>
		@@ -332,14 +334,14 @@ static int aer_inject(struct aer_error_inj *einj)
		return -ENODEV;
		rpdev = pcie_find_root_port(dev);
		if (!rpdev) {
		pci_err(dev, "aer_inject: Root port not found\n");
		pci_err(dev, "Root port not found\n");
		ret = -ENODEV;
		goto out_put;
		}

		pos_cap_err = dev->aer_cap;
		if (!pos_cap_err) {
		pci_err(dev, "aer_inject: Device doesn't support AER\n");
		pci_err(dev, "Device doesn't support AER\n");
		ret = -EPROTONOSUPPORT;
		goto out_put;
		}
		@@ -350,7 +352,7 @@ static int aer_inject(struct aer_error_inj *einj)

		rp_pos_cap_err = rpdev->aer_cap;
		if (!rp_pos_cap_err) {
		pci_err(rpdev, "aer_inject: Root port doesn't support AER\n");
		pci_err(rpdev, "Root port doesn't support AER\n");
		ret = -EPROTONOSUPPORT;
		goto out_put;
		}
		@@ -398,14 +400,14 @@ static int aer_inject(struct aer_error_inj *einj)
		if (!aer_mask_override && einj->cor_status &&
		!(einj->cor_status & ~cor_mask)) {
		ret = -EINVAL;
		pci_warn(dev, "aer_inject: The correctable error(s) is masked by device\n");
		pci_warn(dev, "The correctable error(s) is masked by device\n");
		spin_unlock_irqrestore(&inject_lock, flags);
		goto out_put;
		}
		if (!aer_mask_override && einj->uncor_status &&
		!(einj->uncor_status & ~uncor_mask)) {
		ret = -EINVAL;
		pci_warn(dev, "aer_inject: The uncorrectable error(s) is masked by device\n");
		pci_warn(dev, "The uncorrectable error(s) is masked by device\n");
		spin_unlock_irqrestore(&inject_lock, flags);
		goto out_put;
		}
		@@ -460,19 +462,17 @@ static int aer_inject(struct aer_error_inj *einj)
		if (device) {
		edev = to_pcie_device(device);
		if (!get_service_data(edev)) {
		dev_warn(&edev->device,
		"aer_inject: AER service is not initialized\n");
		pci_warn(edev->port, "AER service is not initialized\n");
		ret = -EPROTONOSUPPORT;
		goto out_put;
		}
		dev_info(&edev->device,
		"aer_inject: Injecting errors %08x/%08x into device %s\n",
		pci_info(edev->port, "Injecting errors %08x/%08x into device %s\n",
		einj->cor_status, einj->uncor_status, pci_name(dev));
		local_irq_disable();
		generic_handle_irq(edev->irq);
		local_irq_enable();
		} else {
		pci_err(rpdev, "aer_inject: AER device not found\n");
		pci_err(rpdev, "AER device not found\n");
		ret = -ENODEV;
		}
		out_put:

Admin message