From patchwork Wed Aug 10 06:42:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil Kovvuri X-Patchwork-Id: 657797 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3s8fsG4PdKz9sDf for ; Thu, 11 Aug 2016 04:32:50 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Le9Q69NB; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935309AbcHJSb4 (ORCPT ); Wed, 10 Aug 2016 14:31:56 -0400 Received: from mail-pa0-f67.google.com ([209.85.220.67]:34964 "EHLO mail-pa0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753460AbcHJSbw (ORCPT ); Wed, 10 Aug 2016 14:31:52 -0400 Received: by mail-pa0-f67.google.com with SMTP id cf3so3205009pad.2; Wed, 10 Aug 2016 11:31:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dCab9r/sDV/9rxyqHIxm7/wnFPQZJK3/kTH1Te21JZ8=; b=Le9Q69NBczUbBYJR2LIVRrypKVTEkAL4C0+DhaHjqaNT+Kqw0C4WzRVFY5hiG4sJys pO9TPsm22ZTsy893T8BkqBdcbu0ZVOpsbZru6Jn1e34rUAy6zMDwvw417XILtFwvRurk uGsowysshEQjrBvnKc2wH9pDnpd8DJX4X6jFHBIElzANYxuYN45I4bxc+QTB+f7LvvGq ysPzEaQ+Fq1pEAc0yCF6xv3rL28LoyJ2YDHm5t3isvRZtcAbT3K1H4Ocr39qEk5hBbH3 6HxT/oGQX0D/2w2ys+liAYQ/50Gv3T3H57nWP8FlboWqr2tret1R6owDgfDEZvPV65Mb gqdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dCab9r/sDV/9rxyqHIxm7/wnFPQZJK3/kTH1Te21JZ8=; b=cah4YG6ora2o8+mvH7brFiWRZeWVsZdx4SEmNyRdKsfEgFgatFNJ/V8IL5PsTjEQ6U JVLGSGlS+u0TeYuhBuTOYGgpeA50DqKIlgDWGegKCI4LJSRkLTzK74mK2MtNcJvG9Y48 SmaaFla8K262CbjDqL+fM9q0dTTQtv9BBtrqmzb9vUqjOblJfvBjNHpONTD7asj3iRxN VpQ61DDcLPytipQ3JdPsRxil2GeX54eDx2UOJmERMnKOfvWtnybgMvseyCBGzEqhgqju aiN+9xoO5sxDotoJXczVqOfSrMKBelEqmiAsocxVhjNd5nG3SX1bHbRbDyuDo2BxsKil moTg== X-Gm-Message-State: AEkoouuuYLorT2BfuvcHL865n+vA8Fmxh5ZjpmD16AiBLMP6x7D9BEDfGUR+QiuyMCYF0g== X-Received: by 10.66.10.168 with SMTP id j8mr4299298pab.3.1470811491737; Tue, 09 Aug 2016 23:44:51 -0700 (PDT) Received: from machine421.in.caveonetworks.com ([14.140.2.178]) by smtp.googlemail.com with ESMTPSA id lf11sm60825780pab.17.2016.08.09.23.44.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 Aug 2016 23:44:50 -0700 (PDT) From: sunil.kovvuri@gmail.com To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Radoslaw Biernacki , Sunil Goutham Subject: [PATCH 15/21] net: thunderx: Improvement for MBX interface debug messages Date: Wed, 10 Aug 2016 12:12:47 +0530 Message-Id: <1470811373-28277-16-git-send-email-sunil.kovvuri@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1470811373-28277-1-git-send-email-sunil.kovvuri@gmail.com> References: <1470811373-28277-1-git-send-email-sunil.kovvuri@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Radoslaw Biernacki Adding debug messages in case of NACK for a mailbox message, also did small cleanups. Signed-off-by: Radoslaw Biernacki Signed-off-by: Sunil Goutham --- drivers/net/ethernet/cavium/thunder/nic_main.c | 16 ++++++++++------ drivers/net/ethernet/cavium/thunder/nicvf_main.c | 8 ++++++-- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/cavium/thunder/nic_main.c b/drivers/net/ethernet/cavium/thunder/nic_main.c index 8ed8ecd..668cfd9 100644 --- a/drivers/net/ethernet/cavium/thunder/nic_main.c +++ b/drivers/net/ethernet/cavium/thunder/nic_main.c @@ -831,7 +831,7 @@ static void nic_handle_mbx_intr(struct nicpf *nic, int vf) mbx_addr += sizeof(u64); } - dev_dbg(&nic->pdev->dev, "%s: Mailbox msg %d from VF%d\n", + dev_dbg(&nic->pdev->dev, "%s: Mailbox msg 0x%02x from VF%d\n", __func__, mbx.msg.msg, vf); switch (mbx.msg.msg) { case NIC_MBOX_MSG_READY: @@ -841,8 +841,7 @@ static void nic_handle_mbx_intr(struct nicpf *nic, int vf) nic->duplex[vf] = 0; nic->speed[vf] = 0; } - ret = 1; - break; + goto unlock; case NIC_MBOX_MSG_QS_CFG: reg_addr = NIC_PF_QSET_0_127_CFG | (mbx.qs.num << NIC_QS_ID_SHIFT); @@ -891,8 +890,10 @@ static void nic_handle_mbx_intr(struct nicpf *nic, int vf) nic_tx_channel_cfg(nic, mbx.qs.num, &mbx.sq); break; case NIC_MBOX_MSG_SET_MAC: - if (vf >= nic->num_vf_en) + if (vf >= nic->num_vf_en) { + ret = -1; /* NACK */ break; + } lmac = mbx.mac.vf_id; bgx = NIC_GET_BGX_FROM_VF_LMAC_MAP(nic->vf_lmac_map[lmac]); lmac = NIC_GET_LMAC_FROM_VF_LMAC_MAP(nic->vf_lmac_map[lmac]); @@ -947,10 +948,13 @@ static void nic_handle_mbx_intr(struct nicpf *nic, int vf) break; } - if (!ret) + if (!ret) { nic_mbx_send_ack(nic, vf); - else if (mbx.msg.msg != NIC_MBOX_MSG_READY) + } else if (mbx.msg.msg != NIC_MBOX_MSG_READY) { + dev_err(&nic->pdev->dev, "NACK for MBOX 0x%02x from VF %d\n", + mbx.msg.msg, vf); nic_mbx_send_nack(nic, vf); + } unlock: nic->mbx_lock[vf] = false; } diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c index dbb61a8..300416a 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c @@ -144,15 +144,19 @@ int nicvf_send_msg_to_pf(struct nicvf *nic, union nic_mbx *mbx) /* Wait for previous message to be acked, timeout 2sec */ while (!nic->pf_acked) { - if (nic->pf_nacked) + if (nic->pf_nacked) { + netdev_err(nic->netdev, + "PF NACK to mbox msg 0x%02x from VF%d\n", + (mbx->msg.msg & 0xFF), nic->vf_id); return -EINVAL; + } msleep(sleep); if (nic->pf_acked) break; timeout -= sleep; if (!timeout) { netdev_err(nic->netdev, - "PF didn't ack to mbox msg %d from VF%d\n", + "PF didn't ACK to mbox msg 0x%02x from VF%d\n", (mbx->msg.msg & 0xFF), nic->vf_id); return -EBUSY; }