From patchwork Sat Oct 31 11:35:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 317421 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 215C3C4742C for ; Sat, 31 Oct 2020 11:38:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DEAEE20731 for ; Sat, 31 Oct 2020 11:38:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604144310; bh=e2Rk9PNlPqMnrxoDg8bwy03tmY6Hby9b57Vg85fF3OE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VgxdBilyXuFq5cpOajwZ6gnBS097VXxJ9chAfib4OqBz9HribpllzOPRl7cRAPCIY wSdY0dOi636GPU51v/ZHxdwRIcNkUcSQo3GgR/7VaWi95Zop/PFAw9kk1pkvuH9vRV +FzwTg7EfdAxT1fMBsqukodA50x8LRniwdAqDRkU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726991AbgJaLiX (ORCPT ); Sat, 31 Oct 2020 07:38:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:34506 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727173AbgJaLgX (ORCPT ); Sat, 31 Oct 2020 07:36:23 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5C47020739; Sat, 31 Oct 2020 11:36:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604144182; bh=e2Rk9PNlPqMnrxoDg8bwy03tmY6Hby9b57Vg85fF3OE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GM7rPycyzd+QavLY1FMq10XACCmTfD94pyLJJG5JUyeWI6oLCvsl1DoCcHOF4dmJT 72al2/9NYUAQZF0Ua93f1KeXjz/UtNqWx2zIJT3OmTJoomUhKRzn32Drni2gwgy9fA AOzGtcErbWW/SVfabQtsY8VQiffxpggZ1ZVlPLiQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Frederic Barrat , Andrew Donnellan , Michael Ellerman Subject: [PATCH 5.4 37/49] cxl: Rework error message for incompatible slots Date: Sat, 31 Oct 2020 12:35:33 +0100 Message-Id: <20201031113457.231477874@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201031113455.439684970@linuxfoundation.org> References: <20201031113455.439684970@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Frederic Barrat 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 Reviewed-by: Andrew Donnellan Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20200407115601.25453-1-fbarrat@linux.ibm.com Signed-off-by: Greg Kroah-Hartman --- 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; }