summaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorFrederic Barrat <fbarrat@linux.ibm.com>2020-04-07 13:56:01 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-11-01 12:01:05 +0100
commitebb0adcfbb1fc1eeb924bb0512d6a7e3509083ee (patch)
tree40bdf2ce0eadad970ff0081e58ec428837cf933b /drivers/misc
parent125a229e52e7ef265b2760c7050ebf81e6570775 (diff)
downloadlinux-stable-ebb0adcfbb1fc1eeb924bb0512d6a7e3509083ee.tar.gz
linux-stable-ebb0adcfbb1fc1eeb924bb0512d6a7e3509083ee.tar.bz2
linux-stable-ebb0adcfbb1fc1eeb924bb0512d6a7e3509083ee.zip
cxl: Rework error message for incompatible slots
commit 40ac790d99c6dd16b367d5c2339e446a5f1b0593 upstream. 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") Cc: stable@vger.kernel.org # 4.14+ Signed-off-by: Frederic Barrat <fbarrat@linux.ibm.com> Reviewed-by: Andrew Donnellan <ajd@linux.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20200407115601.25453-1-fbarrat@linux.ibm.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/cxl/pci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c
index 25a9dd9c0c1b..2ba899f5659f 100644
--- a/drivers/misc/cxl/pci.c
+++ b/drivers/misc/cxl/pci.c
@@ -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;
}