From patchwork Wed Jan 23 16:05:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlo Caione X-Patchwork-Id: 1030037 X-Patchwork-Delegate: joe.hershberger@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="iIQdDxQ3"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43l9Dv2Ny3z9s3l for ; Thu, 24 Jan 2019 03:08:15 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 13B48C21E3A; Wed, 23 Jan 2019 16:07:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 4FD1FC21E02; Wed, 23 Jan 2019 16:06:54 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C67F9C21D83; Wed, 23 Jan 2019 16:06:46 +0000 (UTC) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by lists.denx.de (Postfix) with ESMTPS id A1DDFC21DA2 for ; Wed, 23 Jan 2019 16:06:42 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id q18so3095453wrx.9 for ; Wed, 23 Jan 2019 08:06:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QNfeVxFctv2OlQDwCCWXudgQNT1eriGZ2CBs0w2+kkI=; b=iIQdDxQ3kTlw0QJ4ly+OVXF/nOU09EfKCP9wr5qZX+QNxvH9VFBvK1g23nTfhOuVjG OhIE9yQ99a6ben4+cPq0g3T6kuJQKtGLwkZ4TohLn08P+tifVb0bW+asMb6W+8pMIeoS nhQtdgfwKd5iWGG8lY5ZYSkr/D1y+T1ITYFYRZPTYsaaB++JKheboZbUhTnz/bfb1q9w wIOHjtYkI73vQ8Phktcmj3c7mclUoTDgsYkEMyHe1aQxzEegYxX/IH6bI9DvS575LcAD qt1QOEkcwGqa9fwP1HnjpvlO8WdekI0zh7p6dZ/3zgiH9ugTNVRt7vEvA8VH7HfyCbAe PfoA== 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:mime-version:content-transfer-encoding; bh=QNfeVxFctv2OlQDwCCWXudgQNT1eriGZ2CBs0w2+kkI=; b=pqiKmz5qH4N8HNEp/ObffcJxhNJh4w2tZ8t0DJy11sGDR72/JfmAGe8iJpx+P6esj5 m+B1x23RNtmsInXGQHfpC+dVaXppAL7DdJBjaqb0QrXJZ4kaZ/QIzCmaO4GaS6t5+hvf PlEf4L97GXylEMtaFcLxYo7LemT9jYLcGJna8IP4ZdKkDpLzLDb45CKXHa8ynwLSTK8+ 7YsC0VeFjxGpaJS33Jk8sip2n65lcYMswMl2TNMuk/Dx//YyAlCLm7YDFzTSteIBvric gaoil4puQihxkrGLWZlVisNJ4Hbfmb+T67+XM73VlYACssXdrMFaRFOs4salsFmDLm4Z Cxng== X-Gm-Message-State: AJcUukcSH6zoVAErjvrBFw2bUrh79hQW4gb/LT9oDC18UnjlfC9EjW0I OpvXoHBw3i5UkNOIwYfUnB7K2g== X-Google-Smtp-Source: ALg8bN563V4GbeXiRueXpAylalPaavWEkUbK6iDxFI1K5crdjEd35lq5r0+nf+CpXDR0ga4POtKMrw== X-Received: by 2002:adf:ba05:: with SMTP id o5mr3300832wrg.325.1548259602245; Wed, 23 Jan 2019 08:06:42 -0800 (PST) Received: from localhost.localdomain ([2a00:23c4:f7a1:ce00:5105:4b7b:c922:7c6]) by smtp.gmail.com with ESMTPSA id s16sm88252414wrt.77.2019.01.23.08.06.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Jan 2019 08:06:41 -0800 (PST) From: Carlo Caione To: joe.hershberger@ni.com, joseph.hershberger@ni.com, vladimir.oltean@nxp.com, u-boot@lists.denx.de Date: Wed, 23 Jan 2019 16:05:52 +0000 Message-Id: <20190123160552.766-4-ccaione@baylibre.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190123160552.766-1-ccaione@baylibre.com> References: <20190123160552.766-1-ccaione@baylibre.com> MIME-Version: 1.0 Cc: Carlo Caione Subject: [U-Boot] [PATCH v3 3/3] cmd: mdio: Add new parameter to access MMD PHY registers X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Two new parameters (rmmd and wmmd) are added to allow the `mdio` command to access the content of the MMD PHY registers. Signed-off-by: Carlo Caione Acked-by: Joe Hershberger --- cmd/mdio.c | 51 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/cmd/mdio.c b/cmd/mdio.c index 184868063a..f4ae4541e7 100644 --- a/cmd/mdio.c +++ b/cmd/mdio.c @@ -43,7 +43,7 @@ static int mdio_write_ranges(struct phy_device *phydev, struct mii_dev *bus, int addrlo, int addrhi, int devadlo, int devadhi, int reglo, int reghi, unsigned short data, - int extended) + int extended, int mmd) { int addr, devad, reg; int err = 0; @@ -51,12 +51,14 @@ static int mdio_write_ranges(struct phy_device *phydev, struct mii_dev *bus, for (addr = addrlo; addr <= addrhi; addr++) { for (devad = devadlo; devad <= devadhi; devad++) { for (reg = reglo; reg <= reghi; reg++) { - if (!extended) - err = bus->write(bus, addr, devad, - reg, data); - else + if (mmd) + err = phy_write_mmd(phydev, devad, reg, data); + else if (extended) err = phydev->drv->writeext(phydev, addr, devad, reg, data); + else + err = bus->write(bus, addr, devad, + reg, data); if (err) goto err_out; @@ -71,7 +73,7 @@ err_out: static int mdio_read_ranges(struct phy_device *phydev, struct mii_dev *bus, int addrlo, int addrhi, int devadlo, int devadhi, - int reglo, int reghi, int extended) + int reglo, int reghi, int extended, int mmd) { int addr, devad, reg; @@ -83,11 +85,13 @@ static int mdio_read_ranges(struct phy_device *phydev, struct mii_dev *bus, for (reg = reglo; reg <= reghi; reg++) { int val; - if (!extended) - val = bus->read(bus, addr, devad, reg); - else + if (mmd) + val = phy_read_mmd(phydev, devad, reg); + else if (extended) val = phydev->drv->readext(phydev, addr, devad, reg); + else + val = bus->read(bus, addr, devad, reg); if (val < 0) { printf("Error\n"); @@ -189,6 +193,7 @@ static int do_mdio(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) struct mii_dev *bus; struct phy_device *phydev = NULL; int extended = 0; + int mmd = 0; if (argc < 2) return CMD_RET_USAGE; @@ -222,14 +227,26 @@ static int do_mdio(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) bus = phydev->bus; extended = 1; } else { - return -1; + return CMD_RET_FAILURE; } if (!phydev->drv || (!phydev->drv->writeext && (op[0] == 'w')) || (!phydev->drv->readext && (op[0] == 'r'))) { puts("PHY does not have extended functions\n"); - return -1; + return CMD_RET_FAILURE; + } + } + if (op[1] == 'm') { + phydev = mdio_phydev_for_ethname(argv[2]); + + if (phydev) { + addrlo = phydev->addr; + addrhi = addrlo; + bus = phydev->bus; + mmd = 1; + } else { + return CMD_RET_FAILURE; } } } @@ -242,13 +259,13 @@ static int do_mdio(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (pos > 1) if (extract_reg_range(argv[pos--], &devadlo, &devadhi, ®lo, ®hi)) - return -1; + return CMD_RET_FAILURE; default: if (pos > 1) if (extract_phy_range(&argv[2], pos - 1, &bus, &phydev, &addrlo, &addrhi)) - return -1; + return CMD_RET_FAILURE; break; } @@ -265,12 +282,12 @@ static int do_mdio(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) switch (op[0]) { case 'w': mdio_write_ranges(phydev, bus, addrlo, addrhi, devadlo, devadhi, - reglo, reghi, data, extended); + reglo, reghi, data, extended, mmd); break; case 'r': mdio_read_ranges(phydev, bus, addrlo, addrhi, devadlo, devadhi, - reglo, reghi, extended); + reglo, reghi, extended, mmd); break; } @@ -303,6 +320,10 @@ U_BOOT_CMD( "read PHY's extended register at .\n" "mdio wx [.] - " "write PHY's extended register at .\n" + "mdio rmmd [.] - " + "read PHY's extended register at .\n" + "mdio wmmd [.] - " + "write PHY's extended register at .\n" " may be:\n" " \n" " \n"