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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 3DE26C06511 for ; Mon, 1 Jul 2019 19:52:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1CC6221721 for ; Mon, 1 Jul 2019 19:52:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Mv9+1dyM" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726980AbfGATwf (ORCPT ); Mon, 1 Jul 2019 15:52:35 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:34329 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726908AbfGATwc (ORCPT ); Mon, 1 Jul 2019 15:52:32 -0400 Received: by mail-pf1-f193.google.com with SMTP id c85so7078633pfc.1 for ; Mon, 01 Jul 2019 12:52:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+jQsg9MU51amGGS/kxUo2BKmC95rhUWFBTRFO2FxxaM=; b=Mv9+1dyMHuh0MroVoMV4O4cKgAzSJhfv5V1BLa6TY7gokr3jnlQNicp6nL1QVoZLn5 07+1zLyZ3YER/8Xwq6pWry1VTFUWYLJ1ALF3KXR+xmUGIzxaEMbmFnMpqf1dBbFWd+Qm AePbX73zyAjzAdnpAbW7ySwX12axoJdH8xcg4= 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=+jQsg9MU51amGGS/kxUo2BKmC95rhUWFBTRFO2FxxaM=; b=JUWLZl21t4iTRC745zpEVTje1qmYCpcffXfL2dAvXpu+Rgq7d54CYSF4Q0fuSRDvzx XKq0epr+sb9XxmC0gZUgt2jxu/qbp/UGx1kmzJrdDnbkhcF/3FHJSMPwKDGUOORAj5Uh DmezdlOufiXu/3fiDohbOcMVdP1W+F/1/8RLy5ouDYaUR+nl3UK8fxVqYZZjRfcnGMYA E0Uaas4kClhb4N8lw6ntsz74n2s2C+aHx2b4oiww+f/ptsdRQ5PNG1cQJq5m25z8Zxxm DbJikMDfOo2BwVMACW442okU42hYU1qPhqsThYilcapDIeGXmnW2EEKPBPpDeXl5ByR/ gnhw== X-Gm-Message-State: APjAAAXTnmf447N9aB+MaV8oBAUSxWGC/pmFEM8QoLEieugGNFWmTli6 fMBdFUDEAl7/zaW5LS2n8HQ6+A== X-Google-Smtp-Source: APXvYqzuALJgZGNQlRvYTcL6uK9tRgXF+DHaNInWiePUvRU/llYH4ZpSOEnJv8Pvs3Yu+QLAGKU/5A== X-Received: by 2002:a17:90a:cb15:: with SMTP id z21mr1086167pjt.87.1562010752079; Mon, 01 Jul 2019 12:52:32 -0700 (PDT) Received: from localhost ([2620:15c:202:1:75a:3f6e:21d:9374]) by smtp.gmail.com with ESMTPSA id v5sm11207301pgq.66.2019.07.01.12.52.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Jul 2019 12:52:31 -0700 (PDT) From: Matthias Kaehlcke To: "David S . Miller" , Rob Herring , Mark Rutland , Andrew Lunn , Florian Fainelli , Heiner Kallweit Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Douglas Anderson , Matthias Kaehlcke Subject: [PATCH 2/3] net: phy: realtek: Enable accessing RTL8211E extension pages Date: Mon, 1 Jul 2019 12:52:24 -0700 Message-Id: <20190701195225.120808-2-mka@chromium.org> X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog In-Reply-To: <20190701195225.120808-1-mka@chromium.org> References: <20190701195225.120808-1-mka@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The RTL8211E has extension pages, which can be accessed after selecting a page through a custom method. Add a function to modify bits in a register of an extension page and a few helpers for dealing with ext pages. rtl8211e_modify_ext_paged() and rtl821e_restore_page() are inspired by their counterparts phy_modify_paged() and phy_restore_page(). Signed-off-by: Matthias Kaehlcke --- This code might be applicable to other Realtek PHYs, but I don't have access to the datasheets to confirm it, so for now it's just for the RTL8211E. drivers/net/phy/realtek.c | 61 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c index a669945eb829..dfc2e20ef335 100644 --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c @@ -26,6 +26,9 @@ #define RTL821x_EXT_PAGE_SELECT 0x1e #define RTL821x_PAGE_SELECT 0x1f +#define RTL8211E_EXT_PAGE 7 +#define RTL8211E_EPAGSR 0x1e + #define RTL8211F_INSR 0x1d #define RTL8211F_TX_DELAY BIT(8) @@ -53,6 +56,64 @@ static int rtl821x_write_page(struct phy_device *phydev, int page) return __phy_write(phydev, RTL821x_PAGE_SELECT, page); } +static int rtl821e_select_ext_page(struct phy_device *phydev, int page) +{ + int rc; + + rc = phy_write(phydev, RTL821x_PAGE_SELECT, RTL8211E_EXT_PAGE); + if (rc) + return rc; + + return phy_write(phydev, RTL8211E_EPAGSR, page); +} + +static int rtl821e_restore_page(struct phy_device *phydev, int oldpage, int ret) +{ + int r; + + if (oldpage >= 0) { + r = phy_write(phydev, RTL821x_PAGE_SELECT, oldpage); + + /* Propagate the operation return code if the page write + * was successful. + */ + if (ret >= 0 && r < 0) + ret = r; + } else { + /* Propagate the page selection error code */ + ret = oldpage; + } + + return ret; +} + +static int __maybe_unused rtl8211e_modify_ext_paged(struct phy_device *phydev, + int page, u32 regnum, u16 mask, u16 set) +{ + int ret = 0; + int oldpage; + int new; + + oldpage = phy_read(phydev, RTL821x_PAGE_SELECT); + if (oldpage < 0) + goto out; + + ret = rtl821e_select_ext_page(phydev, page); + if (ret) + goto out; + + ret = phy_read(phydev, regnum); + if (ret < 0) + goto out; + + new = (ret & ~mask) | set; + if (new != ret) + ret = phy_write(phydev, regnum, new); + +out: + return rtl821e_restore_page(phydev, oldpage, ret); +} + static int rtl8201_ack_interrupt(struct phy_device *phydev) { int err; -- 2.22.0.410.gd8fdbe21b5-goog