From patchwork Thu May 11 12:08:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Katakam, Harini" X-Patchwork-Id: 13237837 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2EF6F817 for ; Thu, 11 May 2023 12:08:44 +0000 (UTC) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2080.outbound.protection.outlook.com [40.107.244.80]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E79F49D5; Thu, 11 May 2023 05:08:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N/OBSda3LM8JRO27iWCaT/bVuys5yLS19ekP7+EZCiOKHJ1Bu67AWZkNUy/wxekUDAuOgNQImkKXXTfj7Q2Z/gS1MblPqjYZmJKAZyqlHbrQ9vtPD6KXPIcqLF8UYreDCzuWWRPwbgk2qC2GZTt67Y5W6a8I8wa4/SYM0iO6ZiA42KOWalHUYxFIifStmIU+QdZgBJ2sv0Atk6+FPYVOcWJaEJQUTkJt+ASipfXjwn8c5YjLoYkDMcc83+1C3rqhQWDD+/lOjdVvLHDuNm0D4e+IGTune9qho9Kd0IE2OJ1n2w9REGksnn8Kjb4HD74D10slgoHv8qCOXXf1DKBEcw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=46gJb/MrXKjLVsjVGk75JIEk+gFskNQca5JHLqmjurA=; b=L+P3P9LrEFASh6Azt3Qq/laDXpAdollE+llPV7akX3AFDsW8Bvhrld5f6wJ4FAXaIaImWpdAHgl/alc7XMcVg+p5KRf//1BsGUF+MnwGv7Pxf3qFg+d62sw69pvcB/VJfay67i/VDjDQQGlu5/pvOL2OnZbKS1fla8yM0LKU2xpgt+BOHNsB8CxN0/AbfedAgNNpFEIBOG8yTFASTWVPOEqWFFOenp7UrjKPtBnKJuCxfccua+UoUFW3qaf+TYm7ZSxW4WqsFNJxkWFRxVYrRHKSq4kTWfmzaijev60AHSpEgKM8mKP4yd3xL78YRS6dHGeHlvHi43BkR/WX2ZjgOQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=temperror (sender ip is 165.204.84.17) smtp.rcpttodomain=lunn.ch smtp.mailfrom=amd.com; dmarc=temperror action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=46gJb/MrXKjLVsjVGk75JIEk+gFskNQca5JHLqmjurA=; b=KBwUk4Q7NQ+gcLc2BTQ5a7rK19OdfIqk+m7SueUdDjnJsjJowmUcYvEj+mPZn2ZXwJ6nHZ+WnLIQUKNbZzkDLfdXM9HtPikyBAjAb6R/XUVWbrlHvhOzuYSfw4MRa1LUzE6hJ/oTF1aDoTdnUhBWo2I0F0XQwP9amL74o7b6l1o= Received: from MW4PR02CA0014.namprd02.prod.outlook.com (2603:10b6:303:16d::29) by PH7PR12MB9201.namprd12.prod.outlook.com (2603:10b6:510:2e8::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.20; Thu, 11 May 2023 12:08:28 +0000 Received: from CO1NAM11FT049.eop-nam11.prod.protection.outlook.com (2603:10b6:303:16d:cafe::e1) by MW4PR02CA0014.outlook.office365.com (2603:10b6:303:16d::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.22 via Frontend Transport; Thu, 11 May 2023 12:08:27 +0000 X-MS-Exchange-Authentication-Results: spf=temperror (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=temperror action=none header.from=amd.com; Received-SPF: TempError (protection.outlook.com: error in processing during lookup of amd.com: DNS Timeout) Received: from SATLEXMB03.amd.com (165.204.84.17) by CO1NAM11FT049.mail.protection.outlook.com (10.13.175.50) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6387.22 via Frontend Transport; Thu, 11 May 2023 12:08:26 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 11 May 2023 07:08:23 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 11 May 2023 07:08:22 -0500 Received: from xhdharinik40.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2375.34 via Frontend Transport; Thu, 11 May 2023 07:08:18 -0500 From: Harini Katakam To: , , , , , , , , , , CC: , , , , , Subject: [PATCH net-next v3 1/3] phy: mscc: Use PHY_ID_MATCH_VENDOR to minimize PHY ID table Date: Thu, 11 May 2023 17:38:06 +0530 Message-ID: <20230511120808.28646-2-harini.katakam@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230511120808.28646-1-harini.katakam@amd.com> References: <20230511120808.28646-1-harini.katakam@amd.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT049:EE_|PH7PR12MB9201:EE_ X-MS-Office365-Filtering-Correlation-Id: 5f3c1d26-572e-4157-3307-08db52186d0e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Em4M6Vh+Bxs9VGTjir4edthKQc0GYX8RkReUjCw8XDavI3aaGwr1VBxp8p7Fxsic6HfAh/WetMDwnJ+OAfgF9+6MPiTsuNadlZz+dP59obd7ULC6J4eEpKsqAJFU5NykpBdhMqebQsfL/T/avrAl+3LZB1ccB4IGvGuCqjqYjlFpCGG9mwyo+3AKurV+gVwmooG5LzKQa8t8LxG1N/d8UTZbX+Tmyvz+UFlcvQuxeTBh6F0bsBOQDzDPept4ipBDrfMAjzX43jZxs9CKXNvxyzpVX657duih80gkDrQB/uOLRFyH7PB+sO+UpM6KDzWLPGtD6RFf8LVwe3TMpYDYb5VNWvjILOZU83TC2T6cTb1iH5cQCR3hUaejpKoMiawbo5KJ3bFe4Mx9itjeX9i5Xou4HEMwPpyFKcKhGqIIB344XygsruSqXIxhC3sROx0Ju3Y02vAZ1fyQlZ2kmkVg8YProslaCvO8tdYEYSuoX5DChxcmaysGPvNe/VFwVEjKvjIdtmThps3ig+CWsgKs72Xyx+vM8JeScBwWCtPyNKUw/7KRK1veJRDkm3pQyFS3ZOYAsQzqZ8fxVRmrgMK34EGMNgtw9MHFN5leXcNnWHm0w3/81oQn2bCaHmj4y5+VzHOmHKUSYolkpwTXbWTEoxQMIHP/R8Nk4zqdJnUfEEhuOtbM7FMcQ1JqfW8oqUxx8xcMSb7Q+0qpFA4bCWMnRORkXWfR0HDo9rKbsO4LqQYx8KUGHWvypQ6qU1Lr7s0aEC6fH3ulY1daApS5nuFUf4WVFSWHpObWqpR/2hmfp0k= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230028)(4636009)(346002)(396003)(376002)(39860400002)(136003)(451199021)(36840700001)(40470700004)(46966006)(81166007)(41300700001)(186003)(26005)(2906002)(40480700001)(1076003)(5660300002)(40460700003)(44832011)(8936002)(82740400003)(7416002)(110136005)(316002)(54906003)(478600001)(36860700001)(63370400001)(63350400001)(336012)(83380400001)(2616005)(8676002)(47076005)(426003)(36756003)(356005)(86362001)(6666004)(82310400005)(921005)(70206006)(4326008)(70586007)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2023 12:08:26.3834 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5f3c1d26-572e-4157-3307-08db52186d0e X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT049.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9201 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: kuba@kernel.org All the PHY devices variants specified have the same mask and hence can be simplified to one vendor look up for 0x00070400. Any individual config can be identified by PHY_ID_MATCH_EXACT in the respective structure. Signed-off-by: Harini Katakam Reviewed-by: Andrew Lunn --- v3: Correct vendor ID v2: New patch drivers/net/phy/mscc/mscc.h | 1 + drivers/net/phy/mscc/mscc_main.c | 14 +------------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/drivers/net/phy/mscc/mscc.h b/drivers/net/phy/mscc/mscc.h index a50235fdf7d9..9acee8759105 100644 --- a/drivers/net/phy/mscc/mscc.h +++ b/drivers/net/phy/mscc/mscc.h @@ -290,6 +290,7 @@ enum rgmii_clock_delay { #define PHY_ID_VSC8575 0x000707d0 #define PHY_ID_VSC8582 0x000707b0 #define PHY_ID_VSC8584 0x000707c0 +#define PHY_VENDOR_MSCC 0x00070400 #define MSCC_VDDMAC_1500 1500 #define MSCC_VDDMAC_1800 1800 diff --git a/drivers/net/phy/mscc/mscc_main.c b/drivers/net/phy/mscc/mscc_main.c index 62bf99e45af1..91010524e03d 100644 --- a/drivers/net/phy/mscc/mscc_main.c +++ b/drivers/net/phy/mscc/mscc_main.c @@ -2656,19 +2656,7 @@ static struct phy_driver vsc85xx_driver[] = { module_phy_driver(vsc85xx_driver); static struct mdio_device_id __maybe_unused vsc85xx_tbl[] = { - { PHY_ID_VSC8504, 0xfffffff0, }, - { PHY_ID_VSC8514, 0xfffffff0, }, - { PHY_ID_VSC8530, 0xfffffff0, }, - { PHY_ID_VSC8531, 0xfffffff0, }, - { PHY_ID_VSC8540, 0xfffffff0, }, - { PHY_ID_VSC8541, 0xfffffff0, }, - { PHY_ID_VSC8552, 0xfffffff0, }, - { PHY_ID_VSC856X, 0xfffffff0, }, - { PHY_ID_VSC8572, 0xfffffff0, }, - { PHY_ID_VSC8574, 0xfffffff0, }, - { PHY_ID_VSC8575, 0xfffffff0, }, - { PHY_ID_VSC8582, 0xfffffff0, }, - { PHY_ID_VSC8584, 0xfffffff0, }, + { PHY_ID_MATCH_VENDOR(PHY_VENDOR_MSCC) }, { } }; From patchwork Thu May 11 12:08:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Katakam, Harini" X-Patchwork-Id: 13237839 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5C28D65B for ; Thu, 11 May 2023 12:09:08 +0000 (UTC) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2063.outbound.protection.outlook.com [40.107.220.63]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA37B9001; Thu, 11 May 2023 05:08:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LUyqJ89kxPemJ4nRoiWDDMEX4NFM0RSEN13GGP1lOflOneIF/lcHvi4lUR5KxQ5j+ZjMvb8Jr2KUA4AakNkfh+ft6IbLi/XMkFVjhBrqU0wzhxgmRUFeFNTAOV4kovq34eUB4o41bWlK8T4jMZUqqLEznHzXHIeA6bteStbbGxdc0mZEh441uMbpBuGPAoMSTFqAcZ/Nr3lULBpP7erFnume4OQX7GEmz8e31aG78FH/i2kim12CwRSxjbcD0lUZtvpH1MrGjhFwgTDTvsRYlTeqq+rNS72kcbM02nNP/V3RdZu8ap3Hf41BMj7JMEMeQWaxH+hXa9pRl40KT2roTQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=R578/ZAwyPw4Zbv8Rszn4UrKMKi8DO9LSCgUrzUNIAA=; b=XzLN94zPqCiuOCJK9P1Aq0F24w4Aga/4UtWxQn1uW5TBHBfrcX3bV88hWaVkJbGZLScj4/Vlq9sC8hu8gYMnzAO8UyehfSr+FC3dMNXWwDeCw35eGcfxOQj8vc93g7pL+RTi1nVdjk4z4mEye6kYFsxhN40NOCW2XIUZJANxasN/Zo5KzGgUdLE2lFmqBdzh927YdXnMgwOBE8aBx6Jtg/+55zhjY3xT9QYAObn8yiALuHT6DpA7q1L32/tAR1W7p4/wedVSO0asMz+cPIs2kfY/a+ZalYJ5KfEZjCnOfG5NMmcK92J3bI9ngEjBm0n/cpn5WigtR22E2iIPJ6F+bQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lunn.ch smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=R578/ZAwyPw4Zbv8Rszn4UrKMKi8DO9LSCgUrzUNIAA=; b=3li8acMBBXgaZpbXZVG8yD4qCUz74ndQvR7oWBduOqyHiSOn+iAwCaCbfDxdLJU1o8ZGLbcQqXVELLkxZ6FJNKqe37P37oFQWpdtKXeYnKfobaBNK7XmdtzgHOi81d1LyKXayuKrAxsBM3gNyK+pRYsBjF3az38C07b9odzSY4k= Received: from MW4PR02CA0015.namprd02.prod.outlook.com (2603:10b6:303:16d::6) by PH0PR12MB8798.namprd12.prod.outlook.com (2603:10b6:510:28d::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.33; Thu, 11 May 2023 12:08:28 +0000 Received: from CO1NAM11FT049.eop-nam11.prod.protection.outlook.com (2603:10b6:303:16d:cafe::24) by MW4PR02CA0015.outlook.office365.com (2603:10b6:303:16d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.22 via Frontend Transport; Thu, 11 May 2023 12:08:28 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by CO1NAM11FT049.mail.protection.outlook.com (10.13.175.50) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6387.22 via Frontend Transport; Thu, 11 May 2023 12:08:28 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 11 May 2023 07:08:28 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 11 May 2023 07:08:27 -0500 Received: from xhdharinik40.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2375.34 via Frontend Transport; Thu, 11 May 2023 07:08:23 -0500 From: Harini Katakam To: , , , , , , , , , , CC: , , , , , Subject: [PATCH net-next v3 2/3] phy: mscc: Add support for RGMII delay configuration Date: Thu, 11 May 2023 17:38:07 +0530 Message-ID: <20230511120808.28646-3-harini.katakam@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230511120808.28646-1-harini.katakam@amd.com> References: <20230511120808.28646-1-harini.katakam@amd.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT049:EE_|PH0PR12MB8798:EE_ X-MS-Office365-Filtering-Correlation-Id: a5efe008-b101-4362-e359-08db52186e48 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kKHv6GCAGJuU9vebXE3Tlqj2IyCci6qmd1VsbbI3AhuS8trxd2PhQ3yTq5Kf8hs7fZGs/AdIWjx1R/fcQIP9+StnV75Y6BznD4S1KfKarNDF7S8e7JZPaGCNtKnq10OwNvRbBAr3G0ZjM1C+zzPuOSjTUTWUr4OTuHuv2zC33g+AHn+xjkcT0dlJxy08fFqUAO7PpGhaTZKnnllQoonEHXgIt5s37mYqc6SpsZpGRttMSU4aTmA76Z19LzGm58okfgdEvWbdYV15BSER/eeHf2Sm6H0xYxuhZfQ6HUlHinLu7ePmveOf9JED+J32qh4AUw6arJOW/OMndm+2cpTy78Eb0Od3/2Z9UDuDCyluMfgae6D0c9D6TaAItyagcXCTfuZGI7cS5FRJiV3lu6X4EKMMMrT1F9B92O1tII5PArh8ececsPkm3E39thc6FaAkt6byDhVgfUUR40sqDR3ZJ9Ws+/PEaL2YW3YCrL+PbBzBXUJk2gX5it6hFoXNMEvFMUsLvzltKEmclDJoYJaSByjGYCdT6HOV2qwx/PH0wC9mp6UUkRqWTnEY+E4I6/4LN1uK2545hw2ivOLbra6nspumSSCU0JHdmGrYNet3/ygSjILeUxXWnyD8QA2W72GZBmt0cee64uE/Q0F+Ajf9WQCYNwmfe4IcKwsgCZlu4qf9BKnGE0qFS5lAwzFUQMAAimqgRVviK4E9pe7fPSTvpw9nRwFuFolSrsDyqoQaL52IxSj86x3laQymRamIzVqI X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230028)(4636009)(396003)(136003)(39860400002)(376002)(346002)(451199021)(36840700001)(46966006)(40470700004)(478600001)(54906003)(83380400001)(47076005)(426003)(36860700001)(2616005)(336012)(6666004)(86362001)(40480700001)(26005)(1076003)(356005)(82740400003)(316002)(921005)(110136005)(70206006)(4326008)(70586007)(41300700001)(186003)(81166007)(8936002)(7416002)(8676002)(5660300002)(44832011)(40460700003)(2906002)(40140700001)(82310400005)(36756003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2023 12:08:28.4458 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a5efe008-b101-4362-e359-08db52186e48 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT049.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB8798 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: kuba@kernel.org Add support for optional rx/tx-internal-delay-ps from devicetree. - When rx/tx-internal-delay-ps is/are specified, these take priority - When either is absent, 1) use 2ns for respective settings if rgmii-id/rxid/txid is/are present 2) use 0.2ns for respective settings if mode is rgmii Signed-off-by: Harini Katakam --- v3 - Patch split: - Use rx/tx-internal-delay-ps with phy_get_internal_delay - Change RGMII delay selection precedence - Update commit description and subject everywhere to say RGMII delays instead of RGMII tuning. drivers/net/phy/mscc/mscc.h | 2 ++ drivers/net/phy/mscc/mscc_main.c | 35 +++++++++++++++++++++++++------- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/drivers/net/phy/mscc/mscc.h b/drivers/net/phy/mscc/mscc.h index 9acee8759105..ab6c0b7c2136 100644 --- a/drivers/net/phy/mscc/mscc.h +++ b/drivers/net/phy/mscc/mscc.h @@ -374,6 +374,8 @@ struct vsc8531_private { * package. */ unsigned int base_addr; + u32 rx_delay; + u32 tx_delay; #if IS_ENABLED(CONFIG_MACSEC) /* MACsec fields: diff --git a/drivers/net/phy/mscc/mscc_main.c b/drivers/net/phy/mscc/mscc_main.c index 91010524e03d..9e856231e464 100644 --- a/drivers/net/phy/mscc/mscc_main.c +++ b/drivers/net/phy/mscc/mscc_main.c @@ -525,17 +525,14 @@ static int vsc85xx_rgmii_set_skews(struct phy_device *phydev, u32 rgmii_cntl, { u16 rgmii_rx_delay_pos = ffs(rgmii_rx_delay_mask) - 1; u16 rgmii_tx_delay_pos = ffs(rgmii_tx_delay_mask) - 1; + struct vsc8531_private *vsc8531 = phydev->priv; u16 reg_val = 0; int rc; mutex_lock(&phydev->lock); - if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID || - phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) - reg_val |= RGMII_CLK_DELAY_2_0_NS << rgmii_rx_delay_pos; - if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID || - phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) - reg_val |= RGMII_CLK_DELAY_2_0_NS << rgmii_tx_delay_pos; + reg_val |= vsc8531->rx_delay << rgmii_rx_delay_pos; + reg_val |= vsc8531->tx_delay << rgmii_tx_delay_pos; rc = phy_modify_paged(phydev, MSCC_PHY_PAGE_EXTENDED_2, rgmii_cntl, @@ -1808,10 +1805,34 @@ static irqreturn_t vsc8584_handle_interrupt(struct phy_device *phydev) return IRQ_HANDLED; } +static const int vsc8531_internal_delay[] = {200, 800, 1100, 1700, 2000, 2300, + 2600, 3400}; static int vsc85xx_config_init(struct phy_device *phydev) { - int rc, i, phy_id; + int delay_size = ARRAY_SIZE(vsc8531_internal_delay); struct vsc8531_private *vsc8531 = phydev->priv; + struct device *dev = &phydev->mdio.dev; + int rc, i, phy_id; + + vsc8531->rx_delay = phy_get_internal_delay(phydev, dev, &vsc8531_internal_delay[0], + delay_size, true); + if (vsc8531->rx_delay < 0) { + if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID || + phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) + vsc8531->rx_delay = RGMII_CLK_DELAY_2_0_NS; + else + vsc8531->rx_delay = RGMII_CLK_DELAY_0_2_NS; + } + + vsc8531->tx_delay = phy_get_internal_delay(phydev, dev, &vsc8531_internal_delay[0], + delay_size, false); + if (vsc8531->tx_delay < 0) { + if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID || + phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) + vsc8531->rx_delay = RGMII_CLK_DELAY_2_0_NS; + else + vsc8531->rx_delay = RGMII_CLK_DELAY_0_2_NS; + } rc = vsc85xx_default_config(phydev); if (rc) From patchwork Thu May 11 12:08:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Katakam, Harini" X-Patchwork-Id: 13237838 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E4FBB19E54 for ; Thu, 11 May 2023 12:08:45 +0000 (UTC) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2049.outbound.protection.outlook.com [40.107.223.49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B0B330F4; Thu, 11 May 2023 05:08:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C0ujwsmctC/AzaqZ3WK1aCaSF9qFX3Lpp/bN/g7Z7a7X0O2mPii3pXvHphUKcqc6eDdTYaLmju0O8m4JAdDUb/GxPKyzDJrtF+DR2gugzzWPVnlvlD3g1YqrvIpooA2zz63Ph9peld3YTKV65e++zAVRLpgbpFkym/OVXdyMha1idXUKwmLA4Wchi6nhMFKZz8MXCYMrXyf3W2zV4KTMY/mlw3TkD2LlpY7aGsn/uO9LOzJZh84pTzxLoItywXTyrV/WeizkNxdJIzxIrohThftpKDEP1CfpubymBcbQlI7x+nRMSccPDNdWk+ja1HK/5gg1T1I0fLlLtpCPqeWK1w== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=cjFUQItrzTXqsKUOyRwjpzUqpirQmGqgEmJOOvB52Vg=; b=kraSsAR9GIzdbWZRVJ8ymS535DRbfjAADfGM7JSSCR3289jXdEtRjwscRaORl/v/JpfSu1Yfwf97xx2QcBsOYx+D9WRMk/CG6tTc4oC1y50G+g4d9XI5rhMSXYgvBvDx7o/i+ea7ZULOeqf2fo/whyVAzDvSjJ2lV8jh19wgjc4uKyQ3pA80nmCw494ePBk8rAWpbNtwgm+jMZELV2EEWAK65sZz0TTJe4ZTvsqLMZqQ7J7rr50A79jA03KzSHln2QhuY+8AopSKbcCv8viez8Qtely9iXpwLViODURGQ2ibK00nJeyIf9NbSeRxbu6JlcxnD0gwH/cCh0uM26HUYw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lunn.ch smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cjFUQItrzTXqsKUOyRwjpzUqpirQmGqgEmJOOvB52Vg=; b=HZ6b+TeBAeVoJn4ZtvwvgEszjDatIE03A48gpkIlMV29pR05EDHW4yTqXg4yVJ23vTZon0Utq2+Ubk4/C8Eg4AN2dfO0ztYaqF2GC7x4yykiFD3op8yRjHTqk9PVbpq0fluksBNZL1TRf0C8qoPuN7H/7ofWq4R1aOfkRWMc1jM= Received: from MW4PR02CA0009.namprd02.prod.outlook.com (2603:10b6:303:16d::20) by MW3PR12MB4443.namprd12.prod.outlook.com (2603:10b6:303:2d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.20; Thu, 11 May 2023 12:08:35 +0000 Received: from CO1NAM11FT077.eop-nam11.prod.protection.outlook.com (2603:10b6:303:16d:cafe::1c) by MW4PR02CA0009.outlook.office365.com (2603:10b6:303:16d::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.22 via Frontend Transport; Thu, 11 May 2023 12:08:35 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT077.mail.protection.outlook.com (10.13.175.55) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6387.21 via Frontend Transport; Thu, 11 May 2023 12:08:34 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 11 May 2023 07:08:32 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 11 May 2023 07:08:32 -0500 Received: from xhdharinik40.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2375.34 via Frontend Transport; Thu, 11 May 2023 07:08:28 -0500 From: Harini Katakam To: , , , , , , , , , , CC: , , , , , Subject: [PATCH net-next v3 3/3] phy: mscc: Add support for VSC8531_02 Date: Thu, 11 May 2023 17:38:08 +0530 Message-ID: <20230511120808.28646-4-harini.katakam@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230511120808.28646-1-harini.katakam@amd.com> References: <20230511120808.28646-1-harini.katakam@amd.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT077:EE_|MW3PR12MB4443:EE_ X-MS-Office365-Filtering-Correlation-Id: dcbdf84b-bf9b-4690-5d82-08db521871d5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3OY6XvoIVU6jHVAP0sMjXF8d0VumrrnqC0Hsbz7l9+nTXe2MgrlmDJHZTBvUq8ngNT5yjzxiQ/LiBABdLwoM/D1M/J3TLAmLuXqnzBEm6N6AiK9kQAtE8O+O8bVD9IjN/37ppYA3PYuDyHXTwoLHa2DzFPZ2dGT0xAuKJlUYLCJ4cLdi7t65TClk83qKXr2nuJPkAQd6CpNQWQ0SYBkHba4BKGwdwmeNQ7lPwcCCZF+B2ed9uZ4vizol3LXaHOPy8FaA0JB/35qDxmCah39lUWBbr4k4kCsQNijX8tUXNQ7iZM6P9w15IbsR7xD+CSuNK73JgJOaTkZSolnsHWUcyFsSpEFQTYUioGeo3De8XfbrBz7kKqM8o+cy4uG/hJ651h065y3M2afdZ6fFdxCM640DZ0cu2FNzSL7EjmXV+VM4CZIaF/9mUAh9VpM5XE61+1JAfBPPLRiLqFnHCq/GrlhMQ1lE0D0AO+XgG/is+FUuF5LlrXQ+ttQrUY8YSkjfVlroXB2TMLzwuqu8OyoQq/w/saC37BmxAUpl75+rP6079L4PFQmeyvyobl4TtMwCGqdvpcMSQm84+BRkI5lwFIaFpCFYtRfowQCsXJQElKQ80rd/f4UhcyzqW6evtJn5FdiECBgqZWpDVqsUUw7d0i/u6VHpAxTvuywdFT/FF3iBFHATz9Gu33MQyXXI6Mi/HwIg8A1TTQ8w2CGBjf9V9S1x0UAdNsB75T3VENetNlr5xCPvnYRif0Z/2bvYr1p79rW1i8QN3y2ou/r3BpCAoViiWpTsyOXf/mX7ld5oVmI= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230028)(4636009)(346002)(396003)(376002)(39860400002)(136003)(451199021)(36840700001)(40470700004)(46966006)(81166007)(41300700001)(186003)(26005)(2906002)(40480700001)(1076003)(5660300002)(40460700003)(44832011)(8936002)(82740400003)(7416002)(110136005)(316002)(54906003)(478600001)(36860700001)(336012)(83380400001)(2616005)(8676002)(47076005)(426003)(36756003)(356005)(86362001)(6666004)(82310400005)(921005)(70206006)(4326008)(70586007)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2023 12:08:34.3996 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dcbdf84b-bf9b-4690-5d82-08db521871d5 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT077.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4443 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: kuba@kernel.org Add support for VSC8531_02 (Rev 2) device. Use exact PHY ID match. Signed-off-by: Harini Katakam --- v3 - Patch split drivers/net/phy/mscc/mscc.h | 1 + drivers/net/phy/mscc/mscc_main.c | 26 ++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/mscc/mscc.h b/drivers/net/phy/mscc/mscc.h index ab6c0b7c2136..6a0521ff61d2 100644 --- a/drivers/net/phy/mscc/mscc.h +++ b/drivers/net/phy/mscc/mscc.h @@ -281,6 +281,7 @@ enum rgmii_clock_delay { #define PHY_ID_VSC8514 0x00070670 #define PHY_ID_VSC8530 0x00070560 #define PHY_ID_VSC8531 0x00070570 +#define PHY_ID_VSC8531_02 0x00070572 #define PHY_ID_VSC8540 0x00070760 #define PHY_ID_VSC8541 0x00070770 #define PHY_ID_VSC8552 0x000704e0 diff --git a/drivers/net/phy/mscc/mscc_main.c b/drivers/net/phy/mscc/mscc_main.c index 9e856231e464..aa1df69043e5 100644 --- a/drivers/net/phy/mscc/mscc_main.c +++ b/drivers/net/phy/mscc/mscc_main.c @@ -2434,9 +2434,8 @@ static struct phy_driver vsc85xx_driver[] = { .get_stats = &vsc85xx_get_stats, }, { - .phy_id = PHY_ID_VSC8531, + PHY_ID_MATCH_EXACT(PHY_ID_VSC8531), .name = "Microsemi VSC8531", - .phy_id_mask = 0xfffffff0, /* PHY_GBIT_FEATURES */ .soft_reset = &genphy_soft_reset, .config_init = &vsc85xx_config_init, @@ -2457,6 +2456,29 @@ static struct phy_driver vsc85xx_driver[] = { .get_strings = &vsc85xx_get_strings, .get_stats = &vsc85xx_get_stats, }, +{ + PHY_ID_MATCH_EXACT(PHY_ID_VSC8531_02), + .name = "Microsemi VSC8531-02", + /* PHY_GBIT_FEATURES */ + .soft_reset = &genphy_soft_reset, + .config_init = &vsc85xx_config_init, + .config_aneg = &vsc85xx_config_aneg, + .read_status = &vsc85xx_read_status, + .handle_interrupt = vsc85xx_handle_interrupt, + .config_intr = &vsc85xx_config_intr, + .suspend = &genphy_suspend, + .resume = &genphy_resume, + .probe = &vsc85xx_probe, + .set_wol = &vsc85xx_wol_set, + .get_wol = &vsc85xx_wol_get, + .get_tunable = &vsc85xx_get_tunable, + .set_tunable = &vsc85xx_set_tunable, + .read_page = &vsc85xx_phy_read_page, + .write_page = &vsc85xx_phy_write_page, + .get_sset_count = &vsc85xx_get_sset_count, + .get_strings = &vsc85xx_get_strings, + .get_stats = &vsc85xx_get_stats, +}, { .phy_id = PHY_ID_VSC8540, .name = "Microsemi FE VSC8540 SyncE",