From patchwork Wed Mar 12 09:54:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gupta, Suraj" X-Patchwork-Id: 14013266 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8EA87C28B2E for ; Wed, 12 Mar 2025 10:14:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:CC:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=mjlfXpuVTk699j/mSf1lWyI+T5lVEqAAlzV3tMAFGpM=; b=xHRjbXQTgScdX+B3lYSdQhENSY BXn7oDmnLwoKzw4tevP6FJgWskpRn5p3T4Uo6J4YOm6pewvEXLf1QDjl9MkjXcGtm0EYPs8QNGTkH Ijq/Jeq2/gTZOwLyQJqXuSutNt4i7JcdoJd9u+KD2lVTq+KhFLJQUqaVDVVTkPjXQtAPY8siYEEDa AHs4enkijICLMo6LeYI6oHOcOpRuZcVRwzE65Le1lfZyxOnFqXHpdb+CKvQFG4uonp23lXJZEuY73 2iHtYkWfc6WtboIeLjkCM8GT/dpwpz4Vf1qYwey6frwvCy695yZ+RDxushs7dUEstChQD7EYJ3Bez c0z1bbRA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tsJ6I-000000085Bg-1WGi; Wed, 12 Mar 2025 10:14:10 +0000 Received: from mail-dm6nam04on20625.outbound.protection.outlook.com ([2a01:111:f403:2409::625] helo=NAM04-DM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tsJ2U-000000084jR-17ha for linux-arm-kernel@lists.infradead.org; Wed, 12 Mar 2025 10:10:15 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=J35rd2FTXOxtaTMsa7U7d+VzxjFE0JZkljKfq6kXfUJG93IDl4hdakxOjzCGBNDCi1lkW+SjzLSv03fohWyOI951zklIC1FgjhSSORakZdea24QMA9mUL3tDlpLMAvgTCs4KThqDVY7iIHwYAZ0+Yzdh9OjoQcu0YumZ+LlA5KaH2nIEnDimYmKyc3wONJWRsd5p9HQ3XE9UeEdgzN7Ky6MWDa8i1FcBFvuJxx/7toAQh/pJGtiZdNJZVLJyuKRGK0SdOxa3GhuPqRMujezzLzkGTXIhJhIFX7tEJ5oxmrX1y5FcFMUJLvvL8J1tsPa/VK98Rs9kXeRhyx5PVkwtFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=mjlfXpuVTk699j/mSf1lWyI+T5lVEqAAlzV3tMAFGpM=; b=fhNAoR7EOAs7Nn8Pq23YiJMDbL5Mxuonkupnpo3gh/Qm3j8hfqEdepTm/TRmPQ8UsBuBjdQAEdCiGDikDSpPB0uDsLc2dp3YOU0EVl8imuO05ywjqz+KF7hqgzAB0eFfVXxF+LQeNNXgatOB6JwvDmFGbUuBb4cDFhM5q7Qmn5e3PtXyNbpcGgz4pumfQQ/oRVfTRw2aepXwHYISXia5NK1scxeAJmef87IwdmbsvPhEN4AqCzs3hdbTO4E6dNQoRXfPlcfCR2wVampy2VzYiNWzylMOOLj+rzQUHS7s/k5gsYcLKidfwayPyDv+tMJ+ItjdGCKbFpDKsyrUm/S5Ug== 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 (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=mjlfXpuVTk699j/mSf1lWyI+T5lVEqAAlzV3tMAFGpM=; b=aklJtmhKMnzCYNCgIVzKKrp1A2nQaxbaHJLeoJXI5JAG4fA0qzaxS4CDG0zIs41fhN4r2aS2gH4POYYeTvG0EMtaa1DdBicCkovr1FyuATxPS8stVA5eKtHUjfdhpua9i3RGbjWhBE+a5M38JlC3Noy8siatv3lPg+M0x5YM0NQ= Received: from CH0PR03CA0381.namprd03.prod.outlook.com (2603:10b6:610:119::16) by SA3PR12MB8440.namprd12.prod.outlook.com (2603:10b6:806:2f8::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.27; Wed, 12 Mar 2025 09:54:26 +0000 Received: from CH3PEPF00000016.namprd21.prod.outlook.com (2603:10b6:610:119:cafe::85) by CH0PR03CA0381.outlook.office365.com (2603:10b6:610:119::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8534.21 via Frontend Transport; Wed, 12 Mar 2025 09:54:26 +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 CH3PEPF00000016.mail.protection.outlook.com (10.167.244.121) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8558.0 via Frontend Transport; Wed, 12 Mar 2025 09:54:26 +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.2507.39; Wed, 12 Mar 2025 04:54:26 -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.2507.39; Wed, 12 Mar 2025 04:54:24 -0500 Received: from xhdsuragupt40.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Wed, 12 Mar 2025 04:54:21 -0500 From: Suraj Gupta To: , , , , , , , , , CC: , , , , , Subject: [PATCH net-next V2 2/2] net: axienet: Add support for 2500base-X only configuration. Date: Wed, 12 Mar 2025 15:24:11 +0530 Message-ID: <20250312095411.1392379-3-suraj.gupta2@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250312095411.1392379-1-suraj.gupta2@amd.com> References: <20250312095411.1392379-1-suraj.gupta2@amd.com> MIME-Version: 1.0 Received-SPF: None (SATLEXMB05.amd.com: suraj.gupta2@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PEPF00000016:EE_|SA3PR12MB8440:EE_ X-MS-Office365-Filtering-Correlation-Id: a1bb9890-0202-45f9-8983-08dd614be012 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|376014|82310400026|7416014|921020; X-Microsoft-Antispam-Message-Info: PxFAfzCSvrmwLJOAcse0GU1a/YTmP/X7iE8ub/oWNouMMxOvmkFsNXsyCxxTpYpyLVh1riJ7AhMfKqXbbz7grw9dXKJNizPwi9MSV/5xc3mUVYeTKD6DPuoJtIN0sBGijwMC3XZitWXgZg1TdyKwggzUf/dgYaEcfxEyIBCyqLIrzqsqYzJnfsTlAxVx4/W2jX+NbJA/nJWMnPc1xQ9t67NnNyJNsnGJu7VNVEAKeBY43ngdvc93KWawYcpRXjCM3AtpfQFfHsh/n82SJPFarWb7SB0ENrNWcKS4w0wjhU224G/qFZ0t3LDGrk9IvPBtkoKF/tiZ0DuEcRS9UTsF0F0VpHiyKDxYt7DNtunO5XMoc9YjauwG/STkaObMRpltEPRKOcJLtgcPr8lkK/cBn8g2F/3SntJgGEHbTXo0cmr5W4nyyb+hNBWZ1F7CXoSIfVPIO2hEf8NDHxOHUStyjnMYAdPYx7ez4MMNDR7Z9jiw10b0llfRtyOOZ0H7J/lvg9n0e2T590RxT1IRkpNOimFVyEsGHaHTzYpjCwE4u+gr+MA+idH9d6l/uNlW/+Zw8RnYS2xR3jldaqM3+PetP+EPEZdwKB0mb5ilFxY3nFJ2G+9uhqOgeqRlRAED46JGAiTzOb/mEWtso+dIAUUMGyxfczKsYWMIZ4FXgb9+GhyDl6nt0I5FfekHcVFr0rS0NP4ynbT3fwutqIcDBbYLIYcpA5/W3PG44/SV2JYfQT2p62UiQiZ81EJHmDdjVL7nyiE/u1CLQ5LOv2zOYOzVdQsp3dB7fS+r+yHU1RZM+9eGi7/65phgSRRoXnlGi+aZnFQhLr9z+1BSh6gBDxqbthjUYDwWWpwEmM1GF9PbHvhMoZXYuZPseFvTiYAGlZmPSvXZiTXh8qJWsjFjW03SFonQSOZQ2cDmqCkIIu9n3p/6EJuAVY3vuti6jvfiL9O1zSuIjb2mlzIPpx3UxN6ehYOWgROu257kuOeQjOe4OphoCd4fYfuVPouAgF3iSwtLD0WwLa4vaBzYn55lT34ytKIVqQ6On9UE9yu43vBgiircMmEfkf7rZjWFnTQMyMSvCex90BaKE8QBjtg3mSF3EfQ/Saq7Bo+heLPBZg9mvkuIoNKW7j0RfOU0ru6a5UrLKpYRzXU2BalrgeFUQpaUXWroAAGYTc8rBrlajDsQrfPIJ52ykncqjRSAKk9JHRgpuBCOf/z2bHbNb8RhiGAX/PZlG6bo83sSe6hqg/Z2i5Yf1qQJKcUWSekrI3myT7J+37Lb7kfStH8cKZQv5NsGpHVg0eyvOF1V5q9DK0pAKPe0pHM/pDYhDd038R7PsmUBhbSoC0wFDN087xYkvro5eNx8U5HirIQ+MV6N8vVgkFNh1k6ZfKI3eBdk3e7eISq57YMyptOjzpYpwzo7kTHksmnd8sujy6uGty99ODDGzCSWh70BuCs0NPBFt9v7dDwM/9pMLtfV1jrbnE1Log2gW6+a1siKM+WVkkh4AqYjzF0= 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:(13230040)(36860700013)(1800799024)(376014)(82310400026)(7416014)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2025 09:54:26.5449 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a1bb9890-0202-45f9-8983-08dd614be012 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: CH3PEPF00000016.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB8440 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250312_031014_303386_6EBA1A2C X-CRM114-Status: GOOD ( 18.02 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org AXI 1G/2.5G ethernet IP has following synthesis options: 1) SGMII/1000base-X only. 2) 2500base-X only. 3) dynamically switching between (1) and (2). Add support for 2500base-X only configuration. Co-developed-by: Harini Katakam Signed-off-by: Harini Katakam Signed-off-by: Suraj Gupta --- drivers/net/ethernet/xilinx/xilinx_axienet.h | 2 +- .../net/ethernet/xilinx/xilinx_axienet_main.c | 24 +++++++++++++++---- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet.h b/drivers/net/ethernet/xilinx/xilinx_axienet.h index 5ff742103beb..ded3e32999d5 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet.h +++ b/drivers/net/ethernet/xilinx/xilinx_axienet.h @@ -274,7 +274,7 @@ #define XAE_EMMC_RX16BIT 0x01000000 /* 16 bit Rx client enable */ #define XAE_EMMC_LINKSPD_10 0x00000000 /* Link Speed mask for 10 Mbit */ #define XAE_EMMC_LINKSPD_100 0x40000000 /* Link Speed mask for 100 Mbit */ -#define XAE_EMMC_LINKSPD_1000 0x80000000 /* Link Speed mask for 1000 Mbit */ +#define XAE_EMMC_LINKSPD_1000_2500 0x80000000 /* Link Speed mask for 1000 or 2500 Mbit */ /* Bit masks for Axi Ethernet PHYC register */ #define XAE_PHYC_SGMIILINKSPEED_MASK 0xC0000000 /* SGMII link speed mask*/ diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c index 054abf283ab3..0885ce201b0a 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c @@ -2583,6 +2583,7 @@ static struct phylink_pcs *axienet_mac_select_pcs(struct phylink_config *config, struct axienet_local *lp = netdev_priv(ndev); if (interface == PHY_INTERFACE_MODE_1000BASEX || + interface == PHY_INTERFACE_MODE_2500BASEX || interface == PHY_INTERFACE_MODE_SGMII) return &lp->pcs; @@ -2616,8 +2617,9 @@ static void axienet_mac_link_up(struct phylink_config *config, emmc_reg &= ~XAE_EMMC_LINKSPEED_MASK; switch (speed) { + case SPEED_2500: case SPEED_1000: - emmc_reg |= XAE_EMMC_LINKSPD_1000; + emmc_reg |= XAE_EMMC_LINKSPD_1000_2500; break; case SPEED_100: emmc_reg |= XAE_EMMC_LINKSPD_100; @@ -2627,7 +2629,7 @@ static void axienet_mac_link_up(struct phylink_config *config, break; default: dev_err(&ndev->dev, - "Speed other than 10, 100 or 1Gbps is not supported\n"); + "Speed other than 10, 100, 1Gbps or 2.5Gbps is not supported\n"); break; } @@ -3055,7 +3057,8 @@ static int axienet_probe(struct platform_device *pdev) "error registering MDIO bus: %d\n", ret); if (lp->phy_mode == PHY_INTERFACE_MODE_SGMII || - lp->phy_mode == PHY_INTERFACE_MODE_1000BASEX) { + lp->phy_mode == PHY_INTERFACE_MODE_1000BASEX || + lp->phy_mode == PHY_INTERFACE_MODE_2500BASEX) { np = of_parse_phandle(pdev->dev.of_node, "pcs-handle", 0); if (!np) { /* Deprecated: Always use "pcs-handle" for pcs_phy. @@ -3083,8 +3086,19 @@ static int axienet_probe(struct platform_device *pdev) lp->phylink_config.dev = &ndev->dev; lp->phylink_config.type = PHYLINK_NETDEV; lp->phylink_config.mac_managed_pm = true; - lp->phylink_config.mac_capabilities = MAC_SYM_PAUSE | MAC_ASYM_PAUSE | - MAC_10FD | MAC_100FD | MAC_1000FD; + lp->phylink_config.mac_capabilities = MAC_SYM_PAUSE | MAC_ASYM_PAUSE; + + /* AXI 1G/2.5G ethernet IP has following synthesis options: + * 1) SGMII/1000base-X only. + * 2) 2500base-X only. + * 3) Dynamically switching between (1) and (2), and is not + * implemented in driver. + */ + + if (axienet_ior(lp, XAE_ABILITY_OFFSET) & XAE_ABILITY_2_5G) + lp->phylink_config.mac_capabilities |= MAC_2500FD; + else + lp->phylink_config.mac_capabilities |= MAC_10FD | MAC_100FD | MAC_1000FD; __set_bit(lp->phy_mode, lp->phylink_config.supported_interfaces); if (lp->switch_x_sgmii) {