From patchwork Mon Aug 5 16:54:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1142189 X-Patchwork-Delegate: davem@davemloft.net 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=none (p=none dis=none) header.from=analog.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=analog.onmicrosoft.com header.i=@analog.onmicrosoft.com header.b="24xHLl52"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 462K652SHTz9sQw for ; Mon, 5 Aug 2019 23:55:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729082AbfHENzW (ORCPT ); Mon, 5 Aug 2019 09:55:22 -0400 Received: from mx0a-00128a01.pphosted.com ([148.163.135.77]:45350 "EHLO mx0a-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728662AbfHENzW (ORCPT ); Mon, 5 Aug 2019 09:55:22 -0400 Received: from pps.filterd (m0167088.ppops.net [127.0.0.1]) by mx0a-00128a01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x75DqoCR015406; Mon, 5 Aug 2019 09:55:12 -0400 Received: from nam03-by2-obe.outbound.protection.outlook.com (mail-by2nam03lp2050.outbound.protection.outlook.com [104.47.42.50]) by mx0a-00128a01.pphosted.com with ESMTP id 2u5448sdas-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 05 Aug 2019 09:55:12 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eaOAfe0aydCyPNl4a/oGmxrKfXJLyOiuLh864r0mDGgPOgrPIiscTP28GAJAgKpIKFejXr5IZaBtN0cyyczYPFucZZo7WZcIjNeq5NNCMsuZdSg6uxC/Tj8D6T2/F2727cjGV0Z682cPmVOE9fNrX+sXKfhfBMjLwUIcbVXJ/66sck1uXkTF7uJwzhETa/ufRO0eRfHioWStT1iXIhNrFDedmINF5bLiakFkNa+uA12X/fCxtdYr9C9aIPtAQvwF2qyyPRjyJ7EPpVXdHVQ78iUeCzfx1VSmh3UEPH2/A6BPyDUdnWYydBTf9MMtmILkzIf4rAJ/6W8pL7a/NoJ9KQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tYzhIq47KzLaDL8gjaUuzT4Lnwho+jPLKxDTRkJszLw=; b=cAioFg/UgpZHw8/I2uzuhusluYF9x3VwnZ5ax5dQUnPtXEzJuCLctmIDOsOwmCgWoAe/pHlW4cHRTnnyiSFKE80u7XUv2sA1cgYJKmLLDtIHfILn6wGZtZVBINTZTzGROXRpsx0tE48fMmMeguhmh/oB+FGUpgeFy29H5lYxcXzRUtCmg/VEQhbhw1W4YXTVeSFWCAQ+C6RcRksGZh7RHv1wxz4ZXYLaA0qrAyEBRBDX8gff6wY9x/WfJNJOw77jLhr5Ue3iBy0m5vpCJkHi68EwGoVBqc+2tKy2Q0SVCljivAJ4E5i2uYoHpqFV9eysBViOer99xvZE85KJLu9IRA== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass (sender ip is 137.71.25.55) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=analog.com;dmarc=bestguesspass action=none header.from=analog.com;dkim=none (message not signed);arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=analog.onmicrosoft.com; s=selector2-analog-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tYzhIq47KzLaDL8gjaUuzT4Lnwho+jPLKxDTRkJszLw=; b=24xHLl52esn2+0gNkVqRhOwkTXmu7YDsh9cfU9LJtW6WOuQjMJXq1qLKGeSQQdnLMAf4WN2jp8JXpzvKMmr9NvfnnOPa8Lk8kOhtfdy1FgedlWhQkBYfJ4lb1YP6hO7DH3SxQKbvi/qbPrkmkl/zs2HD5nVb83m82A6xQEkQV5E= Received: from MWHPR03CA0016.namprd03.prod.outlook.com (2603:10b6:300:117::26) by BN6PR03MB2516.namprd03.prod.outlook.com (2603:10b6:404:1d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.17; Mon, 5 Aug 2019 13:55:08 +0000 Received: from CY1NAM02FT020.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::206) by MWHPR03CA0016.outlook.office365.com (2603:10b6:300:117::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.12 via Frontend Transport; Mon, 5 Aug 2019 13:55:08 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.55 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.55; helo=nwd2mta1.analog.com; Received: from nwd2mta1.analog.com (137.71.25.55) by CY1NAM02FT020.mail.protection.outlook.com (10.152.75.191) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2136.14 via Frontend Transport; Mon, 5 Aug 2019 13:55:07 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta1.analog.com (8.13.8/8.13.8) with ESMTP id x75Dt4oQ016180 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Mon, 5 Aug 2019 06:55:04 -0700 Received: from saturn.ad.analog.com (10.48.65.109) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Mon, 5 Aug 2019 09:55:06 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH 01/16] net: phy: adin: add support for Analog Devices PHYs Date: Mon, 5 Aug 2019 19:54:38 +0300 Message-ID: <20190805165453.3989-2-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190805165453.3989-1-alexandru.ardelean@analog.com> References: <20190805165453.3989-1-alexandru.ardelean@analog.com> MIME-Version: 1.0 X-ADIRoutedOnPrem: True X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:137.71.25.55; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(376002)(136003)(396003)(39860400002)(346002)(2980300002)(189003)(199004)(476003)(8676002)(2870700001)(50466002)(50226002)(48376002)(8936002)(1076003)(5660300002)(356004)(6666004)(107886003)(70206006)(186003)(26005)(110136005)(70586007)(316002)(106002)(6306002)(426003)(336012)(4326008)(44832011)(126002)(11346002)(2616005)(54906003)(86362001)(36756003)(966005)(2201001)(478600001)(486006)(446003)(51416003)(7696005)(76176011)(7636002)(47776003)(305945005)(246002)(2906002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR03MB2516; H:nwd2mta1.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail10.analog.com; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f776ffbe-d3b2-4a51-38c0-08d719ac86ed X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328); SRVR:BN6PR03MB2516; X-MS-TrafficTypeDiagnostic: BN6PR03MB2516: X-MS-Exchange-PUrlCount: 3 X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-Forefront-PRVS: 01208B1E18 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: NoSg8vpHBEf1zNVW84Zvu8fASRKh5bE6hab6jOrIY0iawezaXutzqXHwXQbmzg2zX39qTNLqy1p7gEQh9js/vqLbulrXKMKyGbm9oQfL52Y9ZOo5LfiSdc8GbCAdkpOJh5yy8UA/7o6cpgyLwLAimw3b/YfLyUXpfbPex0Pzeb/pQn+U5OcSulwf4Sska9+POfelMQtb7Ji/1FYOHr65rRjhscpQAuXaQzTq7o7WeS98ffhRctf83i1dAJ1neo7LyWKL1hr90Vuy0zJ7Rt0yyXK0qgWSlslq+73ysSyP04P5KvesTsLulsHFW/lsqvmV5h+deam6XLGO74z4ERhpaTeyFJCMdgm7DOZiWodIyYKLTF0YRikCcmP3vzDuPRwqImpOYdbCKdmiwGbo+O2MioVKtHLJtKm+zJxTGaEH5Sk= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2019 13:55:07.9212 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f776ffbe-d3b2-4a51-38c0-08d719ac86ed X-MS-Exchange-CrossTenant-Id: eaa689b4-8f87-40e0-9c6f-7228de4d754a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=eaa689b4-8f87-40e0-9c6f-7228de4d754a; Ip=[137.71.25.55]; Helo=[nwd2mta1.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR03MB2516 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-05_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908050154 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This change adds support for Analog Devices Industrial Ethernet PHYs. Particularly the PHYs this driver adds support for: * ADIN1200 - Robust, Industrial, Low Power 10/100 Ethernet PHY * ADIN1300 - Robust, Industrial, Low Latency 10/100/1000 Gigabit Ethernet PHY The 2 chips are pin & register compatible with one another. The main difference being that ADIN1200 doesn't operate in gigabit mode. The chips can be operated by the Generic PHY driver as well via the standard IEEE PHY registers (0x0000 - 0x000F) which are supported by the kernel as well. This assumes that configuration of the PHY has been done required. Configuration can also be done via registers, which will be implemented by the driver in the next changes. Datasheets: https://www.analog.com/media/en/technical-documentation/data-sheets/ADIN1300.pdf https://www.analog.com/media/en/technical-documentation/data-sheets/ADIN1200.pdf Signed-off-by: Alexandru Ardelean --- MAINTAINERS | 7 +++++ drivers/net/phy/Kconfig | 9 ++++++ drivers/net/phy/Makefile | 1 + drivers/net/phy/adin.c | 59 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+) create mode 100644 drivers/net/phy/adin.c diff --git a/MAINTAINERS b/MAINTAINERS index ee663e0e2f2e..faf5723610c8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -938,6 +938,13 @@ S: Supported F: drivers/mux/adgs1408.c F: Documentation/devicetree/bindings/mux/adi,adgs1408.txt +ANALOG DEVICES INC ADIN DRIVER +M: Alexandru Ardelean +L: netdev@vger.kernel.org +W: http://ez.analog.com/community/linux-device-drivers +S: Supported +F: drivers/net/phy/adin.c + ANALOG DEVICES INC ADIS DRIVER LIBRARY M: Alexandru Ardelean S: Supported diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index 206d8650ee7f..5966d3413676 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -257,6 +257,15 @@ config SFP depends on HWMON || HWMON=n select MDIO_I2C +config ADIN_PHY + tristate "Analog Devices Industrial Ethernet PHYs" + help + Adds support for the Analog Devices Industrial Ethernet PHYs. + Currently supports the: + - ADIN1200 - Robust,Industrial, Low Power 10/100 Ethernet PHY + - ADIN1300 - Robust,Industrial, Low Latency 10/100/1000 Gigabit + Ethernet PHY + config AMD_PHY tristate "AMD PHYs" ---help--- diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile index ba07c27e4208..a03437e091f3 100644 --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile @@ -47,6 +47,7 @@ obj-$(CONFIG_SFP) += sfp.o sfp-obj-$(CONFIG_SFP) += sfp-bus.o obj-y += $(sfp-obj-y) $(sfp-obj-m) +obj-$(CONFIG_ADIN_PHY) += adin.o obj-$(CONFIG_AMD_PHY) += amd.o aquantia-objs += aquantia_main.o ifdef CONFIG_HWMON diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c new file mode 100644 index 000000000000..6a610d4563c3 --- /dev/null +++ b/drivers/net/phy/adin.c @@ -0,0 +1,59 @@ +// SPDX-License-Identifier: GPL-2.0+ +/** + * Driver for Analog Devices Industrial Ethernet PHYs + * + * Copyright 2019 Analog Devices Inc. + */ +#include +#include +#include +#include +#include +#include + +#define PHY_ID_ADIN1200 0x0283bc20 +#define PHY_ID_ADIN1300 0x0283bc30 + +static int adin_config_init(struct phy_device *phydev) +{ + int rc; + + rc = genphy_config_init(phydev); + if (rc < 0) + return rc; + + return 0; +} + +static struct phy_driver adin_driver[] = { + { + .phy_id = PHY_ID_ADIN1200, + .name = "ADIN1200", + .phy_id_mask = 0xfffffff0, + .features = PHY_BASIC_FEATURES, + .config_init = adin_config_init, + .config_aneg = genphy_config_aneg, + .read_status = genphy_read_status, + }, + { + .phy_id = PHY_ID_ADIN1300, + .name = "ADIN1300", + .phy_id_mask = 0xfffffff0, + .features = PHY_GBIT_FEATURES, + .config_init = adin_config_init, + .config_aneg = genphy_config_aneg, + .read_status = genphy_read_status, + }, +}; + +module_phy_driver(adin_driver); + +static struct mdio_device_id __maybe_unused adin_tbl[] = { + { PHY_ID_ADIN1200, 0xfffffff0 }, + { PHY_ID_ADIN1300, 0xfffffff0 }, + { } +}; + +MODULE_DEVICE_TABLE(mdio, adin_tbl); +MODULE_DESCRIPTION("Analog Devices Industrial Ethernet PHY driver"); +MODULE_LICENSE("GPL"); From patchwork Mon Aug 5 16:54:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1142205 X-Patchwork-Delegate: davem@davemloft.net 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=none (p=none dis=none) header.from=analog.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=analog.onmicrosoft.com header.i=@analog.onmicrosoft.com header.b="XVNLnnC5"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 462K7g3ZMMz9sPJ for ; Mon, 5 Aug 2019 23:56:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729290AbfHENz1 (ORCPT ); Mon, 5 Aug 2019 09:55:27 -0400 Received: from mx0b-00128a01.pphosted.com ([148.163.139.77]:3656 "EHLO mx0b-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729147AbfHENz0 (ORCPT ); Mon, 5 Aug 2019 09:55:26 -0400 Received: from pps.filterd (m0167090.ppops.net [127.0.0.1]) by mx0b-00128a01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x75DqjLu018849; Mon, 5 Aug 2019 09:55:19 -0400 Received: from nam03-dm3-obe.outbound.protection.outlook.com (mail-dm3nam03lp2051.outbound.protection.outlook.com [104.47.41.51]) by mx0b-00128a01.pphosted.com with ESMTP id 2u56w5svg0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 05 Aug 2019 09:55:19 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FC0tlhyTF+eEZMvuVk68wTkZXpW7XpuWVCmXRusuortoI3all2qfF17KMfnnorj0ENPRsUvyT2RwyKWFRRu2ZiigVra5i7xMcG3JPDUr2+wA2riTwcGQ7fjdvCHK7apU7jdQaoWMpSom0Phvk4r24o08D26Fz+0CApS1biZnjgTGoZ5C8x5v3cun76/kdjfNqbVIYHOXR60h8De4Gxx80A5qHu1Hy/7KfaSGOQRjhzzl+Vz9VPeTCtxWqfAUvmXl3ObHC/UMKlCSA9uxo9ZNz9WJFaZOhBznRHYsSYSDoYMqWTDPivt9tSRVzZOebvhTk9W4gPAqWqFJkgDuaRsU9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FvkTzCJCStkWeyCHAoNoB0MkBmdD62Wi3w4lxghg27k=; b=kV4e4nGXmUSvB7Bt2A0+ZygEbWTMVupc31QaxQ12fCZbH+N/MqKYmdG5dulUiCJjH4EK3nfCunLF5s2yQhTSeKH60+PvSMZe/PH6uhZnRwrQ0kwVNl5Gfih+Mrc44KuGslQkGCs6Ad8r7b+QQgUkFDsSf2+ecieMoGn80mw+MBY/hQ+Nrq6r5sMn0QvHJpJwXdOq4SvdrqikWwyoLjhVyqjFt8EzyGto+pvQN4nAt8XPsD0b6YEG+LgHy0p8y/04HMcaiEzgYHnoPGZVx823oW85GG4/N7/PHcUtNnAUetlufXmQaIiom6DUPBvTIrxy+YrxO3Gdq2HPW3+ZmPRkuw== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass (sender ip is 137.71.25.55) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=analog.com;dmarc=bestguesspass action=none header.from=analog.com;dkim=none (message not signed);arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=analog.onmicrosoft.com; s=selector2-analog-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FvkTzCJCStkWeyCHAoNoB0MkBmdD62Wi3w4lxghg27k=; b=XVNLnnC5P63AKq1NVNnNXRdviSqkxQnl5K3XuqTEKtgXiyoCS6KHGgBvZaelgdvVSoQ+bI+5nIWWjFP3nN8kEyPO9vy0PxmRtt24YkuTMmKnzmiyOBnreKJYxsmKwqTkMLCV6kgSWCt4E4nHXLaO5pMRrYgdNxJ3uE8DHYWZgPI= Received: from CY4PR03CA0024.namprd03.prod.outlook.com (2603:10b6:903:33::34) by DM6PR03MB4187.namprd03.prod.outlook.com (2603:10b6:5:5d::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.13; Mon, 5 Aug 2019 13:55:11 +0000 Received: from CY1NAM02FT041.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::203) by CY4PR03CA0024.outlook.office365.com (2603:10b6:903:33::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2136.13 via Frontend Transport; Mon, 5 Aug 2019 13:55:11 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.55 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.55; helo=nwd2mta1.analog.com; Received: from nwd2mta1.analog.com (137.71.25.55) by CY1NAM02FT041.mail.protection.outlook.com (10.152.74.156) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2136.14 via Frontend Transport; Mon, 5 Aug 2019 13:55:10 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta1.analog.com (8.13.8/8.13.8) with ESMTP id x75Dt7q1016185 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Mon, 5 Aug 2019 06:55:07 -0700 Received: from saturn.ad.analog.com (10.48.65.109) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Mon, 5 Aug 2019 09:55:09 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH 02/16] net: phy: adin: hook genphy_{suspend, resume} into the driver Date: Mon, 5 Aug 2019 19:54:39 +0300 Message-ID: <20190805165453.3989-3-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190805165453.3989-1-alexandru.ardelean@analog.com> References: <20190805165453.3989-1-alexandru.ardelean@analog.com> MIME-Version: 1.0 X-ADIRoutedOnPrem: True X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:137.71.25.55; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(376002)(346002)(136003)(396003)(39860400002)(2980300002)(199004)(189003)(426003)(14444005)(4744005)(316002)(76176011)(106002)(54906003)(51416003)(7696005)(47776003)(15650500001)(305945005)(4326008)(36756003)(478600001)(110136005)(107886003)(246002)(44832011)(50466002)(48376002)(7636002)(446003)(50226002)(186003)(6666004)(356004)(2906002)(86362001)(2201001)(26005)(5660300002)(126002)(2616005)(486006)(2870700001)(8676002)(70206006)(336012)(11346002)(8936002)(70586007)(476003)(1076003)(142933001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR03MB4187; H:nwd2mta1.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail10.analog.com; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 18262398-7e6d-4d08-7b4c-08d719ac8870 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328); SRVR:DM6PR03MB4187; X-MS-TrafficTypeDiagnostic: DM6PR03MB4187: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:849; X-Forefront-PRVS: 01208B1E18 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: GeQU6exjVoDLObuNWS3qYnaQwkFBnMxCa5ILjxozqE1XQlstE+p2SgkAOKj8mKXdf1Mh+R16XXV0fp3rNgMKANlZaaYMnSFZGNuO2yrpYXXTUeF8JJM3GC/859Ko8bNhmcVNWhZ9ASyNbVJxo9PeBS15kbnN+WjxBEzgGBRTrjl4ZB0+4fnYEV2q/YzwUiZ78fQz5dk4qTc2qCxuO4E4NZerAOonr6SLsUwIcJxAYKZyrApzpHp10SA2SDfhHLKZiSf8woooX7Yt1cn3fseZCyAGOKeWd5rU88u6dwD6HG5Vwm+Tt2gDDGE4gzVkHaLGu/0P30LOjRo4WANWCIiiXttSQHtErvVgtwk1v+m2Hy+RavNDQelBhqQDzPg2rf11n/6pkMU3XOULvzKenLXXgpFu2XXTvDxmTKmk53mpR70= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2019 13:55:10.4982 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 18262398-7e6d-4d08-7b4c-08d719ac8870 X-MS-Exchange-CrossTenant-Id: eaa689b4-8f87-40e0-9c6f-7228de4d754a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=eaa689b4-8f87-40e0-9c6f-7228de4d754a; Ip=[137.71.25.55]; Helo=[nwd2mta1.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR03MB4187 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-05_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=993 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908050154 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The chip supports standard suspend/resume via BMCR reg. Hook these functions into the `adin` driver. Signed-off-by: Alexandru Ardelean Reviewed-by: Andrew Lunn --- drivers/net/phy/adin.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c index 6a610d4563c3..c100a0dd95cd 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -34,6 +34,8 @@ static struct phy_driver adin_driver[] = { .config_init = adin_config_init, .config_aneg = genphy_config_aneg, .read_status = genphy_read_status, + .resume = genphy_resume, + .suspend = genphy_suspend, }, { .phy_id = PHY_ID_ADIN1300, @@ -43,6 +45,8 @@ static struct phy_driver adin_driver[] = { .config_init = adin_config_init, .config_aneg = genphy_config_aneg, .read_status = genphy_read_status, + .resume = genphy_resume, + .suspend = genphy_suspend, }, }; From patchwork Mon Aug 5 16:54:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1142203 X-Patchwork-Delegate: davem@davemloft.net 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=none (p=none dis=none) header.from=analog.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=analog.onmicrosoft.com header.i=@analog.onmicrosoft.com header.b="NP5/8KV2"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 462K7W1wxVz9sPJ for ; Mon, 5 Aug 2019 23:56:39 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729540AbfHENzc (ORCPT ); Mon, 5 Aug 2019 09:55:32 -0400 Received: from mx0a-00128a01.pphosted.com ([148.163.135.77]:54988 "EHLO mx0a-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729483AbfHENzb (ORCPT ); Mon, 5 Aug 2019 09:55:31 -0400 Received: from pps.filterd (m0167089.ppops.net [127.0.0.1]) by mx0a-00128a01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x75DqpIV026512; Mon, 5 Aug 2019 09:55:17 -0400 Received: from nam01-sn1-obe.outbound.protection.outlook.com (mail-sn1nam01lp2058.outbound.protection.outlook.com [104.47.32.58]) by mx0a-00128a01.pphosted.com with ESMTP id 2u576712vu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 05 Aug 2019 09:55:17 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MdZZZaPlNM9klFvinh18oktxHN7jEY6iEYkBTWSXl6eiovYfKIG43qhaMMPyanTNR0UeO7jHTcdmnlcigZ0XTuOwMP8TPg9rTuUHMlHzPUH0Z1sYr/rIqSjxV3UfjlcCXo7hFmEaBxaTKpkocEZ356ZPNDT6L2lXWRqZxop9sWwvgUskGqLpRZ225Zl+ygmrF5CIkYbxMKmqI+d0TpVwbJ9pNfP2T+bTGRAkNGqjQHazI3CAths/vTsL5HZS3YxqXql2p9n78LDXtKGSRJGm7zL3oR1/jiwzJgJHPmwJdF/9J381iIl3LpGNtnihUiTI9FcedTdSSVXbXDuIRANyxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jj8fx8kmqyVB/vj6tk2imRG2sLcSF5tadMa/T4V9wm0=; b=Ql4v+nnda1qyjl3J5AbpFb1fd0w2OezsPFyNWAcGMo3U+q+/zOXAVWjodWCrKaSVlUSA9SXZSgfbNHnY54pTW0h3r0HCXoa3+dPcCdJ42T7Xz0228jUjKSHDYygmL7X0sjsRFkWYYA7c0CCi0KO+moCXABRKm78dtVdMNBWZAE7s+N79//F6KJtuLH+huz94XPTJBA2sAfhAqafNm81EVsrPBJxcjhlohyFJsH4d4RewHes6togBv6Yc8Pj61xPliZsfcnEbYDoOzZiijbtSVdnP33KIpdvh3a8xzeC6EKKUd/eRYpLRTw8QBPhF2iFUAsT46jUxKSZ4WwwzBaM9qA== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass (sender ip is 137.71.25.55) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=analog.com;dmarc=bestguesspass action=none header.from=analog.com;dkim=none (message not signed);arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=analog.onmicrosoft.com; s=selector2-analog-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jj8fx8kmqyVB/vj6tk2imRG2sLcSF5tadMa/T4V9wm0=; b=NP5/8KV2ASyTkCZeEkw3DyGCKGkFTpnT/MbfMCCKNZ5zC1ulZQ9uiX8GJRTVbGh/wm0+mZhnGQRTuOa+rzz5/iKYYCcplY0nCXx75fFmiViueiLMgca2yI7e0aZBzy801on+beAksbB4cWOzba43a/SYbvAQ4sJKUxWqF7CG1wA= Received: from BL0PR03CA0018.namprd03.prod.outlook.com (2603:10b6:208:2d::31) by BYAPR03MB4903.namprd03.prod.outlook.com (2603:10b6:a03:13a::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.16; Mon, 5 Aug 2019 13:55:14 +0000 Received: from CY1NAM02FT062.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::209) by BL0PR03CA0018.outlook.office365.com (2603:10b6:208:2d::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.12 via Frontend Transport; Mon, 5 Aug 2019 13:55:13 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.55 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.55; helo=nwd2mta1.analog.com; Received: from nwd2mta1.analog.com (137.71.25.55) by CY1NAM02FT062.mail.protection.outlook.com (10.152.75.60) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2136.14 via Frontend Transport; Mon, 5 Aug 2019 13:55:13 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta1.analog.com (8.13.8/8.13.8) with ESMTP id x75Dt9t9016192 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Mon, 5 Aug 2019 06:55:09 -0700 Received: from saturn.ad.analog.com (10.48.65.109) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Mon, 5 Aug 2019 09:55:11 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH 03/16] net: phy: adin: add support for interrupts Date: Mon, 5 Aug 2019 19:54:40 +0300 Message-ID: <20190805165453.3989-4-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190805165453.3989-1-alexandru.ardelean@analog.com> References: <20190805165453.3989-1-alexandru.ardelean@analog.com> MIME-Version: 1.0 X-ADIRoutedOnPrem: True X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:137.71.25.55; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(346002)(376002)(39860400002)(136003)(396003)(2980300002)(199004)(189003)(2616005)(47776003)(7636002)(76176011)(26005)(186003)(50226002)(8936002)(336012)(246002)(8676002)(426003)(11346002)(44832011)(486006)(446003)(1076003)(126002)(2201001)(51416003)(110136005)(356004)(6666004)(106002)(476003)(14444005)(5660300002)(7696005)(305945005)(2906002)(70586007)(2870700001)(70206006)(54906003)(48376002)(478600001)(50466002)(107886003)(86362001)(4326008)(36756003)(316002); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR03MB4903; H:nwd2mta1.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail10.analog.com; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: de77fd49-8c5a-4148-7dc5-08d719ac89f5 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328); SRVR:BYAPR03MB4903; X-MS-TrafficTypeDiagnostic: BYAPR03MB4903: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4941; X-Forefront-PRVS: 01208B1E18 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: AxudvxswKtD/cg4HbyFnp2XgXv1uHubqjJSIonq06EjsS/D9/Ek16lj/k1fgSgG1MaoZDjQBAYCtHr/SWFzW7S3bMv8L3+xCz6PCCFuJtQ2gfzuEXV5AKPDCFUo5rjmLsXsSffIF1fYhYCjP0lKIckPAY4mIc6J8iR3myEf6mzykYoMvCMQSXSTcRuHWRREJqAX+QlctpWgv+kUG6P4iNqfTelVcZlnhjcNxhiTMxSULNO1hyTsoAws6kU60s9SdRRxStuwdwSoAO3ztl0YYH6Y1H0eTQl4r4a3szF4e9eD2zGDztf7042qmXcC/U37LwzqawV/XXzplVOjBi30hb0waLmaakldQc4eu8BW4ud5AG3JxfjfQnTf918b7e3l9ar6ZVMBLpsjtzs3asGmDAEOtnk+nrjiWK/eicZM7wEA= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2019 13:55:13.0466 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: de77fd49-8c5a-4148-7dc5-08d719ac89f5 X-MS-Exchange-CrossTenant-Id: eaa689b4-8f87-40e0-9c6f-7228de4d754a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=eaa689b4-8f87-40e0-9c6f-7228de4d754a; Ip=[137.71.25.55]; Helo=[nwd2mta1.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR03MB4903 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-05_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=869 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908050154 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This change adds support for enabling PHY interrupts that can be used by the PHY framework to get signal for link/speed/auto-negotiation changes. Signed-off-by: Alexandru Ardelean --- drivers/net/phy/adin.c | 44 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c index c100a0dd95cd..b75c723bda79 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -14,6 +14,22 @@ #define PHY_ID_ADIN1200 0x0283bc20 #define PHY_ID_ADIN1300 0x0283bc30 +#define ADIN1300_INT_MASK_REG 0x0018 +#define ADIN1300_INT_MDIO_SYNC_EN BIT(9) +#define ADIN1300_INT_ANEG_STAT_CHNG_EN BIT(8) +#define ADIN1300_INT_ANEG_PAGE_RX_EN BIT(6) +#define ADIN1300_INT_IDLE_ERR_CNT_EN BIT(5) +#define ADIN1300_INT_MAC_FIFO_OU_EN BIT(4) +#define ADIN1300_INT_RX_STAT_CHNG_EN BIT(3) +#define ADIN1300_INT_LINK_STAT_CHNG_EN BIT(2) +#define ADIN1300_INT_SPEED_CHNG_EN BIT(1) +#define ADIN1300_INT_HW_IRQ_EN BIT(0) +#define ADIN1300_INT_MASK_EN \ + (ADIN1300_INT_ANEG_STAT_CHNG_EN | ADIN1300_INT_ANEG_PAGE_RX_EN | \ + ADIN1300_INT_LINK_STAT_CHNG_EN | ADIN1300_INT_SPEED_CHNG_EN | \ + ADIN1300_INT_HW_IRQ_EN) +#define ADIN1300_INT_STATUS_REG 0x0019 + static int adin_config_init(struct phy_device *phydev) { int rc; @@ -25,15 +41,40 @@ static int adin_config_init(struct phy_device *phydev) return 0; } +static int adin_phy_ack_intr(struct phy_device *phydev) +{ + int ret; + + /* Clear pending interrupts. */ + ret = phy_read(phydev, ADIN1300_INT_STATUS_REG); + if (ret < 0) + return ret; + + return 0; +} + +static int adin_phy_config_intr(struct phy_device *phydev) +{ + if (phydev->interrupts == PHY_INTERRUPT_ENABLED) + return phy_set_bits(phydev, ADIN1300_INT_MASK_REG, + ADIN1300_INT_MASK_EN); + + return phy_clear_bits(phydev, ADIN1300_INT_MASK_REG, + ADIN1300_INT_MASK_EN); +} + static struct phy_driver adin_driver[] = { { .phy_id = PHY_ID_ADIN1200, .name = "ADIN1200", .phy_id_mask = 0xfffffff0, .features = PHY_BASIC_FEATURES, + .flags = PHY_HAS_INTERRUPT, .config_init = adin_config_init, .config_aneg = genphy_config_aneg, .read_status = genphy_read_status, + .ack_interrupt = adin_phy_ack_intr, + .config_intr = adin_phy_config_intr, .resume = genphy_resume, .suspend = genphy_suspend, }, @@ -42,9 +83,12 @@ static struct phy_driver adin_driver[] = { .name = "ADIN1300", .phy_id_mask = 0xfffffff0, .features = PHY_GBIT_FEATURES, + .flags = PHY_HAS_INTERRUPT, .config_init = adin_config_init, .config_aneg = genphy_config_aneg, .read_status = genphy_read_status, + .ack_interrupt = adin_phy_ack_intr, + .config_intr = adin_phy_config_intr, .resume = genphy_resume, .suspend = genphy_suspend, }, From patchwork Mon Aug 5 16:54:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1142191 X-Patchwork-Delegate: davem@davemloft.net 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=none (p=none dis=none) header.from=analog.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=analog.onmicrosoft.com header.i=@analog.onmicrosoft.com header.b="jY9ntrAY"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 462K685H0dz9sRh for ; Mon, 5 Aug 2019 23:55:28 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729234AbfHENz1 (ORCPT ); Mon, 5 Aug 2019 09:55:27 -0400 Received: from mx0b-00128a01.pphosted.com ([148.163.139.77]:3670 "EHLO mx0b-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729154AbfHENz0 (ORCPT ); Mon, 5 Aug 2019 09:55:26 -0400 Received: from pps.filterd (m0167090.ppops.net [127.0.0.1]) by mx0b-00128a01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x75DqjLt018849; Mon, 5 Aug 2019 09:55:18 -0400 Received: from nam04-bn3-obe.outbound.protection.outlook.com (mail-bn3nam04lp2055.outbound.protection.outlook.com [104.47.46.55]) by mx0b-00128a01.pphosted.com with ESMTP id 2u56w5svfx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 05 Aug 2019 09:55:18 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GqjSqvjK5SGBzGTKckthVNari8j1ey2aYb7pKeexMZ9jHbunO2uHJIs8gy9ukgleI3eoZNmRep8hVDJ+GdZMv4t6Q1P7PdS8IL/gTQEXB+Lmz7vkYnt7k46T6Ep/kaeWcxic6yCkUKMI9S0f8QgLvup5ok9UdALtFmyELvrxnBcYmqh2L048K/CSc7KnOMzQ0YxQ3ucyF1ZH9rvU2GcYoalQm2xoZeud+7YMwQ0Ff0s0skNhybPT6Znm2+1/p7bP4DsH838D0LG29j/BoFd/vRMXdpFHR/hzsy4olXofLU9USkeb2ypGtVV9FpA6W0bR0c+sAR9shTBRzIGPX/FFSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=p3S49Hc5L60M5JI7HLCZJFQ7hjx5+IAf0XRVJ9udfO0=; b=QmI6wixRu2XRIIH2x4RjLhnok6XFseqB6Q/haIaNjgfe9WLL4ilNX5pS2fRWQlX7TauT/c+nMCDWSwRmliAYs9WKL+Gx3pPBlZFG3ce+zVcsVSe4zwYl6lNtFgWk57rUsOJhaPB+k9f0TsfgZcmHZsbVU8kfKci651CumwKm5Yf4E1I4xb6H/rp0pkuuZeWoI6SkSkeXa/z2h6o4WHu978PZao/XNGGkLs4KSVcQgGMcfH+jUtn3VsPphjgp8iLPCQizl6choxnUONdc35859RRQU1zbgWT+XjpcXGrpIhAPSE4OP5+pY2pgir9P6fvwR9lWHAbF0qfiCIbMySZz3A== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass (sender ip is 137.71.25.55) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=analog.com;dmarc=bestguesspass action=none header.from=analog.com;dkim=none (message not signed);arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=analog.onmicrosoft.com; s=selector2-analog-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=p3S49Hc5L60M5JI7HLCZJFQ7hjx5+IAf0XRVJ9udfO0=; b=jY9ntrAY33kUN+LK5TdFFf3DO0yGBmMktbH1UVcAKG/UHMgpn9Fgc+iqlYjZ58quivTx3hWSD3nNwaBw8A9nC5INTF/qUCk4PMr4J8F5YGvm5+XZEUCkMCp+YhoguvQSzRwJrchC7k+4oqYycMHIrLHaB5+WR/vpz96Odr+RpcA= Received: from BL0PR03CA0026.namprd03.prod.outlook.com (2603:10b6:208:2d::39) by DM6PR03MB4588.namprd03.prod.outlook.com (2603:10b6:5:10d::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2115.15; Mon, 5 Aug 2019 13:55:16 +0000 Received: from CY1NAM02FT033.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::200) by BL0PR03CA0026.outlook.office365.com (2603:10b6:208:2d::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2136.13 via Frontend Transport; Mon, 5 Aug 2019 13:55:15 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.55 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.55; helo=nwd2mta1.analog.com; Received: from nwd2mta1.analog.com (137.71.25.55) by CY1NAM02FT033.mail.protection.outlook.com (10.152.75.179) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2136.14 via Frontend Transport; Mon, 5 Aug 2019 13:55:15 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta1.analog.com (8.13.8/8.13.8) with ESMTP id x75DtBIN016196 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Mon, 5 Aug 2019 06:55:11 -0700 Received: from saturn.ad.analog.com (10.48.65.109) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Mon, 5 Aug 2019 09:55:13 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH 04/16] net: phy: adin: add {write,read}_mmd hooks Date: Mon, 5 Aug 2019 19:54:41 +0300 Message-ID: <20190805165453.3989-5-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190805165453.3989-1-alexandru.ardelean@analog.com> References: <20190805165453.3989-1-alexandru.ardelean@analog.com> MIME-Version: 1.0 X-ADIRoutedOnPrem: True X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:137.71.25.55; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(346002)(136003)(396003)(376002)(39860400002)(2980300002)(189003)(199004)(305945005)(486006)(2870700001)(76176011)(1076003)(70206006)(7636002)(70586007)(336012)(44832011)(8676002)(478600001)(8936002)(426003)(47776003)(106002)(2201001)(246002)(54906003)(356004)(50466002)(6666004)(51416003)(26005)(110136005)(86362001)(316002)(48376002)(476003)(2616005)(4326008)(36756003)(2906002)(126002)(11346002)(446003)(107886003)(5660300002)(50226002)(186003)(7696005)(14444005)(142933001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR03MB4588; H:nwd2mta1.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail10.analog.com; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 05930650-2a78-4c8c-3f31-08d719ac8b2d X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328); SRVR:DM6PR03MB4588; X-MS-TrafficTypeDiagnostic: DM6PR03MB4588: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-Forefront-PRVS: 01208B1E18 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: JvcuVesQb7DEtRH857quvm/xNBXuA9b2hUAi/afhPWWAjNV3j5lvmSScRaXW8kmlFATgB+ImoyvQSXL7awx0eJEhbo3lcN63srm4I+Z7AP7YciGC6trv9Ifr164K4dF8F1BzrMcv8uWVh9qFlP1YIzYeujsfqi/ZLAIgkEJ7DKCEEg5CLT43hMIS1IlYz+1PpiBwqjHa1rh0JZDf87yE3uWEINyGLoifo/ds+UgwEpwl3GPkP+FhZhy4FumdDC3MzjgfMBgtgtuhmXgib8eu4aWhihKllbwtnaonkxWzVUuNawwL5HdM5RiiSbfCyWdYyRpXZjl81/3SP8LzRSmtA/yzueqKbsSjSaakdXbpo8xr7DbMqvxPQUSnY0bwzkeSmcb+eOPVLDhTDsgWwwlqTghxMlH7H+I/27sMIfNMVCk= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2019 13:55:15.0857 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 05930650-2a78-4c8c-3f31-08d719ac8b2d X-MS-Exchange-CrossTenant-Id: eaa689b4-8f87-40e0-9c6f-7228de4d754a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=eaa689b4-8f87-40e0-9c6f-7228de4d754a; Ip=[137.71.25.55]; Helo=[nwd2mta1.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR03MB4588 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-05_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=910 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908050154 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Both ADIN1200 & ADIN1300 support Clause 45 access. The Extended Management Interface (EMI) registers are accessible via both Clause 45 (at register MDIO_MMD_VEND1) and using Clause 22. However, the Clause 22 MMD access operations differ from the implementation in the kernel, in the sense that it uses registers ExtRegPtr (0x10) & ExtRegData (0x11) to access Clause 45 & EMI registers. The indirect access is done via the following mechanism (for both R/W): 1. Write the address of the register in the ExtRegPtr 2. Read/write the value of the register (written at ExtRegPtr) This mechanism is needed to manage configuration of chip settings and to access EEE registers (via Clause 22). Signed-off-by: Alexandru Ardelean --- drivers/net/phy/adin.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c index b75c723bda79..3dd9fe50f4c8 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -14,6 +14,9 @@ #define PHY_ID_ADIN1200 0x0283bc20 #define PHY_ID_ADIN1300 0x0283bc30 +#define ADIN1300_MII_EXT_REG_PTR 0x10 +#define ADIN1300_MII_EXT_REG_DATA 0x11 + #define ADIN1300_INT_MASK_REG 0x0018 #define ADIN1300_INT_MDIO_SYNC_EN BIT(9) #define ADIN1300_INT_ANEG_STAT_CHNG_EN BIT(8) @@ -63,6 +66,45 @@ static int adin_phy_config_intr(struct phy_device *phydev) ADIN1300_INT_MASK_EN); } +static int adin_read_mmd(struct phy_device *phydev, int devad, u16 regnum) +{ + struct mii_bus *bus = phydev->mdio.bus; + int phy_addr = phydev->mdio.addr; + int err; + + if (phydev->is_c45) { + u32 addr = MII_ADDR_C45 | (devad << 16) | (regnum & 0xffff); + + return __mdiobus_read(bus, phy_addr, addr); + } + + err = __mdiobus_write(bus, phy_addr, ADIN1300_MII_EXT_REG_PTR, regnum); + if (err) + return err; + + return __mdiobus_read(bus, phy_addr, ADIN1300_MII_EXT_REG_DATA); +} + +static int adin_write_mmd(struct phy_device *phydev, int devad, u16 regnum, + u16 val) +{ + struct mii_bus *bus = phydev->mdio.bus; + int phy_addr = phydev->mdio.addr; + int err; + + if (phydev->is_c45) { + u32 addr = MII_ADDR_C45 | (devad << 16) | (regnum & 0xffff); + + return __mdiobus_write(bus, phy_addr, addr, val); + } + + err = __mdiobus_write(bus, phy_addr, ADIN1300_MII_EXT_REG_PTR, regnum); + if (err) + return err; + + return __mdiobus_write(bus, phy_addr, ADIN1300_MII_EXT_REG_DATA, val); +} + static struct phy_driver adin_driver[] = { { .phy_id = PHY_ID_ADIN1200, @@ -77,6 +119,8 @@ static struct phy_driver adin_driver[] = { .config_intr = adin_phy_config_intr, .resume = genphy_resume, .suspend = genphy_suspend, + .read_mmd = adin_read_mmd, + .write_mmd = adin_write_mmd, }, { .phy_id = PHY_ID_ADIN1300, @@ -91,6 +135,8 @@ static struct phy_driver adin_driver[] = { .config_intr = adin_phy_config_intr, .resume = genphy_resume, .suspend = genphy_suspend, + .read_mmd = adin_read_mmd, + .write_mmd = adin_write_mmd, }, }; From patchwork Mon Aug 5 16:54:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1142204 X-Patchwork-Delegate: davem@davemloft.net 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=none (p=none dis=none) header.from=analog.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=analog.onmicrosoft.com header.i=@analog.onmicrosoft.com header.b="S9cjGfw4"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 462K7c727Gz9sSm for ; Mon, 5 Aug 2019 23:56:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729392AbfHENz3 (ORCPT ); Mon, 5 Aug 2019 09:55:29 -0400 Received: from mx0b-00128a01.pphosted.com ([148.163.139.77]:3658 "EHLO mx0b-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728662AbfHENz0 (ORCPT ); Mon, 5 Aug 2019 09:55:26 -0400 Received: from pps.filterd (m0167090.ppops.net [127.0.0.1]) by mx0b-00128a01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x75Dqj1i018852; Mon, 5 Aug 2019 09:55:19 -0400 Received: from nam01-sn1-obe.outbound.protection.outlook.com (mail-sn1nam01lp2057.outbound.protection.outlook.com [104.47.32.57]) by mx0b-00128a01.pphosted.com with ESMTP id 2u56w5svfy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 05 Aug 2019 09:55:18 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KT8Tl89mDCwz85dkkJt/K2LfZDoZD2FQvuN+foPlRCmBI0QfE8gG0CnlFNRh4hD3VaXpHGxU9bcJCfddw8rVbEEFzuAXtO1QpkalVk8niM4LEmv9jZ4SeK8n6WsYnvm4DQJubjV3Fn1MJjJoLN65X4ofL0d3vhCv6pGH/PVJE0qNS1fYtpX9Gwaq/VgwbO2h/3DhAaEZbq4YelNrVrKlN2CXJHAoDbB6DAJI14q4kSw82tNleY2UDyzd4XJUx4i1zt5cmjm8aC64LDy4XrX7GOOf9E4ziXdd4ivDbbeGKNDf7q/Ed+d99TLM9OPNI9B1/FOZm/cUcjfsgPPDULAA/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Jb5Hk6VPO8tClzLfJ4s0o5OnMEY+Hc6h+58zVFRGICQ=; b=hZTxX2cRjbuldXkJlvxNBSIM2sUjeW6FO2hEo76caRhv5l9X9Ka9PmencauWqyrJLI1M0+Wta0pjk4oy0hKdtHZRCF5FEs3tjct3hMiikxPrj39xCrW7dLeUqvwDC2YynK0F55ANjdjYT7zkOhexI0JOmtC8eHbq4IvQgmYBbokqBC6fE0jdnHhBtJib/O4CsUpu10+bsRbGl19UgkvKgRUXzdRJehDBJDV054mPNibRx0o+UDt845w1NfOGofLT2FB5HxluasRsq3iKzGYAfcovG5z3ffAM7piAsUFpdg0aupFOnPe2J/+XfA7JXIGA3sDQmysipzltEIUg+fp5NQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass (sender ip is 137.71.25.55) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=analog.com;dmarc=bestguesspass action=none header.from=analog.com;dkim=none (message not signed);arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=analog.onmicrosoft.com; s=selector2-analog-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Jb5Hk6VPO8tClzLfJ4s0o5OnMEY+Hc6h+58zVFRGICQ=; b=S9cjGfw43K6hseIwnBf4uhIeWx8HYNBGeboX0eC1nr209ng6scjapIq8ezsyFB9Askx115i70iY1nrYpIrGTQleb7kbZawh4jZJpXX3xSnRTLM54monfd6fc6CHDCHXnEBfbe2yiKfYWMhCv61jveIxuK0cwovDAQ0UdHqjQzQM= Received: from BN3PR03CA0085.namprd03.prod.outlook.com (2a01:111:e400:7a4d::45) by BN3PR03MB2289.namprd03.prod.outlook.com (2a01:111:e400:7bba::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.17; Mon, 5 Aug 2019 13:55:17 +0000 Received: from BL2NAM02FT060.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::201) by BN3PR03CA0085.outlook.office365.com (2a01:111:e400:7a4d::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2136.20 via Frontend Transport; Mon, 5 Aug 2019 13:55:17 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.55 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.55; helo=nwd2mta1.analog.com; Received: from nwd2mta1.analog.com (137.71.25.55) by BL2NAM02FT060.mail.protection.outlook.com (10.152.76.124) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2136.14 via Frontend Transport; Mon, 5 Aug 2019 13:55:16 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta1.analog.com (8.13.8/8.13.8) with ESMTP id x75DtD5b016201 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Mon, 5 Aug 2019 06:55:13 -0700 Received: from saturn.ad.analog.com (10.48.65.109) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Mon, 5 Aug 2019 09:55:16 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH 05/16] net: phy: adin: configure RGMII/RMII/MII modes on config Date: Mon, 5 Aug 2019 19:54:42 +0300 Message-ID: <20190805165453.3989-6-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190805165453.3989-1-alexandru.ardelean@analog.com> References: <20190805165453.3989-1-alexandru.ardelean@analog.com> MIME-Version: 1.0 X-ADIRoutedOnPrem: True X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:137.71.25.55; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(396003)(376002)(136003)(346002)(39860400002)(2980300002)(199004)(189003)(336012)(2906002)(246002)(36756003)(50226002)(70586007)(8676002)(70206006)(426003)(2616005)(5660300002)(26005)(11346002)(186003)(2870700001)(1076003)(446003)(14444005)(76176011)(126002)(2201001)(486006)(476003)(7696005)(51416003)(86362001)(44832011)(305945005)(7636002)(8936002)(47776003)(107886003)(110136005)(106002)(6666004)(48376002)(478600001)(54906003)(4326008)(356004)(316002)(50466002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR03MB2289; H:nwd2mta1.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail10.analog.com; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5865b632-bac1-41b8-6875-08d719ac8c0f X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600148)(711020)(4605104)(4709080)(1401327)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328); SRVR:BN3PR03MB2289; X-MS-TrafficTypeDiagnostic: BN3PR03MB2289: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-Forefront-PRVS: 01208B1E18 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: vXA9jK+Er5vfYeia5CmESvPToUDJLT0uH2E4f7NRo6+LSfLZO96DmsBqxsfcC24eBN8Gc2ZgZQvdqusJvHmpB845pJMVRwDZE2UXROuNbX+JURzC6YMy4idU5X+Lafj0MKwiKjOxj2lBAlry7V0cy+ii3U+qgEkmvgojRY1YcgJl+uLDIp0C/VoxTcL+AACToRTAFFSvgkCEKCvJ+pcLC81MvyLfkFY1WcK7oApmI7LllAhNVvIZf6U9Xryn6GgKFmmLR8g74cuXrG4EaUzhqL/pLfMqpvp8dodKORQeopM4vflgTCAvRXvYXOTeCZdW3jn0ZmUeva87zxRlSLeQsJsg6FW8AkCqvkNONBvoxl5ORaAWUQ5E+Y29YzLTgAajSqMUTx8G0oXLMWKr5BIuqp1fXMJCctVOTscyQxCu8fo= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2019 13:55:16.9742 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5865b632-bac1-41b8-6875-08d719ac8c0f X-MS-Exchange-CrossTenant-Id: eaa689b4-8f87-40e0-9c6f-7228de4d754a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=eaa689b4-8f87-40e0-9c6f-7228de4d754a; Ip=[137.71.25.55]; Helo=[nwd2mta1.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR03MB2289 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-05_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=976 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908050154 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The ADIN1300 chip supports RGMII, RMII & MII modes. Default (if unconfigured) is RGMII. This change adds support for configuring these modes via the device registers. For RGMII with internal delays (modes RGMII_ID,RGMII_TXID, RGMII_RXID), the default delay is 2 ns. This can be configurable and will be done in a subsequent change. Signed-off-by: Alexandru Ardelean --- drivers/net/phy/adin.c | 79 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c index 3dd9fe50f4c8..dbdb8f60741c 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -33,14 +33,91 @@ ADIN1300_INT_HW_IRQ_EN) #define ADIN1300_INT_STATUS_REG 0x0019 +#define ADIN1300_GE_RGMII_CFG_REG 0xff23 +#define ADIN1300_GE_RGMII_RXID_EN BIT(2) +#define ADIN1300_GE_RGMII_TXID_EN BIT(1) +#define ADIN1300_GE_RGMII_EN BIT(0) + +#define ADIN1300_GE_RMII_CFG_REG 0xff24 +#define ADIN1300_GE_RMII_EN BIT(0) + +static int adin_config_rgmii_mode(struct phy_device *phydev, + phy_interface_t intf) +{ + int reg; + + reg = phy_read_mmd(phydev, MDIO_MMD_VEND1, ADIN1300_GE_RGMII_CFG_REG); + if (reg < 0) + return reg; + + if (!phy_interface_mode_is_rgmii(intf)) { + reg &= ~ADIN1300_GE_RGMII_EN; + goto write; + } + + reg |= ADIN1300_GE_RGMII_EN; + + if (intf == PHY_INTERFACE_MODE_RGMII_ID || + intf == PHY_INTERFACE_MODE_RGMII_RXID) { + reg |= ADIN1300_GE_RGMII_RXID_EN; + } else { + reg &= ~ADIN1300_GE_RGMII_RXID_EN; + } + + if (intf == PHY_INTERFACE_MODE_RGMII_ID || + intf == PHY_INTERFACE_MODE_RGMII_TXID) { + reg |= ADIN1300_GE_RGMII_TXID_EN; + } else { + reg &= ~ADIN1300_GE_RGMII_TXID_EN; + } + +write: + return phy_write_mmd(phydev, MDIO_MMD_VEND1, + ADIN1300_GE_RGMII_CFG_REG, reg); +} + +static int adin_config_rmii_mode(struct phy_device *phydev, + phy_interface_t intf) +{ + int reg; + + reg = phy_read_mmd(phydev, MDIO_MMD_VEND1, ADIN1300_GE_RMII_CFG_REG); + if (reg < 0) + return reg; + + if (intf != PHY_INTERFACE_MODE_RMII) { + reg &= ~ADIN1300_GE_RMII_EN; + goto write; + } + + reg |= ADIN1300_GE_RMII_EN; + +write: + return phy_write_mmd(phydev, MDIO_MMD_VEND1, + ADIN1300_GE_RMII_CFG_REG, reg); +} + static int adin_config_init(struct phy_device *phydev) { - int rc; + phy_interface_t interface, rc; rc = genphy_config_init(phydev); if (rc < 0) return rc; + interface = phydev->interface; + + rc = adin_config_rgmii_mode(phydev, interface); + if (rc < 0) + return rc; + + rc = adin_config_rmii_mode(phydev, interface); + if (rc < 0) + return rc; + + dev_info(&phydev->mdio.dev, "PHY is using mode '%s'\n", + phy_modes(phydev->interface)); + return 0; } From patchwork Mon Aug 5 16:54:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1142206 X-Patchwork-Delegate: davem@davemloft.net 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=none (p=none dis=none) header.from=analog.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=analog.onmicrosoft.com header.i=@analog.onmicrosoft.com header.b="4ZbfkGk+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 462K7m25DNz9sSk for ; Mon, 5 Aug 2019 23:56:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729778AbfHEN4r (ORCPT ); Mon, 5 Aug 2019 09:56:47 -0400 Received: from mx0b-00128a01.pphosted.com ([148.163.139.77]:5464 "EHLO mx0b-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729220AbfHENz2 (ORCPT ); Mon, 5 Aug 2019 09:55:28 -0400 Received: from pps.filterd (m0167090.ppops.net [127.0.0.1]) by mx0b-00128a01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x75DqrI4019294; Mon, 5 Aug 2019 09:55:21 -0400 Received: from nam05-dm3-obe.outbound.protection.outlook.com (mail-dm3nam05lp2056.outbound.protection.outlook.com [104.47.49.56]) by mx0b-00128a01.pphosted.com with ESMTP id 2u56w5svg2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 05 Aug 2019 09:55:21 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ye1/2Jpf7JGIjXlETnW6QHZdEt58QmVTyju5ChGr8P1r8Hyj3SWGLn2McnCmCp4KL/pUP6Qk/hsgwyQD9uAyyjZDqfqI4uA12Nb+Ly6kek2caZroGm1p0Suq43k2NoC3NbjRWgTPXSnG03rhdcrWx3PMYwL53rgK1qrdwhRUWEwNT36Li7Cwnp4SvdQUgqM//Uv/EQJ6ZylhK2GNJiqAEsWRhSi9a9X1AB26VHEuQheS1fgCTbmzgOGXBuZL/v5M3lr80kaKSgBk7EhdYfKGfDsisv48Img14jtZ47d64/7dVwHGhtGdLRH2dy75cnT++7Z6+CXBH4a7+bclNen/Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=H2GEjSTs3oWUTj0qu/gj7m9Gbig3BqK+yio1fLZ0r6I=; b=OmU+sxfVyh2m18EFi8BNLeZLjW22PriaKeZnLkuzFnfukqja/SbIwv5WvTr6zDig5YZZXnf4ePDWAlu1b/ZPfknnjsGwOaG6YUgqRkKmDqfGjJImB90WjnyRkSaPZSbl+XDppIxhYKgXXdhiAaBB5mGHUUvm1NVkcL1orekeSo3TwhQq3OCCCHwGxGbaDvM3N/5HzEUpF2xesUMjx7EVinmxVEowAxZOConS/RLpS1qT2Ep9OvPZZdS2dpV/gezU+R64Z7Kjsd6QFk6p9H3qTvzJknDWJNG5is1kySDIpFVH+1jNEOg5XHF55XLBXOayWG95MbP5NUZQAzppNMcS4g== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass (sender ip is 137.71.25.55) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=analog.com;dmarc=bestguesspass action=none header.from=analog.com;dkim=none (message not signed);arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=analog.onmicrosoft.com; s=selector2-analog-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=H2GEjSTs3oWUTj0qu/gj7m9Gbig3BqK+yio1fLZ0r6I=; b=4ZbfkGk+q6tpkNq9zsb+iOi6n70rmVDXhsQVwcUjYdocpl55vMJwdqi4pAxLqHJMdJKGe6CUM7VXRok80g54QkI4J6FcGlUE3kqq15dkwDlU8lK2JV1pD3mUfM5DoS16DrhUH+2oURywXKwne5/3/1IyYwrr/IzmDLWdLvQsuZw= Received: from BN6PR03CA0097.namprd03.prod.outlook.com (2603:10b6:404:10::11) by MN2PR03MB4912.namprd03.prod.outlook.com (2603:10b6:208:100::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.14; Mon, 5 Aug 2019 13:55:19 +0000 Received: from BL2NAM02FT027.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::201) by BN6PR03CA0097.outlook.office365.com (2603:10b6:404:10::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2136.13 via Frontend Transport; Mon, 5 Aug 2019 13:55:19 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.55 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.55; helo=nwd2mta1.analog.com; Received: from nwd2mta1.analog.com (137.71.25.55) by BL2NAM02FT027.mail.protection.outlook.com (10.152.77.160) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2136.14 via Frontend Transport; Mon, 5 Aug 2019 13:55:18 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta1.analog.com (8.13.8/8.13.8) with ESMTP id x75DtF6w016204 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Mon, 5 Aug 2019 06:55:15 -0700 Received: from saturn.ad.analog.com (10.48.65.109) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Mon, 5 Aug 2019 09:55:18 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH 06/16] net: phy: adin: support PHY mode converters Date: Mon, 5 Aug 2019 19:54:43 +0300 Message-ID: <20190805165453.3989-7-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190805165453.3989-1-alexandru.ardelean@analog.com> References: <20190805165453.3989-1-alexandru.ardelean@analog.com> MIME-Version: 1.0 X-ADIRoutedOnPrem: True X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:137.71.25.55; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(376002)(346002)(396003)(39860400002)(136003)(2980300002)(189003)(199004)(126002)(2616005)(7696005)(51416003)(446003)(305945005)(7636002)(4326008)(107886003)(2870700001)(70206006)(70586007)(86362001)(6666004)(356004)(36756003)(2201001)(110136005)(486006)(50226002)(76176011)(47776003)(26005)(186003)(5660300002)(478600001)(8676002)(8936002)(316002)(48376002)(44832011)(54906003)(50466002)(11346002)(106002)(2906002)(476003)(246002)(1076003)(336012)(426003); DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR03MB4912; H:nwd2mta1.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail10.analog.com; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0c43ca27-7b73-4898-0265-08d719ac8d1e X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328); SRVR:MN2PR03MB4912; X-MS-TrafficTypeDiagnostic: MN2PR03MB4912: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3968; X-Forefront-PRVS: 01208B1E18 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: QrnzBC0Gdx7dx4pgj8HFXOJLHwCGPrIIJwlHKFcOzkUTyKWMLdlTeYQrhahn5XvCDO+aHgHN+CjsEv+NSzGu/0n6ElRAlS4Lpfs7ofJ6bKIPPsVTnJRYoMT0zP502BRQEzE3TZeMeIe2XUpjJVidhJMVmKqylM3ylNRbDiV2nZK3QyWhTyijhdyujoydTx8ecTcPJeyFg/2OzJsE6tnVeqbEFbTRx3e34CkhTH80zWVhQUxo5wpAxMMHvoZrWXBUtIcc3s2kbFHD+yuz1I1+Is0oo+fcMVErJPwITS3rpkQavM5JvM5JCSsTxiLQjzExwY8+7l2kq2OdXsBXNQ0PtgQeNL0r1zpwNWC2xx8uFWjqFBxK3mPfL/53RpKsUtviTdKL6mMS77xd7jcheHT2kJVWU06QbYQJmCjfXNHKgMk= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2019 13:55:18.7717 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0c43ca27-7b73-4898-0265-08d719ac8d1e X-MS-Exchange-CrossTenant-Id: eaa689b4-8f87-40e0-9c6f-7228de4d754a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=eaa689b4-8f87-40e0-9c6f-7228de4d754a; Ip=[137.71.25.55]; Helo=[nwd2mta1.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR03MB4912 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-05_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908050154 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Sometimes, the connection between a MAC and PHY is done via a mode/interface converter. An example is a GMII-to-RGMII converter, which would mean that the MAC operates in GMII mode while the PHY operates in RGMII. In this case there is a discrepancy between what the MAC expects & what the PHY expects and both need to be configured in their respective modes. Sometimes, this converter is specified via a board/system configuration (in the device-tree for example). But, other times it can be left unspecified. The use of these converters is common in boards that have FPGA on them. This patch also adds support for a `adi,phy-mode-internal` property that can be used in these (implicit convert) cases. The internal PHY mode will be used to specify the correct register settings for the PHY. `fwnode_handle` is used, since this property may be specified via ACPI as well in other setups, but testing has been done in DT context. Signed-off-by: Alexandru Ardelean --- drivers/net/phy/adin.c | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c index dbdb8f60741c..e3d2ff8cc09c 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -10,6 +10,7 @@ #include #include #include +#include #define PHY_ID_ADIN1200 0x0283bc20 #define PHY_ID_ADIN1300 0x0283bc30 @@ -41,6 +42,31 @@ #define ADIN1300_GE_RMII_CFG_REG 0xff24 #define ADIN1300_GE_RMII_EN BIT(0) +static int adin_get_phy_internal_mode(struct phy_device *phydev) +{ + struct device *dev = &phydev->mdio.dev; + const char *pm; + int i; + + if (device_property_read_string(dev, "adi,phy-mode-internal", &pm)) + return phydev->interface; + + /** + * Getting here assumes that there is converter in-between the actual + * PHY, for example a GMII-to-RGMII converter. In this case the MAC + * talks GMII and PHY talks RGMII, so the PHY needs to be set in RGMII + * while the MAC can work in GMII mode. + */ + + for (i = 0; i < PHY_INTERFACE_MODE_MAX; i++) + if (!strcasecmp(pm, phy_modes(i))) + return i; + + dev_err(dev, "Invalid value for 'phy-mode-internal': '%s'\n", pm); + + return -EINVAL; +} + static int adin_config_rgmii_mode(struct phy_device *phydev, phy_interface_t intf) { @@ -105,7 +131,9 @@ static int adin_config_init(struct phy_device *phydev) if (rc < 0) return rc; - interface = phydev->interface; + interface = adin_get_phy_internal_mode(phydev); + if (interface < 0) + return interface; rc = adin_config_rgmii_mode(phydev, interface); if (rc < 0) @@ -115,8 +143,13 @@ static int adin_config_init(struct phy_device *phydev) if (rc < 0) return rc; - dev_info(&phydev->mdio.dev, "PHY is using mode '%s'\n", - phy_modes(phydev->interface)); + if (phydev->interface == interface) + dev_info(&phydev->mdio.dev, "PHY is using mode '%s'\n", + phy_modes(phydev->interface)); + else + dev_info(&phydev->mdio.dev, + "PHY is using mode '%s', MAC is using mode '%s'\n", + phy_modes(interface), phy_modes(phydev->interface)); return 0; } From patchwork Mon Aug 5 16:54:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1142193 X-Patchwork-Delegate: davem@davemloft.net 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=none (p=none dis=none) header.from=analog.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=analog.onmicrosoft.com header.i=@analog.onmicrosoft.com header.b="qlDE8qK6"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 462K6N6Hp3z9sRh for ; Mon, 5 Aug 2019 23:55:40 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729769AbfHENzj (ORCPT ); Mon, 5 Aug 2019 09:55:39 -0400 Received: from mx0b-00128a01.pphosted.com ([148.163.139.77]:16086 "EHLO mx0b-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729720AbfHENzj (ORCPT ); Mon, 5 Aug 2019 09:55:39 -0400 Received: from pps.filterd (m0167091.ppops.net [127.0.0.1]) by mx0b-00128a01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x75Dr6eE015931; Mon, 5 Aug 2019 09:55:24 -0400 Received: from nam04-bn3-obe.outbound.protection.outlook.com (mail-bn3nam04lp2053.outbound.protection.outlook.com [104.47.46.53]) by mx0b-00128a01.pphosted.com with ESMTP id 2u6kb20e1d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 05 Aug 2019 09:55:24 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NZZNabxH1YZrJmK5Od99rvWroOvb/VE+pL3NO9bBDZoHwXxZ58U9pZTYDLv370z6kep+/ohhJIxeblanCG8WZ1LAkBCRqpTtXT9M1FZOAIXRELtSnfxNqMCeDuRwvvhJ5XT7IllYeK3C6I07dm60QEJE3VUTgvOg3kobEF8vL01aqHzzcUQaYYkwh+vy0cZPXozqYJf9uUK9fRLA378XZLQKDM6w/nOLcRK7xgCXUPrOB6QB3SyYhtzkkyxD4KjxYi2bPfSLJtFzlOw3/GJVNL/d5rsnGpMnEfCBIZoxFUZFiBPUag2Rtn5if5conV8X2C+Viz25rOh4z/bFAVirqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2bTXW9FbWsrk053yU3mRr/jjxL5i/KX0fA2tAKONyAU=; b=X7fDt/E2BlgrEwUzCmvKHosNubPnHTLlYqsAvR3xPkOx10pUmxJPuF/YPPnEClDZiQR2tHzO52UEe8xo21xHakfeEVWd26c/Y6nLkEUB/j3Nak3Bn5wtPLAmXbJaUypVb/9Svnchy9hHcqyQncJ9di/l+imWu0aGHKfreQe0kheFWnc3Vx6DIX6Fhq8U0+AOnkYaeLtEHqmm0Vf0u03U37tTVy3OTgciOtV+wIzAXCZD4lSaqpexT0oLEDKJir9tHkWN28i/CyoKhdN4K9fS1GuaGiRHwGYOpcT0QXwMkZ77KJZsg9Wq1ofcizXOy85rCPruh+831XyVBBPDczudCg== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass (sender ip is 137.71.25.55) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=analog.com;dmarc=bestguesspass action=none header.from=analog.com;dkim=none (message not signed);arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=analog.onmicrosoft.com; s=selector2-analog-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2bTXW9FbWsrk053yU3mRr/jjxL5i/KX0fA2tAKONyAU=; b=qlDE8qK6FEjsIAwLG0+t3sU0RLc6Q2lKzZ8WI3cYbVemUYMCv5yAztp8SNAuK7rmXORZxQchrKKLhTdMWsU+XMONmuLpAZaGYCMrz94m9cGzA/W7Bb7qvaMlUiqdkJnsqyalBzfKF5APGNyO9tS+5qN6VRpG39TNMjhy9AlQB54= Received: from BN8PR03CA0022.namprd03.prod.outlook.com (2603:10b6:408:94::35) by CY4PR03MB2887.namprd03.prod.outlook.com (2603:10b6:903:132::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.17; Mon, 5 Aug 2019 13:55:21 +0000 Received: from BL2NAM02FT009.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::209) by BN8PR03CA0022.outlook.office365.com (2603:10b6:408:94::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.17 via Frontend Transport; Mon, 5 Aug 2019 13:55:21 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.55 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.55; helo=nwd2mta1.analog.com; Received: from nwd2mta1.analog.com (137.71.25.55) by BL2NAM02FT009.mail.protection.outlook.com (10.152.77.68) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2136.14 via Frontend Transport; Mon, 5 Aug 2019 13:55:20 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta1.analog.com (8.13.8/8.13.8) with ESMTP id x75DtHQQ016208 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Mon, 5 Aug 2019 06:55:17 -0700 Received: from saturn.ad.analog.com (10.48.65.109) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Mon, 5 Aug 2019 09:55:20 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH 07/16] net: phy: adin: make RGMII internal delays configurable Date: Mon, 5 Aug 2019 19:54:44 +0300 Message-ID: <20190805165453.3989-8-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190805165453.3989-1-alexandru.ardelean@analog.com> References: <20190805165453.3989-1-alexandru.ardelean@analog.com> MIME-Version: 1.0 X-ADIRoutedOnPrem: True X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:137.71.25.55; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(136003)(39860400002)(376002)(396003)(346002)(2980300002)(199004)(189003)(2906002)(316002)(76176011)(1076003)(2201001)(126002)(4326008)(47776003)(36756003)(11346002)(51416003)(426003)(486006)(336012)(246002)(26005)(2616005)(7696005)(476003)(44832011)(50466002)(446003)(186003)(6666004)(48376002)(50226002)(70586007)(8936002)(70206006)(54906003)(8676002)(107886003)(478600001)(86362001)(356004)(5660300002)(2870700001)(106002)(7636002)(110136005)(305945005); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB2887; H:nwd2mta1.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail10.analog.com; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9d816bca-a0c4-4da5-c325-08d719ac8e62 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328); SRVR:CY4PR03MB2887; X-MS-TrafficTypeDiagnostic: CY4PR03MB2887: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2803; X-Forefront-PRVS: 01208B1E18 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: i6T3Mdxl/uTvN+JHItFwBB4CWO9MMjQluXTIL4JJ+QG8st4ooTMFz6XIx2oBXHs8YPMB77SfLL5e71Hx4cBvnAL2sQIxLjVQ+VcuOP2pqAH/NovfGmPB9pm6L+c5c0/3OKD8MPZkhxgklizHaNlEbJf+pPn/ym5mSlsPIXJZUw16A/c46vwL1If3XpsJcvBf/RMnUpCbY5isOU91/XBU6ooAmNub3We2dJ9yb3Sni217fJYTsdrr4WPtYnwBoZTX4+BFfP//0NaDnnmI4wzMVjkfl9rQsAT7j9bYFBpYp7nVlLZGwy9CLT0LDm5pbALZ2x3s5aTYbDu3z7Fxg5dnsguU5bHYvoVLTQu3LbgDFofLmNwYnqOiuTIe/Z1v6TnmmFC1WoDqzkoKvu2uYXxi4xUPgbofMUjvSYnemj24jxo= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2019 13:55:20.9110 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9d816bca-a0c4-4da5-c325-08d719ac8e62 X-MS-Exchange-CrossTenant-Id: eaa689b4-8f87-40e0-9c6f-7228de4d754a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=eaa689b4-8f87-40e0-9c6f-7228de4d754a; Ip=[137.71.25.55]; Helo=[nwd2mta1.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR03MB2887 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-05_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908050154 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The internal delays for the RGMII are configurable for both RX & TX. This change adds support for configuring them via device-tree (or ACPI). Signed-off-by: Alexandru Ardelean --- drivers/net/phy/adin.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c index e3d2ff8cc09c..cb96d47d457e 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -5,6 +5,7 @@ * Copyright 2019 Analog Devices Inc. */ #include +#include #include #include #include @@ -12,6 +13,8 @@ #include #include +#include + #define PHY_ID_ADIN1200 0x0283bc20 #define PHY_ID_ADIN1300 0x0283bc30 @@ -35,6 +38,12 @@ #define ADIN1300_INT_STATUS_REG 0x0019 #define ADIN1300_GE_RGMII_CFG_REG 0xff23 +#define ADIN1300_GE_RGMII_RX_MSK GENMASK(8, 6) +#define ADIN1300_GE_RGMII_RX_SEL(x) \ + FIELD_PREP(ADIN1300_GE_RGMII_RX_MSK, x) +#define ADIN1300_GE_RGMII_GTX_MSK GENMASK(5, 3) +#define ADIN1300_GE_RGMII_GTX_SEL(x) \ + FIELD_PREP(ADIN1300_GE_RGMII_GTX_MSK, x) #define ADIN1300_GE_RGMII_RXID_EN BIT(2) #define ADIN1300_GE_RGMII_TXID_EN BIT(1) #define ADIN1300_GE_RGMII_EN BIT(0) @@ -67,6 +76,32 @@ static int adin_get_phy_internal_mode(struct phy_device *phydev) return -EINVAL; } +static void adin_config_rgmii_rx_internal_delay(struct phy_device *phydev, + int *reg) +{ + struct device *dev = &phydev->mdio.dev; + u32 val; + + if (device_property_read_u32(dev, "adi,rx-internal-delay", &val)) + val = ADIN1300_RGMII_2_00_NS; + + *reg &= ADIN1300_GE_RGMII_RX_MSK; + *reg |= ADIN1300_GE_RGMII_RX_SEL(val); +} + +static void adin_config_rgmii_tx_internal_delay(struct phy_device *phydev, + int *reg) +{ + struct device *dev = &phydev->mdio.dev; + u32 val; + + if (device_property_read_u32(dev, "adi,tx-internal-delay", &val)) + val = ADIN1300_RGMII_2_00_NS; + + *reg &= ADIN1300_GE_RGMII_GTX_MSK; + *reg |= ADIN1300_GE_RGMII_GTX_SEL(val); +} + static int adin_config_rgmii_mode(struct phy_device *phydev, phy_interface_t intf) { @@ -86,6 +121,7 @@ static int adin_config_rgmii_mode(struct phy_device *phydev, if (intf == PHY_INTERFACE_MODE_RGMII_ID || intf == PHY_INTERFACE_MODE_RGMII_RXID) { reg |= ADIN1300_GE_RGMII_RXID_EN; + adin_config_rgmii_rx_internal_delay(phydev, ®); } else { reg &= ~ADIN1300_GE_RGMII_RXID_EN; } @@ -93,6 +129,7 @@ static int adin_config_rgmii_mode(struct phy_device *phydev, if (intf == PHY_INTERFACE_MODE_RGMII_ID || intf == PHY_INTERFACE_MODE_RGMII_TXID) { reg |= ADIN1300_GE_RGMII_TXID_EN; + adin_config_rgmii_tx_internal_delay(phydev, ®); } else { reg &= ~ADIN1300_GE_RGMII_TXID_EN; } From patchwork Mon Aug 5 16:54:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1142202 X-Patchwork-Delegate: davem@davemloft.net 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=none (p=none dis=none) header.from=analog.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=analog.onmicrosoft.com header.i=@analog.onmicrosoft.com header.b="DcPU210l"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 462K7S3lg1z9sPJ for ; Mon, 5 Aug 2019 23:56:36 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729632AbfHENzf (ORCPT ); Mon, 5 Aug 2019 09:55:35 -0400 Received: from mx0b-00128a01.pphosted.com ([148.163.139.77]:9552 "EHLO mx0b-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729494AbfHENzc (ORCPT ); Mon, 5 Aug 2019 09:55:32 -0400 Received: from pps.filterd (m0167090.ppops.net [127.0.0.1]) by mx0b-00128a01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x75DqrI5019294; Mon, 5 Aug 2019 09:55:26 -0400 Received: from nam05-by2-obe.outbound.protection.outlook.com (mail-by2nam05lp2058.outbound.protection.outlook.com [104.47.50.58]) by mx0b-00128a01.pphosted.com with ESMTP id 2u56w5svg6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 05 Aug 2019 09:55:26 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b6Ul4xRNrHgWIz9jec68RMgtNaYrfZOcN2EiiNP7O8WY5vYInHyilMG+35EdsR/KqmZWxSenG0R+WNr2FPtCKFBlhRlpF+W4IP0mbiaJ2lUlJwRWX05FTpMpE9q3B0pyl44rkCX8TasN0TX/1F7ZOxsUqiM94tf5GEKJ1Jq1zAw983WlFXGIeQOMzLOwlPunekAhwDgftOT9F/d0fNob/SPBVILRZUqBzjbWwAaxK6OLRd6PyR5qWW2YVOzBQGBVUibh+8vv0958CZ4suF2DoVimJ4inDpEa1qwkwL95JjWunVp0SBCTH4dSh8wKIVEeWhTG3JbRRQ72ylBj7gh7Dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vKJYzhjMtIN/OdLdSwLoo0yBsMiaCODJ2FWPNtB9o60=; b=FnMzjVzUcp3AztHXvApSIGN/6pAcY3aPsuejhO7B+NSbMAvz1r8CnmI3DFPgaYH6xNpGwCoYr42ss7ocGk7HqRKo1VXYdUJ1oPM3a2suhqDawFqSmi9V+kWcggQm/Z/CSbYGEfO3//XiAJdW31gZTcGaMZ6xk6EFlFCVasA0YJ5Zoj8k3f+mgT+4r1wv0L8cwCmwwdyAxtW10zd3pSQ8fV4Kfp0k2Z4yv3wK8ZwneWJtBoQZHWpGKtztgUaRlz/5wQ22lVmC1Wu2C5ryHfi2giHwAUSyRxHANWzVG9lW2T0J+4m+Xk74EB+AiH2KwgoV/5kfhl47SGw4w1hpRdlogg== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass (sender ip is 137.71.25.55) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=analog.com;dmarc=bestguesspass action=none header.from=analog.com;dkim=none (message not signed);arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=analog.onmicrosoft.com; s=selector2-analog-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vKJYzhjMtIN/OdLdSwLoo0yBsMiaCODJ2FWPNtB9o60=; b=DcPU210lruPw2zl6iNirZIJVZNy0GWYPnGifLKzon2Px8IbF0PTDK0DgPge7Gz5S1+pxZHd3jWkT4qxm1Fctxi8cjk50ZMHjuzebl6HrgxjdAhb5WgsAsIx6KmVxJYO3OijUXyoMqVZB29b361h0RYV7Hk4TMl9uA4B7p2ZgOHQ= Received: from DM3PR03CA0016.namprd03.prod.outlook.com (2603:10b6:0:50::26) by CY4PR03MB2968.namprd03.prod.outlook.com (2603:10b6:903:12f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.17; Mon, 5 Aug 2019 13:55:23 +0000 Received: from BL2NAM02FT064.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::203) by DM3PR03CA0016.outlook.office365.com (2603:10b6:0:50::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2136.13 via Frontend Transport; Mon, 5 Aug 2019 13:55:23 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.55 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.55; helo=nwd2mta1.analog.com; Received: from nwd2mta1.analog.com (137.71.25.55) by BL2NAM02FT064.mail.protection.outlook.com (10.152.77.119) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2136.14 via Frontend Transport; Mon, 5 Aug 2019 13:55:23 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta1.analog.com (8.13.8/8.13.8) with ESMTP id x75DtKet016213 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Mon, 5 Aug 2019 06:55:20 -0700 Received: from saturn.ad.analog.com (10.48.65.109) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Mon, 5 Aug 2019 09:55:22 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH 08/16] net: phy: adin: make RMII fifo depth configurable Date: Mon, 5 Aug 2019 19:54:45 +0300 Message-ID: <20190805165453.3989-9-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190805165453.3989-1-alexandru.ardelean@analog.com> References: <20190805165453.3989-1-alexandru.ardelean@analog.com> MIME-Version: 1.0 X-ADIRoutedOnPrem: True X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:137.71.25.55; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(396003)(39860400002)(136003)(376002)(346002)(2980300002)(199004)(189003)(26005)(36756003)(2201001)(110136005)(186003)(54906003)(486006)(44832011)(50466002)(70586007)(48376002)(4326008)(70206006)(2906002)(5660300002)(2870700001)(426003)(126002)(86362001)(446003)(2616005)(336012)(1076003)(246002)(305945005)(478600001)(356004)(47776003)(476003)(11346002)(107886003)(316002)(50226002)(6666004)(7636002)(106002)(7696005)(51416003)(8936002)(8676002)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB2968; H:nwd2mta1.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail10.analog.com; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3d253401-7227-49aa-2467-08d719ac8fb4 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328); SRVR:CY4PR03MB2968; X-MS-TrafficTypeDiagnostic: CY4PR03MB2968: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-Forefront-PRVS: 01208B1E18 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: Dp7AHlqj4Rx2MJkgsJcT1vAKDNRnvxxzJXG3l+dXwDXMWnpBuPH8EoCtMhUHOYKpn2Zja2zLeFhje9jjGOoiUl0IjBb8zSurMXaz8PjqxXQA9UMHOFaE1wtlM9mhi4a7jpFhAO0KsLJFg4Kc1areQCMzBQ0vuQo57khSzZqJ5VJSkpL2Q+kVVAI8Qr1Ne6HAKZPYQyGdpMOFxyPr9NZnmZjJRW75OZxMfciHkOSC+qeSbpJlbCQzk0Gmb+7hfy9/PGEb0c4+Si3wSlnNP53PgExFNejyX5VzeYoE6tbsi0Isl7RjAEqqqkEJD3vqyrVmOqbkm9HdZUuNf4L7N9roIJ7afoPkmnu5bxk6jFWC23ufUkLRgNQ5KnQIjuc0LtiFWyTiMvBCdtCdXKgsSn1kYE/mldXAOesmv5mWXzuxBr4= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2019 13:55:23.1190 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3d253401-7227-49aa-2467-08d719ac8fb4 X-MS-Exchange-CrossTenant-Id: eaa689b4-8f87-40e0-9c6f-7228de4d754a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=eaa689b4-8f87-40e0-9c6f-7228de4d754a; Ip=[137.71.25.55]; Helo=[nwd2mta1.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR03MB2968 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-05_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=753 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908050154 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The FIFO depth can be configured for the RMII mode. This change adds support for doing this via device-tree (or ACPI). Signed-off-by: Alexandru Ardelean --- drivers/net/phy/adin.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c index cb96d47d457e..2e27ffd403b4 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -49,6 +49,9 @@ #define ADIN1300_GE_RGMII_EN BIT(0) #define ADIN1300_GE_RMII_CFG_REG 0xff24 +#define ADIN1300_GE_RMII_FIFO_DEPTH_MSK GENMASK(6, 4) +#define ADIN1300_GE_RMII_FIFO_DEPTH_SEL(x) \ + FIELD_PREP(ADIN1300_GE_RMII_FIFO_DEPTH_MSK, x) #define ADIN1300_GE_RMII_EN BIT(0) static int adin_get_phy_internal_mode(struct phy_device *phydev) @@ -142,6 +145,8 @@ static int adin_config_rgmii_mode(struct phy_device *phydev, static int adin_config_rmii_mode(struct phy_device *phydev, phy_interface_t intf) { + struct device *dev = &phydev->mdio.dev; + u32 val; int reg; reg = phy_read_mmd(phydev, MDIO_MMD_VEND1, ADIN1300_GE_RMII_CFG_REG); @@ -155,6 +160,12 @@ static int adin_config_rmii_mode(struct phy_device *phydev, reg |= ADIN1300_GE_RMII_EN; + if (device_property_read_u32(dev, "adi,fifo-depth", &val)) + val = ADIN1300_RMII_8_BITS; + + reg &= ~ADIN1300_GE_RMII_FIFO_DEPTH_MSK; + reg |= ADIN1300_GE_RMII_FIFO_DEPTH_SEL(val); + write: return phy_write_mmd(phydev, MDIO_MMD_VEND1, ADIN1300_GE_RMII_CFG_REG, reg); From patchwork Mon Aug 5 16:54:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1142192 X-Patchwork-Delegate: davem@davemloft.net 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=none (p=none dis=none) header.from=analog.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=analog.onmicrosoft.com header.i=@analog.onmicrosoft.com header.b="l96ejlqG"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 462K6K5HwYz9sRh for ; Mon, 5 Aug 2019 23:55:37 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729684AbfHENzg (ORCPT ); Mon, 5 Aug 2019 09:55:36 -0400 Received: from mx0b-00128a01.pphosted.com ([148.163.139.77]:12090 "EHLO mx0b-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729483AbfHENzf (ORCPT ); Mon, 5 Aug 2019 09:55:35 -0400 Received: from pps.filterd (m0167091.ppops.net [127.0.0.1]) by mx0b-00128a01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x75Dqnb7015553; Mon, 5 Aug 2019 09:55:27 -0400 Received: from nam03-co1-obe.outbound.protection.outlook.com (mail-co1nam03lp2059.outbound.protection.outlook.com [104.47.40.59]) by mx0b-00128a01.pphosted.com with ESMTP id 2u6kb20e1f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 05 Aug 2019 09:55:27 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xc7twsGfddK1lyLaCdVHXngZbW62joH/ZlnKM+ynliX0PuAtBEbV1taX5at2No8M5C4YTeOHqMdibQb7xrcbtS7vo9nCC+8f+uym3pLIEGuPd4NBb9OPEot2OclkJgl6ln00QkNyVntx3HBLLAuKmIJ1B9IMXjB9E4HkAaeTD3BVHT99X8j7G9yudXmMTzkmghuU5EIhbd9Ko1HaPz0YWDDW7zMWiSaGsix2mvdLKYeqGtJmBEQuzLbiyOZtbsgMNCwXeQLaJBpBsLv9HaBHnrKAMAZ48qlSRTz1v2KBm3XpqL0bPB2+jm9+FgyFbyRfTqDUyTd+0/ZEVq2xYsbMrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tnsTKQ4A7d6vqt3RgY33uvBHqi8QxZMIKNq+w5u/PV4=; b=GQnRB8UeUG4IvlRod+hRoSnCvAW98Qu3G5zXwSaSbEhfBsE1LfA+AkN2qyX5vAKx1Sjun3kPyTt6Hz0CRqfBtsw2sKc7XLjkdbCXMdtxQXWCnXX5VtPxwEOx8X2Kw6+EJmlcx02Mg66UL3fcrFfdklss+sQrwdVNc4EB50hpgBV7S9LaCFpBgWYKwZ5TjDMX39heyZ325BtG1HlC6tKwUmYztX6KREJF+pWvk5SwRGXUPWqnzVmayCGzioOa2NbzrsLhtDWcYf3ouECoPADX63yvTn60zaKYVAd1mFpdyECrv7ds7u5JPccLsnWkeUY1B+voTszOSMF/IEqPTjWUbw== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass (sender ip is 137.71.25.55) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=analog.com;dmarc=bestguesspass action=none header.from=analog.com;dkim=none (message not signed);arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=analog.onmicrosoft.com; s=selector2-analog-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tnsTKQ4A7d6vqt3RgY33uvBHqi8QxZMIKNq+w5u/PV4=; b=l96ejlqGYGSGI5y2AH4L0pntmrpc+pX+LkkoAfeg4aKjUBmnkVBpJOkIkRfxUzLxJ58di0JkHgb6TPU2su45j1tBK/W4NlqtvxwXReX8aDN6Kqy25rKfQntkgDG/4+VQHeyR5alGrWSfWBHymx7kZAUeS5v6N1kogFYWJffFIG4= Received: from BN3PR03CA0085.namprd03.prod.outlook.com (2a01:111:e400:7a4d::45) by CY4PR03MB2838.namprd03.prod.outlook.com (2603:10b6:903:12f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.17; Mon, 5 Aug 2019 13:55:25 +0000 Received: from BL2NAM02FT032.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::201) by BN3PR03CA0085.outlook.office365.com (2a01:111:e400:7a4d::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.20 via Frontend Transport; Mon, 5 Aug 2019 13:55:25 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.55 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.55; helo=nwd2mta1.analog.com; Received: from nwd2mta1.analog.com (137.71.25.55) by BL2NAM02FT032.mail.protection.outlook.com (10.152.77.169) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2136.14 via Frontend Transport; Mon, 5 Aug 2019 13:55:25 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta1.analog.com (8.13.8/8.13.8) with ESMTP id x75DtMEN016216 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Mon, 5 Aug 2019 06:55:22 -0700 Received: from saturn.ad.analog.com (10.48.65.109) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Mon, 5 Aug 2019 09:55:24 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH 09/16] net: phy: adin: add support MDI/MDIX/Auto-MDI selection Date: Mon, 5 Aug 2019 19:54:46 +0300 Message-ID: <20190805165453.3989-10-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190805165453.3989-1-alexandru.ardelean@analog.com> References: <20190805165453.3989-1-alexandru.ardelean@analog.com> MIME-Version: 1.0 X-ADIRoutedOnPrem: True X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:137.71.25.55; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(396003)(39860400002)(346002)(376002)(136003)(2980300002)(189003)(199004)(186003)(8676002)(48376002)(305945005)(50466002)(7636002)(107886003)(4326008)(5660300002)(1076003)(70206006)(70586007)(2870700001)(478600001)(246002)(8936002)(51416003)(7696005)(50226002)(2906002)(47776003)(86362001)(316002)(6666004)(106002)(76176011)(26005)(110136005)(36756003)(54906003)(356004)(426003)(476003)(126002)(446003)(2616005)(336012)(11346002)(14444005)(486006)(44832011)(2201001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB2838; H:nwd2mta1.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail10.analog.com; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 162e6474-8747-4e9c-0539-08d719ac90d7 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328); SRVR:CY4PR03MB2838; X-MS-TrafficTypeDiagnostic: CY4PR03MB2838: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-Forefront-PRVS: 01208B1E18 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: LWPWTWmR9twbYvtJm0EJaMWsTympF/VMD3Ce6Fes7aI0coxxSxqooc8FEY133Xixjk33+gPjzS8DsDQilvT1ER+BVKe9ocYDcINNGNmom2mVnKAISz7scGgPJ8nlXm85eDLRKDD7elYEOQ3JN3WbmI5RDymPg0J6HaRCjVfLdy4gNeqJJkULZjwg1NUZ2RgYt4gz3Irrp6HsgtXcDd6XDIA/AwJtbUzipt/yPLmjHp8ThvxW/cIwM+2ZV6lXwyh4Zl622E+kgb2Og3JS0alYFeyWVsV9GtZhxlJ7JA17TNm/t1eg29XP8HkqkWVRzEfxzI8HhbfgNfEFRdxfQ7cfHJ/CyB/JCZsr+ylwY9mILV4CPtxqEsL9+CvP4U5uNbmHyY4u8iu8JcOAwiU5CmEK+TUnfcw4jDIslQZlkHukETk= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2019 13:55:25.0233 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 162e6474-8747-4e9c-0539-08d719ac90d7 X-MS-Exchange-CrossTenant-Id: eaa689b4-8f87-40e0-9c6f-7228de4d754a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=eaa689b4-8f87-40e0-9c6f-7228de4d754a; Ip=[137.71.25.55]; Helo=[nwd2mta1.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR03MB2838 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-05_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908050154 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The ADIN PHYs support automatic MDI/MDIX negotiation. By default this is disabled, so this is enabled at `config_init`. This is controlled via the PHY Control 1 register. The supported modes are: 1. Manual MDI 2. Manual MDIX 3. Auto MDIX - prefer MDIX 4. Auto MDIX - prefer MDI The phydev mdix & mdix_ctrl fields include modes 3 & 4 into a single auto-mode. So, the default mode this driver enables is 4 when Auto-MDI mode is used. When detecting MDI/MDIX mode, a combination of the PHY Control 1 register and PHY Status 1 register is used to determine the correct MDI/MDIX mode. If Auto-MDI mode is not set, then the manual MDI/MDIX mode is returned. If Auto-MDI mode is set, then MDIX mode is returned differs from the preferred MDI/MDIX mode. This covers all cases where: 1. MDI preferred & Pair01Swapped == MDIX 2. MDIX preferred & Pair01Swapped == MDI 3. MDI preferred & ! Pair01Swapped == MDIX 4. MDIX preferred & ! Pair01Swapped == MDI The preferred MDI/MDIX mode is not configured via SW, but can be configured via HW pins. Note that the `Pair01Swapped` is the Green-Yellow physical pairs. Signed-off-by: Alexandru Ardelean --- drivers/net/phy/adin.c | 117 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 113 insertions(+), 4 deletions(-) diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c index 2e27ffd403b4..31c600b7ec66 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -21,6 +21,10 @@ #define ADIN1300_MII_EXT_REG_PTR 0x10 #define ADIN1300_MII_EXT_REG_DATA 0x11 +#define ADIN1300_PHY_CTRL1 0x0012 +#define ADIN1300_AUTO_MDI_EN BIT(10) +#define ADIN1300_MAN_MDIX_EN BIT(9) + #define ADIN1300_INT_MASK_REG 0x0018 #define ADIN1300_INT_MDIO_SYNC_EN BIT(9) #define ADIN1300_INT_ANEG_STAT_CHNG_EN BIT(8) @@ -37,6 +41,9 @@ ADIN1300_INT_HW_IRQ_EN) #define ADIN1300_INT_STATUS_REG 0x0019 +#define ADIN1300_PHY_STATUS1 0x001a +#define ADIN1300_PAIR_01_SWAP BIT(11) + #define ADIN1300_GE_RGMII_CFG_REG 0xff23 #define ADIN1300_GE_RGMII_RX_MSK GENMASK(8, 6) #define ADIN1300_GE_RGMII_RX_SEL(x) \ @@ -175,6 +182,8 @@ static int adin_config_init(struct phy_device *phydev) { phy_interface_t interface, rc; + phydev->mdix_ctrl = ETH_TP_MDI_AUTO; + rc = genphy_config_init(phydev); if (rc < 0) return rc; @@ -263,6 +272,106 @@ static int adin_write_mmd(struct phy_device *phydev, int devad, u16 regnum, return __mdiobus_write(bus, phy_addr, ADIN1300_MII_EXT_REG_DATA, val); } +static int adin_config_mdix(struct phy_device *phydev) +{ + bool auto_en, mdix_en; + int reg; + + mdix_en = false; + auto_en = false; + switch (phydev->mdix_ctrl) { + case ETH_TP_MDI: + break; + case ETH_TP_MDI_X: + mdix_en = true; + break; + case ETH_TP_MDI_AUTO: + auto_en = true; + break; + default: + return -EINVAL; + } + + reg = phy_read(phydev, ADIN1300_PHY_CTRL1); + if (reg < 0) + return reg; + + if (mdix_en) + reg |= ADIN1300_MAN_MDIX_EN; + else + reg &= ~ADIN1300_MAN_MDIX_EN; + + if (auto_en) + reg |= ADIN1300_AUTO_MDI_EN; + else + reg &= ~ADIN1300_AUTO_MDI_EN; + + return phy_write(phydev, ADIN1300_PHY_CTRL1, reg); +} + +static int adin_config_aneg(struct phy_device *phydev) +{ + int ret; + + ret = adin_config_mdix(phydev); + if (ret) + return ret; + + return genphy_config_aneg(phydev); +} + +static int adin_mdix_update(struct phy_device *phydev) +{ + bool auto_en, mdix_en; + bool swapped; + int reg; + + reg = phy_read(phydev, ADIN1300_PHY_CTRL1); + if (reg < 0) + return reg; + + auto_en = !!(reg & ADIN1300_AUTO_MDI_EN); + mdix_en = !!(reg & ADIN1300_MAN_MDIX_EN); + + /* If MDI/MDIX is forced, just read it from the control reg */ + if (!auto_en) { + if (mdix_en) + phydev->mdix = ETH_TP_MDI_X; + else + phydev->mdix = ETH_TP_MDI; + return 0; + } + + /** + * Otherwise, we need to deduce it from the PHY status2 reg. + * When Auto-MDI is enabled, the ADIN1300_MAN_MDIX_EN bit implies + * a preference for MDIX when it is set. + */ + reg = phy_read(phydev, ADIN1300_PHY_STATUS1); + if (reg < 0) + return reg; + + swapped = !!(reg & ADIN1300_PAIR_01_SWAP); + + if (mdix_en != swapped) + phydev->mdix = ETH_TP_MDI_X; + else + phydev->mdix = ETH_TP_MDI; + + return 0; +} + +static int adin_read_status(struct phy_device *phydev) +{ + int ret; + + ret = adin_mdix_update(phydev); + if (ret < 0) + return ret; + + return genphy_read_status(phydev); +} + static struct phy_driver adin_driver[] = { { .phy_id = PHY_ID_ADIN1200, @@ -271,8 +380,8 @@ static struct phy_driver adin_driver[] = { .features = PHY_BASIC_FEATURES, .flags = PHY_HAS_INTERRUPT, .config_init = adin_config_init, - .config_aneg = genphy_config_aneg, - .read_status = genphy_read_status, + .config_aneg = adin_config_aneg, + .read_status = adin_read_status, .ack_interrupt = adin_phy_ack_intr, .config_intr = adin_phy_config_intr, .resume = genphy_resume, @@ -287,8 +396,8 @@ static struct phy_driver adin_driver[] = { .features = PHY_GBIT_FEATURES, .flags = PHY_HAS_INTERRUPT, .config_init = adin_config_init, - .config_aneg = genphy_config_aneg, - .read_status = genphy_read_status, + .config_aneg = adin_config_aneg, + .read_status = adin_read_status, .ack_interrupt = adin_phy_ack_intr, .config_intr = adin_phy_config_intr, .resume = genphy_resume, From patchwork Mon Aug 5 16:54:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1142201 X-Patchwork-Delegate: davem@davemloft.net 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=none (p=none dis=none) header.from=analog.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=analog.onmicrosoft.com header.i=@analog.onmicrosoft.com header.b="Tgmkwc/+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 462K7N6Bw2z9sSk for ; Mon, 5 Aug 2019 23:56:32 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730436AbfHEN42 (ORCPT ); Mon, 5 Aug 2019 09:56:28 -0400 Received: from mx0b-00128a01.pphosted.com ([148.163.139.77]:12936 "EHLO mx0b-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729576AbfHENzg (ORCPT ); Mon, 5 Aug 2019 09:55:36 -0400 Received: from pps.filterd (m0167090.ppops.net [127.0.0.1]) by mx0b-00128a01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x75DqrI6019294; Mon, 5 Aug 2019 09:55:29 -0400 Received: from nam03-dm3-obe.outbound.protection.outlook.com (mail-dm3nam03lp2053.outbound.protection.outlook.com [104.47.41.53]) by mx0b-00128a01.pphosted.com with ESMTP id 2u56w5svgc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 05 Aug 2019 09:55:29 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mZ1cmyY/M6qc7SZ/JoCOMKuYgjq6e+io/TenVBPJF6E1WT5NQWHclmWRdhG2Mc68vnNA1XohmOP7T0skjQcJy6myFrbkbFuGkrl5DlEl8fBprjVvQMMNXcsy+rFbvcoJJGjCl8EmKGCb4N3YRm8/bBnOgSc1vRX+rKOSC027E/jWypLinkSxiHSqBbpspC8Ox5HX5/YLHCD24sw5igd0tQkpENV6AtxkFcS7NHMvCQemA9TyueX2g8jRKiIaykbAwVmeLyv4XV3ycpkECV5W1s038ZBePOqGwXcHniRxewL3fY5VUej8Hr66hQVsDIxkeK0Pv4JJB3CKZrAch5R9uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=su7P9xjLG+pd1xCYjk0NJdGpVaEIk2Hoje2en79KDDg=; b=KcYRYg5bKXthrLn547XRAYfhMw4l9QFhmUXPTXJ//WG0G4nm0ZZG9hd/ZP5XysO6EObMrR9AsVhzB7TbuilgoYP3Z5LNAljtnwLjTsIqPzB0WIl5xXUUVEa6ZEQu4IqiruVQGksjns3ZhdWIE2X2KHJJMGrzFBObkkNo/lVhT+6ex6fvSoZW4KyfclQNKhebbTdwM0eAaXyyzETNe9pY5m+58xTYwftJWP6l4uxK45Y6tUKFLmk5uPyRqVRUyLu1d2ms+hi73rzMznJc8v9CkmTWAtGIRL+9m7QLgwOltYst2vqlQvHHMU5HRV/iHflIX8oS4c2ePMlrh7jRGK7FbA== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass (sender ip is 137.71.25.55) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=analog.com;dmarc=bestguesspass action=none header.from=analog.com;dkim=none (message not signed);arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=analog.onmicrosoft.com; s=selector2-analog-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=su7P9xjLG+pd1xCYjk0NJdGpVaEIk2Hoje2en79KDDg=; b=Tgmkwc/+EfrtJSqFjV964t9yoiQP91UoSjsppPt7L17JDK8PDFRkOWSgc0I67VRee5AteEEFmgRsUC3T4bGb6dx2ELt7NQMZV159vz/gl+5hWp/wy/CiX7Sc5dwvkU7+ZUrx8BSy0FSl5/U/Fy8itPIxWNwiVlM9Ho1drs37UeA= Received: from BN3PR03CA0056.namprd03.prod.outlook.com (2a01:111:e400:7a4d::16) by CH2PR03MB5240.namprd03.prod.outlook.com (2603:10b6:610:93::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.13; Mon, 5 Aug 2019 13:55:27 +0000 Received: from BL2NAM02FT011.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::206) by BN3PR03CA0056.outlook.office365.com (2a01:111:e400:7a4d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2136.15 via Frontend Transport; Mon, 5 Aug 2019 13:55:27 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.55 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.55; helo=nwd2mta1.analog.com; Received: from nwd2mta1.analog.com (137.71.25.55) by BL2NAM02FT011.mail.protection.outlook.com (10.152.77.5) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2136.14 via Frontend Transport; Mon, 5 Aug 2019 13:55:27 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta1.analog.com (8.13.8/8.13.8) with ESMTP id x75DtO2v016222 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Mon, 5 Aug 2019 06:55:24 -0700 Received: from saturn.ad.analog.com (10.48.65.109) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Mon, 5 Aug 2019 09:55:26 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH 10/16] net: phy: adin: add EEE translation layer for Clause 22 Date: Mon, 5 Aug 2019 19:54:47 +0300 Message-ID: <20190805165453.3989-11-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190805165453.3989-1-alexandru.ardelean@analog.com> References: <20190805165453.3989-1-alexandru.ardelean@analog.com> MIME-Version: 1.0 X-ADIRoutedOnPrem: True X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:137.71.25.55; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(136003)(396003)(376002)(39860400002)(346002)(2980300002)(199004)(189003)(50226002)(48376002)(50466002)(44832011)(356004)(336012)(486006)(11346002)(446003)(126002)(2201001)(2616005)(47776003)(478600001)(14444005)(426003)(70206006)(36756003)(106002)(5660300002)(2870700001)(6666004)(246002)(70586007)(8936002)(316002)(476003)(7636002)(107886003)(54906003)(110136005)(1076003)(76176011)(2906002)(305945005)(8676002)(4326008)(26005)(186003)(51416003)(7696005)(86362001); DIR:OUT; SFP:1101; SCL:1; SRVR:CH2PR03MB5240; H:nwd2mta1.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail10.analog.com; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0f441de3-029c-4be7-7268-08d719ac9213 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328); SRVR:CH2PR03MB5240; X-MS-TrafficTypeDiagnostic: CH2PR03MB5240: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-Forefront-PRVS: 01208B1E18 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: ZgUbvcYWorJ/DyTFgeR8r/fn4TI+4xbmE42ziO4yvKhmG8BuYSaIxkC5ay146mR/6mZ5S8j5JBbSYQRui6urNowqCztTrDtWoT9JW/QgfdLEAK8MjebcOx4iStdeKTVT2OHmJrxTI97QfAesY5qIq1PrUiQ/EzKdJgJgMGSj9rRr9vmQ7ORoMc5illlCxaRTWUC3YKtWi4eLIW/rlmtUMC34O4Z0R4vDkeGZid2mCJo/Leuz4qLGKjJ4vz/IWSG4CHF/zl/IQZyeye9oPXQ+gcITaqDtL0h7/mDaCi4OkoOj3BQYiCUw7r9rUMweJnkXJ/pjjw09EQAKduHM1PLjhnd3vzY1K1hMKTDnQLIXXmPgbg43SMkZHwBIKJ+gY+dlXyvW4RdlnCbhHqjv+9FWW2Nn8PIPW+qU3kXarYUoZ+w= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2019 13:55:27.1001 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0f441de3-029c-4be7-7268-08d719ac9213 X-MS-Exchange-CrossTenant-Id: eaa689b4-8f87-40e0-9c6f-7228de4d754a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=eaa689b4-8f87-40e0-9c6f-7228de4d754a; Ip=[137.71.25.55]; Helo=[nwd2mta1.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR03MB5240 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-05_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=846 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908050154 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The ADIN1200 & ADIN1300 PHYs support EEE by using standard Clause 45 access to access MMD registers for EEE. The EEE register addresses (when using Clause 22) are available at different addresses (than Clause 45), and since accessing these regs (via Clause 22) needs a special mechanism, a translation table is required to convert these addresses. For Clause 45, this is not needed; the addresses are available as specified by IEEE. Signed-off-by: Alexandru Ardelean --- drivers/net/phy/adin.c | 61 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c index 31c600b7ec66..3c559a3ba487 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -44,6 +44,17 @@ #define ADIN1300_PHY_STATUS1 0x001a #define ADIN1300_PAIR_01_SWAP BIT(11) +/* EEE register addresses, accessible via Clause 22 access using + * ADIN1300_MII_EXT_REG_PTR & ADIN1300_MII_EXT_REG_DATA. + * The bit-fields are the same as specified by IEEE, and can be + * accessed via standard Clause 45 access. + */ +#define ADIN1300_EEE_CAP_REG 0x8000 +#define ADIN1300_EEE_ADV_REG 0x8001 +#define ADIN1300_EEE_LPABLE_REG 0x8002 +#define ADIN1300_CLOCK_STOP_REG 0x9400 +#define ADIN1300_LPI_WAKE_ERR_CNT_REG 0xa000 + #define ADIN1300_GE_RGMII_CFG_REG 0xff23 #define ADIN1300_GE_RGMII_RX_MSK GENMASK(8, 6) #define ADIN1300_GE_RGMII_RX_SEL(x) \ @@ -61,6 +72,20 @@ FIELD_PREP(ADIN1300_GE_RMII_FIFO_DEPTH_MSK, x) #define ADIN1300_GE_RMII_EN BIT(0) +struct clause22_mmd_map { + int devad; + u16 cl22_regnum; + u16 adin_regnum; +}; + +static struct clause22_mmd_map clause22_mmd_map[] = { + { MDIO_MMD_PCS, MDIO_PCS_EEE_ABLE, ADIN1300_EEE_CAP_REG }, + { MDIO_MMD_AN, MDIO_AN_EEE_LPABLE, ADIN1300_EEE_LPABLE_REG }, + { MDIO_MMD_AN, MDIO_AN_EEE_ADV, ADIN1300_EEE_ADV_REG }, + { MDIO_MMD_PCS, MDIO_CTRL1, ADIN1300_CLOCK_STOP_REG }, + { MDIO_MMD_PCS, MDIO_PCS_EEE_WK_ERR, ADIN1300_LPI_WAKE_ERR_CNT_REG }, +}; + static int adin_get_phy_internal_mode(struct phy_device *phydev) { struct device *dev = &phydev->mdio.dev; @@ -233,10 +258,31 @@ static int adin_phy_config_intr(struct phy_device *phydev) ADIN1300_INT_MASK_EN); } +static int adin_cl22_to_adin_reg(int devad, u16 cl22_regnum) +{ + struct clause22_mmd_map *m; + int i; + + if (devad == MDIO_MMD_VEND1) + return cl22_regnum; + + for (i = 0; i < ARRAY_SIZE(clause22_mmd_map); i++) { + m = &clause22_mmd_map[i]; + if (m->devad == devad && m->cl22_regnum == cl22_regnum) + return m->adin_regnum; + } + + pr_err("No translation available for devad: %d reg: %04x\n", + devad, cl22_regnum); + + return -EINVAL; +} + static int adin_read_mmd(struct phy_device *phydev, int devad, u16 regnum) { struct mii_bus *bus = phydev->mdio.bus; int phy_addr = phydev->mdio.addr; + int adin_regnum; int err; if (phydev->is_c45) { @@ -245,7 +291,12 @@ static int adin_read_mmd(struct phy_device *phydev, int devad, u16 regnum) return __mdiobus_read(bus, phy_addr, addr); } - err = __mdiobus_write(bus, phy_addr, ADIN1300_MII_EXT_REG_PTR, regnum); + adin_regnum = adin_cl22_to_adin_reg(devad, regnum); + if (adin_regnum < 0) + return adin_regnum; + + err = __mdiobus_write(bus, phy_addr, ADIN1300_MII_EXT_REG_PTR, + adin_regnum); if (err) return err; @@ -257,6 +308,7 @@ static int adin_write_mmd(struct phy_device *phydev, int devad, u16 regnum, { struct mii_bus *bus = phydev->mdio.bus; int phy_addr = phydev->mdio.addr; + int adin_regnum; int err; if (phydev->is_c45) { @@ -265,7 +317,12 @@ static int adin_write_mmd(struct phy_device *phydev, int devad, u16 regnum, return __mdiobus_write(bus, phy_addr, addr, val); } - err = __mdiobus_write(bus, phy_addr, ADIN1300_MII_EXT_REG_PTR, regnum); + adin_regnum = adin_cl22_to_adin_reg(devad, regnum); + if (adin_regnum < 0) + return adin_regnum; + + err = __mdiobus_write(bus, phy_addr, ADIN1300_MII_EXT_REG_PTR, + adin_regnum); if (err) return err; From patchwork Mon Aug 5 16:54:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1142197 X-Patchwork-Delegate: davem@davemloft.net 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=none (p=none dis=none) header.from=analog.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=analog.onmicrosoft.com header.i=@analog.onmicrosoft.com header.b="JWw+rYI4"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 462K6r6bNqz9sSX for ; Mon, 5 Aug 2019 23:56:04 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730222AbfHEN4A (ORCPT ); Mon, 5 Aug 2019 09:56:00 -0400 Received: from mx0a-00128a01.pphosted.com ([148.163.135.77]:4958 "EHLO mx0a-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729930AbfHENzr (ORCPT ); Mon, 5 Aug 2019 09:55:47 -0400 Received: from pps.filterd (m0167088.ppops.net [127.0.0.1]) by mx0a-00128a01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x75Dr6dN016024; Mon, 5 Aug 2019 09:55:32 -0400 Received: from nam04-sn1-obe.outbound.protection.outlook.com (mail-sn1nam04lp2054.outbound.protection.outlook.com [104.47.44.54]) by mx0a-00128a01.pphosted.com with ESMTP id 2u5448sdbn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 05 Aug 2019 09:55:31 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k2NxV6cKp/CpuC9hh6wUSUP+THk3lEiXCUZEdpF3A5YiOkn6KdOO0XKIkelcOnI4ILQdAOMCJ4ikPFeOwZCteoxP1aLdCDvP6o0s3SQus2Wz8wI0DlXOpzzPQWHndUYOWECqnXFUR2I82Z6YtSIPzR+3GCsWkNdzyJ9E5EkoTHs5MxJdIYf/qUnRVGNTvOEaNO5hDLxSWrbbpzc9odCfk2/UCqyGqApFwKyloWN74DOKhbMtYusnoKSSurIJgmGHFSxEGl5onsAEqIZ1Cs4HpU+Ntz94abz9xVqZIQMWILKD9EQ9mqhP76ZbP63agNfw/afZ6whHFQHZGoWOafkBpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cv1A4RjPo1u4YNCnk4egqPxjPp4CETOVX/P4JquR1Fw=; b=EJXuIYvP+lbE65fT3sHKt0vlCalsMpbIG51xRVoouqidimOMi9zUMU9JBjXiR1a6JA71GME2WPRdVcq2lFvGdacGwrnNFCjKmfLN7/PcPUTsVdeFRKkF52z4ElradQnUdVQT6QMklQYjFLeRFifhe5KtnhHgNHokjAWQLn3TMZ6U1n86/tH0ealkYQM1i4wzLJXJedJCA1tnaegI676C9jxV/4QhAe2li44CqUiS6aDnUuDoVcRXooBYUThxKl31yxzq9bZflsRHKzfTBM9cey34utT9JoQ7RrZOuD/LikuzZE0uFqy2P8Er4YjPotfz+oOklrlCxxs8FHwJOLySGg== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass (sender ip is 137.71.25.55) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=analog.com;dmarc=bestguesspass action=none header.from=analog.com;dkim=none (message not signed);arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=analog.onmicrosoft.com; s=selector2-analog-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cv1A4RjPo1u4YNCnk4egqPxjPp4CETOVX/P4JquR1Fw=; b=JWw+rYI4FDEyCLkvCbrwKp/8strA2/tDU9SSGXX/FkHQ6agcFkDixpejLovs6E06YlI/hwtO5i5DIrCi8PGr2m9E84/UXwUixlpU/Ao9hXmr2OOQ/nMKQFpnE6V6cR57nQAELZh2f6/Qet7t6iMiCA+Hd0NdiqQxyDw+plbiNp4= Received: from BN6PR03CA0076.namprd03.prod.outlook.com (2603:10b6:405:6f::14) by SN6PR03MB4014.namprd03.prod.outlook.com (2603:10b6:805:c3::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.14; Mon, 5 Aug 2019 13:55:29 +0000 Received: from BL2NAM02FT021.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::203) by BN6PR03CA0076.outlook.office365.com (2603:10b6:405:6f::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2136.17 via Frontend Transport; Mon, 5 Aug 2019 13:55:29 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.55 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.55; helo=nwd2mta1.analog.com; Received: from nwd2mta1.analog.com (137.71.25.55) by BL2NAM02FT021.mail.protection.outlook.com (10.152.77.158) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2136.14 via Frontend Transport; Mon, 5 Aug 2019 13:55:29 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta1.analog.com (8.13.8/8.13.8) with ESMTP id x75DtQxj016232 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Mon, 5 Aug 2019 06:55:26 -0700 Received: from saturn.ad.analog.com (10.48.65.109) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Mon, 5 Aug 2019 09:55:28 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH 11/16] net: phy: adin: PHY reset mechanisms Date: Mon, 5 Aug 2019 19:54:48 +0300 Message-ID: <20190805165453.3989-12-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190805165453.3989-1-alexandru.ardelean@analog.com> References: <20190805165453.3989-1-alexandru.ardelean@analog.com> MIME-Version: 1.0 X-ADIRoutedOnPrem: True X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:137.71.25.55; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39860400002)(346002)(136003)(396003)(376002)(2980300002)(199004)(189003)(336012)(6666004)(4326008)(50226002)(51416003)(7696005)(426003)(107886003)(44832011)(26005)(70206006)(70586007)(2906002)(86362001)(446003)(316002)(47776003)(486006)(14444005)(126002)(476003)(186003)(2616005)(246002)(11346002)(2201001)(356004)(7636002)(48376002)(2870700001)(36756003)(106002)(50466002)(5660300002)(1076003)(110136005)(478600001)(54906003)(76176011)(305945005)(8936002)(8676002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN6PR03MB4014; H:nwd2mta1.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail10.analog.com; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 68137548-9f4b-41e9-c47e-08d719ac9340 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328); SRVR:SN6PR03MB4014; X-MS-TrafficTypeDiagnostic: SN6PR03MB4014: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2733; X-Forefront-PRVS: 01208B1E18 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: ZB/InwBgWTokm58Us0wOwW7pLQLUwUc/P6HwDgbioP20tWYWfUvZvw+XbPd4KEpjg+mT/LhYEzpC1RzXqYk3o4RHwAOFXg51+t0NPXBSw6jZ5NGU63r8MbiAF4ah4xC2xISlayuXVMkMTD77kzv2YXep7cKGm2RUQng0UlVzEl0X0tIsh+syWRiD0g7QpzCgGdnjXKk6Y2hNsLDzsnzZD9r+7gb4jB9eq1qC5NDcgf4zxK3uFd3iednTG/lwteT9BNlE5IW8bmVXpZxX5sozwkuqX+xgK4qf8n9cK5/o9Z60z5LXDz29gjsLSqywqUJlgjLVayYPEQA9PDbZacdkw0hx0bgr3FRvX2PHKmmEojpynIilvkFgzDxxTP8LU7SoLNuWKnOSaxov6aCntnXsf15bORxpcVewGKXFri220EU= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2019 13:55:29.0698 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 68137548-9f4b-41e9-c47e-08d719ac9340 X-MS-Exchange-CrossTenant-Id: eaa689b4-8f87-40e0-9c6f-7228de4d754a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=eaa689b4-8f87-40e0-9c6f-7228de4d754a; Ip=[137.71.25.55]; Helo=[nwd2mta1.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR03MB4014 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-05_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=647 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908050154 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The ADIN PHYs supports 4 types of reset: 1. The standard PHY reset via BMCR_RESET bit in MII_BMCR reg 2. Reset via GPIO 3. Reset via reg GeSftRst (0xff0c) & reload previous pin configs 4. Reset via reg GeSftRst (0xff0c) & request new pin configs Resets 2 & 4 are almost identical, with the exception that the crystal oscillator is available during reset for 2. Resetting via GeSftRst or via GPIO is useful when doing a warm reboot. If doing various settings via phytool or ethtool, the sub-system registers don't reset just via BMCR_RESET. This change implements resetting the entire PHY subsystem during probe. During PHY HW init (phy_hw_init() logic) the PHY core regs will be reset again via BMCR_RESET. This will also need to happen during a PM resume. Signed-off-by: Alexandru Ardelean --- drivers/net/phy/adin.c | 82 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c index 3c559a3ba487..476a81ce9341 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -6,12 +6,14 @@ */ #include #include +#include #include #include #include #include #include #include +#include #include @@ -55,6 +57,9 @@ #define ADIN1300_CLOCK_STOP_REG 0x9400 #define ADIN1300_LPI_WAKE_ERR_CNT_REG 0xa000 +#define ADIN1300_GE_SOFT_RESET_REG 0xff0c +#define ADIN1300_GE_SOFT_RESET BIT(0) + #define ADIN1300_GE_RGMII_CFG_REG 0xff23 #define ADIN1300_GE_RGMII_RX_MSK GENMASK(8, 6) #define ADIN1300_GE_RGMII_RX_SEL(x) \ @@ -86,6 +91,14 @@ static struct clause22_mmd_map clause22_mmd_map[] = { { MDIO_MMD_PCS, MDIO_PCS_EEE_WK_ERR, ADIN1300_LPI_WAKE_ERR_CNT_REG }, }; +/** + * struct adin_priv - ADIN PHY driver private data + * gpiod_reset optional reset GPIO, to be used in soft_reset() cb + */ +struct adin_priv { + struct gpio_desc *gpiod_reset; +}; + static int adin_get_phy_internal_mode(struct phy_device *phydev) { struct device *dev = &phydev->mdio.dev; @@ -429,6 +442,73 @@ static int adin_read_status(struct phy_device *phydev) return genphy_read_status(phydev); } +static int adin_subsytem_soft_reset(struct phy_device *phydev) +{ + int reg, rc, i; + + reg = phy_read_mmd(phydev, MDIO_MMD_VEND1, ADIN1300_GE_SOFT_RESET_REG); + if (reg < 0) + return reg; + + reg |= ADIN1300_GE_SOFT_RESET; + rc = phy_write_mmd(phydev, MDIO_MMD_VEND1, ADIN1300_GE_SOFT_RESET_REG, + reg); + if (rc < 0) + return rc; + + for (i = 0; i < 20; i++) { + usleep_range(500, 1000); + reg = phy_read_mmd(phydev, MDIO_MMD_VEND1, + ADIN1300_GE_SOFT_RESET_REG); + if (reg < 0 || (reg & ADIN1300_GE_SOFT_RESET)) + continue; + return 0; + } + + return -ETIMEDOUT; +} + +static int adin_reset(struct phy_device *phydev) +{ + struct adin_priv *priv = phydev->priv; + int ret; + + if (priv->gpiod_reset) { + /* GPIO reset requires min 10 uS low, + * 5 msecs max before we know that the interface is up again + */ + gpiod_set_value(priv->gpiod_reset, 0); + usleep_range(10, 15); + gpiod_set_value(priv->gpiod_reset, 1); + mdelay(5); + + return 0; + } + + /* Reset PHY core regs & subsystem regs */ + return adin_subsytem_soft_reset(phydev); +} + +static int adin_probe(struct phy_device *phydev) +{ + struct device *dev = &phydev->mdio.dev; + struct gpio_desc *gpiod_reset; + struct adin_priv *priv; + + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + gpiod_reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH); + if (IS_ERR(gpiod_reset)) + gpiod_reset = NULL; + + priv->gpiod_reset = gpiod_reset; + phydev->priv = priv; + + return adin_reset(phydev); +} + static struct phy_driver adin_driver[] = { { .phy_id = PHY_ID_ADIN1200, @@ -437,6 +517,7 @@ static struct phy_driver adin_driver[] = { .features = PHY_BASIC_FEATURES, .flags = PHY_HAS_INTERRUPT, .config_init = adin_config_init, + .probe = adin_probe, .config_aneg = adin_config_aneg, .read_status = adin_read_status, .ack_interrupt = adin_phy_ack_intr, @@ -453,6 +534,7 @@ static struct phy_driver adin_driver[] = { .features = PHY_GBIT_FEATURES, .flags = PHY_HAS_INTERRUPT, .config_init = adin_config_init, + .probe = adin_probe, .config_aneg = adin_config_aneg, .read_status = adin_read_status, .ack_interrupt = adin_phy_ack_intr, From patchwork Mon Aug 5 16:54:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1142200 X-Patchwork-Delegate: davem@davemloft.net 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=none (p=none dis=none) header.from=analog.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=analog.onmicrosoft.com header.i=@analog.onmicrosoft.com header.b="Rq867kmC"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 462K7K2LMgz9sRm for ; Mon, 5 Aug 2019 23:56:29 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730387AbfHEN4T (ORCPT ); Mon, 5 Aug 2019 09:56:19 -0400 Received: from mx0b-00128a01.pphosted.com ([148.163.139.77]:17960 "EHLO mx0b-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729778AbfHENzl (ORCPT ); Mon, 5 Aug 2019 09:55:41 -0400 Received: from pps.filterd (m0167091.ppops.net [127.0.0.1]) by mx0b-00128a01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x75DqjgS015547; Mon, 5 Aug 2019 09:55:34 -0400 Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2051.outbound.protection.outlook.com [104.47.36.51]) by mx0b-00128a01.pphosted.com with ESMTP id 2u6kb20e1p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 05 Aug 2019 09:55:34 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jaYpNzC7IKcEVJYDlxBM0Frm7tgdC8WP3QesAwT+mHiWRhXKM571dpu5Pus6WBk6x0Arvo7UjFEDbbP6lH9wl7NEcabvg1Qi8k5/Dsm7TcwHnxkSCTUFd9R66zFDPzS+kuhvJop7MxMSRWeou1lyc/lTGEqnPC5bJr9vdDP0rbr3qoNH2u5OLA5DMWsp02hdYzVL/tuh2Fo+9WJK4QXoEbiFRylk0XRVvbqgQJ0qrtQbIfRA7Qfipw4dRusNsVOH8EFizzLPBr8cCyDGWrgyXLRUg+6B91Bb0nyt7uG61FYkZwPopY9wxMDfrdYdO3b3rCXkO/k34iM5sDPXqT9scQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LfKvG3wp05mBR+Fcq6uHKd/mDqDzhkr2Zi/L5TYzUh4=; b=hWUvkfcc6sUS8IxR4RyhzvbIGdmsMHPd74WukJW0S90DYek/YJQvSjXZMGIG0fWh7DsQGaTBuG3uFo2WqLglEo/J8yf3L+/qEF570OpmH8SU5IbsF5bhjp2roqvqyudM7nJ2HCSwLI6YmuQ+oXCJoVCTgMU1qnvJCdaj17YXC13uT56KfO5hVidCgcyBKPIeUDmtaXDvNDrK6wU4vNpeIYLRmocKlV7NwGosEbJ4zUu2BqOxezGFDLp5RUpnTcAUZxq4uuOchzTvUjh9cfaH9IEuD5QlPOQ2LAdqtWgNGbulDT2qk+nIoL/veJkmK1hvawdQUvs6hV4kwlZAllxTtg== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass (sender ip is 137.71.25.55) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=analog.com;dmarc=bestguesspass action=none header.from=analog.com;dkim=none (message not signed);arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=analog.onmicrosoft.com; s=selector2-analog-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LfKvG3wp05mBR+Fcq6uHKd/mDqDzhkr2Zi/L5TYzUh4=; b=Rq867kmCLCE5NJvj8pKmbOFFi2wRw4lBLP9RZHW+1ZPCSIq9O5Jk1YYK9k9C+TQnAo245dTu9r/S7cu3coHuN42bMMfrHvfDV+8q2ds+jWfbXY52Zj/Pw7PB+DYj/GrFuc6gUMIYFkfV2oQAKgEaKKBbjKZXzmnWv17ZfBrMzIo= Received: from MWHPR03CA0033.namprd03.prod.outlook.com (2603:10b6:301:3b::22) by BYAPR03MB4613.namprd03.prod.outlook.com (2603:10b6:a03:12d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.17; Mon, 5 Aug 2019 13:55:31 +0000 Received: from BL2NAM02FT058.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::205) by MWHPR03CA0033.outlook.office365.com (2603:10b6:301:3b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2136.16 via Frontend Transport; Mon, 5 Aug 2019 13:55:31 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.55 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.55; helo=nwd2mta1.analog.com; Received: from nwd2mta1.analog.com (137.71.25.55) by BL2NAM02FT058.mail.protection.outlook.com (10.152.76.176) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2136.14 via Frontend Transport; Mon, 5 Aug 2019 13:55:31 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta1.analog.com (8.13.8/8.13.8) with ESMTP id x75DtSB3016238 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Mon, 5 Aug 2019 06:55:28 -0700 Received: from saturn.ad.analog.com (10.48.65.109) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Mon, 5 Aug 2019 09:55:30 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH 12/16] net: phy: adin: read EEE setting from device-tree Date: Mon, 5 Aug 2019 19:54:49 +0300 Message-ID: <20190805165453.3989-13-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190805165453.3989-1-alexandru.ardelean@analog.com> References: <20190805165453.3989-1-alexandru.ardelean@analog.com> MIME-Version: 1.0 X-ADIRoutedOnPrem: True X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:137.71.25.55; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39860400002)(346002)(376002)(136003)(396003)(2980300002)(189003)(199004)(26005)(186003)(8676002)(7636002)(48376002)(4326008)(50466002)(305945005)(107886003)(5660300002)(1076003)(478600001)(70586007)(70206006)(47776003)(8936002)(2870700001)(246002)(7696005)(51416003)(50226002)(356004)(316002)(6666004)(106002)(76176011)(110136005)(2906002)(54906003)(336012)(36756003)(426003)(14444005)(476003)(86362001)(44832011)(2616005)(446003)(11346002)(126002)(2201001)(486006); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR03MB4613; H:nwd2mta1.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail10.analog.com; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d6bdf0ba-bf59-4094-cf8d-08d719ac9481 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600148)(711020)(4605104)(4709080)(1401327)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328); SRVR:BYAPR03MB4613; X-MS-TrafficTypeDiagnostic: BYAPR03MB4613: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-Forefront-PRVS: 01208B1E18 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: YmMCz17anzZV6/6j+LzIlmWfbiX1gtIgjkcCVqw67on0G3seqhv8g8Yd04aybGmT5SMEdte204qhtocO9Zv8I7+Hs6yWBz8GSzEjmPYq4l86f+9KvR0DxMo2T+caBJOXrOsgH7pDd0LOsIn1jVkNQaUH0z84kNbsDNVceeuvH6GcD4ZcL28lfqxt7362FWyw0KENrPIUIA9uR0thw6F4nnIhU3fxgPekdQYgyrmsX6Elf8bOO4sdS07haxk5o8qyOHDcWSW8SsTDD0C9YFdPPOGRddylfi7Mv4ZQo5Lr2ABnvtDOzlQRXBVS3txBTCCOT1PYsmtiEbG9p1Uq0pVtLwgVVwcQ35QiCnE6mUr5opYTm2bXxN/c/0ee1STkdXrLEYFEOR0KaVwriesu4EXWooF5v/m1Dn/iY/eRhoELoug= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2019 13:55:31.1848 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d6bdf0ba-bf59-4094-cf8d-08d719ac9481 X-MS-Exchange-CrossTenant-Id: eaa689b4-8f87-40e0-9c6f-7228de4d754a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=eaa689b4-8f87-40e0-9c6f-7228de4d754a; Ip=[137.71.25.55]; Helo=[nwd2mta1.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR03MB4613 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-05_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=961 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908050154 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org By default, EEE is not advertised on system init. This change allows the user to specify a device property to enable EEE advertisements when the PHY initializes. Also, before resetting the PHY, the EEE settings are read, so that after the reset is complete, they are written back into the EEE advertisement register. Signed-off-by: Alexandru Ardelean --- drivers/net/phy/adin.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c index 476a81ce9341..cf99ccacfeeb 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -94,9 +94,11 @@ static struct clause22_mmd_map clause22_mmd_map[] = { /** * struct adin_priv - ADIN PHY driver private data * gpiod_reset optional reset GPIO, to be used in soft_reset() cb + * eee_modes EEE modes to advertise after reset */ struct adin_priv { struct gpio_desc *gpiod_reset; + u8 eee_modes; }; static int adin_get_phy_internal_mode(struct phy_device *phydev) @@ -216,6 +218,23 @@ static int adin_config_rmii_mode(struct phy_device *phydev, ADIN1300_GE_RMII_CFG_REG, reg); } +static int adin_config_init_eee(struct phy_device *phydev) +{ + struct adin_priv *priv = phydev->priv; + int reg; + + reg = phy_read_mmd(phydev, MDIO_MMD_VEND1, ADIN1300_EEE_ADV_REG); + if (reg < 0) + return reg; + + if (priv->eee_modes) + reg |= priv->eee_modes; + else + reg &= ~(MDIO_EEE_100TX | MDIO_EEE_1000T); + + return phy_write_mmd(phydev, MDIO_MMD_VEND1, ADIN1300_EEE_ADV_REG, reg); +} + static int adin_config_init(struct phy_device *phydev) { phy_interface_t interface, rc; @@ -238,6 +257,10 @@ static int adin_config_init(struct phy_device *phydev) if (rc < 0) return rc; + rc = adin_config_init_eee(phydev); + if (rc < 0) + return rc; + if (phydev->interface == interface) dev_info(&phydev->mdio.dev, "PHY is using mode '%s'\n", phy_modes(phydev->interface)); @@ -473,6 +496,12 @@ static int adin_reset(struct phy_device *phydev) struct adin_priv *priv = phydev->priv; int ret; + /* Update EEE settings before resetting, in case ethtool changed them */ + ret = phy_read_mmd(phydev, MDIO_MMD_VEND1, ADIN1300_EEE_ADV_REG); + if (ret < 0) + return ret; + priv->eee_modes = (ret & (MDIO_EEE_100TX | MDIO_EEE_1000T)); + if (priv->gpiod_reset) { /* GPIO reset requires min 10 uS low, * 5 msecs max before we know that the interface is up again @@ -504,6 +533,8 @@ static int adin_probe(struct phy_device *phydev) gpiod_reset = NULL; priv->gpiod_reset = gpiod_reset; + if (device_property_read_bool(dev, "adi,eee-enabled")) + priv->eee_modes = (MDIO_EEE_100TX | MDIO_EEE_1000T); phydev->priv = priv; return adin_reset(phydev); From patchwork Mon Aug 5 16:54:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1142194 X-Patchwork-Delegate: davem@davemloft.net 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=none (p=none dis=none) header.from=analog.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=analog.onmicrosoft.com header.i=@analog.onmicrosoft.com header.b="MnqE/VMa"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 462K6W0sMZz9sSX for ; Mon, 5 Aug 2019 23:55:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729865AbfHENzp (ORCPT ); Mon, 5 Aug 2019 09:55:45 -0400 Received: from mx0a-00128a01.pphosted.com ([148.163.135.77]:1472 "EHLO mx0a-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729805AbfHENzn (ORCPT ); Mon, 5 Aug 2019 09:55:43 -0400 Received: from pps.filterd (m0167088.ppops.net [127.0.0.1]) by mx0a-00128a01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x75DqoCV015406; Mon, 5 Aug 2019 09:55:36 -0400 Received: from nam01-by2-obe.outbound.protection.outlook.com (mail-by2nam01lp2052.outbound.protection.outlook.com [104.47.34.52]) by mx0a-00128a01.pphosted.com with ESMTP id 2u5448sdbw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 05 Aug 2019 09:55:36 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ebCyqM3nBEWumVF8fe9lKIbQGJVbFvVBsaPnuKAeOpQ7GRPc/OuPBLXy7OLGMA1ypJRGgxCbUXzoJKJXXLSP0AEu5YRC2uWaPwK0Zt4YyCkOPxGElPeFkjlH62kHV3dodCtPqBCWwOpVRQjBl2n0sJEjghrwmjuJsqOcMZoijxW9U/p+AsYiw0KQxGtf6pULlz+c96mmLDkbWMJxVenojeemjPNJ07ooYPa5SYO4VdkGKdF3Kv/vqBWWCaf/FSJDjTUskq2QxqfPip+soyWIseT8/HVA3kMu2KICBy8QfM7+VzH0XoWRUucSHmfRPL5WHqfcNf+oKrKH1GYM09GxXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uSVlBXmLQrbrDr/1UrmkH0PUCXZvePdkxAdhdT5SR9o=; b=fWSOTNjDUdj9w1fyLbQFrhPy6LcfoU+i+kFl5/CsXlcvDOZVsTpH6oy6ACP7npiT9xYRGNCA6MDPlUtL893ywDp6eiBSfUKqDOthGwO56jDZYUnFeZDSOFhdC0Qyi3W33ocKf27NTc5pbAhCDRl9j3hxN5zlRH6ktiL7u7YsjL9HdNm5Igfk5AIQUG2KKTBHS4uOKgANEX6t4ofTCRk2Wa6hEBgCSzkJaJQ0n+n+bCuLR5lQ994tyyE3ddn+KPH3+0wzYOVrotrjMYbz7XmjHTgjWvKd/xU9VR8nPU9q6sUkG647rhWaDxW3u5cmBcguI/Cvr3YKhCYUfEz5qVKc1Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass (sender ip is 137.71.25.55) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=analog.com;dmarc=bestguesspass action=none header.from=analog.com;dkim=none (message not signed);arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=analog.onmicrosoft.com; s=selector2-analog-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uSVlBXmLQrbrDr/1UrmkH0PUCXZvePdkxAdhdT5SR9o=; b=MnqE/VMaGHg4WHSGllkA6FZuYfqXVROXb6Qe0VtYh0MoZCX7p2jpR6fFkMmleuILia+bsI5ZJoHsJfulas8l7zfqLitW96NOKFE12Dv4VDAjFdvf/3bXvX0uWrs/rZgOZfsp42KGryi0Vl4L/EdyNALNnjXImDzcP5mV48gmWho= Received: from MWHPR03CA0014.namprd03.prod.outlook.com (2603:10b6:300:117::24) by SN2PR03MB2192.namprd03.prod.outlook.com (2603:10b6:804:c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.16; Mon, 5 Aug 2019 13:55:33 +0000 Received: from BL2NAM02FT022.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::209) by MWHPR03CA0014.outlook.office365.com (2603:10b6:300:117::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.14 via Frontend Transport; Mon, 5 Aug 2019 13:55:33 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.55 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.55; helo=nwd2mta1.analog.com; Received: from nwd2mta1.analog.com (137.71.25.55) by BL2NAM02FT022.mail.protection.outlook.com (10.152.77.153) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2136.14 via Frontend Transport; Mon, 5 Aug 2019 13:55:33 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta1.analog.com (8.13.8/8.13.8) with ESMTP id x75DtUqo016246 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Mon, 5 Aug 2019 06:55:30 -0700 Received: from saturn.ad.analog.com (10.48.65.109) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Mon, 5 Aug 2019 09:55:32 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH 13/16] net: phy: adin: implement Energy Detect Powerdown mode Date: Mon, 5 Aug 2019 19:54:50 +0300 Message-ID: <20190805165453.3989-14-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190805165453.3989-1-alexandru.ardelean@analog.com> References: <20190805165453.3989-1-alexandru.ardelean@analog.com> MIME-Version: 1.0 X-ADIRoutedOnPrem: True X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:137.71.25.55; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(136003)(39860400002)(396003)(376002)(346002)(2980300002)(199004)(189003)(1076003)(7636002)(486006)(2616005)(446003)(11346002)(36756003)(336012)(476003)(126002)(47776003)(356004)(50466002)(26005)(4326008)(186003)(54906003)(305945005)(86362001)(478600001)(6666004)(5660300002)(48376002)(50226002)(70586007)(8936002)(316002)(70206006)(8676002)(110136005)(246002)(44832011)(426003)(2906002)(14444005)(2201001)(76176011)(7696005)(106002)(107886003)(2870700001)(51416003); DIR:OUT; SFP:1101; SCL:1; SRVR:SN2PR03MB2192; H:nwd2mta1.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail10.analog.com; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2456e675-b11a-4f92-b510-08d719ac9598 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328); SRVR:SN2PR03MB2192; X-MS-TrafficTypeDiagnostic: SN2PR03MB2192: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-Forefront-PRVS: 01208B1E18 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: Vk4O59ueEX1Wry/ndbEJAVHSIxrbjaHpBLkiHMCZIPjBoWHaSng9IJAe2PcI/xxl56ZO/4Q8nasWeHlRlslP908Tda+81uJK2cc05G5yAXqjLSn9ZD22dN5vE3k6J18sBnS8uBybvjFlZTJqIr6CH4oQ8Cvc1A5v026yENVPHxEQ/y6OItfF96xjyrc78/hlo7Rzb3q2bVuDxagSqwF6vOagMfL50lZA5lqwjCHeMeescry4IOHOcUGWXw3q2BarzX9/Dkpi2bYlOe0ypJyiAcoKrRs3CnPNTeFQMpyGqLiCkrbBM+rTjDQ5CJ5Tz8TSqY5jAgP4WeRxdjZigvhMBuI7sg++e3OxN/zp2qge96vCGFRz0O3oVQ3Y6GWsZDH86FSnx2YjNqkbeB7S4SL+JAAfyHCcjaoqGxMmlnPED5c= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2019 13:55:33.0126 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2456e675-b11a-4f92-b510-08d719ac9598 X-MS-Exchange-CrossTenant-Id: eaa689b4-8f87-40e0-9c6f-7228de4d754a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=eaa689b4-8f87-40e0-9c6f-7228de4d754a; Ip=[137.71.25.55]; Helo=[nwd2mta1.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR03MB2192 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-05_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908050154 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The ADIN PHYs support Energy Detect Powerdown mode, which puts the PHY into a low power mode when there is no signal on the wire (typically cable unplugged). This behavior is enabled by default, but can be disabled via device property. Signed-off-by: Alexandru Ardelean --- drivers/net/phy/adin.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c index cf99ccacfeeb..86848444bd98 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -27,6 +27,11 @@ #define ADIN1300_AUTO_MDI_EN BIT(10) #define ADIN1300_MAN_MDIX_EN BIT(9) +#define ADIN1300_PHY_CTRL_STATUS2 0x0015 +#define ADIN1300_NRG_PD_EN BIT(3) +#define ADIN1300_NRG_PD_TX_EN BIT(2) +#define ADIN1300_NRG_PD_STATUS BIT(1) + #define ADIN1300_INT_MASK_REG 0x0018 #define ADIN1300_INT_MDIO_SYNC_EN BIT(9) #define ADIN1300_INT_ANEG_STAT_CHNG_EN BIT(8) @@ -95,10 +100,12 @@ static struct clause22_mmd_map clause22_mmd_map[] = { * struct adin_priv - ADIN PHY driver private data * gpiod_reset optional reset GPIO, to be used in soft_reset() cb * eee_modes EEE modes to advertise after reset + * edpd_enabled true if Energy Detect Powerdown mode is enabled */ struct adin_priv { struct gpio_desc *gpiod_reset; u8 eee_modes; + bool edpd_enabled; }; static int adin_get_phy_internal_mode(struct phy_device *phydev) @@ -235,6 +242,18 @@ static int adin_config_init_eee(struct phy_device *phydev) return phy_write_mmd(phydev, MDIO_MMD_VEND1, ADIN1300_EEE_ADV_REG, reg); } +static int adin_config_init_edpd(struct phy_device *phydev) +{ + struct adin_priv *priv = phydev->priv; + + if (priv->edpd_enabled) + return phy_set_bits(phydev, ADIN1300_PHY_CTRL_STATUS2, + (ADIN1300_NRG_PD_EN | ADIN1300_NRG_PD_TX_EN)); + + return phy_clear_bits(phydev, ADIN1300_PHY_CTRL_STATUS2, + (ADIN1300_NRG_PD_EN | ADIN1300_NRG_PD_TX_EN)); +} + static int adin_config_init(struct phy_device *phydev) { phy_interface_t interface, rc; @@ -261,6 +280,10 @@ static int adin_config_init(struct phy_device *phydev) if (rc < 0) return rc; + rc = adin_config_init_edpd(phydev); + if (rc < 0) + return rc; + if (phydev->interface == interface) dev_info(&phydev->mdio.dev, "PHY is using mode '%s'\n", phy_modes(phydev->interface)); @@ -535,6 +558,10 @@ static int adin_probe(struct phy_device *phydev) priv->gpiod_reset = gpiod_reset; if (device_property_read_bool(dev, "adi,eee-enabled")) priv->eee_modes = (MDIO_EEE_100TX | MDIO_EEE_1000T); + if (device_property_read_bool(dev, "adi,disable-energy-detect")) + priv->edpd_enabled = false; + else + priv->edpd_enabled = true; phydev->priv = priv; return adin_reset(phydev); From patchwork Mon Aug 5 16:54:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1142198 X-Patchwork-Delegate: davem@davemloft.net 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=none (p=none dis=none) header.from=analog.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=analog.onmicrosoft.com header.i=@analog.onmicrosoft.com header.b="zx2g0Zkl"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 462K6t2ptnz9sSk for ; Mon, 5 Aug 2019 23:56:06 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729924AbfHENzq (ORCPT ); Mon, 5 Aug 2019 09:55:46 -0400 Received: from mx0b-00128a01.pphosted.com ([148.163.139.77]:20290 "EHLO mx0b-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729811AbfHENzn (ORCPT ); Mon, 5 Aug 2019 09:55:43 -0400 Received: from pps.filterd (m0167091.ppops.net [127.0.0.1]) by mx0b-00128a01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x75Dr6eF015931; Mon, 5 Aug 2019 09:55:36 -0400 Received: from nam04-bn3-obe.outbound.protection.outlook.com (mail-bn3nam04lp2051.outbound.protection.outlook.com [104.47.46.51]) by mx0b-00128a01.pphosted.com with ESMTP id 2u6kb20e1r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 05 Aug 2019 09:55:36 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CKjcicxI2CK0H96FktbF9KtKJy9Cs9aKkJWtfzWni9E3HD8Sphvh6ec5ekr4Wd98aZIWYNpX41N9pqEJDH58uJFvHVX0CPYTyg2bQvcFZy9QQLr1NLeH9ykyTovi2fAQUvQ//cmFE77waVgejwdbl6Sem/fVaLBWq95oUYlb8dix+L4A44TmBSI/DSDuZyT3bICmZvMFqmqZGnwK5DJQbMVZN8Y16HcgrgimctZaLGREU8Owxf7CsWyOhUggyxYC/PxUPiF68AaWMRqra8Ad58e0J3fx8LPX1rNln0BuSPLGuBsVCGW1GFVnPa36cwbyr8Z1LxspE8tes33BUlvb1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XZfnRuVYtokZjwc5ec/5sEejvtx4wWrHXKXoHjeWl4M=; b=MWFqSDa6PlQIi+8R6yew0JVjjq/z2U055HpqFjY/7zfYYowXkCgQL8enG33J0CPgnfMfyv4/yQiwtIFgirVBVnxZ2cF48JGs+JwPF4f/P6YsDGPhNhTpwU0n8BlA8k2waz/dfsuS5p4WbQe9B6SN/xupXnBr2Yl8Pt6HgESTionQyPkp54FzcZcB2msu6jX/cwBtTZqq1IjC5WImL5f/arIo6bZLmMdF0Fs3EEc2m7gc4awAQR/SJHWzNScUKAmUzTw3LButyam8iJni4ZQjB1Y5M8pGZ4X8OH8VnkmDMtRt9WQTG/xMPvqrjDYhfo/UqnOKYlJoa79KjF3KkqzaoQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass (sender ip is 137.71.25.55) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=analog.com;dmarc=bestguesspass action=none header.from=analog.com;dkim=none (message not signed);arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=analog.onmicrosoft.com; s=selector2-analog-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XZfnRuVYtokZjwc5ec/5sEejvtx4wWrHXKXoHjeWl4M=; b=zx2g0Zkl9D9+44BIH6QkCCOMBdUoQY9RixFtUuaWs115T830wjWiz+e0cakP7YtRj0b2gowIRMBh22Bgj8BqpdpzPj/vdF44OztKzJEJth4wTkro1F5mW6BURFTGkLjryNKpJs9lORdgO6mmlHftNm/hlPSlWWSNh7z/sTxhJRY= Received: from BL0PR03CA0025.namprd03.prod.outlook.com (2603:10b6:208:2d::38) by BL0PR03MB4260.namprd03.prod.outlook.com (2603:10b6:208:6b::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.17; Mon, 5 Aug 2019 13:55:35 +0000 Received: from BL2NAM02FT040.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::208) by BL0PR03CA0025.outlook.office365.com (2603:10b6:208:2d::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.13 via Frontend Transport; Mon, 5 Aug 2019 13:55:35 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.55 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.55; helo=nwd2mta1.analog.com; Received: from nwd2mta1.analog.com (137.71.25.55) by BL2NAM02FT040.mail.protection.outlook.com (10.152.77.193) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2136.14 via Frontend Transport; Mon, 5 Aug 2019 13:55:35 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta1.analog.com (8.13.8/8.13.8) with ESMTP id x75DtWMW016249 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Mon, 5 Aug 2019 06:55:32 -0700 Received: from saturn.ad.analog.com (10.48.65.109) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Mon, 5 Aug 2019 09:55:34 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH 14/16] net: phy: adin: make sure down-speed auto-neg is enabled Date: Mon, 5 Aug 2019 19:54:51 +0300 Message-ID: <20190805165453.3989-15-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190805165453.3989-1-alexandru.ardelean@analog.com> References: <20190805165453.3989-1-alexandru.ardelean@analog.com> MIME-Version: 1.0 X-ADIRoutedOnPrem: True X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:137.71.25.55; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39860400002)(136003)(346002)(376002)(396003)(2980300002)(189003)(199004)(7636002)(70586007)(305945005)(70206006)(50466002)(336012)(446003)(246002)(426003)(11346002)(8676002)(126002)(36756003)(476003)(2616005)(2870700001)(5660300002)(44832011)(1076003)(47776003)(186003)(26005)(48376002)(486006)(2906002)(8936002)(50226002)(86362001)(316002)(478600001)(2201001)(6666004)(356004)(51416003)(7696005)(76176011)(4326008)(106002)(107886003)(110136005)(54906003); DIR:OUT; SFP:1101; SCL:1; SRVR:BL0PR03MB4260; H:nwd2mta1.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail10.analog.com; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 765ccce4-5976-4598-9656-08d719ac96cd X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328); SRVR:BL0PR03MB4260; X-MS-TrafficTypeDiagnostic: BL0PR03MB4260: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4714; X-Forefront-PRVS: 01208B1E18 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: mpw++cu8PMlM91yMCgiBAPnT+Fu/j5R3RjJDYOPxjgoQPjgn0JOMfL+YGTVHn9AW3dqNxWWe4x/drzylDBsJCCc59zRY7UxIOhrWZjomzN3wg+sA1cgnceBe4tEgTToBlGcji1uSKTDdZfVauP9zZoVLXfTTHo7Eq548IrncjVbFKIKpl8wQpX4z8AhqBqj2jQd+vbiI4ZQ2J7eeOygnrFMCDAF/iU5Bx3f58FhTHEn8ycFksbPQLt2xLjauWitYTc+j622C6Frs72UseX3xA7RlAzDbSpKBDPn1YFgVi0meMYOpqZhhFZPOrmJ0puMGjiacIIBTCgagleNUQKaMxgY0Xzn/OYZuyOO8DiHf0C5nHRrMBSzHHuMREs5v90wZu+PBqokRdNb/7FXWlkufbGA9uTnY4G08199yIlLLc2E= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2019 13:55:35.0368 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 765ccce4-5976-4598-9656-08d719ac96cd X-MS-Exchange-CrossTenant-Id: eaa689b4-8f87-40e0-9c6f-7228de4d754a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=eaa689b4-8f87-40e0-9c6f-7228de4d754a; Ip=[137.71.25.55]; Helo=[nwd2mta1.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR03MB4260 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-05_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908050154 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Down-speed auto-negotiation may not always be enabled, in which case the PHY won't down-shift to 100 or 10 during auto-negotiation. Signed-off-by: Alexandru Ardelean --- drivers/net/phy/adin.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c index 86848444bd98..a1f3456a8504 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -32,6 +32,13 @@ #define ADIN1300_NRG_PD_TX_EN BIT(2) #define ADIN1300_NRG_PD_STATUS BIT(1) +#define ADIN1300_PHY_CTRL2 0x0016 +#define ADIN1300_DOWNSPEED_AN_100_EN BIT(11) +#define ADIN1300_DOWNSPEED_AN_10_EN BIT(10) +#define ADIN1300_GROUP_MDIO_EN BIT(6) +#define ADIN1300_DOWNSPEEDS_EN \ + (ADIN1300_DOWNSPEED_AN_100_EN | ADIN1300_DOWNSPEED_AN_10_EN) + #define ADIN1300_INT_MASK_REG 0x0018 #define ADIN1300_INT_MDIO_SYNC_EN BIT(9) #define ADIN1300_INT_ANEG_STAT_CHNG_EN BIT(8) @@ -425,6 +432,22 @@ static int adin_config_mdix(struct phy_device *phydev) return phy_write(phydev, ADIN1300_PHY_CTRL1, reg); } +static int adin_config_downspeeds(struct phy_device *phydev) +{ + int reg; + + reg = phy_read(phydev, ADIN1300_PHY_CTRL2); + if (reg < 0) + return reg; + + if ((reg & ADIN1300_DOWNSPEEDS_EN) == ADIN1300_DOWNSPEEDS_EN) + return 0; + + reg |= ADIN1300_DOWNSPEEDS_EN; + + return phy_write(phydev, ADIN1300_PHY_CTRL2, reg); +} + static int adin_config_aneg(struct phy_device *phydev) { int ret; @@ -433,6 +456,10 @@ static int adin_config_aneg(struct phy_device *phydev) if (ret) return ret; + ret = adin_config_downspeeds(phydev); + if (ret < 0) + return ret; + return genphy_config_aneg(phydev); } From patchwork Mon Aug 5 16:54:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1142199 X-Patchwork-Delegate: davem@davemloft.net 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=none (p=none dis=none) header.from=analog.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=analog.onmicrosoft.com header.i=@analog.onmicrosoft.com header.b="7jRx/B+K"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 462K6w5rHjz9sSZ for ; Mon, 5 Aug 2019 23:56:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730312AbfHEN4I (ORCPT ); Mon, 5 Aug 2019 09:56:08 -0400 Received: from mx0a-00128a01.pphosted.com ([148.163.135.77]:4614 "EHLO mx0a-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729911AbfHENzq (ORCPT ); Mon, 5 Aug 2019 09:55:46 -0400 Received: from pps.filterd (m0167089.ppops.net [127.0.0.1]) by mx0a-00128a01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x75Dqrwa026596; Mon, 5 Aug 2019 09:55:39 -0400 Received: from nam03-co1-obe.outbound.protection.outlook.com (mail-co1nam03lp2054.outbound.protection.outlook.com [104.47.40.54]) by mx0a-00128a01.pphosted.com with ESMTP id 2u576712xc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 05 Aug 2019 09:55:39 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fsV0c7wSju5oXz3MrJNfwhlPXfzP+ZGGhdNT6YfnLC09Ehn7y8Udu9TAfgbrxKtJG33kM1UvRWWh4ZCFaRCLBERVJanSdxXPIQJ7+BKOIlycq99sd4sBle/Jvm3Q7uJ6h8mooeIL7XXzheV6AzDZkoL1LQ0lFj3t8ekkiK2ludnKO2PUPrhQFc9QKTIiGxR61V7tRo0+o2667TlgKYfPgmJdJc+5ANm8gK7BOctsNKZ5xVQRmQ64/s3tWjEI8nf9NfW/Ph7V0bF1Z09gvc1oNPeZRpo920GLgFeH/0xIRVvaMUcF/FjE6C0HFAnx6bnkJQJZJvaF1Gflntz48laBNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2fGJsVqpRU5Mzv698G1bhEg6K2VsudNEVIFPmka+b0k=; b=Ef7Y0QFD5/c5GfD8r/Nyzz1ochAj5v7nMLrimkIFLEuK9gSDJDgT8X4H61j7G2rGTxNr3ICgYqa1zbTyejqMVBWN6TlUkC4Bod7xFuR5wr6YJWpk/Q4JfhDA7Fo3z6gnxLO0jpV/GtqbL+U9CBbhQC1iZQts21g9wXsCwHQqaLB2cbPTO1/rRa2S5Frmq/kz6DPN8XvyeF+vCowAmSnVDPi2JL3Xfnm6rdgS6cFk+LeGh6upIxsPEj7RYo++pG4LpxaLzAgVpQKR0bxodSStHoeIUkM7l6iXP7R7cqQQ5PaqURMKM5yh6qBOzY1iIVsFpb2i89QtKwOuAIrcQW92ug== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass (sender ip is 137.71.25.55) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=analog.com;dmarc=bestguesspass action=none header.from=analog.com;dkim=none (message not signed);arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=analog.onmicrosoft.com; s=selector2-analog-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2fGJsVqpRU5Mzv698G1bhEg6K2VsudNEVIFPmka+b0k=; b=7jRx/B+K+hkUQHQrT8VxS/IBN6PRs7C09cxLMTpn+ZYi9TKC62zpgqij4rI1DvQV418w1zT7fTObCheNKjo7VE924BrvauqMBqOn1hdMO7OcO+GAyxJvYod3/FCAcC0rUd/RpZtRMdDpgvgsmyI/xdx+BpIXROazKQZIZUIziVY= Received: from DM5PR03CA0036.namprd03.prod.outlook.com (2603:10b6:4:3b::25) by CY1PR03MB2186.namprd03.prod.outlook.com (2a01:111:e400:c61a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.17; Mon, 5 Aug 2019 13:55:37 +0000 Received: from BL2NAM02FT012.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::204) by DM5PR03CA0036.outlook.office365.com (2603:10b6:4:3b::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2136.13 via Frontend Transport; Mon, 5 Aug 2019 13:55:37 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.55 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.55; helo=nwd2mta1.analog.com; Received: from nwd2mta1.analog.com (137.71.25.55) by BL2NAM02FT012.mail.protection.outlook.com (10.152.77.27) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2136.14 via Frontend Transport; Mon, 5 Aug 2019 13:55:37 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta1.analog.com (8.13.8/8.13.8) with ESMTP id x75DtYZ3016255 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Mon, 5 Aug 2019 06:55:34 -0700 Received: from saturn.ad.analog.com (10.48.65.109) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Mon, 5 Aug 2019 09:55:36 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH 15/16] net: phy: adin: add ethtool get_stats support Date: Mon, 5 Aug 2019 19:54:52 +0300 Message-ID: <20190805165453.3989-16-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190805165453.3989-1-alexandru.ardelean@analog.com> References: <20190805165453.3989-1-alexandru.ardelean@analog.com> MIME-Version: 1.0 X-ADIRoutedOnPrem: True X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:137.71.25.55; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(396003)(39860400002)(136003)(346002)(376002)(2980300002)(199004)(189003)(14444005)(2616005)(476003)(186003)(336012)(8676002)(426003)(106002)(7636002)(305945005)(316002)(11346002)(446003)(54906003)(51416003)(4326008)(7696005)(110136005)(76176011)(86362001)(356004)(44832011)(126002)(486006)(6666004)(2201001)(478600001)(36756003)(2906002)(26005)(1076003)(5660300002)(107886003)(70206006)(2870700001)(48376002)(50466002)(8936002)(70586007)(50226002)(47776003)(246002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR03MB2186; H:nwd2mta1.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail10.analog.com; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5dc05824-e906-4de7-a17f-08d719ac9815 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328); SRVR:CY1PR03MB2186; X-MS-TrafficTypeDiagnostic: CY1PR03MB2186: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-Forefront-PRVS: 01208B1E18 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: VYXhjVxAEAlAHvPXbf2Jv2XXGTRwvtvz0d43k+QUMduwPlbcZxI8wJ+VM++6bOiP4+D0TZ3txQhy3AvXqUUlU+/uU2F1qC6bWEdJJmb/hr9ykH6TQ5Fq4H+njCh03P1cV6KxLZcmwyxr5L1R/5+qnyGDyi7vMbvCXytGTDoAmyLPDsMosvJDqXlu/p2roNvGVvVqZnoDBtbnTtIbcIRpmP8NhzI4TYJ0iSldf8hCnjX7c6rX7AmblPUGsOmVeIytpTbb2tHwpQsbFlLFARYNHtcnJO52x+YRAitz5lJcKdo0tS8c1ACsLpKUoT7cpUtwPIoL/RbCExfxaRf8UPJYPTkjN0GuMRE/CXGPfsfaUM58V5VEfq9jmfk5VLg6NYwtI02SqBorXajN8BTDlY2AbI4KQ87OiCXlNqWWO0Z4Bok= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2019 13:55:37.1757 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5dc05824-e906-4de7-a17f-08d719ac9815 X-MS-Exchange-CrossTenant-Id: eaa689b4-8f87-40e0-9c6f-7228de4d754a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=eaa689b4-8f87-40e0-9c6f-7228de4d754a; Ip=[137.71.25.55]; Helo=[nwd2mta1.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB2186 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-05_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908050154 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This change implements retrieving all the error counters from the PHY. The PHY supports several error counters/stats. The `Mean Square Errors` status values are only valie when a link is established, and shouldn't be incremented. These values characterize the quality of a signal. The rest of the error counters are self-clearing on read. Most of them are reports from the Frame Checker engine that the PHY has. Not retrieving the `LPI Wake Error Count Register` here, since that is used by the PHY framework to check for any EEE errors. And that register is self-clearing when read (as per IEEE spec). Signed-off-by: Alexandru Ardelean --- drivers/net/phy/adin.c | 108 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c index a1f3456a8504..04896547dac8 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -103,6 +103,32 @@ static struct clause22_mmd_map clause22_mmd_map[] = { { MDIO_MMD_PCS, MDIO_PCS_EEE_WK_ERR, ADIN1300_LPI_WAKE_ERR_CNT_REG }, }; +struct adin_hw_stat { + const char *string; + u16 reg1; + u16 reg2; + bool do_not_inc; +}; + +/* Named just like in the datasheet */ +static struct adin_hw_stat adin_hw_stats[] = { + { "RxErrCnt", 0x0014, }, + { "MseA", 0x8402, 0, true }, + { "MseB", 0x8403, 0, true }, + { "MseC", 0x8404, 0, true }, + { "MseD", 0x8405, 0, true }, + { "FcFrmCnt", 0x940A, 0x940B }, /* FcFrmCntH + FcFrmCntL */ + { "FcLenErrCnt", 0x940C }, + { "FcAlgnErrCnt", 0x940D }, + { "FcSymbErrCnt", 0x940E }, + { "FcOszCnt", 0x940F }, + { "FcUszCnt", 0x9410 }, + { "FcOddCnt", 0x9411 }, + { "FcOddPreCnt", 0x9412 }, + { "FcDribbleBitsCnt", 0x9413 }, + { "FcFalseCarrierCnt", 0x9414 }, +}; + /** * struct adin_priv - ADIN PHY driver private data * gpiod_reset optional reset GPIO, to be used in soft_reset() cb @@ -113,6 +139,7 @@ struct adin_priv { struct gpio_desc *gpiod_reset; u8 eee_modes; bool edpd_enabled; + u64 stats[ARRAY_SIZE(adin_hw_stats)]; }; static int adin_get_phy_internal_mode(struct phy_device *phydev) @@ -568,6 +595,81 @@ static int adin_reset(struct phy_device *phydev) return adin_subsytem_soft_reset(phydev); } +static int adin_get_sset_count(struct phy_device *phydev) +{ + return ARRAY_SIZE(adin_hw_stats); +} + +static void adin_get_strings(struct phy_device *phydev, u8 *data) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(adin_hw_stats); i++) { + memcpy(data + i * ETH_GSTRING_LEN, + adin_hw_stats[i].string, ETH_GSTRING_LEN); + } +} + +static int adin_read_mmd_stat_regs(struct phy_device *phydev, + struct adin_hw_stat *stat, + u32 *val) +{ + int ret; + + ret = phy_read_mmd(phydev, MDIO_MMD_VEND1, stat->reg1); + if (ret < 0) + return ret; + + *val = (ret & 0xffff); + + if (stat->reg2 == 0) + return 0; + + ret = phy_read_mmd(phydev, MDIO_MMD_VEND1, stat->reg2); + if (ret < 0) + return ret; + + *val <<= 16; + *val |= (ret & 0xffff); + + return 0; +} + +static u64 adin_get_stat(struct phy_device *phydev, int i) +{ + struct adin_hw_stat *stat = &adin_hw_stats[i]; + struct adin_priv *priv = phydev->priv; + u32 val; + int ret; + + if (stat->reg1 > 0x1f) { + ret = adin_read_mmd_stat_regs(phydev, stat, &val); + if (ret < 0) + return (u64)(~0); + } else { + ret = phy_read(phydev, stat->reg1); + if (ret < 0) + return (u64)(~0); + val = (ret & 0xffff); + } + + if (stat->do_not_inc) + priv->stats[i] = val; + else + priv->stats[i] += val; + + return priv->stats[i]; +} + +static void adin_get_stats(struct phy_device *phydev, + struct ethtool_stats *stats, u64 *data) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(adin_hw_stats); i++) + data[i] = adin_get_stat(phydev, i); +} + static int adin_probe(struct phy_device *phydev) { struct device *dev = &phydev->mdio.dev; @@ -607,6 +709,9 @@ static struct phy_driver adin_driver[] = { .read_status = adin_read_status, .ack_interrupt = adin_phy_ack_intr, .config_intr = adin_phy_config_intr, + .get_sset_count = adin_get_sset_count, + .get_strings = adin_get_strings, + .get_stats = adin_get_stats, .resume = genphy_resume, .suspend = genphy_suspend, .read_mmd = adin_read_mmd, @@ -624,6 +729,9 @@ static struct phy_driver adin_driver[] = { .read_status = adin_read_status, .ack_interrupt = adin_phy_ack_intr, .config_intr = adin_phy_config_intr, + .get_sset_count = adin_get_sset_count, + .get_strings = adin_get_strings, + .get_stats = adin_get_stats, .resume = genphy_resume, .suspend = genphy_suspend, .read_mmd = adin_read_mmd, From patchwork Mon Aug 5 16:54:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1142195 X-Patchwork-Delegate: davem@davemloft.net 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=none (p=none dis=none) header.from=analog.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=analog.onmicrosoft.com header.i=@analog.onmicrosoft.com header.b="pJdjeBeM"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 462K6l5FfYz9sSg for ; Mon, 5 Aug 2019 23:55:59 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730093AbfHENzx (ORCPT ); Mon, 5 Aug 2019 09:55:53 -0400 Received: from mx0b-00128a01.pphosted.com ([148.163.139.77]:26942 "EHLO mx0b-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729811AbfHENzv (ORCPT ); Mon, 5 Aug 2019 09:55:51 -0400 Received: from pps.filterd (m0167090.ppops.net [127.0.0.1]) by mx0b-00128a01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x75DqrI8019294; Mon, 5 Aug 2019 09:55:43 -0400 Received: from nam03-by2-obe.outbound.protection.outlook.com (mail-by2nam03lp2055.outbound.protection.outlook.com [104.47.42.55]) by mx0b-00128a01.pphosted.com with ESMTP id 2u56w5svgn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 05 Aug 2019 09:55:43 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RJWu5OSh8s/MXIw+hyEdGgOSke02qE2/ekOjt17QQoavFE5y+tMW8lYD7VJYlMqaT2Admels+poKy/h+alhAUnPhwBxy05lFq8wUICMDw6xJL1K1CUFItpQ6kFBUH1YNQrZixq9jMHOIPglbI3g66UyPzv5VZMO7Nz06HaZizjKgRw/6piZQd8QkvO2uL675yYRLP0fBi+m/Ibh1ab7ClxnpiWtDPanIeCXkc1MsFmZGmBTOQm1iKkYszTnimpcZqsM/pn7O+28sOpf3SZ05ja4tEUuThJZAsAo68qvkc+7goQQls2QU0vib0T9frL+nN9toGVbk1zebuK0CyplRhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6RgZ1io5NXf3iCajAt61CX3RdChj8GoaGYCjaieIJDE=; b=m7eqsDiFRnDP9FilP10ErLaDGgzcZnVvjSGqpaQLJdoWKwPAC58/4LRJr3hoLGum2Z+VxOW/8HAaf0PJUf6nRfvL31UU345EAUUUnPb4zrMQpi73u2S/ajczcOtxcLsjVHTFUGwESs3xWGy8yvXvxkgk3ClHd3v+U8O2aEb3dQC2lNSGid1e9E4I1z02nBKXlr0M0iY4NEKmmcoBqJkCmXpR6TgHhAd+b4V58yeNABpe1qGzIiew88r1p70qiBCQ+VtefbjloMg1fmvNded3T2/9LW5Ce2Z4LQRuxlbr/RlwS7vkLxoIbJxOHnE+evL234slPUVRqMJYkHzrgAVyhA== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass (sender ip is 137.71.25.55) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=analog.com;dmarc=bestguesspass action=none header.from=analog.com;dkim=none (message not signed);arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=analog.onmicrosoft.com; s=selector2-analog-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6RgZ1io5NXf3iCajAt61CX3RdChj8GoaGYCjaieIJDE=; b=pJdjeBeMKYiacIr+oMUJKucbyhIDzas1oZRHu3OHl3tZj3s591k4/0pJ3Fc7j/MOp+CrrpvO+HAfAFtvXiQMJK3uN+tUQzN6HbCjaZ6TREJ02dMccmD2dyitvI0kaN0f3SIUaZOKDXA089DgSHjKHmwDxgY1TQoDkYdPGwGKMjg= Received: from BN8PR03CA0033.namprd03.prod.outlook.com (2603:10b6:408:94::46) by CO2PR03MB2230.namprd03.prod.outlook.com (2603:10b6:102:d::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.14; Mon, 5 Aug 2019 13:55:40 +0000 Received: from CY1NAM02FT016.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::201) by BN8PR03CA0033.outlook.office365.com (2603:10b6:408:94::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2136.17 via Frontend Transport; Mon, 5 Aug 2019 13:55:40 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.55 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.55; helo=nwd2mta1.analog.com; Received: from nwd2mta1.analog.com (137.71.25.55) by CY1NAM02FT016.mail.protection.outlook.com (10.152.75.164) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2136.14 via Frontend Transport; Mon, 5 Aug 2019 13:55:39 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta1.analog.com (8.13.8/8.13.8) with ESMTP id x75DtaNc016266 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Mon, 5 Aug 2019 06:55:36 -0700 Received: from saturn.ad.analog.com (10.48.65.109) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Mon, 5 Aug 2019 09:55:38 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH 16/16] dt-bindings: net: add bindings for ADIN PHY driver Date: Mon, 5 Aug 2019 19:54:53 +0300 Message-ID: <20190805165453.3989-17-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190805165453.3989-1-alexandru.ardelean@analog.com> References: <20190805165453.3989-1-alexandru.ardelean@analog.com> MIME-Version: 1.0 X-ADIRoutedOnPrem: True X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:137.71.25.55; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(136003)(396003)(39860400002)(346002)(376002)(2980300002)(199004)(189003)(1076003)(246002)(48376002)(316002)(8936002)(2870700001)(305945005)(26005)(5660300002)(186003)(50466002)(486006)(70586007)(7636002)(36756003)(8676002)(47776003)(51416003)(86362001)(7696005)(50226002)(70206006)(14444005)(44832011)(2201001)(356004)(6666004)(110136005)(2616005)(476003)(126002)(76176011)(11346002)(6306002)(446003)(54906003)(106002)(426003)(336012)(478600001)(966005)(107886003)(53376002)(2906002)(4326008); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR03MB2230; H:nwd2mta1.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail10.analog.com; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f9e29299-4d2a-4a17-abc4-08d719ac99e7 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328); SRVR:CO2PR03MB2230; X-MS-TrafficTypeDiagnostic: CO2PR03MB2230: X-MS-Exchange-PUrlCount: 3 X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-Forefront-PRVS: 01208B1E18 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: aAnFMBv+gP+1e1Uov9Z0GG7HY0NwJmn6HlqgTDnllcZpEXYzcRLOSPilMMpjlEXeN2ql2pI//cPaS1Q1Kbr7AriJhq1uirgPvrW6XVugCH/sEcQ5HbWJwmsSI3Wr8b2RxZ3GuuCvHQV4G0Q8P7LsbcnSMDdlrX9ODGMfy2gAMg7LeUivMm5UxNYQ4vIM82WGDHFmMQexyhnxm6OuLAHXqAk+1r3e//rTIG2P1GcXTvS9Wtnh1E+efMp36v+CcVWL30/gfH3dM/f/qOu3ROSnnzi1/BEhgQg4amPNAJWx0rMbRHZm36ZfdggiFUK1icGE0nJU47YP6ZanRevrqdfrwX04p4xTR1yP2oVVlpMInUi+QVzBq0o5CAsHqvun7ewRRj3jxxerXW3iKLUWeVjiDBI2Zr0pu2HkYJc94gbdnGc= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2019 13:55:39.6785 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f9e29299-4d2a-4a17-abc4-08d719ac99e7 X-MS-Exchange-CrossTenant-Id: eaa689b4-8f87-40e0-9c6f-7228de4d754a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=eaa689b4-8f87-40e0-9c6f-7228de4d754a; Ip=[137.71.25.55]; Helo=[nwd2mta1.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR03MB2230 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-05_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908050154 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This change adds bindings for the Analog Devices ADIN PHY driver, detailing all the properties implemented by the driver. Signed-off-by: Alexandru Ardelean --- .../devicetree/bindings/net/adi,adin.yaml | 93 +++++++++++++++++++ MAINTAINERS | 2 + include/dt-bindings/net/adin.h | 26 ++++++ 3 files changed, 121 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/adi,adin.yaml create mode 100644 include/dt-bindings/net/adin.h diff --git a/Documentation/devicetree/bindings/net/adi,adin.yaml b/Documentation/devicetree/bindings/net/adi,adin.yaml new file mode 100644 index 000000000000..fcf884bb86f7 --- /dev/null +++ b/Documentation/devicetree/bindings/net/adi,adin.yaml @@ -0,0 +1,93 @@ +# SPDX-License-Identifier: GPL-2.0+ +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/adi,adin.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Analog Devices ADIN1200/ADIN1300 PHY + +maintainers: + - Alexandru Ardelean + +description: | + Bindings for Analog Devices Industrial Ethernet PHYs + +properties: + compatible: + description: | + Compatible list, may contain "ethernet-phy-ieee802.3-c45" in which case + Clause 45 will be used to access device management registers. If + unspecified, Clause 22 will be used. Use this only when MDIO supports + Clause 45 access, but there is no other way to determine this. + enum: + - ethernet-phy-ieee802.3-c45 + + adi,phy-mode-internal: + $ref: /schemas/types.yaml#/definitions/string + description: | + The internal mode of the PHY. This assumes that there is a PHY converter + in-between the MAC & PHY. + enum: [ "rgmii", "rgmii-id", "rgmii-txid", "rgmii-rxid", "rmii", "mii" ] + + adi,rx-internal-delay: + $ref: /schemas/types.yaml#/definitions/uint32 + description: | + RGMII RX Clock Delay used only when PHY operates in RGMII mode (phy-mode + is "rgmii-id", "rgmii-rxid", "rgmii-txid") see `dt-bindings/net/adin.h` + default value is 0 (which represents 2 ns) + enum: [ 0, 1, 2, 6, 7 ] + + adi,tx-internal-delay: + $ref: /schemas/types.yaml#/definitions/uint32 + description: | + RGMII TX Clock Delay used only when PHY operates in RGMII mode (phy-mode + is "rgmii-id", "rgmii-rxid", "rgmii-txid") see `dt-bindings/net/adin.h` + default value is 0 (which represents 2 ns) + enum: [ 0, 1, 2, 6, 7 ] + + adi,fifo-depth: + $ref: /schemas/types.yaml#/definitions/uint32 + description: | + When operating in RMII mode, this option configures the FIFO depth. + See `dt-bindings/net/adin.h`. + enum: [ 0, 1, 2, 3, 4, 5 ] + + adi,eee-enabled: + description: | + Advertise EEE capabilities on power-up/init (default disabled) + type: boolean + + adi,disable-energy-detect: + description: | + Disables Energy Detect Powerdown Mode (default disabled, i.e energy detect + is enabled if this property is unspecified) + type: boolean + + reset-gpios: + description: | + GPIO to reset the PHY + see Documentation/devicetree/bindings/gpio/gpio.txt. + +examples: + - | + ethernet-phy@0 { + compatible = "ethernet-phy-ieee802.3-c45"; + reg = <0>; + }; + - | + #include + ethernet-phy@1 { + reg = <1>; + adi,phy-mode-internal = "rgmii-id"; + + adi,rx-internal-delay = ; + adi,tx-internal-delay = ; + }; + - | + #include + ethernet-phy@2 { + reg = <2>; + phy-mode = "rmii"; + + adi,fifo-depth = ; + }; diff --git a/MAINTAINERS b/MAINTAINERS index faf5723610c8..6ffbb266dee4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -944,6 +944,8 @@ L: netdev@vger.kernel.org W: http://ez.analog.com/community/linux-device-drivers S: Supported F: drivers/net/phy/adin.c +F: include/dt-bindings/net/adin.h +F: Documentation/devicetree/bindings/net/adi,adin.yaml ANALOG DEVICES INC ADIS DRIVER LIBRARY M: Alexandru Ardelean diff --git a/include/dt-bindings/net/adin.h b/include/dt-bindings/net/adin.h new file mode 100644 index 000000000000..4c3afa550c59 --- /dev/null +++ b/include/dt-bindings/net/adin.h @@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/** + * Device Tree constants for Analog Devices Industrial Ethernet PHYs + * + * Copyright 2019 Analog Devices Inc. + */ + +#ifndef _DT_BINDINGS_ADIN_H +#define _DT_BINDINGS_ADIN_H + +/* RGMII internal delay settings for rx and tx for ADIN1300 */ +#define ADIN1300_RGMII_1_60_NS 0x1 +#define ADIN1300_RGMII_1_80_NS 0x2 +#define ADIN1300_RGMII_2_00_NS 0x0 +#define ADIN1300_RGMII_2_20_NS 0x6 +#define ADIN1300_RGMII_2_40_NS 0x7 + +/* RMII fifo depth values */ +#define ADIN1300_RMII_4_BITS 0x0 +#define ADIN1300_RMII_8_BITS 0x1 +#define ADIN1300_RMII_12_BITS 0x2 +#define ADIN1300_RMII_16_BITS 0x3 +#define ADIN1300_RMII_20_BITS 0x4 +#define ADIN1300_RMII_24_BITS 0x5 + +#endif