From: sunil.kovvuri@gmail.com
To: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Radoslaw Biernacki <rad@semihalf.com>,
Sunil Goutham <sgoutham@cavium.com>
Subject: [PATCH v2 15/21] net: thunderx: Improvement for MBX interface debug messages
Date: Fri, 12 Aug 2016 16:51:38 +0530 [thread overview]
Message-ID: <1471000904-21715-16-git-send-email-sunil.kovvuri@gmail.com> (raw)
In-Reply-To: <1471000904-21715-1-git-send-email-sunil.kovvuri@gmail.com>
From: Radoslaw Biernacki <rad@semihalf.com>
Adding debug messages in case of NACK for a mailbox message, also
did small cleanups.
Signed-off-by: Radoslaw Biernacki <rad@semihalf.com>
Signed-off-by: Sunil Goutham <sgoutham@cavium.com>
---
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 b982e5f..c706b2e 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 5335ff1..dd57361 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;
}
--
2.7.4
next prev parent reply other threads:[~2016-08-12 11:21 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-12 11:21 [PATCH v2 00/21] net: thunderx: Support for newer chips and miscellaneous patches sunil.kovvuri
2016-08-12 11:21 ` [PATCH v2 01/21] net: thunderx: Moved HW capability info from macros to structure sunil.kovvuri
2016-08-12 11:21 ` [PATCH v2 02/21] net: thunderx: Add VNIC's PCI devid on future chips sunil.kovvuri
2016-08-12 11:21 ` [PATCH v2 03/21] net: thunderx: Add support for 81xx and 83xx chips sunil.kovvuri
2016-08-12 11:21 ` [PATCH v2 04/21] net: thunderx: Set queue count based on number of CPUs sunil.kovvuri
2016-08-12 11:21 ` [PATCH v2 05/21] net: thunderx: Enable CQE_RX desc's extension fields sunil.kovvuri
2016-08-12 11:21 ` [PATCH v2 06/21] net: thunderx: Enable mailbox interrupts on 81xx/83xx sunil.kovvuri
2016-08-12 11:21 ` [PATCH v2 07/21] net: thunderx: Support for different LMAC types within BGX sunil.kovvuri
2016-08-12 11:21 ` [PATCH v2 08/21] net: thunderx: Add 81xx support to BGX driver sunil.kovvuri
2016-08-12 11:21 ` [PATCH v2 09/21] net: thunderx: Add QSGMII interface type support sunil.kovvuri
2016-08-12 11:21 ` [PATCH v2 10/21] net: thunderx: Add RGMII " sunil.kovvuri
2016-08-12 11:21 ` [PATCH v2 11/21] net: thunderx: Add support for 16 LMACs of 83xx sunil.kovvuri
2016-08-12 11:21 ` [PATCH v2 12/21] net: thunderx: Support for 83xx mixed QLM/DLM config sunil.kovvuri
2016-08-12 11:21 ` [PATCH v2 13/21] net: thunderx: Use netdev's name for naming VF's interrupts sunil.kovvuri
2016-08-12 11:21 ` [PATCH v2 14/21] net: thunderx: Use skb_add_rx_frag() for split buffer Rx pkts sunil.kovvuri
2016-08-12 11:21 ` sunil.kovvuri [this message]
2016-08-12 11:21 ` [PATCH v2 16/21] net: thunderx: Reset RXQ HW stats when interface is brought down sunil.kovvuri
2016-08-12 11:21 ` [PATCH v2 17/21] net: thunderx: Don't set mac address for secondary Qset VFs sunil.kovvuri
2016-08-12 11:21 ` [PATCH v2 18/21] net: thunderx: Use napi_consume_skb for bulk free sunil.kovvuri
2016-08-12 11:21 ` [PATCH v2 19/21] net: thunderx: Configure tunnelling protocol parsing sunil.kovvuri
2016-08-12 11:21 ` [PATCH v2 20/21] net: thunderx: Use netdev_rss_key_fill() helper sunil.kovvuri
2016-08-12 11:21 ` [PATCH v2 21/21] net: thunderx: Don't set RX_PACKET_DIS while initializing sunil.kovvuri
2016-08-13 19:01 ` [PATCH v2 00/21] net: thunderx: Support for newer chips and miscellaneous patches David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1471000904-21715-16-git-send-email-sunil.kovvuri@gmail.com \
--to=sunil.kovvuri@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=rad@semihalf.com \
--cc=sgoutham@cavium.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).