Commit 748ac391 authored by Frederic Barrat's avatar Frederic Barrat Committed by Michael Ellerman

pci/hotplug/pnv-php: Wrap warnings in macro

An opencapi slot doesn't have an associated bridge device. It's not
needed for operation, but any warning is displayed through pci_warn()
which uses the pci_dev struct of the assocated bridge device. So wrap
those warning so that a different trace mechanism can be used if it's
an opencapi slot.
Reviewed-by: default avatarAlastair D'Silva <alastair@d-silva.org>
Reviewed-by: default avatarAndrew Donnellan <ajd@linux.ibm.com>
Signed-off-by: default avatarFrederic Barrat <fbarrat@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20191121134918.7155-11-fbarrat@linux.ibm.com
parent be1611e0
...@@ -18,6 +18,9 @@ ...@@ -18,6 +18,9 @@
#define DRIVER_AUTHOR "Gavin Shan, IBM Corporation" #define DRIVER_AUTHOR "Gavin Shan, IBM Corporation"
#define DRIVER_DESC "PowerPC PowerNV PCI Hotplug Driver" #define DRIVER_DESC "PowerPC PowerNV PCI Hotplug Driver"
#define SLOT_WARN(sl, x...) \
((sl)->pdev ? pci_warn((sl)->pdev, x) : dev_warn(&(sl)->bus->dev, x))
struct pnv_php_event { struct pnv_php_event {
bool added; bool added;
struct pnv_php_slot *php_slot; struct pnv_php_slot *php_slot;
...@@ -265,7 +268,7 @@ static int pnv_php_add_devtree(struct pnv_php_slot *php_slot) ...@@ -265,7 +268,7 @@ static int pnv_php_add_devtree(struct pnv_php_slot *php_slot)
ret = pnv_pci_get_device_tree(php_slot->dn->phandle, fdt1, 0x10000); ret = pnv_pci_get_device_tree(php_slot->dn->phandle, fdt1, 0x10000);
if (ret) { if (ret) {
pci_warn(php_slot->pdev, "Error %d getting FDT blob\n", ret); SLOT_WARN(php_slot, "Error %d getting FDT blob\n", ret);
goto free_fdt1; goto free_fdt1;
} }
...@@ -279,7 +282,7 @@ static int pnv_php_add_devtree(struct pnv_php_slot *php_slot) ...@@ -279,7 +282,7 @@ static int pnv_php_add_devtree(struct pnv_php_slot *php_slot)
dt = of_fdt_unflatten_tree(fdt, php_slot->dn, NULL); dt = of_fdt_unflatten_tree(fdt, php_slot->dn, NULL);
if (!dt) { if (!dt) {
ret = -EINVAL; ret = -EINVAL;
pci_warn(php_slot->pdev, "Cannot unflatten FDT\n"); SLOT_WARN(php_slot, "Cannot unflatten FDT\n");
goto free_fdt; goto free_fdt;
} }
...@@ -289,7 +292,7 @@ static int pnv_php_add_devtree(struct pnv_php_slot *php_slot) ...@@ -289,7 +292,7 @@ static int pnv_php_add_devtree(struct pnv_php_slot *php_slot)
ret = pnv_php_populate_changeset(&php_slot->ocs, php_slot->dn); ret = pnv_php_populate_changeset(&php_slot->ocs, php_slot->dn);
if (ret) { if (ret) {
pnv_php_reverse_nodes(php_slot->dn); pnv_php_reverse_nodes(php_slot->dn);
pci_warn(php_slot->pdev, "Error %d populating changeset\n", SLOT_WARN(php_slot, "Error %d populating changeset\n",
ret); ret);
goto free_dt; goto free_dt;
} }
...@@ -297,7 +300,7 @@ static int pnv_php_add_devtree(struct pnv_php_slot *php_slot) ...@@ -297,7 +300,7 @@ static int pnv_php_add_devtree(struct pnv_php_slot *php_slot)
php_slot->dn->child = NULL; php_slot->dn->child = NULL;
ret = of_changeset_apply(&php_slot->ocs); ret = of_changeset_apply(&php_slot->ocs);
if (ret) { if (ret) {
pci_warn(php_slot->pdev, "Error %d applying changeset\n", ret); SLOT_WARN(php_slot, "Error %d applying changeset\n", ret);
goto destroy_changeset; goto destroy_changeset;
} }
...@@ -337,7 +340,7 @@ int pnv_php_set_slot_power_state(struct hotplug_slot *slot, ...@@ -337,7 +340,7 @@ int pnv_php_set_slot_power_state(struct hotplug_slot *slot,
if (ret > 0) { if (ret > 0) {
if (be64_to_cpu(msg.params[1]) != php_slot->dn->phandle || if (be64_to_cpu(msg.params[1]) != php_slot->dn->phandle ||
be64_to_cpu(msg.params[2]) != state) { be64_to_cpu(msg.params[2]) != state) {
pci_warn(php_slot->pdev, "Wrong msg (%lld, %lld, %lld)\n", SLOT_WARN(php_slot, "Wrong msg (%lld, %lld, %lld)\n",
be64_to_cpu(msg.params[1]), be64_to_cpu(msg.params[1]),
be64_to_cpu(msg.params[2]), be64_to_cpu(msg.params[2]),
be64_to_cpu(msg.params[3])); be64_to_cpu(msg.params[3]));
...@@ -359,7 +362,7 @@ int pnv_php_set_slot_power_state(struct hotplug_slot *slot, ...@@ -359,7 +362,7 @@ int pnv_php_set_slot_power_state(struct hotplug_slot *slot,
return ret; return ret;
error: error:
pci_warn(php_slot->pdev, "Error %d powering %s\n", SLOT_WARN(php_slot, "Error %d powering %s\n",
ret, (state == OPAL_PCI_SLOT_POWER_ON) ? "on" : "off"); ret, (state == OPAL_PCI_SLOT_POWER_ON) ? "on" : "off");
return ret; return ret;
} }
...@@ -378,7 +381,7 @@ static int pnv_php_get_power_state(struct hotplug_slot *slot, u8 *state) ...@@ -378,7 +381,7 @@ static int pnv_php_get_power_state(struct hotplug_slot *slot, u8 *state)
*/ */
ret = pnv_pci_get_power_state(php_slot->id, &power_state); ret = pnv_pci_get_power_state(php_slot->id, &power_state);
if (ret) { if (ret) {
pci_warn(php_slot->pdev, "Error %d getting power status\n", SLOT_WARN(php_slot, "Error %d getting power status\n",
ret); ret);
} else { } else {
*state = power_state; *state = power_state;
...@@ -402,7 +405,7 @@ static int pnv_php_get_adapter_state(struct hotplug_slot *slot, u8 *state) ...@@ -402,7 +405,7 @@ static int pnv_php_get_adapter_state(struct hotplug_slot *slot, u8 *state)
*state = presence; *state = presence;
ret = 0; ret = 0;
} else { } else {
pci_warn(php_slot->pdev, "Error %d getting presence\n", ret); SLOT_WARN(php_slot, "Error %d getting presence\n", ret);
} }
return ret; return ret;
...@@ -681,7 +684,7 @@ static int pnv_php_register_slot(struct pnv_php_slot *php_slot) ...@@ -681,7 +684,7 @@ static int pnv_php_register_slot(struct pnv_php_slot *php_slot)
ret = pci_hp_register(&php_slot->slot, php_slot->bus, ret = pci_hp_register(&php_slot->slot, php_slot->bus,
php_slot->slot_no, php_slot->name); php_slot->slot_no, php_slot->name);
if (ret) { if (ret) {
pci_warn(php_slot->pdev, "Error %d registering slot\n", ret); SLOT_WARN(php_slot, "Error %d registering slot\n", ret);
return ret; return ret;
} }
...@@ -734,7 +737,7 @@ static int pnv_php_enable_msix(struct pnv_php_slot *php_slot) ...@@ -734,7 +737,7 @@ static int pnv_php_enable_msix(struct pnv_php_slot *php_slot)
/* Enable MSIx */ /* Enable MSIx */
ret = pci_enable_msix_exact(pdev, &entry, 1); ret = pci_enable_msix_exact(pdev, &entry, 1);
if (ret) { if (ret) {
pci_warn(pdev, "Error %d enabling MSIx\n", ret); SLOT_WARN(php_slot, "Error %d enabling MSIx\n", ret);
return ret; return ret;
} }
...@@ -784,7 +787,8 @@ static irqreturn_t pnv_php_interrupt(int irq, void *data) ...@@ -784,7 +787,8 @@ static irqreturn_t pnv_php_interrupt(int irq, void *data)
(sts & PCI_EXP_SLTSTA_PDC)) { (sts & PCI_EXP_SLTSTA_PDC)) {
ret = pnv_pci_get_presence_state(php_slot->id, &presence); ret = pnv_pci_get_presence_state(php_slot->id, &presence);
if (ret) { if (ret) {
pci_warn(pdev, "PCI slot [%s] error %d getting presence (0x%04x), to retry the operation.\n", SLOT_WARN(php_slot,
"PCI slot [%s] error %d getting presence (0x%04x), to retry the operation.\n",
php_slot->name, ret, sts); php_slot->name, ret, sts);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -815,7 +819,8 @@ static irqreturn_t pnv_php_interrupt(int irq, void *data) ...@@ -815,7 +819,8 @@ static irqreturn_t pnv_php_interrupt(int irq, void *data)
*/ */
event = kzalloc(sizeof(*event), GFP_ATOMIC); event = kzalloc(sizeof(*event), GFP_ATOMIC);
if (!event) { if (!event) {
pci_warn(pdev, "PCI slot [%s] missed hotplug event 0x%04x\n", SLOT_WARN(php_slot,
"PCI slot [%s] missed hotplug event 0x%04x\n",
php_slot->name, sts); php_slot->name, sts);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -840,7 +845,7 @@ static void pnv_php_init_irq(struct pnv_php_slot *php_slot, int irq) ...@@ -840,7 +845,7 @@ static void pnv_php_init_irq(struct pnv_php_slot *php_slot, int irq)
/* Allocate workqueue */ /* Allocate workqueue */
php_slot->wq = alloc_workqueue("pciehp-%s", 0, 0, php_slot->name); php_slot->wq = alloc_workqueue("pciehp-%s", 0, 0, php_slot->name);
if (!php_slot->wq) { if (!php_slot->wq) {
pci_warn(pdev, "Cannot alloc workqueue\n"); SLOT_WARN(php_slot, "Cannot alloc workqueue\n");
pnv_php_disable_irq(php_slot, true); pnv_php_disable_irq(php_slot, true);
return; return;
} }
...@@ -864,7 +869,7 @@ static void pnv_php_init_irq(struct pnv_php_slot *php_slot, int irq) ...@@ -864,7 +869,7 @@ static void pnv_php_init_irq(struct pnv_php_slot *php_slot, int irq)
php_slot->name, php_slot); php_slot->name, php_slot);
if (ret) { if (ret) {
pnv_php_disable_irq(php_slot, true); pnv_php_disable_irq(php_slot, true);
pci_warn(pdev, "Error %d enabling IRQ %d\n", ret, irq); SLOT_WARN(php_slot, "Error %d enabling IRQ %d\n", ret, irq);
return; return;
} }
...@@ -900,7 +905,7 @@ static void pnv_php_enable_irq(struct pnv_php_slot *php_slot) ...@@ -900,7 +905,7 @@ static void pnv_php_enable_irq(struct pnv_php_slot *php_slot)
ret = pci_enable_device(pdev); ret = pci_enable_device(pdev);
if (ret) { if (ret) {
pci_warn(pdev, "Error %d enabling device\n", ret); SLOT_WARN(php_slot, "Error %d enabling device\n", ret);
return; return;
} }
......
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