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 --- drivers/misc/cxl/pci.c | 4 ++-- 1 file 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; }
On 7/4/20 9:56 pm, Frederic Barrat wrote:
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
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?
Reviewed-by: Andrew Donnellan ajd@linux.ibm.com
Le 08/04/2020 à 04:13, Andrew Donnellan a écrit :
On 7/4/20 9:56 pm, Frederic Barrat wrote:
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
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
Reviewed-by: Andrew Donnellan ajd@linux.ibm.com
On Tue, 7 Apr 2020 13:56:01 +0200, Frederic Barrat wrote:
Improve the error message shown if a capi adapter is plugged on a capi-incompatible slot directly under the PHB (no intermediate switch).
Applied to powerpc/next.
[1/1] cxl: Rework error message for incompatible slots https://git.kernel.org/powerpc/c/40ac790d99c6dd16b367d5c2339e446a5f1b0593
cheers
linux-stable-mirror@lists.linaro.org