From patchwork Sat Apr 28 00:32:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 905995 X-Patchwork-Delegate: linville@tuxdriver.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="h2feda1K"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40XsGd6FFBz9s06 for ; Sat, 28 Apr 2018 10:33:13 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933339AbeD1AdB (ORCPT ); Fri, 27 Apr 2018 20:33:01 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:35453 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933322AbeD1Ac6 (ORCPT ); Fri, 27 Apr 2018 20:32:58 -0400 Received: by mail-pf0-f196.google.com with SMTP id j5so2621588pfh.2; Fri, 27 Apr 2018 17:32:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RKMeoC8vh2HArHuOv1wq3hdM7s53bgi3elS05Y4sKfA=; b=h2feda1Ku8KK+PopB+3gQlkV0hLH9vVa1cXcE0V3w8IrVMF3B0rJTXR/tJ6FCAKaRZ +HvmkpkauzoiEM1CTkiQSrsWbU+4l/H4PWEzbW//tfCM65pXy4qefut/yE+U6ynjVBJm jfG72Esg/zzjUupVz6xua1gHdMyaE3oonQtGPWO1gTkdxYuBsnQdJ2G9yOH9c0w3WK41 mClxImyNUw6wwu3927ZyleMJIScqhhGUMJsIAX2kSU4r11uGmW72HnZjKewjaofht/Fh jKC6dh9zKJ2W/f0/DfDHqCQNURrul9UKBc6vXxq84RWWOMGOPm/ERiePRXvZfUJ6zZaJ M4QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RKMeoC8vh2HArHuOv1wq3hdM7s53bgi3elS05Y4sKfA=; b=CLmwqU+0O2Nwmyz/Yb7CVsmBuNN1yVvNU6cQ6uIphjiJ+XhIKJk83HLgJa1QooVLNb 0+ZbhF6vtZ3yyRU89g5aqJdh4E5VyF+htVoFh8Ufr6xwOv27VOyONZUDxtKQqyy5bshD aP+T8lErolQlCw8hWIvzZoYF4/t6b2zucrQpmcM8vZCF7QX5qTSZRn0NZZovc/YHYjAN Sj8E2ccxeviTNO5AU/gJCmLlM+AsHd6gBap9sNmnoShgrTySaZTgBfOjbpq4SqzFph8a Z8vJiDXD1khGfB6BIVzVyK9HpmAyH5nRAexFvQ/13HGFOqPuEFv1jkjnYodUajP4Bxa1 RzBg== X-Gm-Message-State: ALQs6tAn3pdlDSbZi5nkP5qs4wty2S1ngAMgj4dc3SL+ET7vvrymg9/w uCIGWccUIxeUbUTRdrG2yMZCbdNw X-Google-Smtp-Source: AB8JxZpGifpYVIbSDfAgMnb/Ycc4pP5saR201Pw8qNVSjF5ITPT8dSGwK/vYz2L3LRJ2YaRXQ73shA== X-Received: by 2002:a17:902:8692:: with SMTP id g18-v6mr4156146plo.152.1524875577902; Fri, 27 Apr 2018 17:32:57 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id f184sm4694059pfb.52.2018.04.27.17.32.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Apr 2018 17:32:56 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Andrew Lunn , Russell King , linux-kernel@vger.kernel.org (open list), davem@davemloft.net, cphealy@gmail.com, nikita.yoush@cogentembedded.com, vivien.didelot@savoirfairelinux.com, Nisar.Sayed@microchip.com, UNGLinuxDriver@microchip.com Subject: [PATCH ethtool 2/2] ethtool: Add support for PHY test modes Date: Fri, 27 Apr 2018 17:32:37 -0700 Message-Id: <20180428003237.1536-8-f.fainelli@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180428003237.1536-1-f.fainelli@gmail.com> References: <20180428003237.1536-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add two new commands: --get-phy-tests which allows fetching supported test modes by a given network device's PHY interface --set-phy-test which allows entering one of the modes listed before and pass an eventual set of test specific data Signed-off-by: Florian Fainelli --- ethtool.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/ethtool.c b/ethtool.c index 3289e0f6e8ec..f02cd3560197 100644 --- a/ethtool.c +++ b/ethtool.c @@ -4854,6 +4854,118 @@ static int do_reset(struct cmd_context *ctx) return 0; } +static int do_gphytest(struct cmd_context *ctx) +{ + struct ethtool_gstrings *strings; + struct ethtool_phy_test test; + unsigned int i; + int max_len = 0, cur_len, rc; + + if (ctx->argc != 0) + exit_bad_args(); + + strings = get_stringset(ctx, ETH_SS_PHY_TESTS, 0, 1); + if (!strings) { + perror("Cannot get PHY tests strings"); + return 1; + } + if (strings->len == 0) { + fprintf(stderr, "No PHY tests defined\n"); + rc = 1; + goto err; + } + + /* Find longest string and align all strings accordingly */ + for (i = 0; i < strings->len; i++) { + cur_len = strlen((const char*)strings->data + + i * ETH_GSTRING_LEN); + if (cur_len > max_len) + max_len = cur_len; + } + + printf("PHY tests %s:\n", ctx->devname); + for (i = 0; i < strings->len; i++) { + memset(&test, 0, sizeof(test)); + test.cmd = ETHTOOL_GPHYTEST; + test.mode = i; + + rc = send_ioctl(ctx, &test); + if (rc < 0) + continue; + + fprintf(stdout, " %.*s (Test data: %s)\n", + max_len, + (const char *)strings->data + i * ETH_GSTRING_LEN, + test.len ? "Yes" : "No"); + } + + rc = 0; + +err: + free(strings); + return rc; +} + +static int do_sphytest(struct cmd_context *ctx) +{ + struct ethtool_gstrings *strings; + struct ethtool_phy_test gtest; + struct ethtool_phy_test *stest; + unsigned int i; + int rc; + + if (ctx->argc < 1) + exit_bad_args(); + + strings = get_stringset(ctx, ETH_SS_PHY_TESTS, 0, 1); + if (!strings) { + perror("Cannot get PHY test modes"); + return 1; + } + + if (strings->len == 0) { + fprintf(stderr, "No PHY tests defined\n"); + rc = 1; + goto err; + } + + for (i = 0; i < strings->len; i++) { + if (!strcmp(ctx->argp[0], + (const char *)strings->data + i * ETH_GSTRING_LEN)) + break; + } + + if (i == strings->len) + exit_bad_args(); + + memset(>est, 0, sizeof(gtest)); + gtest.cmd = ETHTOOL_GPHYTEST; + gtest.mode = i; + rc = send_ioctl(ctx, >est); + if (rc < 0) { + rc = 1; + goto err; + } + + stest = calloc(1, sizeof(*stest) + gtest.len); + if (!stest) { + perror("Unable to allocate memory"); + rc = 1; + goto err; + } + + stest->cmd = ETHTOOL_SPHYTEST; + stest->len = gtest.len; + stest->mode = i; + + rc = send_ioctl(ctx, stest); + free(stest); +err: + free(strings); + return rc; +} + + static int parse_named_bool(struct cmd_context *ctx, const char *name, u8 *on) { if (ctx->argc < 2) @@ -5223,6 +5335,9 @@ static const struct option { { "--show-fec", 1, do_gfec, "Show FEC settings"}, { "--set-fec", 1, do_sfec, "Set FEC settings", " [ encoding auto|off|rs|baser ]\n"}, + { "--get-phy-tests", 1, do_gphytest,"Get PHY test mode(s)" }, + { "--set-phy-test", 1, do_sphytest, "Set PHY test mode", + " [ test options ]\n" }, { "-h|--help", 0, show_usage, "Show this help" }, { "--version", 0, do_version, "Show version number" }, {}