Commit f8587c80 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/printk-portdrv' 

  - Change some desirable KERN_DEBUG messages to KERN_INFO/KERN_ERR
    (Frederick Lawler)

  - Log PCIe port service messages with pci_dev, not the pcie_device
    (Frederick Lawler)

  - Convert pciehp from pciehp_debug module parameter to generic dynamic
    debug (Frederick Lawler)

* pci/printk-portdrv:
  PCI: pciehp: Remove pointless MY_NAME definition
  PCI: pciehp: Remove pointless PCIE_MODULE_NAME definition
  PCI: pciehp: Remove unused dbg/err/info/warn() wrappers
  PCI: pciehp: Log messages with pci_dev, not pcie_device
  PCI: pciehp: Replace pciehp_debug module param with dyndbg
  PCI: pciehp: Remove pciehp_debug uses
  PCI/AER: Log messages with pci_dev, not pcie_device
  PCI/DPC: Log messages with pci_dev, not pcie_device
  PCI/PME: Replace dev_printk(KERN_DEBUG) with dev_info()
  PCI/AER: Replace dev_printk(KERN_DEBUG) with dev_info()
parents 192415f4 e07ca82a

drivers/pci/hotplug/pciehp.h

+8 −23
Original line number Diff line number Diff line
@@ -25,36 +25,21 @@ 


#include "../pcie/portdrv.h"



#define MY_NAME	"pciehp"



extern bool pciehp_poll_mode;

extern int pciehp_poll_time;

extern bool pciehp_debug;



#define dbg(format, arg...)						\

do {									\

	if (pciehp_debug)						\

		printk(KERN_DEBUG "%s: " format, MY_NAME, ## arg);	\

} while (0)

#define err(format, arg...)						\

	printk(KERN_ERR "%s: " format, MY_NAME, ## arg)

#define info(format, arg...)						\

	printk(KERN_INFO "%s: " format, MY_NAME, ## arg)

#define warn(format, arg...)						\

	printk(KERN_WARNING "%s: " format, MY_NAME, ## arg)



/*

 * Set CONFIG_DYNAMIC_DEBUG=y and boot with 'dyndbg="file pciehp* +p"' to

 * enable debug messages.

 */

#define ctrl_dbg(ctrl, format, arg...)					\

	do {								\

		if (pciehp_debug)					\

			dev_printk(KERN_DEBUG, &ctrl->pcie->device,	\

					format, ## arg);		\

	} while (0)

	pci_dbg(ctrl->pcie->port, format, ## arg)

#define ctrl_err(ctrl, format, arg...)					\

	dev_err(&ctrl->pcie->device, format, ## arg)

	pci_err(ctrl->pcie->port, format, ## arg)

#define ctrl_info(ctrl, format, arg...)					\

	dev_info(&ctrl->pcie->device, format, ## arg)

	pci_info(ctrl->pcie->port, format, ## arg)

#define ctrl_warn(ctrl, format, arg...)					\

	dev_warn(&ctrl->pcie->device, format, ## arg)

	pci_warn(ctrl->pcie->port, format, ## arg)



#define SLOT_NAME_SIZE 10

drivers/pci/hotplug/pciehp_core.c

+8 −10
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 
 *   Dely Sy <dely.l.sy@intel.com>"

 */



#define pr_fmt(fmt) "pciehp: " fmt

#define dev_fmt pr_fmt



#include <linux/moduleparam.h>

#include <linux/kernel.h>

#include <linux/slab.h>
@@ -27,7 +30,6 @@ 
#include "../pci.h"



/* Global variables */

bool pciehp_debug;

bool pciehp_poll_mode;

int pciehp_poll_time;
@@ -35,15 +37,11 @@ int pciehp_poll_time; 
 * not really modular, but the easiest way to keep compat with existing

 * bootargs behaviour is to continue using module_param here.

 */

module_param(pciehp_debug, bool, 0644);

module_param(pciehp_poll_mode, bool, 0644);

module_param(pciehp_poll_time, int, 0644);

MODULE_PARM_DESC(pciehp_debug, "Debugging mode enabled or not");

MODULE_PARM_DESC(pciehp_poll_mode, "Using polling mechanism for hot-plug events or not");

MODULE_PARM_DESC(pciehp_poll_time, "Polling mechanism frequency, in seconds");



#define PCIE_MODULE_NAME "pciehp"



static int set_attention_status(struct hotplug_slot *slot, u8 value);

static int get_power_status(struct hotplug_slot *slot, u8 *value);

static int get_latch_status(struct hotplug_slot *slot, u8 *value);
@@ -182,14 +180,14 @@ static int pciehp_probe(struct pcie_device *dev) 


	if (!dev->port->subordinate) {

		/* Can happen if we run out of bus numbers during probe */

		dev_err(&dev->device,

		pci_err(dev->port,

			"Hotplug bridge without secondary bus, ignoring\n");

		return -ENODEV;

	}



	ctrl = pcie_init(dev);

	if (!ctrl) {

		dev_err(&dev->device, "Controller initialization failed\n");

		pci_err(dev->port, "Controller initialization failed\n");

		return -ENODEV;

	}

	set_service_data(dev, ctrl);
@@ -307,7 +305,7 @@ static int pciehp_runtime_resume(struct pcie_device *dev) 
#endif /* PM */



static struct pcie_port_service_driver hpdriver_portdrv = {

	.name		= PCIE_MODULE_NAME,

	.name		= "pciehp",

	.port_type	= PCIE_ANY_PORT,

	.service	= PCIE_PORT_SERVICE_HP,
@@ -328,9 +326,9 @@ int __init pcie_hp_init(void) 
	int retval = 0;



	retval = pcie_port_service_register(&hpdriver_portdrv);

	dbg("pcie_port_service_register = %d\n", retval);

	pr_debug("pcie_port_service_register = %d\n", retval);

	if (retval)

		dbg("Failure to register service\n");

		pr_debug("Failure to register service\n");



	return retval;

}

drivers/pci/hotplug/pciehp_ctrl.c

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
 *

 */



#define dev_fmt(fmt) "pciehp: " fmt



#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/pm_runtime.h>

drivers/pci/hotplug/pciehp_hpc.c

+8 −9
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 
 * Send feedback to <greg@kroah.com>,<kristen.c.accardi@intel.com>

 */



#define dev_fmt(fmt) "pciehp: " fmt



#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/jiffies.h>
@@ -46,7 +48,7 @@ static inline int pciehp_request_irq(struct controller *ctrl) 


	/* Installs the interrupt handler */

	retval = request_threaded_irq(irq, pciehp_isr, pciehp_ist,

				      IRQF_SHARED, MY_NAME, ctrl);

				      IRQF_SHARED, "pciehp", ctrl);

	if (retval)

		ctrl_err(ctrl, "Cannot get irq %d for the hotplug controller\n",

			 irq);
@@ -232,8 +234,8 @@ static bool pci_bus_check_dev(struct pci_bus *bus, int devfn) 
		delay -= step;

	} while (delay > 0);



	if (count > 1 && pciehp_debug)

		printk(KERN_DEBUG "pci %04x:%02x:%02x.%d id reading try %d times with interval %d ms to get %08x\n",

	if (count > 1)

		pr_debug("pci %04x:%02x:%02x.%d id reading try %d times with interval %d ms to get %08x\n",

			pci_domain_nr(bus), bus->number, PCI_SLOT(devfn),

			PCI_FUNC(devfn), count, step, l);
@@ -822,14 +824,11 @@ static inline void dbg_ctrl(struct controller *ctrl) 
	struct pci_dev *pdev = ctrl->pcie->port;

	u16 reg16;



	if (!pciehp_debug)

		return;



	ctrl_info(ctrl, "Slot Capabilities      : 0x%08x\n", ctrl->slot_cap);

	ctrl_dbg(ctrl, "Slot Capabilities      : 0x%08x\n", ctrl->slot_cap);

	pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, &reg16);

	ctrl_info(ctrl, "Slot Status            : 0x%04x\n", reg16);

	ctrl_dbg(ctrl, "Slot Status            : 0x%04x\n", reg16);

	pcie_capability_read_word(pdev, PCI_EXP_SLTCTL, &reg16);

	ctrl_info(ctrl, "Slot Control           : 0x%04x\n", reg16);

	ctrl_dbg(ctrl, "Slot Control           : 0x%04x\n", reg16);

}



#define FLAG(x, y)	(((x) & (y)) ? '+' : '-')

drivers/pci/hotplug/pciehp_pci.c

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
 *

 */



#define dev_fmt(fmt) "pciehp: " fmt



#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/pci.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE