Commit 18b341b7 authored by Taku Izumi's avatar Taku Izumi Committed by Jesse Barnes

PCI hotplug: pciehp: message refinement

This patch refines messages in pciehp module.  The main changes are as
follows:

 - remove the trailing "."
 - remove __func__ as much as possible
 - capitalize the first letter of messages
 - show PCI device address including its domain
Signed-off-by: default avatarTaku Izumi <izumi.taku@jp.fujitsu.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 8113587c
...@@ -188,7 +188,7 @@ static inline struct slot *pciehp_find_slot(struct controller *ctrl, u8 device) ...@@ -188,7 +188,7 @@ static inline struct slot *pciehp_find_slot(struct controller *ctrl, u8 device)
return slot; return slot;
} }
ctrl_err(ctrl, "%s: slot (device=0x%x) not found\n", __func__, device); ctrl_err(ctrl, "Slot (device=0x%02x) not found\n", device);
return NULL; return NULL;
} }
......
...@@ -184,7 +184,7 @@ static void release_slot(struct hotplug_slot *hotplug_slot) ...@@ -184,7 +184,7 @@ static void release_slot(struct hotplug_slot *hotplug_slot)
{ {
struct slot *slot = hotplug_slot->private; struct slot *slot = hotplug_slot->private;
ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n", ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
__func__, hotplug_slot_name(hotplug_slot)); __func__, hotplug_slot_name(hotplug_slot));
kfree(hotplug_slot->info); kfree(hotplug_slot->info);
...@@ -216,9 +216,11 @@ static int init_slots(struct controller *ctrl) ...@@ -216,9 +216,11 @@ static int init_slots(struct controller *ctrl)
slot->hotplug_slot = hotplug_slot; slot->hotplug_slot = hotplug_slot;
snprintf(name, SLOT_NAME_SIZE, "%u", slot->number); snprintf(name, SLOT_NAME_SIZE, "%u", slot->number);
ctrl_dbg(ctrl, "Registering bus=%x dev=%x hp_slot=%x sun=%x " ctrl_dbg(ctrl, "Registering domain:bus:dev=%04x:%02x:%02x "
"slot_device_offset=%x\n", slot->bus, slot->device, "hp_slot=%x sun=%x slot_device_offset=%x\n",
slot->hp_slot, slot->number, ctrl->slot_device_offset); pci_domain_nr(ctrl->pci_dev->subordinate),
slot->bus, slot->device, slot->hp_slot, slot->number,
ctrl->slot_device_offset);
retval = pci_hp_register(hotplug_slot, retval = pci_hp_register(hotplug_slot,
ctrl->pci_dev->subordinate, ctrl->pci_dev->subordinate,
slot->device, slot->device,
...@@ -238,7 +240,7 @@ static int init_slots(struct controller *ctrl) ...@@ -238,7 +240,7 @@ static int init_slots(struct controller *ctrl)
&hotplug_slot_attr_lock.attr); &hotplug_slot_attr_lock.attr);
if (retval) { if (retval) {
pci_hp_deregister(hotplug_slot); pci_hp_deregister(hotplug_slot);
ctrl_err(ctrl, "cannot create additional sysfs " ctrl_err(ctrl, "Cannot create additional sysfs "
"entries\n"); "entries\n");
goto error_info; goto error_info;
} }
...@@ -273,7 +275,7 @@ static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 status) ...@@ -273,7 +275,7 @@ static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 status)
{ {
struct slot *slot = hotplug_slot->private; struct slot *slot = hotplug_slot->private;
ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n", ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
__func__, slot_name(slot)); __func__, slot_name(slot));
hotplug_slot->info->attention_status = status; hotplug_slot->info->attention_status = status;
...@@ -289,7 +291,7 @@ static int enable_slot(struct hotplug_slot *hotplug_slot) ...@@ -289,7 +291,7 @@ static int enable_slot(struct hotplug_slot *hotplug_slot)
{ {
struct slot *slot = hotplug_slot->private; struct slot *slot = hotplug_slot->private;
ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n", ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
__func__, slot_name(slot)); __func__, slot_name(slot));
return pciehp_sysfs_enable_slot(slot); return pciehp_sysfs_enable_slot(slot);
...@@ -300,7 +302,7 @@ static int disable_slot(struct hotplug_slot *hotplug_slot) ...@@ -300,7 +302,7 @@ static int disable_slot(struct hotplug_slot *hotplug_slot)
{ {
struct slot *slot = hotplug_slot->private; struct slot *slot = hotplug_slot->private;
ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n", ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
__func__, slot_name(slot)); __func__, slot_name(slot));
return pciehp_sysfs_disable_slot(slot); return pciehp_sysfs_disable_slot(slot);
...@@ -311,7 +313,7 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value) ...@@ -311,7 +313,7 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)
struct slot *slot = hotplug_slot->private; struct slot *slot = hotplug_slot->private;
int retval; int retval;
ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n", ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
__func__, slot_name(slot)); __func__, slot_name(slot));
retval = slot->hpc_ops->get_power_status(slot, value); retval = slot->hpc_ops->get_power_status(slot, value);
...@@ -326,7 +328,7 @@ static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value) ...@@ -326,7 +328,7 @@ static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value)
struct slot *slot = hotplug_slot->private; struct slot *slot = hotplug_slot->private;
int retval; int retval;
ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n", ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
__func__, slot_name(slot)); __func__, slot_name(slot));
retval = slot->hpc_ops->get_attention_status(slot, value); retval = slot->hpc_ops->get_attention_status(slot, value);
...@@ -341,7 +343,7 @@ static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value) ...@@ -341,7 +343,7 @@ static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value)
struct slot *slot = hotplug_slot->private; struct slot *slot = hotplug_slot->private;
int retval; int retval;
ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n", ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
__func__, slot_name(slot)); __func__, slot_name(slot));
retval = slot->hpc_ops->get_latch_status(slot, value); retval = slot->hpc_ops->get_latch_status(slot, value);
...@@ -356,7 +358,7 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value) ...@@ -356,7 +358,7 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)
struct slot *slot = hotplug_slot->private; struct slot *slot = hotplug_slot->private;
int retval; int retval;
ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n", ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
__func__, slot_name(slot)); __func__, slot_name(slot));
retval = slot->hpc_ops->get_adapter_status(slot, value); retval = slot->hpc_ops->get_adapter_status(slot, value);
...@@ -372,7 +374,7 @@ static int get_max_bus_speed(struct hotplug_slot *hotplug_slot, ...@@ -372,7 +374,7 @@ static int get_max_bus_speed(struct hotplug_slot *hotplug_slot,
struct slot *slot = hotplug_slot->private; struct slot *slot = hotplug_slot->private;
int retval; int retval;
ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n", ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
__func__, slot_name(slot)); __func__, slot_name(slot));
retval = slot->hpc_ops->get_max_bus_speed(slot, value); retval = slot->hpc_ops->get_max_bus_speed(slot, value);
...@@ -387,7 +389,7 @@ static int get_cur_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spe ...@@ -387,7 +389,7 @@ static int get_cur_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spe
struct slot *slot = hotplug_slot->private; struct slot *slot = hotplug_slot->private;
int retval; int retval;
ctrl_dbg(slot->ctrl, "%s - physical_slot = %s\n", ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
__func__, slot_name(slot)); __func__, slot_name(slot));
retval = slot->hpc_ops->get_cur_bus_speed(slot, value); retval = slot->hpc_ops->get_cur_bus_speed(slot, value);
...@@ -414,7 +416,7 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_ ...@@ -414,7 +416,7 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
ctrl = pcie_init(dev); ctrl = pcie_init(dev);
if (!ctrl) { if (!ctrl) {
dev_err(&dev->device, "controller initialization failed\n"); dev_err(&dev->device, "Controller initialization failed\n");
goto err_out_none; goto err_out_none;
} }
set_service_data(dev, ctrl); set_service_data(dev, ctrl);
...@@ -423,10 +425,10 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_ ...@@ -423,10 +425,10 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
rc = init_slots(ctrl); rc = init_slots(ctrl);
if (rc) { if (rc) {
if (rc == -EBUSY) if (rc == -EBUSY)
ctrl_warn(ctrl, "slot already registered by another " ctrl_warn(ctrl, "Slot already registered by another "
"hotplug driver\n"); "hotplug driver\n");
else else
ctrl_err(ctrl, "slot initialization failed\n"); ctrl_err(ctrl, "Slot initialization failed\n");
goto err_out_release_ctlr; goto err_out_release_ctlr;
} }
...@@ -523,7 +525,7 @@ static int __init pcied_init(void) ...@@ -523,7 +525,7 @@ static int __init pcied_init(void)
dbg("pcie_port_service_register = %d\n", retval); dbg("pcie_port_service_register = %d\n", retval);
info(DRIVER_DESC " version: " DRIVER_VERSION "\n"); info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
if (retval) if (retval)
dbg("%s: Failure to register service\n", __func__); dbg("Failure to register service\n");
return retval; return retval;
} }
......
...@@ -61,7 +61,7 @@ u8 pciehp_handle_attention_button(struct slot *p_slot) ...@@ -61,7 +61,7 @@ u8 pciehp_handle_attention_button(struct slot *p_slot)
struct controller *ctrl = p_slot->ctrl; struct controller *ctrl = p_slot->ctrl;
/* Attention Button Change */ /* Attention Button Change */
ctrl_dbg(ctrl, "Attention button interrupt received.\n"); ctrl_dbg(ctrl, "Attention button interrupt received\n");
/* /*
* Button pressed - See if need to TAKE ACTION!!! * Button pressed - See if need to TAKE ACTION!!!
...@@ -81,7 +81,7 @@ u8 pciehp_handle_switch_change(struct slot *p_slot) ...@@ -81,7 +81,7 @@ u8 pciehp_handle_switch_change(struct slot *p_slot)
struct controller *ctrl = p_slot->ctrl; struct controller *ctrl = p_slot->ctrl;
/* Switch Change */ /* Switch Change */
ctrl_dbg(ctrl, "Switch interrupt received.\n"); ctrl_dbg(ctrl, "Switch interrupt received\n");
p_slot->hpc_ops->get_latch_status(p_slot, &getstatus); p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
if (getstatus) { if (getstatus) {
...@@ -110,7 +110,7 @@ u8 pciehp_handle_presence_change(struct slot *p_slot) ...@@ -110,7 +110,7 @@ u8 pciehp_handle_presence_change(struct slot *p_slot)
struct controller *ctrl = p_slot->ctrl; struct controller *ctrl = p_slot->ctrl;
/* Presence Change */ /* Presence Change */
ctrl_dbg(ctrl, "Presence/Notify input change.\n"); ctrl_dbg(ctrl, "Presence/Notify input change\n");
/* Switch is open, assume a presence change /* Switch is open, assume a presence change
* Save the presence state * Save the presence state
...@@ -142,7 +142,7 @@ u8 pciehp_handle_power_fault(struct slot *p_slot) ...@@ -142,7 +142,7 @@ u8 pciehp_handle_power_fault(struct slot *p_slot)
struct controller *ctrl = p_slot->ctrl; struct controller *ctrl = p_slot->ctrl;
/* power fault */ /* power fault */
ctrl_dbg(ctrl, "Power fault interrupt received.\n"); ctrl_dbg(ctrl, "Power fault interrupt received\n");
if ( !(p_slot->hpc_ops->query_power_fault(p_slot))) { if ( !(p_slot->hpc_ops->query_power_fault(p_slot))) {
/* /*
...@@ -157,7 +157,7 @@ u8 pciehp_handle_power_fault(struct slot *p_slot) ...@@ -157,7 +157,7 @@ u8 pciehp_handle_power_fault(struct slot *p_slot)
*/ */
ctrl_info(ctrl, "Power fault on Slot(%s)\n", slot_name(p_slot)); ctrl_info(ctrl, "Power fault on Slot(%s)\n", slot_name(p_slot));
event_type = INT_POWER_FAULT; event_type = INT_POWER_FAULT;
ctrl_info(ctrl, "power fault bit %x set\n", 0); ctrl_info(ctrl, "Power fault bit %x set\n", 0);
} }
queue_interrupt_event(p_slot, event_type); queue_interrupt_event(p_slot, event_type);
...@@ -175,8 +175,7 @@ static void set_slot_off(struct controller *ctrl, struct slot * pslot) ...@@ -175,8 +175,7 @@ static void set_slot_off(struct controller *ctrl, struct slot * pslot)
if (POWER_CTRL(ctrl)) { if (POWER_CTRL(ctrl)) {
if (pslot->hpc_ops->power_off_slot(pslot)) { if (pslot->hpc_ops->power_off_slot(pslot)) {
ctrl_err(ctrl, ctrl_err(ctrl,
"%s: Issue of Slot Power Off command failed\n", "Issue of Slot Power Off command failed\n");
__func__);
return; return;
} }
} }
...@@ -193,8 +192,8 @@ static void set_slot_off(struct controller *ctrl, struct slot * pslot) ...@@ -193,8 +192,8 @@ static void set_slot_off(struct controller *ctrl, struct slot * pslot)
if (ATTN_LED(ctrl)) { if (ATTN_LED(ctrl)) {
if (pslot->hpc_ops->set_attention_status(pslot, 1)) { if (pslot->hpc_ops->set_attention_status(pslot, 1)) {
ctrl_err(ctrl, "%s: Issue of Set Attention " ctrl_err(ctrl,
"Led command failed\n", __func__); "Issue of Set Attention Led command failed\n");
return; return;
} }
} }
...@@ -211,8 +210,9 @@ static int board_added(struct slot *p_slot) ...@@ -211,8 +210,9 @@ static int board_added(struct slot *p_slot)
{ {
int retval = 0; int retval = 0;
struct controller *ctrl = p_slot->ctrl; struct controller *ctrl = p_slot->ctrl;
struct pci_bus *parent = ctrl->pci_dev->subordinate;
ctrl_dbg(ctrl, "%s: slot device, slot offset, hp slot = %d, %d ,%d\n", ctrl_dbg(ctrl, "%s: slot device, slot offset, hp slot = %d, %d, %d\n",
__func__, p_slot->device, ctrl->slot_device_offset, __func__, p_slot->device, ctrl->slot_device_offset,
p_slot->hp_slot); p_slot->hp_slot);
...@@ -229,22 +229,22 @@ static int board_added(struct slot *p_slot) ...@@ -229,22 +229,22 @@ static int board_added(struct slot *p_slot)
/* Check link training status */ /* Check link training status */
retval = p_slot->hpc_ops->check_lnk_status(ctrl); retval = p_slot->hpc_ops->check_lnk_status(ctrl);
if (retval) { if (retval) {
ctrl_err(ctrl, "%s: Failed to check link status\n", __func__); ctrl_err(ctrl, "Failed to check link status\n");
set_slot_off(ctrl, p_slot); set_slot_off(ctrl, p_slot);
return retval; return retval;
} }
/* Check for a power fault */ /* Check for a power fault */
if (p_slot->hpc_ops->query_power_fault(p_slot)) { if (p_slot->hpc_ops->query_power_fault(p_slot)) {
ctrl_dbg(ctrl, "%s: power fault detected\n", __func__); ctrl_dbg(ctrl, "Power fault detected\n");
retval = POWER_FAILURE; retval = POWER_FAILURE;
goto err_exit; goto err_exit;
} }
retval = pciehp_configure_device(p_slot); retval = pciehp_configure_device(p_slot);
if (retval) { if (retval) {
ctrl_err(ctrl, "Cannot add device 0x%x:%x\n", ctrl_err(ctrl, "Cannot add device at %04x:%02x:%02x\n",
p_slot->bus, p_slot->device); pci_domain_nr(parent), p_slot->bus, p_slot->device);
goto err_exit; goto err_exit;
} }
...@@ -276,14 +276,14 @@ static int remove_board(struct slot *p_slot) ...@@ -276,14 +276,14 @@ static int remove_board(struct slot *p_slot)
if (retval) if (retval)
return retval; return retval;
ctrl_dbg(ctrl, "In %s, hp_slot = %d\n", __func__, p_slot->hp_slot); ctrl_dbg(ctrl, "%s: hp_slot = %d\n", __func__, p_slot->hp_slot);
if (POWER_CTRL(ctrl)) { if (POWER_CTRL(ctrl)) {
/* power off slot */ /* power off slot */
retval = p_slot->hpc_ops->power_off_slot(p_slot); retval = p_slot->hpc_ops->power_off_slot(p_slot);
if (retval) { if (retval) {
ctrl_err(ctrl, "%s: Issue of Slot Disable command " ctrl_err(ctrl,
"failed\n", __func__); "Issue of Slot Disable command failed\n");
return retval; return retval;
} }
} }
...@@ -324,8 +324,10 @@ static void pciehp_power_thread(struct work_struct *work) ...@@ -324,8 +324,10 @@ static void pciehp_power_thread(struct work_struct *work)
switch (p_slot->state) { switch (p_slot->state) {
case POWEROFF_STATE: case POWEROFF_STATE:
mutex_unlock(&p_slot->lock); mutex_unlock(&p_slot->lock);
ctrl_dbg(p_slot->ctrl, "%s: disabling bus:device(%x:%x)\n", ctrl_dbg(p_slot->ctrl,
__func__, p_slot->bus, p_slot->device); "Disabling domain:bus:device=%04x:%02x:%02x\n",
pci_domain_nr(p_slot->ctrl->pci_dev->subordinate),
p_slot->bus, p_slot->device);
pciehp_disable_slot(p_slot); pciehp_disable_slot(p_slot);
mutex_lock(&p_slot->lock); mutex_lock(&p_slot->lock);
p_slot->state = STATIC_STATE; p_slot->state = STATIC_STATE;
...@@ -433,7 +435,6 @@ static void handle_button_press_event(struct slot *p_slot) ...@@ -433,7 +435,6 @@ static void handle_button_press_event(struct slot *p_slot)
* expires to cancel hot-add or hot-remove * expires to cancel hot-add or hot-remove
*/ */
ctrl_info(ctrl, "Button cancel on Slot(%s)\n", slot_name(p_slot)); ctrl_info(ctrl, "Button cancel on Slot(%s)\n", slot_name(p_slot));
ctrl_dbg(ctrl, "%s: button cancel\n", __func__);
cancel_delayed_work(&p_slot->work); cancel_delayed_work(&p_slot->work);
if (p_slot->state == BLINKINGOFF_STATE) { if (p_slot->state == BLINKINGOFF_STATE) {
if (PWR_LED(ctrl)) if (PWR_LED(ctrl))
...@@ -537,16 +538,15 @@ int pciehp_enable_slot(struct slot *p_slot) ...@@ -537,16 +538,15 @@ int pciehp_enable_slot(struct slot *p_slot)
rc = p_slot->hpc_ops->get_adapter_status(p_slot, &getstatus); rc = p_slot->hpc_ops->get_adapter_status(p_slot, &getstatus);
if (rc || !getstatus) { if (rc || !getstatus) {
ctrl_info(ctrl, "%s: no adapter on slot(%s)\n", ctrl_info(ctrl, "No adapter on slot(%s)\n", slot_name(p_slot));
__func__, slot_name(p_slot));
mutex_unlock(&p_slot->ctrl->crit_sect); mutex_unlock(&p_slot->ctrl->crit_sect);
return -ENODEV; return -ENODEV;
} }
if (MRL_SENS(p_slot->ctrl)) { if (MRL_SENS(p_slot->ctrl)) {
rc = p_slot->hpc_ops->get_latch_status(p_slot, &getstatus); rc = p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
if (rc || getstatus) { if (rc || getstatus) {
ctrl_info(ctrl, "%s: latch open on slot(%s)\n", ctrl_info(ctrl, "Latch open on slot(%s)\n",
__func__, slot_name(p_slot)); slot_name(p_slot));
mutex_unlock(&p_slot->ctrl->crit_sect); mutex_unlock(&p_slot->ctrl->crit_sect);
return -ENODEV; return -ENODEV;
} }
...@@ -555,8 +555,8 @@ int pciehp_enable_slot(struct slot *p_slot) ...@@ -555,8 +555,8 @@ int pciehp_enable_slot(struct slot *p_slot)
if (POWER_CTRL(p_slot->ctrl)) { if (POWER_CTRL(p_slot->ctrl)) {
rc = p_slot->hpc_ops->get_power_status(p_slot, &getstatus); rc = p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
if (rc || getstatus) { if (rc || getstatus) {
ctrl_info(ctrl, "%s: already enabled on slot(%s)\n", ctrl_info(ctrl, "Already enabled on slot(%s)\n",
__func__, slot_name(p_slot)); slot_name(p_slot));
mutex_unlock(&p_slot->ctrl->crit_sect); mutex_unlock(&p_slot->ctrl->crit_sect);
return -EINVAL; return -EINVAL;
} }
...@@ -591,8 +591,8 @@ int pciehp_disable_slot(struct slot *p_slot) ...@@ -591,8 +591,8 @@ int pciehp_disable_slot(struct slot *p_slot)
if (!HP_SUPR_RM(p_slot->ctrl)) { if (!HP_SUPR_RM(p_slot->ctrl)) {
ret = p_slot->hpc_ops->get_adapter_status(p_slot, &getstatus); ret = p_slot->hpc_ops->get_adapter_status(p_slot, &getstatus);
if (ret || !getstatus) { if (ret || !getstatus) {
ctrl_info(ctrl, "%s: no adapter on slot(%s)\n", ctrl_info(ctrl, "No adapter on slot(%s)\n",
__func__, slot_name(p_slot)); slot_name(p_slot));
mutex_unlock(&p_slot->ctrl->crit_sect); mutex_unlock(&p_slot->ctrl->crit_sect);
return -ENODEV; return -ENODEV;
} }
...@@ -601,8 +601,8 @@ int pciehp_disable_slot(struct slot *p_slot) ...@@ -601,8 +601,8 @@ int pciehp_disable_slot(struct slot *p_slot)
if (MRL_SENS(p_slot->ctrl)) { if (MRL_SENS(p_slot->ctrl)) {
ret = p_slot->hpc_ops->get_latch_status(p_slot, &getstatus); ret = p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
if (ret || getstatus) { if (ret || getstatus) {
ctrl_info(ctrl, "%s: latch open on slot(%s)\n", ctrl_info(ctrl, "Latch open on slot(%s)\n",
__func__, slot_name(p_slot)); slot_name(p_slot));
mutex_unlock(&p_slot->ctrl->crit_sect); mutex_unlock(&p_slot->ctrl->crit_sect);
return -ENODEV; return -ENODEV;
} }
...@@ -611,8 +611,8 @@ int pciehp_disable_slot(struct slot *p_slot) ...@@ -611,8 +611,8 @@ int pciehp_disable_slot(struct slot *p_slot)
if (POWER_CTRL(p_slot->ctrl)) { if (POWER_CTRL(p_slot->ctrl)) {
ret = p_slot->hpc_ops->get_power_status(p_slot, &getstatus); ret = p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
if (ret || !getstatus) { if (ret || !getstatus) {
ctrl_info(ctrl, "%s: already disabled slot(%s)\n", ctrl_info(ctrl, "Already disabled on slot(%s)\n",
__func__, slot_name(p_slot)); slot_name(p_slot));
mutex_unlock(&p_slot->ctrl->crit_sect); mutex_unlock(&p_slot->ctrl->crit_sect);
return -EINVAL; return -EINVAL;
} }
......
...@@ -316,22 +316,19 @@ static int pcie_write_cmd(struct controller *ctrl, u16 cmd, u16 mask) ...@@ -316,22 +316,19 @@ static int pcie_write_cmd(struct controller *ctrl, u16 cmd, u16 mask)
* proceed forward to issue the next command according * proceed forward to issue the next command according
* to spec. Just print out the error message. * to spec. Just print out the error message.
*/ */
ctrl_dbg(ctrl, ctrl_dbg(ctrl, "CMD_COMPLETED not clear after 1 sec\n");
"%s: CMD_COMPLETED not clear after 1 sec.\n",
__func__);
} else if (!NO_CMD_CMPL(ctrl)) { } else if (!NO_CMD_CMPL(ctrl)) {
/* /*
* This controller semms to notify of command completed * This controller semms to notify of command completed
* event even though it supports none of power * event even though it supports none of power
* controller, attention led, power led and EMI. * controller, attention led, power led and EMI.
*/ */
ctrl_dbg(ctrl, "%s: Unexpected CMD_COMPLETED. Need to " ctrl_dbg(ctrl, "Unexpected CMD_COMPLETED. Need to "
"wait for command completed event.\n", "wait for command completed event.\n");
__func__);
ctrl->no_cmd_complete = 0; ctrl->no_cmd_complete = 0;
} else { } else {
ctrl_dbg(ctrl, "%s: Unexpected CMD_COMPLETED. Maybe " ctrl_dbg(ctrl, "Unexpected CMD_COMPLETED. Maybe "
"the controller is broken.\n", __func__); "the controller is broken.\n");
} }
} }
...@@ -347,8 +344,7 @@ static int pcie_write_cmd(struct controller *ctrl, u16 cmd, u16 mask) ...@@ -347,8 +344,7 @@ static int pcie_write_cmd(struct controller *ctrl, u16 cmd, u16 mask)
smp_mb(); smp_mb();
retval = pciehp_writew(ctrl, SLOTCTRL, slot_ctrl); retval = pciehp_writew(ctrl, SLOTCTRL, slot_ctrl);
if (retval) if (retval)
ctrl_err(ctrl, "%s: Cannot write to SLOTCTRL register\n", ctrl_err(ctrl, "Cannot write to SLOTCTRL register\n");
__func__);
/* /*
* Wait for command completion. * Wait for command completion.
...@@ -418,15 +414,14 @@ static int hpc_check_lnk_status(struct controller *ctrl) ...@@ -418,15 +414,14 @@ static int hpc_check_lnk_status(struct controller *ctrl)
retval = pciehp_readw(ctrl, LNKSTATUS, &lnk_status); retval = pciehp_readw(ctrl, LNKSTATUS, &lnk_status);
if (retval) { if (retval) {
ctrl_err(ctrl, "%s: Cannot read LNKSTATUS register\n", ctrl_err(ctrl, "Cannot read LNKSTATUS register\n");
__func__);
return retval; return retval;
} }
ctrl_dbg(ctrl, "%s: lnk_status = %x\n", __func__, lnk_status); ctrl_dbg(ctrl, "%s: lnk_status = %x\n", __func__, lnk_status);
if ( (lnk_status & LNK_TRN) || (lnk_status & LNK_TRN_ERR) || if ( (lnk_status & LNK_TRN) || (lnk_status & LNK_TRN_ERR) ||
!(lnk_status & NEG_LINK_WD)) { !(lnk_status & NEG_LINK_WD)) {
ctrl_err(ctrl, "%s : Link Training Error occurs \n", __func__); ctrl_err(ctrl, "Link Training Error occurs \n");
retval = -1; retval = -1;
return retval; return retval;
} }
...@@ -551,7 +546,7 @@ static int hpc_query_power_fault(struct slot *slot) ...@@ -551,7 +546,7 @@ static int hpc_query_power_fault(struct slot *slot)
retval = pciehp_readw(ctrl, SLOTSTATUS, &slot_status); retval = pciehp_readw(ctrl, SLOTSTATUS, &slot_status);
if (retval) { if (retval) {
ctrl_err(ctrl, "%s: Cannot check for power fault\n", __func__); ctrl_err(ctrl, "Cannot check for power fault\n");
return retval; return retval;
} }
pwr_fault = (u8)((slot_status & PWR_FAULT_DETECTED) >> 1); pwr_fault = (u8)((slot_status & PWR_FAULT_DETECTED) >> 1);
...@@ -567,7 +562,7 @@ static int hpc_get_emi_status(struct slot *slot, u8 *status) ...@@ -567,7 +562,7 @@ static int hpc_get_emi_status(struct slot *slot, u8 *status)
retval = pciehp_readw(ctrl, SLOTSTATUS, &slot_status); retval = pciehp_readw(ctrl, SLOTSTATUS, &slot_status);
if (retval) { if (retval) {
ctrl_err(ctrl, "%s : Cannot check EMI status\n", __func__); ctrl_err(ctrl, "Cannot check EMI status\n");
return retval; return retval;
} }
*status = (slot_status & EMI_STATE) >> EMI_STATUS_BIT; *status = (slot_status & EMI_STATE) >> EMI_STATUS_BIT;
...@@ -697,8 +692,7 @@ static int hpc_power_on_slot(struct slot * slot) ...@@ -697,8 +692,7 @@ static int hpc_power_on_slot(struct slot * slot)
retval = pcie_write_cmd(ctrl, slot_cmd, cmd_mask); retval = pcie_write_cmd(ctrl, slot_cmd, cmd_mask);
if (retval) { if (retval) {
ctrl_err(ctrl, "%s: Write %x command failed!\n", ctrl_err(ctrl, "Write %x command failed!\n", slot_cmd);
__func__, slot_cmd);
return -1; return -1;
} }
ctrl_dbg(ctrl, "%s: SLOTCTRL %x write cmd %x\n", ctrl_dbg(ctrl, "%s: SLOTCTRL %x write cmd %x\n",
...@@ -776,7 +770,7 @@ static int hpc_power_off_slot(struct slot * slot) ...@@ -776,7 +770,7 @@ static int hpc_power_off_slot(struct slot * slot)
retval = pcie_write_cmd(ctrl, slot_cmd, cmd_mask); retval = pcie_write_cmd(ctrl, slot_cmd, cmd_mask);
if (retval) { if (retval) {
ctrl_err(ctrl, "%s: Write command failed!\n", __func__); ctrl_err(ctrl, "Write command failed!\n");
retval = -1; retval = -1;
goto out; goto out;
} }
...@@ -1056,8 +1050,7 @@ int pcie_enable_notification(struct controller *ctrl) ...@@ -1056,8 +1050,7 @@ int pcie_enable_notification(struct controller *ctrl)
PWR_FAULT_DETECT_ENABLE | HP_INTR_ENABLE | CMD_CMPL_INTR_ENABLE; PWR_FAULT_DETECT_ENABLE | HP_INTR_ENABLE | CMD_CMPL_INTR_ENABLE;
if (pcie_write_cmd(ctrl, cmd, mask)) { if (pcie_write_cmd(ctrl, cmd, mask)) {
ctrl_err(ctrl, "%s: Cannot enable software notification\n", ctrl_err(ctrl, "Cannot enable software notification\n");
__func__);
return -1; return -1;
} }
return 0; return 0;
...@@ -1069,8 +1062,7 @@ static void pcie_disable_notification(struct controller *ctrl) ...@@ -1069,8 +1062,7 @@ static void pcie_disable_notification(struct controller *ctrl)
mask = PRSN_DETECT_ENABLE | ATTN_BUTTN_ENABLE | MRL_DETECT_ENABLE | mask = PRSN_DETECT_ENABLE | ATTN_BUTTN_ENABLE | MRL_DETECT_ENABLE |
PWR_FAULT_DETECT_ENABLE | HP_INTR_ENABLE | CMD_CMPL_INTR_ENABLE; PWR_FAULT_DETECT_ENABLE | HP_INTR_ENABLE | CMD_CMPL_INTR_ENABLE;
if (pcie_write_cmd(ctrl, 0, mask)) if (pcie_write_cmd(ctrl, 0, mask))
ctrl_warn(ctrl, "%s: Cannot disable software notification\n", ctrl_warn(ctrl, "Cannot disable software notification\n");
__func__);
} }
static int pcie_init_notification(struct controller *ctrl) static int pcie_init_notification(struct controller *ctrl)
...@@ -1179,7 +1171,7 @@ struct controller *pcie_init(struct pcie_device *dev) ...@@ -1179,7 +1171,7 @@ struct controller *pcie_init(struct pcie_device *dev)
ctrl = kzalloc(sizeof(*ctrl), GFP_KERNEL); ctrl = kzalloc(sizeof(*ctrl), GFP_KERNEL);
if (!ctrl) { if (!ctrl) {
dev_err(&dev->device, "%s : out of memory\n", __func__); dev_err(&dev->device, "%s: Out of memory\n", __func__);
goto abort; goto abort;
} }
INIT_LIST_HEAD(&ctrl->slot_list); INIT_LIST_HEAD(&ctrl->slot_list);
...@@ -1188,12 +1180,11 @@ struct controller *pcie_init(struct pcie_device *dev) ...@@ -1188,12 +1180,11 @@ struct controller *pcie_init(struct pcie_device *dev)
ctrl->pci_dev = pdev; ctrl->pci_dev = pdev;
ctrl->cap_base = pci_find_capability(pdev, PCI_CAP_ID_EXP); ctrl->cap_base = pci_find_capability(pdev, PCI_CAP_ID_EXP);
if (!ctrl->cap_base) { if (!ctrl->cap_base) {
ctrl_err(ctrl, "%s: Cannot find PCI Express capability\n", ctrl_err(ctrl, "Cannot find PCI Express capability\n");
__func__);
goto abort_ctrl; goto abort_ctrl;
} }
if (pciehp_readl(ctrl, SLOTCAP, &slot_cap)) { if (pciehp_readl(ctrl, SLOTCAP, &slot_cap)) {
ctrl_err(ctrl, "%s: Cannot read SLOTCAP register\n", __func__); ctrl_err(ctrl, "Cannot read SLOTCAP register\n");
goto abort_ctrl; goto abort_ctrl;
} }
......
...@@ -39,8 +39,7 @@ static void program_hpp_type0(struct pci_dev *dev, struct hpp_type0 *hpp) ...@@ -39,8 +39,7 @@ static void program_hpp_type0(struct pci_dev *dev, struct hpp_type0 *hpp)
u16 pci_cmd, pci_bctl; u16 pci_cmd, pci_bctl;
if (hpp->revision > 1) { if (hpp->revision > 1) {
printk(KERN_WARNING "%s: Rev.%d type0 record not supported\n", warn("Rev.%d type0 record not supported\n", hpp->revision);
__func__, hpp->revision);
return; return;
} }
...@@ -81,8 +80,7 @@ static void program_hpp_type2(struct pci_dev *dev, struct hpp_type2 *hpp) ...@@ -81,8 +80,7 @@ static void program_hpp_type2(struct pci_dev *dev, struct hpp_type2 *hpp)
u32 reg32; u32 reg32;
if (hpp->revision > 1) { if (hpp->revision > 1) {
printk(KERN_WARNING "%s: Rev.%d type2 record not supported\n", warn("Rev.%d type2 record not supported\n", hpp->revision);
__func__, hpp->revision);
return; return;
} }
...@@ -149,8 +147,7 @@ static void program_fw_provided_values(struct pci_dev *dev) ...@@ -149,8 +147,7 @@ static void program_fw_provided_values(struct pci_dev *dev)
return; return;
if (pciehp_get_hp_params_from_firmware(dev, &hpp)) { if (pciehp_get_hp_params_from_firmware(dev, &hpp)) {
printk(KERN_WARNING "%s: Could not get hotplug parameters\n", warn("Could not get hotplug parameters\n");
__func__);
return; return;
} }
...@@ -202,9 +199,9 @@ int pciehp_configure_device(struct slot *p_slot) ...@@ -202,9 +199,9 @@ int pciehp_configure_device(struct slot *p_slot)
dev = pci_get_slot(parent, PCI_DEVFN(p_slot->device, 0)); dev = pci_get_slot(parent, PCI_DEVFN(p_slot->device, 0));
if (dev) { if (dev) {
ctrl_err(ctrl, ctrl_err(ctrl, "Device %s already exists "
"Device %s already exists at %x:%x, cannot hot-add\n", "at %04x:%02x:%02x, cannot hot-add\n", pci_name(dev),
pci_name(dev), p_slot->bus, p_slot->device); pci_domain_nr(parent), p_slot->bus, p_slot->device);
pci_dev_put(dev); pci_dev_put(dev);
return -EINVAL; return -EINVAL;
} }
...@@ -248,8 +245,8 @@ int pciehp_unconfigure_device(struct slot *p_slot) ...@@ -248,8 +245,8 @@ int pciehp_unconfigure_device(struct slot *p_slot)
u16 command; u16 command;
struct controller *ctrl = p_slot->ctrl; struct controller *ctrl = p_slot->ctrl;
ctrl_dbg(ctrl, "%s: bus/dev = %x/%x\n", __func__, ctrl_dbg(ctrl, "%s: domain:bus:dev = %04x:%02x:%02x\n",
p_slot->bus, p_slot->device); __func__, pci_domain_nr(parent), p_slot->bus, p_slot->device);
ret = p_slot->hpc_ops->get_adapter_status(p_slot, &presence); ret = p_slot->hpc_ops->get_adapter_status(p_slot, &presence);
if (ret) if (ret)
presence = 0; presence = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment