From patchwork Fri Apr 12 12:52:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Venkat Kumar Ande X-Patchwork-Id: 139268 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4BBD443E52; Fri, 12 Apr 2024 14:55:36 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C0D0042D87; Fri, 12 Apr 2024 14:54:35 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2046.outbound.protection.outlook.com [40.107.212.46]) by mails.dpdk.org (Postfix) with ESMTP id 76E0041104 for ; Fri, 12 Apr 2024 14:54:30 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=idLUXwSIigbO7ml0OnKyKdxy6LPtt4EhjZyN/4vNYDk9XXXq6N6FJAfNcPiRSFaKBBANZH1EhateTuM9QK3yUBA3UbCY8n7YAQIvzULwUrxiZ85TAQDmu3wKue6lcZ8wHeITwLKpX1V0ntlKKcosCVInWCmvm8uKLD1neiIFR9vraGGFs7j5+b/02RzSb9scy7QU95X/sBmIwx+8CPyo2D4tiN7QBUP8SP92niPssUU+0ShsNMNDIsKzBXE7ekLl8cdPNAe0tUeMTMnVt6y0cmpWRLV+msHp8XAU+KtQsuNu9Tze/SL4B5sYd0m4JJWf970hLnh4U0CQ+qyNqJE0YA== 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=lTVgRb3iFp2sK06q0jpSAERWB6Yq+Bz0Sq5KWTKltPc=; b=DsKO7DIcbYp2W9znAO+P8dl4b6AAbqvZ/Gd7AoxwMFXKTzVq73N3SAiuJunphPLhkKZB7wGhdQ7btl7DeT6F9OWmdHutOw6j5h3XN1JOi2fhFneApuyBKS7y+3HIDUu/e48UcbNKPdd7Iqhad3Ed6QR9e7ptEMTwKEeCH/veJk2JNPEd1ZIRqfr1znl0YD49qCbMI0GrevptA/pww7yS1HaZ+YkpK+WZxm1HrP420FurRc3CwYv1z7NjaDKU3nnzzan2Ka01WQ8dhMdQIQQsKXVz7n845pXSv/W1F1sEdqwnzGCv8rhahIiY7MaT877US3VIXW+8Pg2oNFga2t0hsg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=dpdk.org 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 (0) 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=lTVgRb3iFp2sK06q0jpSAERWB6Yq+Bz0Sq5KWTKltPc=; b=wQlRm6FSV+hv7I1qGNbRqux6DNqHO87wcHNAMJF3dOiV64pWi+Y0Iws/0btC8pCwAPX0VIDCCVVyyoGDk94WkA7OGuJCTKKrUuI8qPXBkFKd23soDhIGFh1fThZaLalFfAhQDQ68+HxDsmC6NY6ObDoKc5R+N2YLOiJGlqGBe3g= Received: from BL0PR05CA0029.namprd05.prod.outlook.com (2603:10b6:208:91::39) by CH3PR12MB8910.namprd12.prod.outlook.com (2603:10b6:610:179::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Fri, 12 Apr 2024 12:54:27 +0000 Received: from BL6PEPF00020E5F.namprd04.prod.outlook.com (2603:10b6:208:91:cafe::b5) by BL0PR05CA0029.outlook.office365.com (2603:10b6:208:91::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7495.12 via Frontend Transport; Fri, 12 Apr 2024 12:54:27 +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 BL6PEPF00020E5F.mail.protection.outlook.com (10.167.249.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7452.22 via Frontend Transport; Fri, 12 Apr 2024 12:54:27 +0000 Received: from cae-Lilac-RMB.amd.com (10.180.168.240) 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.2507.35; Fri, 12 Apr 2024 07:54:20 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande Subject: [PATCH 20/24] net/axgbe: replace mii generic macro for c45 with AXGBE Date: Fri, 12 Apr 2024 08:52:45 -0400 Message-ID: <20240412125249.10625-20-VenkatKumar.Ande@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412125249.10625-1-VenkatKumar.Ande@amd.com> References: <20240412125249.10625-1-VenkatKumar.Ande@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF00020E5F:EE_|CH3PR12MB8910:EE_ X-MS-Office365-Filtering-Correlation-Id: f6efb39f-22c0-434c-6558-08dc5aefafe0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7ucv49sBoCS1fzKJyfQXZKKQyj7oBfKsS0sYct0BMBSMKtd40grP4qbR6G9gGnXG8lPCdoo3QyyqmEs640soB+1NUj8gJrZ1iWQ4pj1m7hr8OFoG7CXgXvHtW4fSsUKwAJyDuc9kfhrim6eDCdFo2uYxVl4m9Oj2GJZH1io0dk/OmB5k1QtwjW06omoDmK7RFcbIiHQIdwInI4ro4URPBhywdwtoUxbmJlW+0mmEnElRgD3iy9ELPvB35z4oggEPEE6w1vUszPgY4te4Auzg0ZooAi25VuMla+/ZMa1FSNOcpA9vGvP7zH593AVyfJJ///P7mGuPO5CDrzv6pxHosPjooSn9d6rtkcZut0D2+TZUI+XbCOXR/FCF4I6ZJHj29XiGOWggxQTb8exkHy93tLVmoV6ttWWpBLCTKZPHk2fzenKgs6llphPIGreEW4gPMsypBeQewy6Sou5O6svyvngM6aIy187u/HzG8cdxxzAHY6axd5AQ7+dYROHzdrrTEFAh99GjbN7wRv2xL61QOkCOFRIzdDr1wkxMDt2YB8W2WXT3vS7enXva/mmgICaxVowHifqHzl9Nn9a5lj8j5qCrmc04jkyZbRO/piVkq38ourdcV8VhTvevMwLiP09+jcXB6Z9QJ5yyOjsp8AaumarfBLqsvFPZxKIjDsOYnAqIYfj15D+LCmppmxYBiGseVamx9RqOzo4vq5B09ohdSGNg4osTWI++TbpL4LaM/bksRTRD3ejVF5LbqPrz5AkW 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:(13230031)(36860700004)(82310400014)(376005)(1800799015); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2024 12:54:27.3701 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f6efb39f-22c0-434c-6558-08dc5aefafe0 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: BL6PEPF00020E5F.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8910 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The axgbe driver reuses MII_ADDR_C45 for its own purpose. The values derived with it are never passed to phylib or a linux MDIO bus driver. In order that MII_ADDR_C45 can be removed, add an AXGBE specific Signed-off-by: Venkat Kumar Ande --- drivers/net/axgbe/axgbe_common.h | 4 ++-- drivers/net/axgbe/axgbe_dev.c | 8 ++++---- drivers/net/axgbe/axgbe_phy.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/axgbe/axgbe_common.h b/drivers/net/axgbe/axgbe_common.h index 51532fb34a..1a43192630 100644 --- a/drivers/net/axgbe/axgbe_common.h +++ b/drivers/net/axgbe/axgbe_common.h @@ -1732,14 +1732,14 @@ do { \ */ #define XMDIO_READ(_pdata, _mmd, _reg) \ ((_pdata)->hw_if.read_mmd_regs((_pdata), 0, \ - MII_ADDR_C45 | ((_mmd) << 16) | ((_reg) & 0xffff))) + AXGBE_ADDR_C45 | ((_mmd) << 16) | ((_reg) & 0xffff))) #define XMDIO_READ_BITS(_pdata, _mmd, _reg, _mask) \ (XMDIO_READ((_pdata), _mmd, _reg) & _mask) #define XMDIO_WRITE(_pdata, _mmd, _reg, _val) \ ((_pdata)->hw_if.write_mmd_regs((_pdata), 0, \ - MII_ADDR_C45 | ((_mmd) << 16) | ((_reg) & 0xffff), (_val))) + AXGBE_ADDR_C45 | ((_mmd) << 16) | ((_reg) & 0xffff), (_val))) #define XMDIO_WRITE_BITS(_pdata, _mmd, _reg, _mask, _val) \ do { \ diff --git a/drivers/net/axgbe/axgbe_dev.c b/drivers/net/axgbe/axgbe_dev.c index fa7324efa7..ebe64295aa 100644 --- a/drivers/net/axgbe/axgbe_dev.c +++ b/drivers/net/axgbe/axgbe_dev.c @@ -207,8 +207,8 @@ static int axgbe_read_mmd_regs_v2(struct axgbe_port *pdata, unsigned int mmd_address, index, offset; int mmd_data; - if (mmd_reg & MII_ADDR_C45) - mmd_address = mmd_reg & ~MII_ADDR_C45; + if (mmd_reg & AXGBE_ADDR_C45) + mmd_address = mmd_reg & ~AXGBE_ADDR_C45; else mmd_address = (pdata->mdio_mmd << 16) | (mmd_reg & 0xffff); @@ -241,8 +241,8 @@ static void axgbe_write_mmd_regs_v2(struct axgbe_port *pdata, { unsigned int mmd_address, index, offset; - if (mmd_reg & MII_ADDR_C45) - mmd_address = mmd_reg & ~MII_ADDR_C45; + if (mmd_reg & AXGBE_ADDR_C45) + mmd_address = mmd_reg & ~AXGBE_ADDR_C45; else mmd_address = (pdata->mdio_mmd << 16) | (mmd_reg & 0xffff); diff --git a/drivers/net/axgbe/axgbe_phy.h b/drivers/net/axgbe/axgbe_phy.h index 5b844e81cd..eee3afc370 100644 --- a/drivers/net/axgbe/axgbe_phy.h +++ b/drivers/net/axgbe/axgbe_phy.h @@ -16,7 +16,7 @@ /* Or MII_ADDR_C45 into regnum for read/write on mii_bus to enable the 21 bit * IEEE 802.3ae clause 45 addressing mode used by 10GIGE phy chips. */ -#define MII_ADDR_C45 (1 << 30) +#define AXGBE_ADDR_C45 (1 << 30) /* Basic mode status register. */ #define BMSR_LSTATUS 0x0004 /* Link status */