From mboxrd@z Thu Jan 1 00:00:00 1970 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=-13.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 07C1BC433E5 for ; Fri, 17 Jul 2020 13:49:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CFFBE2076A for ; Fri, 17 Jul 2020 13:49:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726829AbgGQNtU (ORCPT ); Fri, 17 Jul 2020 09:49:20 -0400 Received: from stargate.chelsio.com ([12.32.117.8]:60081 "EHLO stargate.chelsio.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726205AbgGQNtU (ORCPT ); Fri, 17 Jul 2020 09:49:20 -0400 Received: from vishal.asicdesigners.com (indranil-pc.asicdesigners.com [10.193.177.163] (may be forged)) by stargate.chelsio.com (8.13.8/8.13.8) with ESMTP id 06HDn2F7017430; Fri, 17 Jul 2020 06:49:16 -0700 From: Vishal Kulkarni To: netdev@vger.kernel.org, davem@davemloft.net Cc: nirranjan@chelsio.com, Vishal Kulkarni Subject: [PATCH net-next 2/4] cxgb4: Add link test to ethtool self test Date: Fri, 17 Jul 2020 19:17:57 +0530 Message-Id: <20200717134759.8268-3-vishal@chelsio.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200717134759.8268-1-vishal@chelsio.com> References: <20200717134759.8268-1-vishal@chelsio.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This test checks whether link is up or not Signed-off-by: Vishal Kulkarni --- .../ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 35 ++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c index 1ec6157f8ba7..f374757e15c8 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c @@ -27,11 +27,13 @@ static void set_msglevel(struct net_device *dev, u32 val) enum cxgb4_ethtool_tests { CXGB4_ETHTOOL_ADAPTER_TEST, + CXGB4_ETHTOOL_LINK_TEST, CXGB4_ETHTOOL_MAX_TEST, }; static const char cxgb4_selftest_strings[CXGB4_ETHTOOL_MAX_TEST][ETH_GSTRING_LEN] = { "Adapter health status", + "Link test", }; static const char * const flash_region_strings[] = { @@ -2085,14 +2087,45 @@ static void cxgb4_adapter_status_test(struct net_device *netdev, u64 *data) *data = 0; } +static void cxgb4_link_test(struct net_device *netdev, u64 *data) +{ + struct port_info *pi = netdev_priv(netdev); + unsigned int link = 0; + int ret; + + ret = t4_get_link_params(pi, &link, NULL, NULL); + if (ret) { + *data = ret; + return; + } + + *data = !link; +} + static void cxgb4_self_test(struct net_device *netdev, struct ethtool_test *eth_test, u64 *data) { + int i; + memset(data, 0, sizeof(u64) * CXGB4_ETHTOOL_MAX_TEST); cxgb4_adapter_status_test(netdev, &data[CXGB4_ETHTOOL_ADAPTER_TEST]); - if (data[CXGB4_ETHTOOL_ADAPTER_TEST]) + if (data[CXGB4_ETHTOOL_ADAPTER_TEST]) { + for (i = CXGB4_ETHTOOL_ADAPTER_TEST + 1; + i < CXGB4_ETHTOOL_MAX_TEST; i++) + data[i] = 1; + eth_test->flags |= ETH_TEST_FL_FAILED; + return; + } + + cxgb4_link_test(netdev, &data[CXGB4_ETHTOOL_LINK_TEST]); + for (i = CXGB4_ETHTOOL_ADAPTER_TEST; i < CXGB4_ETHTOOL_MAX_TEST; i++) { + if (data[i]) { + eth_test->flags |= ETH_TEST_FL_FAILED; + break; + } + } } static const struct ethtool_ops cxgb_ethtool_ops = { -- 2.21.1