From patchwork Thu Aug 8 12:30:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1143994 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="QaEasZzo"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4647782kGpz9sMr for ; Thu, 8 Aug 2019 22:32:36 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389698AbfHHMat (ORCPT ); Thu, 8 Aug 2019 08:30:49 -0400 Received: from mx0a-00128a01.pphosted.com ([148.163.135.77]:45064 "EHLO mx0a-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728825AbfHHMat (ORCPT ); Thu, 8 Aug 2019 08:30:49 -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 x78CRm0q022426; Thu, 8 Aug 2019 08:30:38 -0400 Received: from nam05-dm3-obe.outbound.protection.outlook.com (mail-dm3nam05lp2057.outbound.protection.outlook.com [104.47.49.57]) by mx0a-00128a01.pphosted.com with ESMTP id 2u7xkj3gvq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 08 Aug 2019 08:30:37 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ECDWJXXShblIFaqX2qEHXeEvpx7yBmv+vY11Q5jMYOKmiU3sWdynMRCA2cq8A01+LpbGhokHbALPIttthsGjG/95Gjsr8xRsda2QilgFO1s1QPrCKluKLVfD4Nmlk41Eh5bJR0sWsV2CUIKD0CXCMl7ahozL5/b1lzuwS+FA++1JpV3wthtFWH+Sf6STTC4peacsKLVP3LbikJnODKufiMTdw2YWzf5GG5rZfvDLRbbK2SpbblPtOwOn+uci66ukJElCGMCOyw+K6f8+KT5kUQefMBHL3gZ+2BhUlsKEk8KafQyv0Qt1fWi6mPxhD95yVqL8WfeeUPnnk6jymFQnGA== 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=HG1vGVMds4pKsnKaroZN0iMGz+tIIs+xl/fUtEsEAa0=; b=nPwAHxhuokgI/yTB8Ii+G+2wu9DSgLXuDDFq9BEbWEgObVkbbGG9w3qCqkSq6WhfAN1BknJRnk7jYvylcbUR2bFxoE+YCVPVqWQJ+SfNPgCIL6U1BH3mYo01YdU9V3X5D0hMgk4nHLbVaqD2mwsg/5APRsUn+g6E5+x82mmoLC4GR8WUO8gjau3yDKTruQ5VMTBL/3YZwo7TEexw2QKWrGOMdHnaZHj3pn0ym8EeGf0LwnopGFzY9Chcap/fnAQazUiQrVf6mgYDeKKVbLo2MdHpoipwNazCw2pEpLWb5H6eo+LnVamMqRKa+S9x0grgydJKznqF5jNsNzqZwox5OQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 137.71.25.57) 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=HG1vGVMds4pKsnKaroZN0iMGz+tIIs+xl/fUtEsEAa0=; b=QaEasZzo4P7STLQ6Bu+hL/kpBtgd6np1TDHp8LjcTBYyQxl9j0Sfuo2+WJoHhbVgyhkV41CAmtKc07luSf/qvoT5WXe37uoWzTeVt1/3sqN7LzpdFRr4GDqYqwUr5zCvhhgpyeV/o4XN+XX7Kv7VbjUnvfC9oMkZwol9FaNAF/c= Received: from MWHPR03CA0026.namprd03.prod.outlook.com (2603:10b6:301:3b::15) by BN6PR03MB3140.namprd03.prod.outlook.com (2603:10b6:405:47::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.14; Thu, 8 Aug 2019 12:30:35 +0000 Received: from CY1NAM02FT034.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::208) by MWHPR03CA0026.outlook.office365.com (2603:10b6:301:3b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.15 via Frontend Transport; Thu, 8 Aug 2019 12:30:35 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.57 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.57; helo=nwd2mta2.analog.com; Received: from nwd2mta2.analog.com (137.71.25.57) by CY1NAM02FT034.mail.protection.outlook.com (10.152.75.190) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2157.15 via Frontend Transport; Thu, 8 Aug 2019 12:30:34 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta2.analog.com (8.13.8/8.13.8) with ESMTP id x78CUXBq021106 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Thu, 8 Aug 2019 05:30:33 -0700 Received: from saturn.ad.analog.com (10.48.65.113) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Thu, 8 Aug 2019 08:30:33 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH v2 01/15] net: phy: adin: add support for Analog Devices PHYs Date: Thu, 8 Aug 2019 15:30:12 +0300 Message-ID: <20190808123026.17382-2-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190808123026.17382-1-alexandru.ardelean@analog.com> References: <20190808123026.17382-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.57; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(136003)(376002)(39860400002)(346002)(396003)(2980300002)(189003)(199004)(76176011)(356004)(50226002)(6666004)(7636002)(48376002)(478600001)(305945005)(966005)(316002)(2201001)(106002)(54906003)(110136005)(246002)(7696005)(51416003)(5660300002)(8936002)(8676002)(70206006)(86362001)(70586007)(336012)(446003)(4326008)(426003)(47776003)(6306002)(107886003)(126002)(486006)(2870700001)(11346002)(476003)(36756003)(2906002)(2616005)(50466002)(44832011)(1076003)(186003)(26005); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR03MB3140; H:nwd2mta2.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail11.analog.com; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 79f022de-0cf0-4cb1-6938-08d71bfc3613 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328); SRVR:BN6PR03MB3140; X-MS-TrafficTypeDiagnostic: BN6PR03MB3140: X-MS-Exchange-PUrlCount: 3 X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-Forefront-PRVS: 012349AD1C X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: fppj4IGllTd8ZZgZRYXQOhe3xAf/5VhuFmk1aeBvqZMM5mnwO1X3BgdjXKKbvkyKQhBISXSO0cMv3Q6gmcgjsRBzDmSyz6XElbcKUXZfgqz8Y09MTu4/y6ocnRJD0VShrNQeMy37C8+J32n5WIKTlXmCP7FJRA8kq9hBCEea8+iCq7CESsY7NlKcYOQ0JsQt9QU3sXQSfOfvB0/xd0CntqiIADf/A27cEzDmJfp/OWgy/8XHqk6E6r/aBamJj5DHHIyLn10cY1+fHFVh03DxJKecIuNP89hpFWYy3OZCsVJdE9fxaLG43az1hQD10N+gjywR5PNr/1CGpwJF98sA8A+w74bYHNo5cTFZu5z2GhFFAvd0bs6Rgjo5Hqb03Xub6fV/Jh0tMxTdb9K8v0TvCvAzaFvwUFfZ4cIUFvMvgGo= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2019 12:30:34.3510 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 79f022de-0cf0-4cb1-6938-08d71bfc3613 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.57]; Helo=[nwd2mta2.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR03MB3140 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-08_06:, , 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-1908080130 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 completely in HW, according to spec. Configuration can also be done via registers, which will be supported by this driver. 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 Reviewed-by: Andrew Lunn --- MAINTAINERS | 7 ++++++ drivers/net/phy/Kconfig | 9 ++++++++ drivers/net/phy/Makefile | 1 + drivers/net/phy/adin.c | 49 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 66 insertions(+) create mode 100644 drivers/net/phy/adin.c diff --git a/MAINTAINERS b/MAINTAINERS index e352550a6895..e8aa8a667864 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 48ca213c0ada..03be30cde552 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..6d7af4743957 --- /dev/null +++ b/drivers/net/phy/adin.c @@ -0,0 +1,49 @@ +// 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) +{ + return genphy_config_init(phydev); +} + +static struct phy_driver adin_driver[] = { + { + PHY_ID_MATCH_MODEL(PHY_ID_ADIN1200), + .name = "ADIN1200", + .config_init = adin_config_init, + .config_aneg = genphy_config_aneg, + .read_status = genphy_read_status, + }, + { + PHY_ID_MATCH_MODEL(PHY_ID_ADIN1300), + .name = "ADIN1300", + .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_MATCH_MODEL(PHY_ID_ADIN1200) }, + { PHY_ID_MATCH_MODEL(PHY_ID_ADIN1300) }, + { } +}; + +MODULE_DEVICE_TABLE(mdio, adin_tbl); +MODULE_DESCRIPTION("Analog Devices Industrial Ethernet PHY driver"); +MODULE_LICENSE("GPL"); From patchwork Thu Aug 8 12:30:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1143991 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="bsQZN/ny"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46476x09X8z9sNx for ; Thu, 8 Aug 2019 22:32:25 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389745AbfHHMau (ORCPT ); Thu, 8 Aug 2019 08:30:50 -0400 Received: from mx0a-00128a01.pphosted.com ([148.163.135.77]:45038 "EHLO mx0a-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727649AbfHHMat (ORCPT ); Thu, 8 Aug 2019 08:30:49 -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 x78CRobN022491; Thu, 8 Aug 2019 08:30:39 -0400 Received: from nam02-bl2-obe.outbound.protection.outlook.com (mail-bl2nam02lp2053.outbound.protection.outlook.com [104.47.38.53]) by mx0a-00128a01.pphosted.com with ESMTP id 2u7xkj3gvu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 08 Aug 2019 08:30:39 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JJRwo+0C4rleel2+Nj76lJkEpb3hotqH0uWSfojw6C4IwQNrcieRj7p/9pcCa8eZ6X6bM525uIYry8/BWCGvMO0fMUj+XHkcjkvOhWLVrTbUzUuA5Wy/VBebxf2OAbF+1IeOwAORU+wHNDTsfVv0AS4EuTvENUOxgJbVuArDyFllhOamKDQcFMof9rpCm07eJJW9Eoq0wpNT6f0gKp7Wvxvh6OmSSSkvnNzOHFtG0PJvydYDcerBAvWMgkquyE2jp2zC5GQETb2H7a+gZUGIT76zIXJhn9LSGGxeqARWjTPJbAlytFtkrnlzbM6dgnM9QWPtLAB7kch2BDXP7HQd9g== 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=FlNnl0XLW34T/QV6J2As0OV9goGnjBVq5rlCqSOFUvE=; b=NseqVUWUEHliGWxt4Lo8f+6wVWSAneksTzl52OIxsfp9tnShKov5ohPM34HQyffbtwf1+iMcez0X/GN4vSNI1S4eyAzhc9APXSO8GUpaiQIZIGqbXYRhHC+xdZhALvhbINPvSlU5eOaKVh2KnKdj9QnsSSAFyTSactrz7mvRMoMd1LUX2o0qtJCVykUwCs6SmlVUlCs8YqsguJDu/ssaonK331K3zhr9HD0xJS+mOw7GlQNPifiPIv/jeFueO4AbVASFpA79DxildD9kp4biLxeEv1FkFNX1g+TNzPZoSVgCCzCzzddZUc3hOEUVzecve+9qdu6PwJmXhF5ABKsyDQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 137.71.25.57) 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=FlNnl0XLW34T/QV6J2As0OV9goGnjBVq5rlCqSOFUvE=; b=bsQZN/nyuzfbWElrYTila3E3BhYlhLT/TkyLlMSFwaLdW2hNRf13A8hbp8MpQNKwUqWtlaEAobFGkup4Z+wnYLk9vbRLxXDzwjGMk1/70Fy64vzIZyuBH3uYHcew3KT5HmmWNvLcFQLEeD7qnrH7NDRY+6h0lL35Dqzug5QZuc8= Received: from DM3PR03CA0010.namprd03.prod.outlook.com (2603:10b6:0:50::20) by BYAPR03MB4888.namprd03.prod.outlook.com (2603:10b6:a03:13a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.18; Thu, 8 Aug 2019 12:30:37 +0000 Received: from CY1NAM02FT060.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::209) by DM3PR03CA0010.outlook.office365.com (2603:10b6:0:50::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.16 via Frontend Transport; Thu, 8 Aug 2019 12:30:37 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.57 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.57; helo=nwd2mta2.analog.com; Received: from nwd2mta2.analog.com (137.71.25.57) by CY1NAM02FT060.mail.protection.outlook.com (10.152.74.252) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2157.15 via Frontend Transport; Thu, 8 Aug 2019 12:30:36 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta2.analog.com (8.13.8/8.13.8) with ESMTP id x78CUaaX021156 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Thu, 8 Aug 2019 05:30:36 -0700 Received: from saturn.ad.analog.com (10.48.65.113) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Thu, 8 Aug 2019 08:30:35 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH v2 02/15] net: phy: adin: hook genphy_read_abilities() to get_features Date: Thu, 8 Aug 2019 15:30:13 +0300 Message-ID: <20190808123026.17382-3-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190808123026.17382-1-alexandru.ardelean@analog.com> References: <20190808123026.17382-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.57; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(376002)(39860400002)(136003)(346002)(396003)(2980300002)(199004)(189003)(106002)(26005)(8676002)(70586007)(70206006)(48376002)(50466002)(4326008)(50226002)(110136005)(478600001)(51416003)(76176011)(7696005)(54906003)(8936002)(316002)(107886003)(47776003)(86362001)(7636002)(426003)(1076003)(36756003)(2201001)(336012)(44832011)(2870700001)(476003)(126002)(186003)(246002)(6666004)(486006)(356004)(5660300002)(305945005)(2906002)(11346002)(2616005)(446003); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR03MB4888; H:nwd2mta2.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail11.analog.com; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 785722a6-9663-4457-b83e-08d71bfc3768 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328); SRVR:BYAPR03MB4888; X-MS-TrafficTypeDiagnostic: BYAPR03MB4888: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-Forefront-PRVS: 012349AD1C X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: XVDZVBK7NQYTbMlnprZFxRsA2hBcuPHkyn7YCOkULNC/bOyJbEfAQtvDIy8IfKnfBPA/jbZEPJhiIHZdpz3O/l5NM6CkJ7dNOMp1w7+v1byPx4Lsk8KKCLvM06eE8xnePOYpDs3qs7mgvFrZy/RWH/NX1CC1J5P7Daf7K2jTYcU8UVo+WlcDdTMIGwTUAv7kyB3g3embS2B2GRHFlMSwrgd84ic0GzLdAa38Y5DWuU3dUgFubo5LhiS4U4n2ue+VvvGtacXwWSEthhi6lTNq80cX+u/JL3rCNNoY2YD3JcQcLW1idpKynXsMsGzSVzo9iAMd+LDsMyqc9hFoz7OYtYa5M5piMLqjaklKg6HP9Dw3FaF7nXZ4LrI3zcQmPFkLrO5aNuhQDOOl+nUeJ4vdcoapy8C7YqWuq0WjYV4AGdE= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2019 12:30:36.5638 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 785722a6-9663-4457-b83e-08d71bfc3768 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.57]; Helo=[nwd2mta2.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR03MB4888 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-08_06:, , 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-1908080130 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The ADIN PHYs can operate with Clause 45, however they are not typical for how phylib considers Clause 45 PHYs. If the `features` field & the `get_features` hook are unspecified, and the device wants to operate via Clause 45, it would also try to read features via the `genphy_c45_pma_read_abilities()`, which will try to read PMA regs that are unsupported. Hooking the `genphy_read_abilities()` function to the `get_features` hook will ensure that this does not happen and the PHY features are read correctly regardless of Clause 22 or Clause 45 operation. Signed-off-by: Alexandru Ardelean --- drivers/net/phy/adin.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c index 6d7af4743957..879797d076e0 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -26,6 +26,7 @@ static struct phy_driver adin_driver[] = { .config_init = adin_config_init, .config_aneg = genphy_config_aneg, .read_status = genphy_read_status, + .get_features = genphy_read_abilities, }, { PHY_ID_MATCH_MODEL(PHY_ID_ADIN1300), @@ -33,6 +34,7 @@ static struct phy_driver adin_driver[] = { .config_init = adin_config_init, .config_aneg = genphy_config_aneg, .read_status = genphy_read_status, + .get_features = genphy_read_abilities, }, }; From patchwork Thu Aug 8 12:30:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1143995 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="Vw0ozMRB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46477H3mhkz9sP3 for ; Thu, 8 Aug 2019 22:32:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390060AbfHHMcj (ORCPT ); Thu, 8 Aug 2019 08:32:39 -0400 Received: from mx0a-00128a01.pphosted.com ([148.163.135.77]:45550 "EHLO mx0a-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728980AbfHHMat (ORCPT ); Thu, 8 Aug 2019 08:30:49 -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 x78CRobO022491; Thu, 8 Aug 2019 08:30:42 -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 2u7xkj3gvx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 08 Aug 2019 08:30:41 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k0IxaqfSPdaaS36rjdHjGQdO4asAo86tDzDbqhSAW3cL7k8fV+qFKzchtpNMcghe+oM3CmapI54KMRlwHcsrO6rkWahwZyz+t/nTRIiLi4AXIqaRjkZqmFV5P8TeVSZkxWdMpaIDxvXpPQOCDPmIasd8JbrpQ0gmEAUztDauadfvrAknQwfCNOKK2zk8yJswCCHtBAlOd4mvx1AvSzLUHs1TvoqsmErWBfo9uohFmxl0jm8PLLUuCJsoia2KCfluOa+IlSvZSwIG76sztBdYf13nSYwi0C7I+Cp71bp2zfpygTWW7vq4YpMHhMtQ75lIG0iMihgkMpQg9YI6SM/Whg== 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=h1vrwbrOrviwYf1w5DV0S5pcUO9N7R7Aew9IDwTEkJI=; b=Np7cn1+xFSBe97vqwIdmKF6V2+FJr688qyRaPIpl8ehyfdjdgxov/4QNl0mkKaHNnIqf/4nF2YQSl7OVd7bA8b/O+r/VGfeqxO5uI8uBVivIxblPuNb9oNKQSn/8sSfpqo4+HnhArypSkMH7uwmPcghgDBILn3jhWzfrzheygHwT5w4h+Q5JbDdLXtN6YgQ3SBVYhijbodbPRsAndAUieON3t48Kehiodw/PSh+e5+2hyjCC2tYG+KGLSS2p6FW3MDLr5Q5YSbZxG584NGb7u5/+KD48UTkE8RAZ+NQDTffYxWih4k2qWTmsCmeIdTej1hQLVsPn8tf8qySc7b+zCA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 137.71.25.57) 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=h1vrwbrOrviwYf1w5DV0S5pcUO9N7R7Aew9IDwTEkJI=; b=Vw0ozMRB/QQUH5YWlFspUbTNLs44upBD7x6nhz0y4bYo1vBJ0/CE3Pb/lXPr+MNSkW7tK/dctTkuQ0TEsYUjTfJU/6+64Zn7tjtHvcJCdx1gyDa583ZTGJ7HWQOnkg0HvLla5VCWNiNt5XURja0KW16ZFJe/nq/CGXBxXZDMo38= Received: from DM3PR03CA0007.namprd03.prod.outlook.com (2603:10b6:0:50::17) by SN6PR03MB4189.namprd03.prod.outlook.com (2603:10b6:805:c5::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.18; Thu, 8 Aug 2019 12:30:39 +0000 Received: from CY1NAM02FT027.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::209) by DM3PR03CA0007.outlook.office365.com (2603:10b6:0:50::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.13 via Frontend Transport; Thu, 8 Aug 2019 12:30:39 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.57 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.57; helo=nwd2mta2.analog.com; Received: from nwd2mta2.analog.com (137.71.25.57) by CY1NAM02FT027.mail.protection.outlook.com (10.152.75.159) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2157.15 via Frontend Transport; Thu, 8 Aug 2019 12:30:38 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta2.analog.com (8.13.8/8.13.8) with ESMTP id x78CUc9Q021203 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Thu, 8 Aug 2019 05:30:38 -0700 Received: from saturn.ad.analog.com (10.48.65.113) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Thu, 8 Aug 2019 08:30:37 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH v2 03/15] net: phy: adin: hook genphy_{suspend, resume} into the driver Date: Thu, 8 Aug 2019 15:30:14 +0300 Message-ID: <20190808123026.17382-4-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190808123026.17382-1-alexandru.ardelean@analog.com> References: <20190808123026.17382-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.57; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(376002)(39860400002)(136003)(346002)(396003)(2980300002)(189003)(199004)(246002)(86362001)(8676002)(4326008)(4744005)(305945005)(70206006)(70586007)(2201001)(107886003)(7636002)(36756003)(26005)(316002)(186003)(8936002)(110136005)(76176011)(7696005)(51416003)(476003)(50226002)(2616005)(446003)(11346002)(486006)(44832011)(1076003)(126002)(6666004)(356004)(336012)(48376002)(54906003)(426003)(106002)(14444005)(2906002)(50466002)(15650500001)(2870700001)(478600001)(47776003)(5660300002)(142933001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN6PR03MB4189; H:nwd2mta2.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail11.analog.com; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2f61bcfb-00de-41e2-b57b-08d71bfc38bb X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328); SRVR:SN6PR03MB4189; X-MS-TrafficTypeDiagnostic: SN6PR03MB4189: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:849; X-Forefront-PRVS: 012349AD1C X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: lCv7buj2/UXMHDvTW0p99o1dKUKvsxnYdE9N0t6pg6iouOSmio6vvkPyBACEHbUf1gei03sTxLBTWjRxgNHTjAQa5AY4JteprDM//sf8kgkxp5vfJUpYXPqqMjx37UDQOBnercov+pqeXQ84W/3OQ8UyMnZsfHDWHNzzyTcL5AuG9/2vZ5KW2mjmA5E1v0RuuB+MLcNfWJRjCvpAezOhNMmbITvV22XXdxcdm+rOFxJvrw8sWVsn1CrdkHDX/puyEEZ2VM1mSsoaK9/eRG71PSOjqSPCs77e8+Wi9ibLyrrmovhSf6dMDw0qyccIIpxh4EF0JSBvdF2p+L2xjmR83WSDa18a1z1G2R7ffzjM2RTYK6i4Wz8fFke+Qv/giAENmy0cYY/xNbvUsn/h2RymNb6kQD7SEdsAV3uuSz8diNs= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2019 12:30:38.8234 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2f61bcfb-00de-41e2-b57b-08d71bfc38bb 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.57]; Helo=[nwd2mta2.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR03MB4189 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-08_06:, , 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=982 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908080130 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 879797d076e0..45490fbe273b 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -27,6 +27,8 @@ static struct phy_driver adin_driver[] = { .config_aneg = genphy_config_aneg, .read_status = genphy_read_status, .get_features = genphy_read_abilities, + .resume = genphy_resume, + .suspend = genphy_suspend, }, { PHY_ID_MATCH_MODEL(PHY_ID_ADIN1300), @@ -35,6 +37,8 @@ static struct phy_driver adin_driver[] = { .config_aneg = genphy_config_aneg, .read_status = genphy_read_status, .get_features = genphy_read_abilities, + .resume = genphy_resume, + .suspend = genphy_suspend, }, }; From patchwork Thu Aug 8 12:30:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1143978 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="IpAUGYJn"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46475G2cZSz9sNx for ; Thu, 8 Aug 2019 22:30:58 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389791AbfHHMax (ORCPT ); Thu, 8 Aug 2019 08:30:53 -0400 Received: from mx0a-00128a01.pphosted.com ([148.163.135.77]:47936 "EHLO mx0a-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727649AbfHHMav (ORCPT ); Thu, 8 Aug 2019 08:30:51 -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 x78CRsML012779; Thu, 8 Aug 2019 08:30:44 -0400 Received: from nam03-dm3-obe.outbound.protection.outlook.com (mail-dm3nam03lp2052.outbound.protection.outlook.com [104.47.41.52]) by mx0a-00128a01.pphosted.com with ESMTP id 2u820jjrux-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 08 Aug 2019 08:30:44 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X/H6OhB8TbrSkt4WkRmO8oBdehhRxGNWSgZInrDa0ZlFnQfPoMZpIWPxtA+lz5nb2589/RsBI/B6omI/TGyJcuKlWzMHD9etJ/f0Yrrm5FTcmGjh2kJ5xYMOaOlzACtKdYCauQJVALzj0Q5p45Un8hb8L7V7O3Dh0527bizbH6GxOPjiHNzR2AM7iMC0pY55bKS//7a10weB8APX4daX96T8KxBc++VYZzEHO3PBrdudj43/QiqphtRKFuyLvg5Nh/mZx2TgEDl2h0jXdMAkRqYgSfKVSLq8w+6LtQE+eidLzx2m6YOsTDuQLndMJxIrHQEztpYrSXnNLnk1QZfUTA== 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=eawoPnmHxZ2cC65gIdnjOchv1f8C9Iv6KcLaVi2/2p8=; b=NJ2wuJHE1B6ZH7DcwM6hSFYpeF+ijr170zEhZ2P91keM2ciSvGC7yYKOAsaFQbhC+kk1hdbPdpWJxKd+N4ru1mIRei9mCIYvtfjxhzU3q+04zsXNzLLdo0nx00KabuF/Ydw6fzVbXiDtgZxxbnG3xAqdyiSIsFiN2ZoLmarx0L9DPnG3xXslA45FDHJsYngTeCX0toYEP9BQMOd8ifwp4UuAsEV1H+fd0OLVzEZBvtBzNx16jYMWUFXMqokmjUS0MLQUZFC9TSkCAaneaW/WlW1VjCYGBOC1xzUl9QQmlo9LjCH7Xyabl9/wazmaMe4w9d3BL4UeRZGH6ee5lBMXWQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass (sender ip is 137.71.25.57) 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=eawoPnmHxZ2cC65gIdnjOchv1f8C9Iv6KcLaVi2/2p8=; b=IpAUGYJnLcpJXvWK00eHI2cBMRaDiRW61KhaJuwZho+i5Cl3q1/EyFPgCwDdgnLARBmOzMonXWoa8jLTGajFYAG3+jl290IA1r12f9SV91p90SRKrrIzlLRD575u7Ap219ZnsWkjKq1JiBmqfQp4xXuiCLYbyyFVtb9Ixu39cX4= Received: from DM6PR03CA0058.namprd03.prod.outlook.com (2603:10b6:5:100::35) by BYAPR03MB4213.namprd03.prod.outlook.com (2603:10b6:a03:7f::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.16; Thu, 8 Aug 2019 12:30:41 +0000 Received: from SN1NAM02FT025.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::202) by DM6PR03CA0058.outlook.office365.com (2603:10b6:5:100::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.16 via Frontend Transport; Thu, 8 Aug 2019 12:30:41 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.57 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.57; helo=nwd2mta2.analog.com; Received: from nwd2mta2.analog.com (137.71.25.57) by SN1NAM02FT025.mail.protection.outlook.com (10.152.72.87) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2157.15 via Frontend Transport; Thu, 8 Aug 2019 12:30:40 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta2.analog.com (8.13.8/8.13.8) with ESMTP id x78CUetZ021214 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Thu, 8 Aug 2019 05:30:40 -0700 Received: from saturn.ad.analog.com (10.48.65.113) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Thu, 8 Aug 2019 08:30:39 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH v2 04/15] net: phy: adin: add support for interrupts Date: Thu, 8 Aug 2019 15:30:15 +0300 Message-ID: <20190808123026.17382-5-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190808123026.17382-1-alexandru.ardelean@analog.com> References: <20190808123026.17382-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.57; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(346002)(396003)(39860400002)(376002)(136003)(2980300002)(189003)(199004)(26005)(86362001)(44832011)(246002)(2616005)(186003)(50226002)(11346002)(126002)(4326008)(107886003)(486006)(446003)(7696005)(36756003)(51416003)(476003)(336012)(8676002)(8936002)(70586007)(70206006)(76176011)(305945005)(426003)(7636002)(2906002)(356004)(316002)(5660300002)(6666004)(106002)(2870700001)(54906003)(478600001)(48376002)(50466002)(47776003)(14444005)(1076003)(110136005)(2201001); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR03MB4213; H:nwd2mta2.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail11.analog.com; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 309aa98c-7017-4e0a-dba9-08d71bfc39d0 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328); SRVR:BYAPR03MB4213; X-MS-TrafficTypeDiagnostic: BYAPR03MB4213: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4941; X-Forefront-PRVS: 012349AD1C X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: Hs7psfhTaecdqSDnmMJedxzXJ2zd3kgg7YePr1MQCCcH9P7dI5SfOLpASfFIHrvwZz2TTTIRqmwwTUUMfV9YSMDBmS7pzWRUwTcP+pApzVETnbJttk6Hlx760O49wC9NQAmQZ6K+Mb4xEUMZ40ffLKsEf6E7WxMKNYCN74FG+2AP8myViSLwbsLoBsMIl7pNfCGBc1hAskYM9StZ61x+O4orirL+nomirTkq9bvxkC64PkMhLF34yBpBi0bJYNodOhBhbAXCB1NKfIEpnGHGZWiUUqWvUL4VUMGR6wIB5ishdHhTYkMY/BpH5YgvzDwjrKkFz7i7zknRwrEl1CftDhjcORXGXil1YZJ1cp1rRlP0bGcytHQlqMyml8fNo7MGlvt4ylb3FM+4c+OMhlzqyPItfCNkKJEauJHatjNH9q4= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2019 12:30:40.7518 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 309aa98c-7017-4e0a-dba9-08d71bfc39d0 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.57]; Helo=[nwd2mta2.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR03MB4213 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-08_06:, , 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-1908080130 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 Reviewed-by: Andrew Lunn --- drivers/net/phy/adin.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c index 45490fbe273b..69000fb16704 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -14,11 +14,45 @@ #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) { return genphy_config_init(phydev); } +static int adin_phy_ack_intr(struct phy_device *phydev) +{ + /* Clear pending interrupts */ + int rc = phy_read(phydev, ADIN1300_INT_STATUS_REG); + + return rc < 0 ? rc : 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_MATCH_MODEL(PHY_ID_ADIN1200), @@ -27,6 +61,8 @@ static struct phy_driver adin_driver[] = { .config_aneg = genphy_config_aneg, .read_status = genphy_read_status, .get_features = genphy_read_abilities, + .ack_interrupt = adin_phy_ack_intr, + .config_intr = adin_phy_config_intr, .resume = genphy_resume, .suspend = genphy_suspend, }, @@ -37,6 +73,8 @@ static struct phy_driver adin_driver[] = { .config_aneg = genphy_config_aneg, .read_status = genphy_read_status, .get_features = genphy_read_abilities, + .ack_interrupt = adin_phy_ack_intr, + .config_intr = adin_phy_config_intr, .resume = genphy_resume, .suspend = genphy_suspend, }, From patchwork Thu Aug 8 12:30:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1143990 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="0AXT48CT"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46476q1sGFz9sPM for ; Thu, 8 Aug 2019 22:32:19 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390047AbfHHMcP (ORCPT ); Thu, 8 Aug 2019 08:32:15 -0400 Received: from mx0b-00128a01.pphosted.com ([148.163.139.77]:19964 "EHLO mx0b-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732254AbfHHMax (ORCPT ); Thu, 8 Aug 2019 08:30:53 -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 x78CSGhR002639; Thu, 8 Aug 2019 08:30:45 -0400 Received: from nam05-dm3-obe.outbound.protection.outlook.com (mail-dm3nam05lp2055.outbound.protection.outlook.com [104.47.49.55]) by mx0b-00128a01.pphosted.com with ESMTP id 2u7wxfkv4c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 08 Aug 2019 08:30:45 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LAL/Ln1xgBGTmDDm+EK6So737EW1IxFheTxyjoBZW36owY9ek0N8WCZLtt/S9J9+GmZNG4Ivt/NU0PbgAI0KPjH78sHFDDfDq9yBQ4bq4WOluhtuA3AsOmT5Gzu6nT7rFX8RGzhpiAAwUWARmIt9a5hrPh0SEJyv8PMdAdLjVCgqNcmUoeZjgVZ5lNEhi5/s4zQTiI49AWrw4FjUb3SICTAWrlGGGOrBy/8NvWqhr+nFWyCyaHABvnHkkeAktoFaDmtkqprxuPaqFEYN9japTYo7fqs6QqRcO9qPqwAEd2EJjj2PMD2BnEBRow9EN9VJ5p+H/4qU8289jXuYtr5ZKw== 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=vvOl9aLNAIx4btKasL23JvR1dRgPmnqnr8INriFcIgA=; b=VCerY1bjEZMOXEaG6MxsYIx3Wbu3Ws6PPrl4+eL2RLvwoqAb8xuVRYTX7jpdfraqAUaoJ4uRbOF+GMpH7vOHsmLPvtnZMInF9EDxAlqHxi7/ybDtWqNVNSPxKftpDUxcHOFpphwxTm9j3NbGMa7geQBIAplxA34tZRk8qKe88GNNv68vZGlPYRbZAuCG0NeL8F+V8iIvV0uLiASxoKUoRDBz2fBvUYRwEHQdzzkonmeQaoi1kw2vVD1vsLOdSIGOfFtqW2HbiNVEO4gfgDUApkjlUnP/YT2WpxX/EtFazEfdb3a4AcLHd5Jia9fv12kL+h5+WMPFa72eg4jkxMEVtg== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass (sender ip is 137.71.25.57) 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=vvOl9aLNAIx4btKasL23JvR1dRgPmnqnr8INriFcIgA=; b=0AXT48CTUwZR3WvAPcxLOZy5CLxqYxrXxAfdI8SeOWswUT0TZmMELbSZ912QN0Sr/hrnetShXG19fcEJ22dNVpz7RNRLSYjcTldVbW7hwu68Y6yPlb5bm5DbmsUf80gv6Je/gxlh5BhIFhLJKeFqr859A5uHlMydl/Pdyc0XYvk= Received: from DM3PR03CA0017.namprd03.prod.outlook.com (2603:10b6:0:50::27) by DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:3c::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.12; Thu, 8 Aug 2019 12:30:43 +0000 Received: from SN1NAM02FT037.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::209) by DM3PR03CA0017.outlook.office365.com (2603:10b6:0:50::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.14 via Frontend Transport; Thu, 8 Aug 2019 12:30:43 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.57 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.57; helo=nwd2mta2.analog.com; Received: from nwd2mta2.analog.com (137.71.25.57) by SN1NAM02FT037.mail.protection.outlook.com (10.152.72.89) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2157.15 via Frontend Transport; Thu, 8 Aug 2019 12:30:42 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta2.analog.com (8.13.8/8.13.8) with ESMTP id x78CUgpn021217 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Thu, 8 Aug 2019 05:30:42 -0700 Received: from saturn.ad.analog.com (10.48.65.113) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Thu, 8 Aug 2019 08:30:41 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH v2 05/15] net: phy: adin: add {write,read}_mmd hooks Date: Thu, 8 Aug 2019 15:30:16 +0300 Message-ID: <20190808123026.17382-6-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190808123026.17382-1-alexandru.ardelean@analog.com> References: <20190808123026.17382-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.57; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39860400002)(346002)(136003)(376002)(396003)(2980300002)(189003)(199004)(478600001)(2906002)(7696005)(1076003)(4326008)(107886003)(14444005)(48376002)(50466002)(446003)(54906003)(110136005)(336012)(486006)(2616005)(476003)(426003)(11346002)(76176011)(186003)(356004)(6666004)(106002)(26005)(36756003)(51416003)(126002)(316002)(44832011)(2201001)(2870700001)(70586007)(86362001)(50226002)(8936002)(305945005)(246002)(7636002)(47776003)(70206006)(5660300002)(8676002)(142933001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR03MB3163; H:nwd2mta2.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail11.analog.com; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: acfa6ad3-e4b4-4b34-cec5-08d71bfc3b22 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328); SRVR:DM5PR03MB3163; X-MS-TrafficTypeDiagnostic: DM5PR03MB3163: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-Forefront-PRVS: 012349AD1C X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: FNn279NMDWvn+7gS8Gvl3R5fVDKb+IEfCklfb1LRRyzIS5YEXcfOb53iWlScx0cVp5eLEH8N4AlaItEhaN9MWm+ugvBLuamS9+PVhKr5kCxT1WyDlUyfAtDVl/L37xNpl3nndmsiwxXxLmYyDW5H+XDThldwG3N3A3LFD2SLkS9IRMYI1reqVD14EAe/xgThV8vlE8vYBezI3xFb2Ynf71mpas3CFuaa8NBdfLwqTgEgTvFT2oU/tbzFKn+0ECeKU/k2i5BglpzBkkl7VM4M7expnZAFW1mNLuXjAmkNqtylfqu3sWuJq2MMvgJ4mdvvWzFkayWg7BLfuAf0LlOpEi0awn8TGEZOOOFn7NWC5+ToEse50OwokbxL02NEUgMLp6IrNi/xkpR0eVLTB53TcZBGGVUC07qBJUvWaqOOz+A= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2019 12:30:42.8414 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: acfa6ad3-e4b4-4b34-cec5-08d71bfc3b22 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.57]; Helo=[nwd2mta2.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR03MB3163 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-08_06:, , 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=951 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908080130 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 69000fb16704..a833e329be6f 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 0x0010 +#define ADIN1300_MII_EXT_REG_DATA 0x0011 + #define ADIN1300_INT_MASK_REG 0x0018 #define ADIN1300_INT_MDIO_SYNC_EN BIT(9) #define ADIN1300_INT_ANEG_STAT_CHNG_EN BIT(8) @@ -53,6 +56,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_MATCH_MODEL(PHY_ID_ADIN1200), @@ -65,6 +107,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_MATCH_MODEL(PHY_ID_ADIN1300), @@ -77,6 +121,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 Thu Aug 8 12:30:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1143980 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="legRj4HE"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46475N21L9z9sN4 for ; Thu, 8 Aug 2019 22:31:02 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732446AbfHHMbA (ORCPT ); Thu, 8 Aug 2019 08:31:00 -0400 Received: from mx0b-00128a01.pphosted.com ([148.163.139.77]:24992 "EHLO mx0b-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732327AbfHHMa6 (ORCPT ); Thu, 8 Aug 2019 08:30:58 -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 x78CRlML030260; Thu, 8 Aug 2019 08:30:48 -0400 Received: from nam04-co1-obe.outbound.protection.outlook.com (mail-co1nam04lp2059.outbound.protection.outlook.com [104.47.45.59]) by mx0b-00128a01.pphosted.com with ESMTP id 2u8bmphap0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 08 Aug 2019 08:30:48 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OgDoRuhPfRYTZaUTRUEhwy4hynnIzNIdLoEY1H65c0cO8TJxWPNpm7xRIdJgiN+3rMG+kPpp//WQ0iRir9pRwnN8a7mNMCHaIqw0ExO3HvkHp+xOUjbBnQacTIDdAJJ5RD5pKMxOw5eyYvzafHdXGL3oiTadDqVTMrhf4MPXvOyduU+5tC8cHHgirbrH/ZlHHbee3I6uXnXjIAo+WYkPTysox1lbfIFLYAR+pxl29k9AL4cJhcg55372xTecr1UcoBNZC4jlC+veIXukqICR6qU8m/7oXNU1rYxxHvnlbaNZKkXueTY4svDdFIMo+JD5d7KwzZUCXogDbNo4HbH6Cg== 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=iPdhqdwHLnUBWmoSbZWb4yIMtk5VtPAUvwAtghdiS2o=; b=NyjH7RmrYec24zIPFGrnLW6Ca332IhjCbBPuxF62mHStTNs2ZwfoT/p7WUI7XiwLuwH4ViGvD7bxyOtZmQIfTGMkFi0/WY2v5zDw7jwq6bLpwBxu3jqb1w1egY9jBg9K3dAeL45IZgB7AptGy+tGtnkNIbe9R/9J1OiomkhP786k2/RAucT05GbwCXTzRCq4dVNLhjU+gihE6zmeketr6IRXIdSVdWQPAEWMy6ml4q1pTOp22lUYeEVjqKqSnWH8IY7b/PwUabRIl4cw+XeJM5jTfzKfLGaDbEd0ah59/izN0kunR9VPlllIxazPkZMAeD1X7FDk4RJPmpxibi41oA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 137.71.25.57) 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=iPdhqdwHLnUBWmoSbZWb4yIMtk5VtPAUvwAtghdiS2o=; b=legRj4HEF1T0Y3EzJwjiHT88i4KKzcnUBDeII3+Cihe5NzkGZxJT/n/k3xAObxzCcoOfKFpj2a40IiopHHoe3TuzSFQDkX92PZz0PriRXv/V/mcNKlzuqHop+0ONmw7Es8Po8ebBrvNbExDHL6wC5q6uIxjCfFegA5pMKHUA0gA= Received: from CY1PR03CA0022.namprd03.prod.outlook.com (2603:10b6:600::32) by BN3PR03MB2404.namprd03.prod.outlook.com (2a01:111:e400:7bbe::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.14; Thu, 8 Aug 2019 12:30:45 +0000 Received: from SN1NAM02FT049.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::201) by CY1PR03CA0022.outlook.office365.com (2603:10b6:600::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.16 via Frontend Transport; Thu, 8 Aug 2019 12:30:45 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.57 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.57; helo=nwd2mta2.analog.com; Received: from nwd2mta2.analog.com (137.71.25.57) by SN1NAM02FT049.mail.protection.outlook.com (10.152.72.166) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2157.15 via Frontend Transport; Thu, 8 Aug 2019 12:30:44 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta2.analog.com (8.13.8/8.13.8) with ESMTP id x78CUiUE021225 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Thu, 8 Aug 2019 05:30:44 -0700 Received: from saturn.ad.analog.com (10.48.65.113) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Thu, 8 Aug 2019 08:30:43 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH v2 06/15] net: phy: adin: configure RGMII/RMII/MII modes on config Date: Thu, 8 Aug 2019 15:30:17 +0300 Message-ID: <20190808123026.17382-7-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190808123026.17382-1-alexandru.ardelean@analog.com> References: <20190808123026.17382-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.57; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(396003)(376002)(346002)(136003)(39860400002)(2980300002)(199004)(189003)(2201001)(70586007)(86362001)(4326008)(7636002)(8676002)(36756003)(70206006)(305945005)(47776003)(336012)(476003)(26005)(44832011)(126002)(186003)(446003)(6666004)(14444005)(426003)(356004)(11346002)(2616005)(1076003)(54906003)(48376002)(7696005)(50466002)(478600001)(76176011)(51416003)(486006)(246002)(316002)(106002)(107886003)(5660300002)(2870700001)(2906002)(50226002)(8936002)(110136005); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR03MB2404; H:nwd2mta2.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail11.analog.com; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d3411e22-88f9-4a02-6e0b-08d71bfc3c48 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328); SRVR:BN3PR03MB2404; X-MS-TrafficTypeDiagnostic: BN3PR03MB2404: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-Forefront-PRVS: 012349AD1C X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: 34/sBeJi4B4yKnJnNRr9QwORXCnC4lKI+/suNXc3zAVvFub1KlvifvdJyduyN+RUKIhxP81IBmN6rrRrv5RNzD0waJSqnB40114qY51PXFhNMK8zA6rIPGxOX+2GuBO9FOjGQSvElNdZraqXAX4TITY3R5DF7uJSPEyAKIqVFfcr0qEF7du71Wp9ni21IHlwXiPek+VtyCxXMIzQrcg0C7TugcMaipJhMqNAnYO+CG2Rx/GfDvFsOXxN4drictwuKFYOOi9UKLh/GgxAXSRoOOSfDSFcAM+1Dz3no46wd1THl1S0fpZxfPWRHqA/Vsdckip7MGwtAoJ68IeNF/HWRq103o8D2pmu5o4LBlnH1+koo3NJKStYEwN7oSzsz39UI+YM+4pmIzpafKgVgVCv91jQSzxedPHpdrvbPvuuuNw= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2019 12:30:44.8915 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d3411e22-88f9-4a02-6e0b-08d71bfc3c48 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.57]; Helo=[nwd2mta2.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR03MB2404 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-08_06:, , 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-1908080130 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 Reviewed-by: Andrew Lunn --- 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 a833e329be6f..9169d6c08383 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -33,9 +33,86 @@ 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) +{ + int reg; + + if (!phy_interface_is_rgmii(phydev)) + return phy_clear_bits_mmd(phydev, MDIO_MMD_VEND1, + ADIN1300_GE_RGMII_CFG_REG, + ADIN1300_GE_RGMII_EN); + + reg = phy_read_mmd(phydev, MDIO_MMD_VEND1, ADIN1300_GE_RGMII_CFG_REG); + if (reg < 0) + return reg; + + reg |= ADIN1300_GE_RGMII_EN; + + if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID || + phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) { + reg |= ADIN1300_GE_RGMII_RXID_EN; + } else { + reg &= ~ADIN1300_GE_RGMII_RXID_EN; + } + + if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID || + phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID) { + reg |= ADIN1300_GE_RGMII_TXID_EN; + } else { + reg &= ~ADIN1300_GE_RGMII_TXID_EN; + } + + return phy_write_mmd(phydev, MDIO_MMD_VEND1, + ADIN1300_GE_RGMII_CFG_REG, reg); +} + +static int adin_config_rmii_mode(struct phy_device *phydev) +{ + int reg; + + if (phydev->interface != PHY_INTERFACE_MODE_RMII) + return phy_clear_bits_mmd(phydev, MDIO_MMD_VEND1, + ADIN1300_GE_RMII_CFG_REG, + ADIN1300_GE_RMII_EN); + + reg = phy_read_mmd(phydev, MDIO_MMD_VEND1, ADIN1300_GE_RMII_CFG_REG); + if (reg < 0) + return reg; + + reg |= ADIN1300_GE_RMII_EN; + + return phy_write_mmd(phydev, MDIO_MMD_VEND1, + ADIN1300_GE_RMII_CFG_REG, reg); +} + static int adin_config_init(struct phy_device *phydev) { - return genphy_config_init(phydev); + int rc; + + rc = genphy_config_init(phydev); + if (rc < 0) + return rc; + + rc = adin_config_rgmii_mode(phydev); + if (rc < 0) + return rc; + + rc = adin_config_rmii_mode(phydev); + if (rc < 0) + return rc; + + phydev_dbg(phydev, "PHY is using mode '%s'\n", + phy_modes(phydev->interface)); + + return 0; } static int adin_phy_ack_intr(struct phy_device *phydev) From patchwork Thu Aug 8 12:30:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1143979 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="M0MaN5Du"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46475H0z4Pz9sN4 for ; Thu, 8 Aug 2019 22:30:59 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732405AbfHHMa5 (ORCPT ); Thu, 8 Aug 2019 08:30:57 -0400 Received: from mx0a-00128a01.pphosted.com ([148.163.135.77]:53164 "EHLO mx0a-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727649AbfHHMa4 (ORCPT ); Thu, 8 Aug 2019 08:30:56 -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 x78CRm0s022426; Thu, 8 Aug 2019 08:30:49 -0400 Received: from nam04-co1-obe.outbound.protection.outlook.com (mail-co1nam04lp2057.outbound.protection.outlook.com [104.47.45.57]) by mx0a-00128a01.pphosted.com with ESMTP id 2u7xkj3gw6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 08 Aug 2019 08:30:49 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tn6+eP5FG+V+noKLoQL4qrKHDS/kODN3LVPCe815Iq80N1Bu+e9zGq1j8rmDNUA+v6P/ADCLfKwr5sHj/knhm7DsNawWJhLvt19oqWEQlkglSQegJ/Ydfj63ZCQ7W+F8ljal4XxTDk3kgdKRbejHLUyQsd6TptkdbO87orG0LW9NSxrXPzUaaIBhWu1MokH/vwVUA3la4kL8jfZT36dsl6U7hV78ZqzmnNoL2LbcuY8+xHLv74ErehRT6XkF9t8EMQg+nU73Vve0fYvFRLWe/7tQmx1VYvR1GBW8FDBMycU1Q8ktmHJuJSANsVLK17/uWFtKeHV9vOSCGLQ4TjvkSA== 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=PO5OkiX1WmTXvZvAt60yK0vtiIQQDEigJHhwCJ9cKmU=; b=E4AeALOmT272vbOVSTe/bA5qDu8we9YRyiK2XWXKr5DDDLS1jFgElT60jvKRwoB80+qugq4YDNULN9oMTBmaH8zkJzkgCgMv4Ftsv8Vwj7ppM/sXo6xeORGau4avS0x9ap57zdRwpSo3xO5bpjy3MkDRJW8fMATmTT/WncHl/hr2oCHEBanT5+uZt2+sqs8HsYr5QJUsQKK4Iy154ghWgFcGx7YezKiX1B8f9n39OYCTmTDhlM2d3YqbfuKtT/HV7yWM6veAvrQK0ftc2JoPfurQFTju39oS4UAhVavBmRNMHjWoo5h31hUG18I3Wkp2yeEiar/nKCs8kS2LwBuxTw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 137.71.25.57) 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=PO5OkiX1WmTXvZvAt60yK0vtiIQQDEigJHhwCJ9cKmU=; b=M0MaN5Du/8ncQ7OTIq37mrvYgBpmBAoSKGxYaCI1XBZrdJoSea5ML0PkJQOw4H1sxgfIjrKMYhkn5pzSQT9b+kQTmNDTEdT6oSB154zWgijlwt9GopWXqOUK1BszPiKjBZ/Oz0Zf9JubHyRMmzg0kiqW4pzyUlFjdOhNDEnqvac= Received: from BY5PR03CA0017.namprd03.prod.outlook.com (2603:10b6:a03:1e0::27) by BY5PR03MB5249.namprd03.prod.outlook.com (2603:10b6:a03:21b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.18; Thu, 8 Aug 2019 12:30:47 +0000 Received: from SN1NAM02FT029.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::208) by BY5PR03CA0017.outlook.office365.com (2603:10b6:a03:1e0::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.15 via Frontend Transport; Thu, 8 Aug 2019 12:30:47 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.57 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.57; helo=nwd2mta2.analog.com; Received: from nwd2mta2.analog.com (137.71.25.57) by SN1NAM02FT029.mail.protection.outlook.com (10.152.72.110) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2157.15 via Frontend Transport; Thu, 8 Aug 2019 12:30:46 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta2.analog.com (8.13.8/8.13.8) with ESMTP id x78CUknL021238 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Thu, 8 Aug 2019 05:30:46 -0700 Received: from saturn.ad.analog.com (10.48.65.113) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Thu, 8 Aug 2019 08:30:45 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH v2 07/15] net: phy: adin: make RGMII internal delays configurable Date: Thu, 8 Aug 2019 15:30:18 +0300 Message-ID: <20190808123026.17382-8-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190808123026.17382-1-alexandru.ardelean@analog.com> References: <20190808123026.17382-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.57; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(376002)(136003)(396003)(39860400002)(346002)(2980300002)(199004)(189003)(44832011)(106002)(26005)(426003)(446003)(476003)(11346002)(2616005)(50226002)(8676002)(8936002)(186003)(51416003)(76176011)(478600001)(47776003)(7696005)(50466002)(4326008)(126002)(336012)(36756003)(316002)(110136005)(54906003)(486006)(1076003)(2201001)(305945005)(6666004)(86362001)(48376002)(107886003)(7636002)(356004)(70206006)(2870700001)(5660300002)(2906002)(246002)(70586007); DIR:OUT; SFP:1101; SCL:1; SRVR:BY5PR03MB5249; H:nwd2mta2.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail11.analog.com; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a47065ec-8517-4584-a2ce-08d71bfc3d8b X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328); SRVR:BY5PR03MB5249; X-MS-TrafficTypeDiagnostic: BY5PR03MB5249: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2512; X-Forefront-PRVS: 012349AD1C X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: 7rJeujk6zBPRcjltFCHBvf60uajW1h1y6aNBpfYwTNc3tJ8E4prHLpq7S38DyXOi5E0aca5nI2FQO6RiDpo6uLq8sqhOqfNClvdgw/p3jQ/3iiwtvvKi9GHSFWahEoUpMbDOEkQbQeR9/irnF1b5s3y2FEjvTPWcp2L0g8T74difCrnH+tYZcOg5hTTT0d2MtZKbIGywaMZyCH79JUDzp1ExKrKFqbVwZyQ/WaRj2lKei3mHYeOZoN/tebbQqyms9C8tyTRz656EEoP2Waia65jyB2raKVO5IukhptgBjQX0afxRU+9u9DcmlZ9SUBx7Y0zVkhF8ASAqsMTx3JwISGbOb4E8fmxufRoRaYDCh+EYcv37MiProdkQnrw/K8MKyZaC2LxVBCoq9m30toWoVeUvqZMZxe+j8BEIg2IcFMU= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2019 12:30:46.9820 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a47065ec-8517-4584-a2ce-08d71bfc3d8b 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.57]; Helo=[nwd2mta2.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR03MB5249 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-08_06:, , 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=912 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908080130 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 Reviewed-by: Andrew Lunn --- 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 9169d6c08383..62c1268e55f7 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -5,11 +5,13 @@ * Copyright 2019 Analog Devices Inc. */ #include +#include #include #include #include #include #include +#include #define PHY_ID_ADIN1200 0x0283bc20 #define PHY_ID_ADIN1300 0x0283bc30 @@ -34,15 +36,83 @@ #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) +/* RGMII internal delay settings for rx and tx for ADIN1300 */ +#define ADIN1300_RGMII_1_60_NS 0x0001 +#define ADIN1300_RGMII_1_80_NS 0x0002 +#define ADIN1300_RGMII_2_00_NS 0x0000 +#define ADIN1300_RGMII_2_20_NS 0x0006 +#define ADIN1300_RGMII_2_40_NS 0x0007 + #define ADIN1300_GE_RMII_CFG_REG 0xff24 #define ADIN1300_GE_RMII_EN BIT(0) +/** + * struct adin_cfg_reg_map - map a config value to aregister value + * @cfg value in device configuration + * @reg value in the register + */ +struct adin_cfg_reg_map { + int cfg; + int reg; +}; + +static const struct adin_cfg_reg_map adin_rgmii_delays[] = { + { 1600, ADIN1300_RGMII_1_60_NS }, + { 1800, ADIN1300_RGMII_1_80_NS }, + { 2000, ADIN1300_RGMII_2_00_NS }, + { 2200, ADIN1300_RGMII_2_20_NS }, + { 2400, ADIN1300_RGMII_2_40_NS }, + { }, +}; + +static int adin_lookup_reg_value(const struct adin_cfg_reg_map *tbl, int cfg) +{ + size_t i; + + for (i = 0; tbl[i].cfg; i++) { + if (tbl[i].cfg == cfg) + return tbl[i].reg; + } + + return -EINVAL; +} + +static u32 adin_get_reg_value(struct phy_device *phydev, + const char *prop_name, + const struct adin_cfg_reg_map *tbl, + u32 dflt) +{ + struct device *dev = &phydev->mdio.dev; + u32 val; + int rc; + + if (device_property_read_u32(dev, prop_name, &val)) + return dflt; + + rc = adin_lookup_reg_value(tbl, val); + if (rc < 0) { + phydev_warn(phydev, + "Unsupported value %u for %s using default (%u)\n", + val, prop_name, dflt); + return dflt; + } + + return rc; +} + static int adin_config_rgmii_mode(struct phy_device *phydev) { + u32 val; int reg; if (!phy_interface_is_rgmii(phydev)) @@ -59,6 +129,12 @@ static int adin_config_rgmii_mode(struct phy_device *phydev) if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID || phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) { reg |= ADIN1300_GE_RGMII_RXID_EN; + + val = adin_get_reg_value(phydev, "adi,rx-internal-delay-ps", + adin_rgmii_delays, + ADIN1300_RGMII_2_00_NS); + reg &= ~ADIN1300_GE_RGMII_RX_MSK; + reg |= ADIN1300_GE_RGMII_RX_SEL(val); } else { reg &= ~ADIN1300_GE_RGMII_RXID_EN; } @@ -66,6 +142,12 @@ static int adin_config_rgmii_mode(struct phy_device *phydev) if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID || phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID) { reg |= ADIN1300_GE_RGMII_TXID_EN; + + val = adin_get_reg_value(phydev, "adi,tx-internal-delay-ps", + adin_rgmii_delays, + ADIN1300_RGMII_2_00_NS); + reg &= ~ADIN1300_GE_RGMII_GTX_MSK; + reg |= ADIN1300_GE_RGMII_GTX_SEL(val); } else { reg &= ~ADIN1300_GE_RGMII_TXID_EN; } From patchwork Thu Aug 8 12:30:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1143989 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="GT+f0L0Q"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46476J0WRwz9sP3 for ; Thu, 8 Aug 2019 22:31:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403867AbfHHMbv (ORCPT ); Thu, 8 Aug 2019 08:31:51 -0400 Received: from mx0b-00128a01.pphosted.com ([148.163.139.77]:25972 "EHLO mx0b-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727649AbfHHMa6 (ORCPT ); Thu, 8 Aug 2019 08:30:58 -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 x78CSGhT002639; Thu, 8 Aug 2019 08:30:52 -0400 Received: from nam04-sn1-obe.outbound.protection.outlook.com (mail-sn1nam04lp2050.outbound.protection.outlook.com [104.47.44.50]) by mx0b-00128a01.pphosted.com with ESMTP id 2u7wxfkv4q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 08 Aug 2019 08:30:52 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H137CVY5jHaVMSm+iaXStYawCqcpmpq7BVgIdIVW8iGyVAuYAUIFy9f2MYzNt5HJPe8HRZbdW69m45t1btF/K+jyd3sjZmfiHiO7uPjcVWJb8feppkuSNoI+OGTclkXkzKkaZJJzAqzqbj81pZASVQSki7PE88BucYiTNdZIxzmOQb5DDsW4Wk7wuLXWVbrcYFGLWfokX08hNeNCCGkVs89VCsAehBHcx11EnIP53J9eVs+B4COw0Ehi47SpSD9ATBhfrjnIhRutyknjCXc0iFeYa9CXSHWm6p7txD1BcKTncLKeph9TAbgE7R9tDPGC3suelkWEOcomtsTKE5BcrQ== 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=lo87MbwsScP4O3fIARcBRherYlw2H1yF42su7ZJiLy0=; b=OFac1LWMfbXZFpvZkZzrkNw8Vm7HJDaNHRhm3IVFMHj5e1E/CQSngoVVfQaNdqUkS9Ux6tunYXaC3I6fMzPzIkoXAlTTwjiUnaR0IyfpLw0CfhHvPm3yXhHnLQ50ZawqsB91+73qacheIrOCTUWuGjCue9A3RZV9aBL25UfNQNBUUpKY5ICS48ZZWf4XIZXh5RiGp++u2cuo0oBMXazROW5wJzBbkQwVZby0sq0pfJcw+tmolnaoyJnIOhcpqZtCUGdLELMozgh6hW7JSZ+bq2YRoCOdpBxZP7qqkOFf6rDe9pSAj+/CzYoncB+/Owo6BerkeOkeCKWxXJnxXhbWcg== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass (sender ip is 137.71.25.57) 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=lo87MbwsScP4O3fIARcBRherYlw2H1yF42su7ZJiLy0=; b=GT+f0L0QF4RuQwCkxA5LhCw62Us0QCXB2MEU854QytLzrufDhCGfgv5jyIMhsVp2iDzcQunjLAYPgPkRORnYcKbeNRA0cr0yj/g8IF6TdoTD1Cr1cSfaJZS5twp9XSaHoZ6CKVI9SmnSYHQcO4vctyUH9TMezo1lWo0/wttPK5M= Received: from BN3PR03CA0055.namprd03.prod.outlook.com (2a01:111:e400:7a4d::15) by SN6PR03MB3775.namprd03.prod.outlook.com (2603:10b6:805:6a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2115.10; Thu, 8 Aug 2019 12:30:49 +0000 Received: from SN1NAM02FT051.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::203) by BN3PR03CA0055.outlook.office365.com (2a01:111:e400:7a4d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.15 via Frontend Transport; Thu, 8 Aug 2019 12:30:49 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.57 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.57; helo=nwd2mta2.analog.com; Received: from nwd2mta2.analog.com (137.71.25.57) by SN1NAM02FT051.mail.protection.outlook.com (10.152.73.103) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2157.15 via Frontend Transport; Thu, 8 Aug 2019 12:30:48 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta2.analog.com (8.13.8/8.13.8) with ESMTP id x78CUm0K021246 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Thu, 8 Aug 2019 05:30:48 -0700 Received: from saturn.ad.analog.com (10.48.65.113) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Thu, 8 Aug 2019 08:30:47 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH v2 08/15] net: phy: adin: make RMII fifo depth configurable Date: Thu, 8 Aug 2019 15:30:19 +0300 Message-ID: <20190808123026.17382-9-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190808123026.17382-1-alexandru.ardelean@analog.com> References: <20190808123026.17382-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.57; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(396003)(346002)(136003)(376002)(39860400002)(2980300002)(189003)(199004)(446003)(426003)(11346002)(70206006)(2616005)(186003)(126002)(1076003)(5660300002)(476003)(336012)(2870700001)(86362001)(7636002)(356004)(70586007)(6666004)(486006)(246002)(2906002)(36756003)(2201001)(305945005)(54906003)(47776003)(50466002)(26005)(48376002)(8936002)(44832011)(478600001)(76176011)(50226002)(8676002)(51416003)(316002)(106002)(110136005)(7696005)(4326008)(107886003); DIR:OUT; SFP:1101; SCL:1; SRVR:SN6PR03MB3775; H:nwd2mta2.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail11.analog.com; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d20b014f-3978-4bb3-d86b-08d71bfc3eb0 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328); SRVR:SN6PR03MB3775; X-MS-TrafficTypeDiagnostic: SN6PR03MB3775: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-Forefront-PRVS: 012349AD1C X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: 2FEzn/lrj/vih2/nwuoPDgL51zb84ubGJ0il4pciiVBC3X8ZCaDF7duQ0ZzKcOBVpBG1yR7H3bX2TBKCfp6Hlif5Lz60jnj305PvdO6elxiOX2/HcB+IzyFnzpTPVheLTi/1DQ3zs5IgoFUdQFKwSygbk2tZuPOCC6pGrUStfwGELVJMSRPW8Emade+ZYu/lfhibaQgtzJXpKkxkAS9aJgqEeiD6O5TGRC5y6ty/r5C8/GByxKs1D24dNrMhoRl6uazPXz9p7RLu6L0DxEWByS9Fwn3DWtWfF/PgGcI7yScHGEWQM58Jyg84V0SvPQhVffDd2F0MVSewtwAirZfwcDXWz7rP/T8mt32G55fbL/S6qQehFOC0hyyqwcC+uOeD4dCAWc/tg4aWTLczFqAzQffDAbjmeXB/0+CvZupnqAM= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2019 12:30:48.8986 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d20b014f-3978-4bb3-d86b-08d71bfc3eb0 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.57]; Helo=[nwd2mta2.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR03MB3775 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-08_06:, , 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=724 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908080130 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 Reviewed-by: Andrew Lunn --- drivers/net/phy/adin.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c index 62c1268e55f7..26b2f2b21596 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -54,8 +54,19 @@ #define ADIN1300_RGMII_2_40_NS 0x0007 #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) +/* RMII fifo depth values */ +#define ADIN1300_RMII_4_BITS 0x0000 +#define ADIN1300_RMII_8_BITS 0x0001 +#define ADIN1300_RMII_12_BITS 0x0002 +#define ADIN1300_RMII_16_BITS 0x0003 +#define ADIN1300_RMII_20_BITS 0x0004 +#define ADIN1300_RMII_24_BITS 0x0005 + /** * struct adin_cfg_reg_map - map a config value to aregister value * @cfg value in device configuration @@ -75,6 +86,16 @@ static const struct adin_cfg_reg_map adin_rgmii_delays[] = { { }, }; +static const struct adin_cfg_reg_map adin_rmii_fifo_depths[] = { + { 4, ADIN1300_RMII_4_BITS }, + { 8, ADIN1300_RMII_8_BITS }, + { 12, ADIN1300_RMII_12_BITS }, + { 16, ADIN1300_RMII_16_BITS }, + { 20, ADIN1300_RMII_20_BITS }, + { 24, ADIN1300_RMII_24_BITS }, + { }, +}; + static int adin_lookup_reg_value(const struct adin_cfg_reg_map *tbl, int cfg) { size_t i; @@ -158,6 +179,7 @@ static int adin_config_rgmii_mode(struct phy_device *phydev) static int adin_config_rmii_mode(struct phy_device *phydev) { + u32 val; int reg; if (phydev->interface != PHY_INTERFACE_MODE_RMII) @@ -171,6 +193,13 @@ static int adin_config_rmii_mode(struct phy_device *phydev) reg |= ADIN1300_GE_RMII_EN; + val = adin_get_reg_value(phydev, "adi,fifo-depth-bits", + adin_rmii_fifo_depths, + ADIN1300_RMII_8_BITS); + + reg &= ~ADIN1300_GE_RMII_FIFO_DEPTH_MSK; + reg |= ADIN1300_GE_RMII_FIFO_DEPTH_SEL(val); + return phy_write_mmd(phydev, MDIO_MMD_VEND1, ADIN1300_GE_RMII_CFG_REG, reg); } From patchwork Thu Aug 8 12:30:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1143988 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="PsR24czZ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46476C29VMz9sP3 for ; Thu, 8 Aug 2019 22:31:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403845AbfHHMbn (ORCPT ); Thu, 8 Aug 2019 08:31:43 -0400 Received: from mx0b-00128a01.pphosted.com ([148.163.139.77]:28458 "EHLO mx0b-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732442AbfHHMbA (ORCPT ); Thu, 8 Aug 2019 08:31:00 -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 x78CRjCk030249; Thu, 8 Aug 2019 08:30:54 -0400 Received: from nam03-dm3-obe.outbound.protection.outlook.com (mail-dm3nam03lp2058.outbound.protection.outlook.com [104.47.41.58]) by mx0b-00128a01.pphosted.com with ESMTP id 2u8bmphap6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 08 Aug 2019 08:30:54 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RgDIrS+haDPahuuH4AvUvtgwWaQoT5uQd7f7iEmfxd/BqePbXFUdolenuOTLA9V1zfPAyfv+RLG6IHlQ2lOTY+WMvqlYbYMw+A+JrWRuLzqTcaOoJ87T8qYyzXuW1bf+09B+75mf1DijtiyySVzGHPoUjVH22/SaR00JEuPIZvZ+CuoedcniutK6vLLqe2QrfFpbmDxYFDU3Aw+NZbu8hppPltEYq0ZyayzGYbHbbUBDHlhBf+x27+5CoYuO7/6+e1nlj32x+eUrIye6F5qm3sU23lJCDdhCczz5NiOiQLuIIpYQ/zEF6snJJJL3DnENTv+AXAqugn7fveLAJQXOeg== 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=RBW+W35TuglpVYET/nhDHKJGYGIeKNpkLvcYKm2SLWE=; b=nBY6dyZdkjOM147pG8UvKA3a0MBHGKyUWOwU/XSAoH3iBdQ3iWTQAwquu7Ep+tRIaWPb/YreAKn01yfS5ju1CDf3ZV1HK1oi1g9MnwaESpACxW0yfaOeSK0vzWOnJXrVyMCubmmQyzkCONkhXwfOZgFWPQtlr68tJ9GGZY9kBzPcg0OUEy7Y1a5f5Lq0ylcYsd3CtQIL7qbx3hP6P9U6tC5E8zifQC0PoMoyVPsQzDvCikRQjggaQI0SnpGCqUnZ1BzCgiXIS/bbZaMLBGtOOZxfo0cHHNO2thVVckuxn3ejkEIkobno08OFTgpM/3fohjNEkroxStWeQ9j7aYMExA== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass (sender ip is 137.71.25.57) 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=RBW+W35TuglpVYET/nhDHKJGYGIeKNpkLvcYKm2SLWE=; b=PsR24czZ/u0FPj4xYxScamaHSYinhirgaMCTdCsEXfXKBDRUyen/tYIkZecOumSyAuTz+OiMUzUYo4sbH18Q2prT7UOgECofNjniR93wo04dUUM6W5BloCz109iRLcPry0FIJhZux4bYEBwwts2w1Tsy3abFtqt3zOWdmoxzWb0= Received: from BYAPR03CA0032.namprd03.prod.outlook.com (2603:10b6:a02:a8::45) by BYAPR03MB3653.namprd03.prod.outlook.com (2603:10b6:a02:ab::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.16; Thu, 8 Aug 2019 12:30:51 +0000 Received: from CY1NAM02FT047.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::205) by BYAPR03CA0032.outlook.office365.com (2603:10b6:a02:a8::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.16 via Frontend Transport; Thu, 8 Aug 2019 12:30:51 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.57 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.57; helo=nwd2mta2.analog.com; Received: from nwd2mta2.analog.com (137.71.25.57) by CY1NAM02FT047.mail.protection.outlook.com (10.152.74.177) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2157.15 via Frontend Transport; Thu, 8 Aug 2019 12:30:50 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta2.analog.com (8.13.8/8.13.8) with ESMTP id x78CUoAR021251 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Thu, 8 Aug 2019 05:30:50 -0700 Received: from saturn.ad.analog.com (10.48.65.113) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Thu, 8 Aug 2019 08:30:49 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH v2 09/15] net: phy: adin: add support MDI/MDIX/Auto-MDI selection Date: Thu, 8 Aug 2019 15:30:20 +0300 Message-ID: <20190808123026.17382-10-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190808123026.17382-1-alexandru.ardelean@analog.com> References: <20190808123026.17382-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.57; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(136003)(376002)(346002)(39860400002)(396003)(2980300002)(189003)(199004)(2616005)(50466002)(126002)(4326008)(44832011)(486006)(51416003)(476003)(356004)(426003)(2870700001)(11346002)(14444005)(336012)(76176011)(48376002)(2906002)(7696005)(1076003)(2201001)(47776003)(8676002)(246002)(107886003)(446003)(305945005)(7636002)(6666004)(86362001)(186003)(26005)(106002)(70586007)(50226002)(5660300002)(316002)(110136005)(36756003)(478600001)(54906003)(70206006)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR03MB3653; H:nwd2mta2.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail11.analog.com; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c4b5fdf3-b862-42ea-0b9a-08d71bfc3ff5 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328); SRVR:BYAPR03MB3653; X-MS-TrafficTypeDiagnostic: BYAPR03MB3653: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-Forefront-PRVS: 012349AD1C X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: xv/mMJmJwFFxWvzKgiEsChEHr3azswO1s7l4fiiz4SfIDST8Kp+DLM2I62ZRGuR1Dks2RwNIWBzZXru2oVITk0wy9OgAioninyrLoocXdPAQhyAVATtL2Df6Lgymz7Q8Q32e2nGG+KhaKkRXo+vkEcTlZ5a16HKr8y6DXbhjSoyQoUNFLStUUSSqgNqEOPdnjKPaQmaQs5qbhVkPXJauH7P/AGo/i2X/TEn21l02OHbZ81yFtDBC6nhbYLbgO0FVjlUp8+ozDd+mwKVi6iSOutPg7EdM6bDFyBYpPX00YMCws7ZPYM+r6Ck1rCBMQWFsWFMufJAwVPRvgNM73UHskSqCHXaORcXjVG9/yednrFVCHCEsDoVMLZUENPlTwO8PVqP4YpcxhLkhfz/ACeHYejepKdkzfPv5fzVvjXhl26E= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2019 12:30:50.9532 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c4b5fdf3-b862-42ea-0b9a-08d71bfc3ff5 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.57]; Helo=[nwd2mta2.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR03MB3653 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-08_06:, , 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-1908080130 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 26b2f2b21596..69ef53bbecc3 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -19,6 +19,10 @@ #define ADIN1300_MII_EXT_REG_PTR 0x0010 #define ADIN1300_MII_EXT_REG_DATA 0x0011 +#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) @@ -35,6 +39,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) \ @@ -208,6 +215,8 @@ static int adin_config_init(struct phy_device *phydev) { int rc; + phydev->mdix_ctrl = ETH_TP_MDI_AUTO; + rc = genphy_config_init(phydev); if (rc < 0) return rc; @@ -283,13 +292,113 @@ 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_MATCH_MODEL(PHY_ID_ADIN1200), .name = "ADIN1200", .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, .get_features = genphy_read_abilities, .ack_interrupt = adin_phy_ack_intr, .config_intr = adin_phy_config_intr, @@ -302,8 +411,8 @@ static struct phy_driver adin_driver[] = { PHY_ID_MATCH_MODEL(PHY_ID_ADIN1300), .name = "ADIN1300", .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, .get_features = genphy_read_abilities, .ack_interrupt = adin_phy_ack_intr, .config_intr = adin_phy_config_intr, From patchwork Thu Aug 8 12:30:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1143981 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="vVICqg4O"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46475S6ZGrz9sN4 for ; Thu, 8 Aug 2019 22:31:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389842AbfHHMbE (ORCPT ); Thu, 8 Aug 2019 08:31:04 -0400 Received: from mx0b-00128a01.pphosted.com ([148.163.139.77]:29630 "EHLO mx0b-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732452AbfHHMbC (ORCPT ); Thu, 8 Aug 2019 08:31:02 -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 x78CRnfe002129; Thu, 8 Aug 2019 08:30:56 -0400 Received: from nam04-co1-obe.outbound.protection.outlook.com (mail-co1nam04lp2058.outbound.protection.outlook.com [104.47.45.58]) by mx0b-00128a01.pphosted.com with ESMTP id 2u7wxfkv4u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 08 Aug 2019 08:30:55 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZDNUIJochJztbvY8u5X2p7Zft84B5DFFq9p98fCF0xtdGTfJRbctcT/WdvWMm+7PpJu+Daz5qbiYMbGXLGauAm7AR22c5ymCE4OAfa6YGE0tSNGXE5KgzyaRttiQ+SSzHVQbVELbTYfefvWBCIuoGnAAHHawSIcJr+a5mWDt1M+Xba1PXqiC6Bc6FIF/RtscbqfcD3aXaHjXiJq6mmNFxC1PeFFLKuX/lGL/7N8P5dRTvI2QiexbbUzrmfsDoOFyNeN5gWDLcjKy+O8Ez84Edqlr+kHVmN217BtWSQG6gtijoQXFwP35j07E9CDsMLLe1io9uhJ8V4P3SRad2NlU+Q== 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=mzVOdnpFSj+yyTp2i7ivfM+0PyqRHg1Pul/8BTF6W00=; b=RtbdA9/408ZJ8L34aK+KJ9lkOmQlAhBsyP5sd39KrGyhv7OsLa4eU5vOk/u70spKuS/vPNHadntshPSxqsTgzj/h7I+8x2GZz/ob5BCxy1zndqqcYfbqZusy+f3m7Hdxwsl7/h4vAFL6aPply9QmU787Utj7egggoI2bXi9sfyl8vRq9oPts7o7bVCPzVanMwa6+tRPBdbLI8KTb7LzAd5dNMfG24da0JKLft+l9t2wH3dPfY4h5xFAeCR9hmvEFzK3s4BRoX/Rb8Hn9gcwTd/u49UVy6PjtWakRUmZdjyrsuvbnGKjv6DRYsDZwSFgSKicUlQu3a/E7WKEG/brc2Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 137.71.25.57) 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=mzVOdnpFSj+yyTp2i7ivfM+0PyqRHg1Pul/8BTF6W00=; b=vVICqg4OTWzhI3YhAOx1GKY/PPCQVvlf/86JUWfd2L5ezjVWqhKeVl4jrzYXmnF365wPMHmIm08GkwR3qa/IAnq/qJgPwAnOGexJYJp3L4y5RXPuV6mjcKwYnwk35rIFNRh/2w3R+CaLMdmxzynJI0fORWSrIsJ76Syag8Ur97o= Received: from DM6PR03CA0033.namprd03.prod.outlook.com (2603:10b6:5:40::46) by DM6PR03MB5100.namprd03.prod.outlook.com (2603:10b6:5:1e9::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.16; Thu, 8 Aug 2019 12:30:53 +0000 Received: from CY1NAM02FT031.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::207) by DM6PR03CA0033.outlook.office365.com (2603:10b6:5:40::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2157.16 via Frontend Transport; Thu, 8 Aug 2019 12:30:53 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.57 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.57; helo=nwd2mta2.analog.com; Received: from nwd2mta2.analog.com (137.71.25.57) by CY1NAM02FT031.mail.protection.outlook.com (10.152.75.180) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2157.15 via Frontend Transport; Thu, 8 Aug 2019 12:30:52 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta2.analog.com (8.13.8/8.13.8) with ESMTP id x78CUq95021261 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Thu, 8 Aug 2019 05:30:52 -0700 Received: from saturn.ad.analog.com (10.48.65.113) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Thu, 8 Aug 2019 08:30:51 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH v2 10/15] net: phy: adin: add EEE translation layer from Clause 45 to Clause 22 Date: Thu, 8 Aug 2019 15:30:21 +0300 Message-ID: <20190808123026.17382-11-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190808123026.17382-1-alexandru.ardelean@analog.com> References: <20190808123026.17382-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.57; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39860400002)(136003)(376002)(396003)(346002)(2980300002)(199004)(189003)(336012)(14444005)(426003)(44832011)(486006)(186003)(446003)(126002)(476003)(26005)(2616005)(11346002)(50466002)(36756003)(50226002)(2870700001)(1076003)(478600001)(5660300002)(8936002)(2906002)(6666004)(70206006)(356004)(70586007)(48376002)(7636002)(107886003)(76176011)(316002)(51416003)(7696005)(4326008)(110136005)(246002)(47776003)(86362001)(54906003)(8676002)(2201001)(106002)(305945005); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR03MB5100; H:nwd2mta2.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail11.analog.com; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8ad59d7e-5bdc-4c41-427a-08d71bfc4127 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600148)(711020)(4605104)(4709080)(1401327)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328); SRVR:DM6PR03MB5100; X-MS-TrafficTypeDiagnostic: DM6PR03MB5100: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-Forefront-PRVS: 012349AD1C X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: 49dRt+iyqi0RaEe1QbgmKY6GZatIgI0dDaWlnUylH2zOok7yqZFoBYwKV9uAnsf2Urhv03hH5f+D+sbh0xrRl/4E1jmNNahaUaRHKiNhec/W5uAziLPkjb5iFZLwfWTi9sl20SAZzONjZ55gXxs+9X3Lkv/647QpOHOip8hH2z/o2V3D61btlNuoW+dhFjNiC/SLY+lkrCI3S1t12OKoC8rXKJU+fgTgjaJkOyRn7Ci2kdL3cydApeN8vujxEm4z6kriIsGe+QwTOwC7JdcUH6s8s0Tb1X1v8mMyUUulDGSFYHZu19DL8WDYeJoHfGivLvyYylrpdojfryqaZcok2w5rAaPBdITmgRKEWUkQf69dprNnU3DH8NCr9UZb49r4u03qXMGrSzymLKoBW1ZP5hOOtXl6jG0BUeRQ+owDaLA= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2019 12:30:52.9600 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8ad59d7e-5bdc-4c41-427a-08d71bfc4127 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.57]; Helo=[nwd2mta2.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR03MB5100 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-08_06:, , 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-1908080130 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 | 69 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c index 69ef53bbecc3..c1cea1b6bd75 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -42,6 +42,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) \ @@ -103,6 +114,26 @@ static const struct adin_cfg_reg_map adin_rmii_fifo_depths[] = { { }, }; +/** + * struct adin_clause45_mmd_map - map to convert Clause 45 regs to Clause 22 + * @devad device address used in Clause 45 access + * @cl45_regnum register address defined by Clause 45 + * @adin_regnum equivalent register address accessible via Clause 22 + */ +struct adin_clause45_mmd_map { + int devad; + u16 cl45_regnum; + u16 adin_regnum; +}; + +static struct adin_clause45_mmd_map adin_clause45_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_lookup_reg_value(const struct adin_cfg_reg_map *tbl, int cfg) { size_t i; @@ -253,10 +284,33 @@ static int adin_phy_config_intr(struct phy_device *phydev) ADIN1300_INT_MASK_EN); } +static int adin_cl45_to_adin_reg(struct phy_device *phydev, int devad, + u16 cl45_regnum) +{ + struct adin_clause45_mmd_map *m; + int i; + + if (devad == MDIO_MMD_VEND1) + return cl45_regnum; + + for (i = 0; i < ARRAY_SIZE(adin_clause45_mmd_map); i++) { + m = &adin_clause45_mmd_map[i]; + if (m->devad == devad && m->cl45_regnum == cl45_regnum) + return m->adin_regnum; + } + + phydev_err(phydev, + "No translation available for devad: %d reg: %04x\n", + devad, cl45_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) { @@ -265,7 +319,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_cl45_to_adin_reg(phydev, 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; @@ -277,6 +336,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) { @@ -285,7 +345,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_cl45_to_adin_reg(phydev, 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 Thu Aug 8 12:30:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1143987 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="bz2bTKVs"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4647631VH4z9sP9 for ; Thu, 8 Aug 2019 22:31:39 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389892AbfHHMbJ (ORCPT ); Thu, 8 Aug 2019 08:31:09 -0400 Received: from mx0b-00128a01.pphosted.com ([148.163.139.77]:31676 "EHLO mx0b-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389798AbfHHMbE (ORCPT ); Thu, 8 Aug 2019 08:31:04 -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 x78CRscB002141; Thu, 8 Aug 2019 08:30:57 -0400 Received: from nam04-bn3-obe.outbound.protection.outlook.com (mail-bn3nam04lp2054.outbound.protection.outlook.com [104.47.46.54]) by mx0b-00128a01.pphosted.com with ESMTP id 2u7wxfkv4x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 08 Aug 2019 08:30:57 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z4A09v1LsdjI93nIrKJkR1R6dcwHcUbROCBdEiNEVhQWVTSDbHfDQ/Pe5VIoViU56wpVU3bx/rKxEK4q5LYdX1dHUyCfijc2Xd9HefV9valdkcx/1bZnZvT3tQuqWU9DmIU9HiiTwmiBeyiNocxD6+uBrEhk+YOcrAqhihQsfUTO2gWL27ku58y8qsFJVtH+z1ff14i/RZzBQkm29A69zX9MiQ8v2Lky/eU33pM33Z0X9oKoCzdEhNXROMy2sD2N17LArtJiP5qeGelNhcz2VXMNwT6+JqoCw47q1LrkmB6v/OAQ2cSCmxZvqhF6tJl0HMdl9x0tQkv0h1WmXTsOIw== 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=GHPXD4spCXJ5uLs1jP2uoypa0o9tVtiQQM02OQbEPcU=; b=P/jAKc28cOsWOoMzGKIJqiWAwXghG2KXFIrXwwBfRzP49iPn+bT4FnFHICPgPJrIs8ZUz42t4+KTNR/ofoEBcJHHR+bANaJEpFBK9VfxbtCQMdaftoG+eE1CmTLG8XXYYy/RRnh+BghmG32JUNw9JZMlxiMlVfKntDw9lp53kdnKEeaeoHsk8Jjk4FjHc4kjguaYSyc5Cl5wlWRHscM674TTZm3jIubNoozOsF9B84FB8zql/q4eHGutLzOzJeTuaAB1w02Ml3jcZIAdnj8At8xN9dOMUriJwmfnqXiRfXRrzWSrwOIOM/geCuz0G9/CRvo1KKZ9AvALdjb6r6xnmQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 137.71.25.57) 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=GHPXD4spCXJ5uLs1jP2uoypa0o9tVtiQQM02OQbEPcU=; b=bz2bTKVsJWlbPSTw+i+kvjUtTns5Dnlr0wlENe8lSVhgPo/CPmVqPxJAetDViYEEdvzI+BEBIoPtZox5EmgrRXG7nOKXPnK3WXz98vCwTufYhXb7IxyrFVrX+zvWG0iAShmcUl9KTIzxH+MYnKp8nYxr5IhxNig5dF6dXA5qgZI= Received: from BN6PR03CA0012.namprd03.prod.outlook.com (2603:10b6:404:23::22) by MN2PR03MB4895.namprd03.prod.outlook.com (2603:10b6:208:101::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.18; Thu, 8 Aug 2019 12:30:55 +0000 Received: from CY1NAM02FT038.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::202) by BN6PR03CA0012.outlook.office365.com (2603:10b6:404:23::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.14 via Frontend Transport; Thu, 8 Aug 2019 12:30:55 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.57 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.57; helo=nwd2mta2.analog.com; Received: from nwd2mta2.analog.com (137.71.25.57) by CY1NAM02FT038.mail.protection.outlook.com (10.152.74.217) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2157.15 via Frontend Transport; Thu, 8 Aug 2019 12:30:55 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta2.analog.com (8.13.8/8.13.8) with ESMTP id x78CUsJW021273 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Thu, 8 Aug 2019 05:30:54 -0700 Received: from saturn.ad.analog.com (10.48.65.113) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Thu, 8 Aug 2019 08:30:53 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH v2 11/15] net: phy: adin: implement PHY subsystem software reset Date: Thu, 8 Aug 2019 15:30:22 +0300 Message-ID: <20190808123026.17382-12-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190808123026.17382-1-alexandru.ardelean@analog.com> References: <20190808123026.17382-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.57; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(136003)(346002)(396003)(39860400002)(376002)(2980300002)(199004)(189003)(316002)(107886003)(47776003)(486006)(126002)(11346002)(476003)(44832011)(2616005)(426003)(446003)(336012)(2906002)(305945005)(7636002)(2870700001)(246002)(8676002)(50466002)(186003)(6666004)(356004)(86362001)(2201001)(5660300002)(48376002)(1076003)(76176011)(26005)(7696005)(51416003)(110136005)(106002)(54906003)(36756003)(70586007)(70206006)(4326008)(14444005)(8936002)(50226002)(478600001); DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR03MB4895; H:nwd2mta2.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail11.analog.com; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7df3606d-866a-48f7-479e-08d71bfc4262 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328); SRVR:MN2PR03MB4895; X-MS-TrafficTypeDiagnostic: MN2PR03MB4895: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2201; X-Forefront-PRVS: 012349AD1C X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: mNZAOPDz+abW2CBRHPa3g8V9ZypOt59wzbIu6tOC8/suzPZGjo8ZiHAm15ewDHHwMuqPW2NUACSBLjGrhgfDutum1ybugLGeP/UuRyjDfKfqxxMB5Hb8dHZ9T/YVV6HGLqmmfnaVrzQUV9LmEO49Lsg2spkaXciYFz7lBXp1nqvP09tG0gHT8jspRA54GPLWaXudZ+wasXkqbjy0p0J6SJGLL+htfNfEZyNdKQp96T46NylJ6RGn8fgAjQmU3j1SjksquoxI82jNe+ZrUkeKNA7kXeQ1Mz8tnwZ9fjbx8Q6yuPFfTiHfOhoRR8iWxCcIvGX/l7YTqnjuNv7aSLuoYIEU2TrchhtDVAbevrhNzm9MqMLPm4QvbfFAnCCGIxqh3zzlORc3za4+VwmCNz8PZMUjTTLrqMm0g8t34HBorA8= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2019 12:30:55.0215 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7df3606d-866a-48f7-479e-08d71bfc4262 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.57]; Helo=[nwd2mta2.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR03MB4895 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-08_06:, , 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=911 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908080130 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. As it turns out, phylib already supports GPIO reset. In case this is configured, the PHY driver won't do anything. In case it isn't specified the subsystem software reset will kick in. Resetting via GeSftRst or via GPIO is useful when doing a warm reboot, because this will reset the subsystem registers to default values. Signed-off-by: Alexandru Ardelean --- drivers/net/phy/adin.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c index c1cea1b6bd75..f276d692bdee 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -6,6 +6,7 @@ */ #include #include +#include #include #include #include @@ -53,6 +54,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) \ @@ -457,11 +461,49 @@ 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; + + rc = phy_set_bits_mmd(phydev, MDIO_MMD_VEND1, + ADIN1300_GE_SOFT_RESET_REG, + ADIN1300_GE_SOFT_RESET); + 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) +{ + /* If there is a reset GPIO just exit */ + if (!IS_ERR_OR_NULL(phydev->mdio.reset_gpio)) + return 0; + + /* Reset PHY core regs & subsystem regs */ + return adin_subsytem_soft_reset(phydev); +} + +static int adin_probe(struct phy_device *phydev) +{ + return adin_reset(phydev); +} + static struct phy_driver adin_driver[] = { { PHY_ID_MATCH_MODEL(PHY_ID_ADIN1200), .name = "ADIN1200", .config_init = adin_config_init, + .probe = adin_probe, .config_aneg = adin_config_aneg, .read_status = adin_read_status, .get_features = genphy_read_abilities, @@ -476,6 +518,7 @@ static struct phy_driver adin_driver[] = { PHY_ID_MATCH_MODEL(PHY_ID_ADIN1300), .name = "ADIN1300", .config_init = adin_config_init, + .probe = adin_probe, .config_aneg = adin_config_aneg, .read_status = adin_read_status, .get_features = genphy_read_abilities, From patchwork Thu Aug 8 12:30:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1143986 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="nb/KEmTp"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46475z19xkz9sNx for ; Thu, 8 Aug 2019 22:31:35 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389929AbfHHMbK (ORCPT ); Thu, 8 Aug 2019 08:31:10 -0400 Received: from mx0b-00128a01.pphosted.com ([148.163.139.77]:35574 "EHLO mx0b-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732327AbfHHMbH (ORCPT ); Thu, 8 Aug 2019 08:31:07 -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 x78CRlYs002123; Thu, 8 Aug 2019 08:31:00 -0400 Received: from nam04-co1-obe.outbound.protection.outlook.com (mail-co1nam04lp2059.outbound.protection.outlook.com [104.47.45.59]) by mx0b-00128a01.pphosted.com with ESMTP id 2u7wxfkv52-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 08 Aug 2019 08:30:59 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UANfABmB6XWQ/RV462vDnsHAwdNJW3h5SELnWkvG3LG8AZIXYxiTzb5WUx8PZm0ppEAoaQzJpKka7qGErOyyL8viyQkRLL7S5qOfIZplgrBjIEwnQ/zvD9jrvOrLQku68vskTXhjxZNFBqqC0usuVaCwHXO54qP1escBgU9OHxXjPNd+C/aCFPy4kfcbndf3ODdrwKkHKPytFCeS4VA46I3voKctLnC2u/S9MNaUME6NntrmeivYKgktfDrtXhIn/CP70eN6MxEurhzg0LENwJxEegNWIuvsJc1hMCQ1Nh3AHop6v8DInpsXalLXLrGW1QVag79pi5GV1d5OVocTdQ== 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=UnTHv6Q7MqlOozcXUJPCFC2jyIGJGvFV43eNsz0BdEU=; b=A0cR5KG2yxgjlec9hAbsH1pUo4K1Zo0/3Kv7cit7MJ75piQ3s4c/W80xDnA6968ZuUxjpPjcTZFVGfPqz9Wc5IqRLT+s5d9ayeLuPFlO+Bqs6Py3Lsk991NDp0iE5DyoVSOPBDmlDbs1iyC2qjTJzWnGNdKBn6yyEVPvntWUgpt6MPu4lZaeC3KycPlAPCdlHbIGYDFqx29JogZ4TOpId+JCuCgLMeW4lBbtBEGIfeCA38X9+6PhJL4y1KmfgIXehWRhOoDZSX0oI8zAoZKRCNIDnLV1uong2Np4vn86Gz/yIWdAQfBcLMZ7hraXNFQ4eiRQX4gQWfyMvYwcUCp6fA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 137.71.25.57) 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=UnTHv6Q7MqlOozcXUJPCFC2jyIGJGvFV43eNsz0BdEU=; b=nb/KEmTpGho/MyolhoKVyq9ehansmOt+Rh0qOcRA67Yj+HnyyHocLtHBGW4LmjnaPrbOadgdp5sQ1Xt4nUfvhx301lzJKYIJMTTBgNG9A8nx25JxZLB1tir0shpIKYhA6Vm803yz6ZVQfGqkBJ1hqn0UXWBzPi64Tc5Ef6PAQDM= Received: from DM3PR03CA0003.namprd03.prod.outlook.com (2603:10b6:0:50::13) by DM6PR03MB4714.namprd03.prod.outlook.com (2603:10b6:5:181::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.16; Thu, 8 Aug 2019 12:30:58 +0000 Received: from CY1NAM02FT045.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::209) by DM3PR03CA0003.outlook.office365.com (2603:10b6:0:50::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2157.16 via Frontend Transport; Thu, 8 Aug 2019 12:30:58 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.57 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.57; helo=nwd2mta2.analog.com; Received: from nwd2mta2.analog.com (137.71.25.57) by CY1NAM02FT045.mail.protection.outlook.com (10.152.75.111) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2157.15 via Frontend Transport; Thu, 8 Aug 2019 12:30:57 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta2.analog.com (8.13.8/8.13.8) with ESMTP id x78CUuW4021277 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Thu, 8 Aug 2019 05:30:56 -0700 Received: from saturn.ad.analog.com (10.48.65.113) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Thu, 8 Aug 2019 08:30:55 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH v2 12/15] net: phy: adin: implement Energy Detect Powerdown mode Date: Thu, 8 Aug 2019 15:30:23 +0300 Message-ID: <20190808123026.17382-13-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190808123026.17382-1-alexandru.ardelean@analog.com> References: <20190808123026.17382-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.57; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(376002)(39860400002)(396003)(346002)(136003)(2980300002)(199004)(189003)(1076003)(7636002)(76176011)(305945005)(356004)(4326008)(5660300002)(186003)(6666004)(2906002)(8676002)(26005)(478600001)(2870700001)(107886003)(126002)(476003)(54906003)(336012)(316002)(446003)(50226002)(14444005)(8936002)(70586007)(51416003)(110136005)(486006)(44832011)(106002)(48376002)(86362001)(47776003)(11346002)(36756003)(50466002)(426003)(2616005)(70206006)(2201001)(246002)(7696005); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR03MB4714; H:nwd2mta2.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail11.analog.com; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 78bc084e-bc94-4c60-9bb4-08d71bfc43d3 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328); SRVR:DM6PR03MB4714; X-MS-TrafficTypeDiagnostic: DM6PR03MB4714: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3631; X-Forefront-PRVS: 012349AD1C X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: sroe9JKdotZJ4s34SqS8jtUGC7uHjMIfsAKzTKAInqrc3G4L3/ryVF2Jz3qVgfqTzV/trSfXfiFKQxqmHLpCy5DNWNfW33X94uHdlDG09OII/0iliFGTkyUbYidOdlO31I9sZPBVhdyMQIPaMAFGhRNWzvz0rS50iEncwDqbFD6oM+TQzcE913x79oVMpcitQyPtwTzfsn/g4qPy6JmVyH22+3jQBgBuTOKqeRzpKgShlz0RPm+QtpQvPOvBk5i3hVOZ0k5PehrUSg1yUBcgnvB7UuPlqS48JyAmA8+LK/fN/bbS7aQqyWxXZUSoRIUvLnwBCZu3CDteuSbHSoDruz3TyF3+KlqbNrQWhmecMMpef1Rre5PARjEG7tB5mXjkX6cnd6YfdyATi6VEWBcH4pnHuK9OscalfqW27FL9LQ8= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2019 12:30:57.4440 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 78bc084e-bc94-4c60-9bb4-08d71bfc43d3 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.57]; Helo=[nwd2mta2.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR03MB4714 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-08_06:, , 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-1908080130 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 | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c index f276d692bdee..bc4393195de7 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -24,6 +24,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) @@ -138,6 +143,14 @@ static struct adin_clause45_mmd_map adin_clause45_mmd_map[] = { { MDIO_MMD_PCS, MDIO_PCS_EEE_WK_ERR, ADIN1300_LPI_WAKE_ERR_CNT_REG }, }; +/** + * struct adin_priv - ADIN PHY driver private data + * edpd_enabled true if Energy Detect Powerdown mode is enabled + */ +struct adin_priv { + bool edpd_enabled; +}; + static int adin_lookup_reg_value(const struct adin_cfg_reg_map *tbl, int cfg) { size_t i; @@ -246,6 +259,18 @@ static int adin_config_rmii_mode(struct phy_device *phydev) ADIN1300_GE_RMII_CFG_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) { int rc; @@ -264,6 +289,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; + phydev_dbg(phydev, "PHY is using mode '%s'\n", phy_modes(phydev->interface)); @@ -495,6 +524,17 @@ static int adin_reset(struct phy_device *phydev) static int adin_probe(struct phy_device *phydev) { + struct device *dev = &phydev->mdio.dev; + struct adin_priv *priv; + + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + priv->edpd_enabled = + device_property_read_bool(dev, "adi,disable-energy-detect"); + phydev->priv = priv; + return adin_reset(phydev); } From patchwork Thu Aug 8 12:30:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1143982 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="bJ9vLsmS"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46475c5RD5z9sP9 for ; Thu, 8 Aug 2019 22:31:16 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389947AbfHHMbL (ORCPT ); Thu, 8 Aug 2019 08:31:11 -0400 Received: from mx0b-00128a01.pphosted.com ([148.163.139.77]:36608 "EHLO mx0b-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732344AbfHHMbJ (ORCPT ); Thu, 8 Aug 2019 08:31:09 -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 x78CRjCl030249; Thu, 8 Aug 2019 08:31:02 -0400 Received: from nam04-sn1-obe.outbound.protection.outlook.com (mail-sn1nam04lp2054.outbound.protection.outlook.com [104.47.44.54]) by mx0b-00128a01.pphosted.com with ESMTP id 2u8bmphapf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 08 Aug 2019 08:31:02 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AEQLk/J0pBOrwrZHBL3Ceq56xUSUtExzmOJkwEVWHwX12CxQK4J3hUZiVd/Y4s5vuSuELDTXLp5QES71w7Xc11C4mSSIAd7/XBSIumFUMqjZ4305hx3PVFyTR3uSPMUdBryEm4yNCZlNI4v7oKsK38dxIHsZv2ecX3X2PQ545wQRja+K4/x2MHvvMMEmi50mVIuHmG4zV1P+vAirzq8PMhqlY2SPXaHekO6v8jy+DUrct8eq9zCIs8ZeMaH8hPaN4g8lF6LhHTy9mM0I6U2hubJvIJufgjD9kFr2tt/xN1aTcC3aKjc+rEBmXKMGaz3rJJBpWg1faW19fs2W2QizXw== 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=AGklS0X5NtIXondSTFhDwMJLNKtCkT2vazlDJJnHfrs=; b=YiCXu5IWJMgU0F+G58Z9lxtH2EPLF41cvTAX9YKvkWxeIsIDtB/H5cyaojB1/xG3b+HLS3V9Uzc/tkhfZg3oAZFgh1dVisTHaIqCks7z2MTBRKpUvPhA/p2PrdZbu2FByCJan93rI/IqyALWGddPSOv01ukw0/nOO8MjasJq/tHYEILkZa5jAiLAXPM9UqBjm0JUYFKpmkgs2lkhgsI91UVmbKVhRwCRYlPEzQKevEsRdCLIusyRVKscat+4IVI/e/a1//dD5Lpwa5BEjJwLxVQms17GSxqpECocpQPW6zorFx+K80OrEOnN8S7ZJSdesZ8dZR9B9zB3m9D7MKuzcg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 137.71.25.57) 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=AGklS0X5NtIXondSTFhDwMJLNKtCkT2vazlDJJnHfrs=; b=bJ9vLsmSLwBvXsgDx99ccqdncuwnN0b0afkW4wyTOAFa9pL6BnNpVyTSBWLX47LYHHWvvCnm6sVLq/oubyFEMWLUju0oIWD03GKTITzRXxibET7Z1CPOizTTWRGNfa4Rr6LlmTpfA/mluqpjUshB/DblxsDkGl0IbzomuWWLmDI= Received: from BN6PR03CA0080.namprd03.prod.outlook.com (2603:10b6:405:6f::18) by BYAPR03MB3512.namprd03.prod.outlook.com (2603:10b6:a02:aa::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.17; Thu, 8 Aug 2019 12:30:59 +0000 Received: from SN1NAM02FT055.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::207) by BN6PR03CA0080.outlook.office365.com (2603:10b6:405:6f::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2157.18 via Frontend Transport; Thu, 8 Aug 2019 12:30:59 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.57 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.57; helo=nwd2mta2.analog.com; Received: from nwd2mta2.analog.com (137.71.25.57) by SN1NAM02FT055.mail.protection.outlook.com (10.152.72.174) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2157.15 via Frontend Transport; Thu, 8 Aug 2019 12:30:59 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta2.analog.com (8.13.8/8.13.8) with ESMTP id x78CUw7t021292 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Thu, 8 Aug 2019 05:30:58 -0700 Received: from saturn.ad.analog.com (10.48.65.113) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Thu, 8 Aug 2019 08:30:58 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH v2 13/15] net: phy: adin: configure downshift on config_init Date: Thu, 8 Aug 2019 15:30:24 +0300 Message-ID: <20190808123026.17382-14-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190808123026.17382-1-alexandru.ardelean@analog.com> References: <20190808123026.17382-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.57; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(346002)(136003)(39860400002)(376002)(396003)(2980300002)(199004)(189003)(50226002)(54906003)(426003)(36756003)(316002)(2870700001)(110136005)(106002)(2906002)(47776003)(186003)(26005)(486006)(476003)(2616005)(11346002)(126002)(446003)(44832011)(356004)(6666004)(7696005)(51416003)(76176011)(336012)(4326008)(7636002)(1076003)(86362001)(246002)(5660300002)(478600001)(8676002)(2201001)(107886003)(8936002)(48376002)(50466002)(70206006)(70586007)(305945005); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR03MB3512; H:nwd2mta2.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail11.analog.com; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: abd72e0e-6680-4312-1753-08d71bfc44b2 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600148)(711020)(4605104)(4709080)(1401327)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328); SRVR:BYAPR03MB3512; X-MS-TrafficTypeDiagnostic: BYAPR03MB3512: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3826; X-Forefront-PRVS: 012349AD1C X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: yz1BjX3gFI6MEcbwbb0d/a2cSPXM8f5SSBy+WtyUAiOOB8fP2IPgLt/O5qIziKu/Us5npBxIKUHl4YfD//jV31egWKjyG/lhwIzsZVT/HuoYERILneP8ce6+QF4KAqdaHUG8BxnwktrqZmCgHyjt13j/70IHuBuk3oXrwCuolYMOebucmBMh+kFY8DCbzGYJRLLW/FWufp5Bn68P5OKVvjlEBz6lX48d9F08amyu9c8766R401qH3VDHQwH0yELhhw14I6pJxqBwPVWtnUN4BitgQ9bMS2hTCsSFjRI/A/9tOfvHnm1YwDC4IG3u3Baay5aM0lKeIEKuC0wlNiXjDWLNqJUyUCPaPiVhrLS41ow6EiFukSPeGUMfyJlTVcP6L1ckZTD1suOJ+W45DLHb9HZzN7YT/HzJQCdraKVVE/s= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2019 12:30:59.0081 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: abd72e0e-6680-4312-1753-08d71bfc44b2 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.57]; Helo=[nwd2mta2.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR03MB3512 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-08_06:, , 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-1908080130 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. This change enables downshift and configures the number of retries to default 8 (maximum supported value). The change has been adapted from the Marvell PHY driver. Signed-off-by: Alexandru Ardelean --- drivers/net/phy/adin.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c index bc4393195de7..d6d1f5037eb7 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -29,6 +29,18 @@ #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_PHY_CTRL3 0x0017 +#define ADIN1300_LINKING_EN BIT(13) +#define ADIN1300_DOWNSPEED_RETRIES_MSK GENMASK(12, 10) +#define ADIN1300_DOWNSPEED_RETRIES_OFF 10 + #define ADIN1300_INT_MASK_REG 0x0018 #define ADIN1300_INT_MDIO_SYNC_EN BIT(9) #define ADIN1300_INT_ANEG_STAT_CHNG_EN BIT(8) @@ -259,6 +271,29 @@ static int adin_config_rmii_mode(struct phy_device *phydev) ADIN1300_GE_RMII_CFG_REG, reg); } +static int adin_config_down_shift(struct phy_device *phydev, bool enable, + u8 retries) +{ + u16 mask, set; + int rc; + + if (!enable) + return phy_clear_bits(phydev, ADIN1300_PHY_CTRL2, + ADIN1300_DOWNSPEEDS_EN); + + mask = ADIN1300_LINKING_EN | ADIN1300_DOWNSPEED_RETRIES_MSK; + set = (retries << ADIN1300_DOWNSPEED_RETRIES_OFF); + set &= ADIN1300_DOWNSPEED_RETRIES_MSK; + set |= ADIN1300_LINKING_EN; + + rc = phy_modify_changed(phydev, ADIN1300_PHY_CTRL3, mask, set); + if (rc < 0) + return rc; + + return phy_set_bits(phydev, ADIN1300_PHY_CTRL2, + ADIN1300_DOWNSPEEDS_EN); +} + static int adin_config_init_edpd(struct phy_device *phydev) { struct adin_priv *priv = phydev->priv; @@ -289,6 +324,10 @@ static int adin_config_init(struct phy_device *phydev) if (rc < 0) return rc; + rc = adin_config_down_shift(phydev, true, 8); + if (rc < 0) + return rc; + rc = adin_config_init_edpd(phydev); if (rc < 0) return rc; From patchwork Thu Aug 8 12:30:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1143985 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="GTlLLx2b"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46475w45Wnz9sP3 for ; Thu, 8 Aug 2019 22:31:32 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403827AbfHHMb3 (ORCPT ); Thu, 8 Aug 2019 08:31:29 -0400 Received: from mx0a-00128a01.pphosted.com ([148.163.135.77]:4060 "EHLO mx0a-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389924AbfHHMbL (ORCPT ); Thu, 8 Aug 2019 08:31:11 -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 x78CRoBE022494; Thu, 8 Aug 2019 08:31:04 -0400 Received: from nam04-bn3-obe.outbound.protection.outlook.com (mail-bn3nam04lp2058.outbound.protection.outlook.com [104.47.46.58]) by mx0a-00128a01.pphosted.com with ESMTP id 2u7xkj3gwe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 08 Aug 2019 08:31:04 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AX7Yx/nA0MTpQfJA0AFmWdt5p1wDwwkZ/FwTlxAdWb6yv88zzrT+PxZozHjugYZhhMPGlSZSFhfwn0xcDN6rnQrmAvw2xZdzNyKGPChL648AzfHFMS8wkZXWRCjIcCA6LWmwLs5l55UFrTiFKJJyYAmdfkiFww4yxjdEomA4/YRMfDmQ5/MtN93+MVUbhMPvbdKcsiLIR5WOeNoB/woYkeCTMf8JaI5Zu0oPVNWGVmep66po1fzm+Y6HaAtZkwJP9qA+yjW9yBwjNsH1jzx1jNDoNIyIDS765cMSIQqrysEbm0RTSJEFlTAdo3LDeLmq29US1EaE/UPUifx4F/tS2A== 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=SMV1Twb2t7GaH/tlSWpRt1C4iRpG1S/d3wJmfiVny88=; b=MwNO8ZaXv5gcJd6rZ9BpEK1IzSe3ciQQjU/Q2Vxo5Lh/fQvHMwvyPyQdj7cneE5lsrH4Q37y2umRRJIFJ86iPGxVy/CWgVQc4JiyOx7xWlXuRfZucnPS6BVPFs7j9TooFeW7atydx6ATnJYl0CL9SsnFymQ5KCfh5F/QFMqv6vs6IAYm93zIUlH16HT/0NgKFHwXEaMaxORDnNC8FsQsyweAWKgTtg7bCHmd0p8Lzdg+eBvRV1VUV4MfvRYCjITcKQyuWDs4R62DIWQue4l9aO7JOgDsAxDtOBHF6Q1sQPOc+4N/z7b0p269NXqrrT17ddoTiyQqWP3Bb7/iyQWngw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 137.71.25.57) 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=SMV1Twb2t7GaH/tlSWpRt1C4iRpG1S/d3wJmfiVny88=; b=GTlLLx2bv+3HEu5fXtLcDFsrmifbXfUC76I7XPf+j1CSHUTiQU9QnQFiXbZWwAPdmHQYxVt1LUVr6smg+VQZEYwza+SfEXzRLbKqnwbmKhMcwOS93hjBlB1NHq+8P0rRND0Y5YzwSrq0izRD4NmErT//gcYkiWd6h1ZYmZjOBDc= Received: from MWHPR03CA0044.namprd03.prod.outlook.com (2603:10b6:301:3b::33) by BY5PR03MB5046.namprd03.prod.outlook.com (2603:10b6:a03:1ec::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.18; Thu, 8 Aug 2019 12:31:02 +0000 Received: from SN1NAM02FT048.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::201) by MWHPR03CA0044.outlook.office365.com (2603:10b6:301:3b::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.14 via Frontend Transport; Thu, 8 Aug 2019 12:31:01 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.57 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.57; helo=nwd2mta2.analog.com; Received: from nwd2mta2.analog.com (137.71.25.57) by SN1NAM02FT048.mail.protection.outlook.com (10.152.72.202) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2157.15 via Frontend Transport; Thu, 8 Aug 2019 12:31:01 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta2.analog.com (8.13.8/8.13.8) with ESMTP id x78CV0HV021300 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Thu, 8 Aug 2019 05:31:00 -0700 Received: from saturn.ad.analog.com (10.48.65.113) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Thu, 8 Aug 2019 08:31:00 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH v2 14/15] net: phy: adin: add ethtool get_stats support Date: Thu, 8 Aug 2019 15:30:25 +0300 Message-ID: <20190808123026.17382-15-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190808123026.17382-1-alexandru.ardelean@analog.com> References: <20190808123026.17382-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.57; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(346002)(39860400002)(376002)(396003)(136003)(2980300002)(189003)(199004)(76176011)(5660300002)(50226002)(110136005)(47776003)(70206006)(106002)(54906003)(8676002)(1076003)(7696005)(2906002)(8936002)(2870700001)(26005)(51416003)(107886003)(336012)(246002)(305945005)(7636002)(4326008)(11346002)(446003)(186003)(70586007)(426003)(2201001)(486006)(476003)(2616005)(126002)(316002)(44832011)(48376002)(50466002)(6666004)(36756003)(14444005)(478600001)(86362001)(356004); DIR:OUT; SFP:1101; SCL:1; SRVR:BY5PR03MB5046; H:nwd2mta2.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail11.analog.com; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0ea90495-755f-4008-c538-08d71bfc45e7 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328); SRVR:BY5PR03MB5046; X-MS-TrafficTypeDiagnostic: BY5PR03MB5046: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-Forefront-PRVS: 012349AD1C X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: 2DXIDzVxUxN+U8hnkkxYkqtFJnh5MTShmC4VvymwIDZj7NI6Qi/CVD4k6kHPCEApG1NvyEJgt/LfPkbmG6y/VNvRfBmg4re1tfZOPaoKPELhofOOeKZX3ypO9xM4M7M2Y4yP+4FFf4pP708TBddS5jFnYl+LIkbhfc601xV4qMX7OkgmUiPMfFjE1uaAbi17QNxB4ld1+sTO9UyfHuDT8LaEx92TLe24+OeMQPcxiptevr2JpyD/L6W3YlvVlmRz3Vm57VGUE1H/QVrazGb5sXX73u/Dgyjm2fN9UivoN1BScRI1kSMSDyukitljsjm3p4BtY/p3sBev4+wU5v32/QBvyzx0ezvMQdsgSvLvt+tDHcUjlWHG470Kr5HbNp38tpUWvHKGAk5w5MZTb2J6XE3yB6Y2xCVN1Z7lrqphc4M= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2019 12:31:01.0266 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0ea90495-755f-4008-c538-08d71bfc45e7 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.57]; Helo=[nwd2mta2.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR03MB5046 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-08_06:, , 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-1908080130 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 accumulated. 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 | 109 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c index d6d1f5037eb7..d170d1e837b5 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -155,12 +155,40 @@ static struct adin_clause45_mmd_map adin_clause45_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_accumulate; +}; + +/* 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 * edpd_enabled true if Energy Detect Powerdown mode is enabled + * stats statistic counters for the PHY */ struct adin_priv { bool edpd_enabled; + u64 stats[ARRAY_SIZE(adin_hw_stats)]; }; static int adin_lookup_reg_value(const struct adin_cfg_reg_map *tbl, int cfg) @@ -561,6 +589,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++) { + strlcpy(&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_accumulate) + 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; @@ -588,6 +691,9 @@ static struct phy_driver adin_driver[] = { .get_features = genphy_read_abilities, .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, @@ -603,6 +709,9 @@ static struct phy_driver adin_driver[] = { .get_features = genphy_read_abilities, .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 Thu Aug 8 12:30:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 1143983 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="AM/0mTSH"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46475n2zwyz9sP3 for ; Thu, 8 Aug 2019 22:31:25 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403801AbfHHMbT (ORCPT ); Thu, 8 Aug 2019 08:31:19 -0400 Received: from mx0b-00128a01.pphosted.com ([148.163.139.77]:40366 "EHLO mx0b-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389951AbfHHMbM (ORCPT ); Thu, 8 Aug 2019 08:31:12 -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 x78CSGhX002639; Thu, 8 Aug 2019 08:31:06 -0400 Received: from nam02-cy1-obe.outbound.protection.outlook.com (mail-cys01nam02lp2053.outbound.protection.outlook.com [104.47.37.53]) by mx0b-00128a01.pphosted.com with ESMTP id 2u7wxfkv57-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 08 Aug 2019 08:31:06 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jWmiOvfD65nIHOGL8QK53Pi9aXlQGKn9/+dJE1gPfBHrUqe/X199MzPLhZKMcn+pweZNKN4Tq2oiYfrBbNwLrmiiYzzshi/Iog457W0oA4OTn5u+ztiG8dBcDJRbI4oxoVwpJboRPNsdMX8XpVEG2ho+RqpBxfR+8J4Q95SHC8JIIyUSulAKJEmqhLzQhBzGPzMYSIKRGdq4SuHhJRByc4pXi02E9cywVGn4HDkLDHpPUyDLn5T03V+MWRCjC+zMVUTfZB0oXB+gyNId/kOlY1m4BkDfd6MGfIl/NYPXPprk/25g2rbeGrxZQHqot/t/yf38B8CcOZqUjBTCc8S8jA== 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=5cyzasWJU2lbaumPe8bDNVinZB/VicHNBvMUkNPRNEM=; b=gthAVtKt4Z2es19jGFl64vRtdPS6mtaeUIVxT405UCLyhB+EIgfbAFADrcEC0ycjrDo77vhIzi8DUwU2+lbuBW/Sk5t3OGY1hyofQlSli/Z7A+M1wssaSwVrVSTRuOFm7wL8lx9S7Ffv02ELWTlfmKJZYRuzJulYZoDOvdkzuWGfNVevrEKWKhAdDsaDn/ybz9M2b9JOnkS1Q98yLpNrgj50O2/kmz/QMwgVyE76BoNel0Iwb1/bg/FTeu7J88nQq3J9BkwVLZkmkdG8C9RHDoOITjLETCPJUxn/Kb4gDgbRLkBr2ovwQBFi/qxQvVbmHTyP/flWMYNNJtigDjiavA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 137.71.25.57) 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=5cyzasWJU2lbaumPe8bDNVinZB/VicHNBvMUkNPRNEM=; b=AM/0mTSHE1YNko6zPZfbEVnFYsLlh6rCm3DkEO7b9IkC1sd18NPTnaRgih2KNj7PnzBrXn8bR29+CugiSg1xUH8cYXTiJmtY6eqNdx3P16FuRpzCLltVPeOCxbQZL2dOckTp3HX8hG+abwH+xSIMdDINrd3FqqQx2tJ6nl2vpBk= Received: from BN3PR03CA0102.namprd03.prod.outlook.com (2603:10b6:400:4::20) by MN2PR03MB5053.namprd03.prod.outlook.com (2603:10b6:208:1ac::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.17; Thu, 8 Aug 2019 12:31:03 +0000 Received: from SN1NAM02FT016.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::208) by BN3PR03CA0102.outlook.office365.com (2603:10b6:400:4::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.16 via Frontend Transport; Thu, 8 Aug 2019 12:31:03 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.57 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.57; helo=nwd2mta2.analog.com; Received: from nwd2mta2.analog.com (137.71.25.57) by SN1NAM02FT016.mail.protection.outlook.com (10.152.72.113) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2157.15 via Frontend Transport; Thu, 8 Aug 2019 12:31:02 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta2.analog.com (8.13.8/8.13.8) with ESMTP id x78CV223021308 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Thu, 8 Aug 2019 05:31:02 -0700 Received: from saturn.ad.analog.com (10.48.65.113) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Thu, 8 Aug 2019 08:31:02 -0400 From: Alexandru Ardelean To: , , CC: , , , , , , Alexandru Ardelean Subject: [PATCH v2 15/15] dt-bindings: net: add bindings for ADIN PHY driver Date: Thu, 8 Aug 2019 15:30:26 +0300 Message-ID: <20190808123026.17382-16-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190808123026.17382-1-alexandru.ardelean@analog.com> References: <20190808123026.17382-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.57; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(346002)(376002)(396003)(39860400002)(136003)(2980300002)(189003)(199004)(26005)(50466002)(2870700001)(2906002)(36756003)(48376002)(47776003)(186003)(478600001)(110136005)(107886003)(4326008)(54906003)(53376002)(6306002)(106002)(14444005)(5660300002)(966005)(336012)(426003)(2616005)(11346002)(70206006)(44832011)(316002)(476003)(126002)(486006)(70586007)(246002)(51416003)(50226002)(1076003)(8676002)(2201001)(7636002)(305945005)(8936002)(6666004)(86362001)(446003)(7696005)(356004)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR03MB5053; H:nwd2mta2.analog.com; FPR:; SPF:Pass; LANG:en; PTR:nwd2mail11.analog.com; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 29d07bd0-abf8-4a6b-7a15-08d71bfc470a X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328); SRVR:MN2PR03MB5053; X-MS-TrafficTypeDiagnostic: MN2PR03MB5053: X-MS-Exchange-PUrlCount: 3 X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4714; X-Forefront-PRVS: 012349AD1C X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: y9nF9kY5BavlaFCD2aKU2P8ij/3KPMf68bGajBS2k0NW4jerNcgLAtlaAizZXMqYvU4SFWgS/01VTsx8vZribF7aFRkF6QwpgEGXYBNYbzIsn108zJoRXJ6JFUdYuPSrQ2y/Xa3rsKfUJB0Sbn/OH66BhiQqpvf96NQQnQd1+claKI87o1QIOhGS+WKzXCRh5wn7vZZbYTTTxZe+sHHRaf9jJUF3Wdz1JFqkjngdbzdKcJ0jnGCq6UpjTNhWovVBsT/Y4B09Fk28RYs+oG24tsF4H1phyO3QqV9L0w/tU5VN9uo7Fp1wB/f48EINPdN3U2kdBOlauxci9kBR4VQz/vXkQM4Qat33GH3CLOXTyz7HEsqf7XHxiXtN+tVATnYRTfbFo4j+5LR6heOR5+VnZPab1Vr/nRcfnJAPHgz5VXc= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2019 12:31:02.9268 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 29d07bd0-abf8-4a6b-7a15-08d71bfc470a 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.57]; Helo=[nwd2mta2.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR03MB5053 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-08_06:, , 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-1908080130 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 | 76 +++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 77 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/adi,adin.yaml diff --git a/Documentation/devicetree/bindings/net/adi,adin.yaml b/Documentation/devicetree/bindings/net/adi,adin.yaml new file mode 100644 index 000000000000..86177c8fe23a --- /dev/null +++ b/Documentation/devicetree/bindings/net/adi,adin.yaml @@ -0,0 +1,76 @@ +# 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 + +allOf: + - $ref: ethernet-phy.yaml# + +properties: + adi,rx-internal-delay-ps: + $ref: /schemas/types.yaml#/definitions/uint32 + description: | + RGMII RX Clock Delay used only when PHY operates in RGMII mode with + internal delay (phy-mode is 'rgmii-id' or 'rgmii-rxid') in pico-seconds. + enum: [ 1600, 1800, 2000, 2200, 2400 ] + default: 2000 + + adi,tx-internal-delay-ps: + $ref: /schemas/types.yaml#/definitions/uint32 + description: | + RGMII TX Clock Delay used only when PHY operates in RGMII mode with + internal delay (phy-mode is 'rgmii-id' or 'rgmii-txid') in pico-seconds. + enum: [ 1600, 1800, 2000, 2200, 2400 ] + default: 2000 + + adi,fifo-depth-bits: + $ref: /schemas/types.yaml#/definitions/uint32 + description: | + When operating in RMII mode, this option configures the FIFO depth. + enum: [ 4, 8, 12, 16, 20, 24 ] + default: 8 + + 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 + +examples: + - | + ethernet { + #address-cells = <1>; + #size-cells = <0>; + + phy-mode = "rgmii-id"; + + ethernet-phy@0 { + reg = <0>; + + adi,rx-internal-delay-ps = <1800>; + adi,tx-internal-delay-ps = <2200>; + }; + }; + - | + ethernet { + #address-cells = <1>; + #size-cells = <0>; + + phy-mode = "rmii"; + + ethernet-phy@1 { + reg = <1>; + + adi,fifo-depth-bits = <16>; + adi,disable-energy-detect; + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS index e8aa8a667864..fd9ab61c2670 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -944,6 +944,7 @@ L: netdev@vger.kernel.org W: http://ez.analog.com/community/linux-device-drivers S: Supported F: drivers/net/phy/adin.c +F: Documentation/devicetree/bindings/net/adi,adin.yaml ANALOG DEVICES INC ADIS DRIVER LIBRARY M: Alexandru Ardelean