Commit 1ff8f36f authored by Sam Bobroff's avatar Sam Bobroff Committed by Michael Ellerman
Browse files

powerpc/eeh: Convert log messages to eeh_edev_* macros 



Convert existing messages, where appropriate, to use the eeh_edev_*
logging macros.

The only effect should be minor adjustments to the log messages, apart
from:

- A new message in pseries_eeh_probe() "Probing device" to match the
powernv case.
- The "Probing device" message in pnv_eeh_probe() is now generated
slightly later, which will mean that it is no longer emitted for
devices that aren't probed due to the initial checks.

Signed-off-by: default avatarSam Bobroff <sbobroff@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/ce505a0a7a4a5b0367f0f40f8b26e7c0a9cf4cb7.1565930772.git.sbobroff@linux.ibm.com
parent b093f2cb

arch/powerpc/include/asm/ppc-pci.h

+0 −5
Original line number Diff line number Diff line
@@ -62,11 +62,6 @@ void eeh_pe_dev_mode_mark(struct eeh_pe *pe, int mode); 
void eeh_sysfs_add_device(struct pci_dev *pdev);

void eeh_sysfs_remove_device(struct pci_dev *pdev);



static inline const char *eeh_pci_name(struct pci_dev *pdev) 

{ 

	return pdev ? pci_name(pdev) : "<null>";

} 



static inline const char *eeh_driver_name(struct pci_dev *pdev)

{

	return (pdev && pdev->driver) ? pdev->driver->name : "<null>";

arch/powerpc/kernel/eeh.c

+8 −11
Original line number Diff line number Diff line
@@ -470,8 +470,7 @@ int eeh_dev_check_failure(struct eeh_dev *edev) 
	/* Access to IO BARs might get this far and still not want checking. */

	if (!pe) {

		eeh_stats.ignored_check++;

		pr_debug("EEH: Ignored check for %s\n",

			eeh_pci_name(dev));

		eeh_edev_dbg(edev, "Ignored check\n");

		return 0;

	}
@@ -511,12 +510,11 @@ int eeh_dev_check_failure(struct eeh_dev *edev) 
			if (dn)

				location = of_get_property(dn, "ibm,loc-code",

						NULL);

			printk(KERN_ERR "EEH: %d reads ignored for recovering device at "

				"location=%s driver=%s pci addr=%s\n",

			eeh_edev_err(edev, "%d reads ignored for recovering device at location=%s driver=%s\n",

				pe->check_count,

				location ? location : "unknown",

				eeh_driver_name(dev), eeh_pci_name(dev));

			printk(KERN_ERR "EEH: Might be infinite loop in %s driver\n",

				eeh_driver_name(dev));

			eeh_edev_err(edev, "Might be infinite loop in %s driver\n",

				eeh_driver_name(dev));

			dump_stack();

		}
@@ -1188,12 +1186,11 @@ void eeh_add_device_late(struct pci_dev *dev) 
	if (!dev)

		return;



	pr_debug("EEH: Adding device %s\n", pci_name(dev));



	pdn = pci_get_pdn_by_devfn(dev->bus, dev->devfn);

	edev = pdn_to_eeh_dev(pdn);

	eeh_edev_dbg(edev, "Adding device\n");

	if (edev->pdev == dev) {

		pr_debug("EEH: Device %s already referenced!\n", pci_name(dev));

		eeh_edev_dbg(edev, "Device already referenced!\n");

		return;

	}
@@ -1296,10 +1293,10 @@ void eeh_remove_device(struct pci_dev *dev) 
	edev = pci_dev_to_eeh_dev(dev);



	/* Unregister the device with the EEH/PCI address search system */

	pr_debug("EEH: Removing device %s\n", pci_name(dev));

	dev_dbg(&dev->dev, "EEH: Removing device\n");



	if (!edev || !edev->pdev || !edev->pe) {

		pr_debug("EEH: Not referenced !\n");

		dev_dbg(&dev->dev, "EEH: Device not referenced!\n");

		return;

	}

arch/powerpc/kernel/eeh_cache.c

+4 −4
Original line number Diff line number Diff line
@@ -148,8 +148,8 @@ eeh_addr_cache_insert(struct pci_dev *dev, resource_size_t alo, 
	piar->pcidev = dev;

	piar->flags = flags;



	pr_debug("PIAR: insert range=[%pap:%pap] dev=%s\n",

		 &alo, &ahi, pci_name(dev));

	eeh_edev_dbg(piar->edev, "PIAR: insert range=[%pap:%pap]\n",

		 &alo, &ahi);



	rb_link_node(&piar->rb_node, parent, p);

	rb_insert_color(&piar->rb_node, &pci_io_addr_cache_root.rb_root);
@@ -229,8 +229,8 @@ restart: 
		piar = rb_entry(n, struct pci_io_addr_range, rb_node);



		if (piar->pcidev == dev) {

			pr_debug("PIAR: remove range=[%pap:%pap] dev=%s\n",

				 &piar->addr_lo, &piar->addr_hi, pci_name(dev));

			eeh_edev_dbg(piar->edev, "PIAR: remove range=[%pap:%pap]\n",

				 &piar->addr_lo, &piar->addr_hi);

			rb_erase(n, &pci_io_addr_cache_root.rb_root);

			kfree(piar);

			goto restart;

arch/powerpc/kernel/eeh_driver.c

+2 −5
Original line number Diff line number Diff line
@@ -456,12 +456,9 @@ static void *eeh_add_virt_device(struct eeh_dev *edev) 
{

	struct pci_driver *driver;

	struct pci_dev *dev = eeh_dev_to_pci_dev(edev);

	struct pci_dn *pdn = eeh_dev_to_pdn(edev);



	if (!(edev->physfn)) {

		pr_warn("%s: EEH dev %04x:%02x:%02x.%01x not for VF\n",

			__func__, pdn->phb->global_number, pdn->busno,

			PCI_SLOT(pdn->devfn), PCI_FUNC(pdn->devfn));

		eeh_edev_warn(edev, "Not for VF\n");

		return NULL;

	}
@@ -475,7 +472,7 @@ static void *eeh_add_virt_device(struct eeh_dev *edev) 
	}



#ifdef CONFIG_PCI_IOV

	pci_iov_add_virtfn(edev->physfn, pdn->vf_index);

	pci_iov_add_virtfn(edev->physfn, eeh_dev_to_pdn(edev)->vf_index);

#endif

	return NULL;

}

arch/powerpc/kernel/eeh_pe.c

+13 −38
Original line number Diff line number Diff line
@@ -379,8 +379,7 @@ int eeh_add_to_parent_pe(struct eeh_dev *edev) 


	/* Check if the PE number is valid */

	if (!eeh_has_flag(EEH_VALID_PE_ZERO) && !edev->pe_config_addr) {

		pr_err("%s: Invalid PE#0 for edev 0x%x on PHB#%x\n",

		       __func__, config_addr, pdn->phb->global_number);

		eeh_edev_err(edev, "PE#0 is invalid for this PHB!\n");

		return -EINVAL;

	}
@@ -398,12 +397,7 @@ int eeh_add_to_parent_pe(struct eeh_dev *edev) 


		/* Put the edev to PE */

		list_add_tail(&edev->entry, &pe->edevs);

		pr_debug("EEH: Add %04x:%02x:%02x.%01x to Bus PE#%x\n",

			 pdn->phb->global_number,

			 pdn->busno,

			 PCI_SLOT(pdn->devfn),

			 PCI_FUNC(pdn->devfn),

			 pe->addr);

		eeh_edev_dbg(edev, "Added to bus PE\n");

		return 0;

	} else if (pe && (pe->type & EEH_PE_INVALID)) {

		list_add_tail(&edev->entry, &pe->edevs);
@@ -420,13 +414,8 @@ int eeh_add_to_parent_pe(struct eeh_dev *edev) 
			parent = parent->parent;

		}



		pr_debug("EEH: Add %04x:%02x:%02x.%01x to Device "

			 "PE#%x, Parent PE#%x\n",

			 pdn->phb->global_number,

			 pdn->busno,

			 PCI_SLOT(pdn->devfn),

			 PCI_FUNC(pdn->devfn),

			 pe->addr, pe->parent->addr);

		eeh_edev_dbg(edev, "Added to device PE (parent: PE#%x)\n",

			     pe->parent->addr);

		return 0;

	}
@@ -468,13 +457,8 @@ int eeh_add_to_parent_pe(struct eeh_dev *edev) 
	list_add_tail(&pe->child, &parent->child_list);

	list_add_tail(&edev->entry, &pe->edevs);

	edev->pe = pe;

	pr_debug("EEH: Add %04x:%02x:%02x.%01x to "

		 "Device PE#%x, Parent PE#%x\n",

		 pdn->phb->global_number,

		 pdn->busno,

		 PCI_SLOT(pdn->devfn),

		 PCI_FUNC(pdn->devfn),

		 pe->addr, pe->parent->addr);

	eeh_edev_dbg(edev, "Added to device PE (parent: PE#%x)\n",

		     pe->parent->addr);



	return 0;

}
@@ -492,15 +476,10 @@ int eeh_rmv_from_parent_pe(struct eeh_dev *edev) 
{

	struct eeh_pe *pe, *parent, *child;

	int cnt;

	struct pci_dn *pdn = eeh_dev_to_pdn(edev);



	pe = eeh_dev_to_pe(edev);

	if (!pe) {

		pr_debug("%s: No PE found for device %04x:%02x:%02x.%01x\n",

			 __func__,  pdn->phb->global_number,

			 pdn->busno,

			 PCI_SLOT(pdn->devfn),

			 PCI_FUNC(pdn->devfn));

		eeh_edev_dbg(edev, "No PE found for device.\n");

		return -EEXIST;

	}
@@ -717,17 +696,13 @@ static void eeh_bridge_check_link(struct eeh_dev *edev) 
	if (!(edev->mode & (EEH_DEV_ROOT_PORT | EEH_DEV_DS_PORT)))

		return;



	pr_debug("%s: Check PCIe link for %04x:%02x:%02x.%01x ...\n",

		 __func__, pdn->phb->global_number,

		 pdn->busno,

		 PCI_SLOT(pdn->devfn),

		 PCI_FUNC(pdn->devfn));

	eeh_edev_dbg(edev, "Checking PCIe link...\n");



	/* Check slot status */

	cap = edev->pcie_cap;

	eeh_ops->read_config(pdn, cap + PCI_EXP_SLTSTA, 2, &val);

	if (!(val & PCI_EXP_SLTSTA_PDS)) {

		pr_debug("  No card in the slot (0x%04x) !\n", val);

		eeh_edev_dbg(edev, "No card in the slot (0x%04x) !\n", val);

		return;

	}
@@ -736,7 +711,7 @@ static void eeh_bridge_check_link(struct eeh_dev *edev) 
	if (val & PCI_EXP_SLTCAP_PCP) {

		eeh_ops->read_config(pdn, cap + PCI_EXP_SLTCTL, 2, &val);

		if (val & PCI_EXP_SLTCTL_PCC) {

			pr_debug("  In power-off state, power it on ...\n");

			eeh_edev_dbg(edev, "In power-off state, power it on ...\n");

			val &= ~(PCI_EXP_SLTCTL_PCC | PCI_EXP_SLTCTL_PIC);

			val |= (0x0100 & PCI_EXP_SLTCTL_PIC);

			eeh_ops->write_config(pdn, cap + PCI_EXP_SLTCTL, 2, val);
@@ -752,7 +727,7 @@ static void eeh_bridge_check_link(struct eeh_dev *edev) 
	/* Check link */

	eeh_ops->read_config(pdn, cap + PCI_EXP_LNKCAP, 4, &val);

	if (!(val & PCI_EXP_LNKCAP_DLLLARC)) {

		pr_debug("  No link reporting capability (0x%08x) \n", val);

		eeh_edev_dbg(edev, "No link reporting capability (0x%08x) \n", val);

		msleep(1000);

		return;

	}
@@ -769,10 +744,10 @@ static void eeh_bridge_check_link(struct eeh_dev *edev) 
	}



	if (val & PCI_EXP_LNKSTA_DLLLA)

		pr_debug("  Link up (%s)\n",

		eeh_edev_dbg(edev, "Link up (%s)\n",

			 (val & PCI_EXP_LNKSTA_CLS_2_5GB) ? "2.5GB" : "5GB");

	else

		pr_debug("  Link not ready (0x%04x)\n", val);

		eeh_edev_dbg(edev, "Link not ready (0x%04x)\n", val);

}



#define BYTE_SWAP(OFF)	(8*((OFF)/4)+3-(OFF))

CRA Git | Maintained and supported by SUSTech CRA and CCSE