Skip to contentSkip to conversation

cxl: Rework error message for incompatible slots

PATCH Applied Frederic Barrat 3 participants 4 messages Apr 7, 2020 – Sep 9, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cxl: Rework error message for incompatible slots

Improve the error message shown if a capi adapter is plugged on a capi-incompatible slot directly under the PHB (no intermediate switch).

Fixes 5632874311db ("cxl: Add support for POWER9 DD2")
---
 drivers/misc/cxl/pci.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/misc/cxl/pci.c +2 -2
index 25a9dd9c0c1b..2ba899f5659f 100644
@@ -393,8 +393,8 @@ int cxl_calc_capp_routing(struct pci_dev *dev, u64 *chipid,
 	*capp_unit_id = get_capp_unit_id(np, *phb_index);
 	of_node_put(np);
 	if (!*capp_unit_id) {
-		pr_err("cxl: invalid capp unit id (phb_index: %d)\n",
-		       *phb_index);
+		pr_err("cxl: No capp unit found for PHB[%lld,%d]. Make sure the adapter is on a capi-compatible slot\n",
+		       *chipid, *phb_index);
 		return -ENODEV;
 	}
 
Signature · 1 line
2.25.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Frederic Barrat

Improve the error message shown if a capi adapter is plugged on a capi-incompatible slot directly under the PHB (no intermediate switch).

Fixes 5632874311db ("cxl: Add support for POWER9 DD2")

Seems fine to me, not sure if it needs to go to stable but I suppose this could be causing actual confusion out in the field?

Signature · 2 lines
Andrew Donnellan              OzLabs, ADL Canberra
[email protected]             IBM Australia Limited
#2 lore raw

Le 08/04/2020 à 04:13, Andrew Donnellan a écrit :

Quoted 9 lines · Frederic Barrat
Quoted 6 lines

Improve the error message shown if a capi adapter is plugged on a capi-incompatible slot directly under the PHB (no intermediate switch).

Fixes 5632874311db ("cxl: Add support for POWER9 DD2")

Seems fine to me, not sure if it needs to go to stable but I suppose this could be causing actual confusion out in the field?

Yes it does. The reason for this patch is it was hit by a customer.

Fred

Quoted 1 line