This is a note to let you know that I've just added the patch titled cxl: Rework error message for incompatible slots to the 5.8-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: cxl-rework-error-message-for-incompatible-slots.patch and it can be found in the queue-5.8 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 40ac790d99c6dd16b367d5c2339e446a5f1b0593 Mon Sep 17 00:00:00 2001 From: Frederic Barrat <fbarrat@xxxxxxxxxxxxx> Date: Tue, 7 Apr 2020 13:56:01 +0200 Subject: cxl: Rework error message for incompatible slots From: Frederic Barrat <fbarrat@xxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxx # 4.14+ Signed-off-by: Frederic Barrat <fbarrat@xxxxxxxxxxxxx> Reviewed-by: Andrew Donnellan <ajd@xxxxxxxxxxxxx> Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20200407115601.25453-1-fbarrat@xxxxxxxxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/misc/cxl/pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/misc/cxl/pci.c +++ b/drivers/misc/cxl/pci.c @@ -393,8 +393,8 @@ int cxl_calc_capp_routing(struct pci_dev *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; } Patches currently in stable-queue which might be from fbarrat@xxxxxxxxxxxxx are queue-5.8/cxl-rework-error-message-for-incompatible-slots.patch