From patchwork Fri Apr 12 12:52:36 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: 139260 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 5422843E52; Fri, 12 Apr 2024 14:54:38 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DF33E427DB; Fri, 12 Apr 2024 14:54:14 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2077.outbound.protection.outlook.com [40.107.102.77]) by mails.dpdk.org (Postfix) with ESMTP id 9A9D9411F3 for ; Fri, 12 Apr 2024 14:54:11 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dvuOkwksuacCgQhWZCk5O4G9Aj7Ds/Es2+Amfefo8oxeNLnXGifr+2m6opaOIwzh0B9qVwmDbBzKWA9Ne85+eQn9UJsjfkn0Or+RJ4gUnPfpSLM+i2Lc3CoQr/Axs3ICJ3HDnmVoQgH8U8skIgZc79TLU/Lf6JOG7O9xwm5JPCEtY+RTULJCWFg/twjzcYrSsOvx/ROYLoEfr+NfAi2uHJvFQ9ISf7YEBNkkZIMPEHEjAbxIcTRtWRVlZ8eQYuNZApl67KMigRSxDFE6jvvv3SJEY1wBq0VqTGHUqX19ahOF6A1wHtoB70cDA3PwV3s3Hd9oxvp87N8UJuqJQhXUnQ== 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=mC59Qb4C8QNStRJer317aj0aFnBK0gf91dxKzmfLrbY=; b=hK7+YWcJLJSH5pJzXHfAqoqaIf5m8I2sJck5DjKxUYbtHeAPeMsvX7VYW+a0cMaJoaBT6wdYPVgcY7i6VY2kY9+3BMbTXWYW9e0F5fl25KrQQOzKa1GZ1aWhk8+bQSJJFJwGi1vytiROt/3+f4C1LlNIGq70N/Z4oRM6/zMCwRcwRvY1W1gMXtUo/QnduaFR5lICSvcIeyPzf092M6R+mHG6j8DaiNwcQW1zn1Zk04UuXOr8aIZ7JNdeoAFwX+rwFPgW84MRCIdRkXthlz7N67S2aOe2JoSEDCEmc1fF9mw1LqfpWW97rs7inzADbPD1hcKV3wkP6JakwmiuJQlTTw== 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=mC59Qb4C8QNStRJer317aj0aFnBK0gf91dxKzmfLrbY=; b=3ywGdQTIklmstt5ikCC2sVLhOkM+aZyGum/PUPLZPFYqaRCAZ++tPto0FHEx0ir4Op7e+C2NTy2FwDPncdfP41ktAfQv+VVgMeGjgel6GIqnG8pUqnFSMmVdVyhSyXNLz99CygP2uH244o4gIpZuyKs2C9XvImfRT3ZymuOMu90= Received: from MN2PR22CA0009.namprd22.prod.outlook.com (2603:10b6:208:238::14) by PH7PR12MB6611.namprd12.prod.outlook.com (2603:10b6:510:211::11) 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:08 +0000 Received: from BL6PEPF00020E5F.namprd04.prod.outlook.com (2603:10b6:208:238:cafe::a7) by MN2PR22CA0009.outlook.office365.com (2603:10b6:208:238::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.26 via Frontend Transport; Fri, 12 Apr 2024 12:54:08 +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:08 +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:53:58 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande Subject: [PATCH 11/24] net/axgbe: use definitions for mailbox commands Date: Fri, 12 Apr 2024 08:52:36 -0400 Message-ID: <20240412125249.10625-11-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_|PH7PR12MB6611:EE_ X-MS-Office365-Filtering-Correlation-Id: c0cd6b44-df29-444e-de9e-08dc5aefa48a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aNIB74vGx55pDv3OsKGWeJjh5OdFcUzeU+bMF76TjPh3DhUxREUl9bW+zG3csm8a9CZcVodx1scatGcb69hybCWaejnSzRx6dv4w04VWTW5rTpLP0rwXpXGtcp+0o3vtJPtTLpMimNfHsbU6XB2PImOyQDY30C0TQGtOKYEQ4HuXAyOlfTUivpMFwAh0hn2mOoeUsuDypLLFYjmcSV0Q+fk9Rw5577qWmtv6GkS4Pnmyx3hSCsdZT760jOvDTpq4i/jawExeI9UAlSrIL5njx5I0+IgVS2lN09d8pZZmw29X1uU+w0yMdjwSXamA3bvda5W3x3gBFJHgHps8XY8ZoJSs+ufWWCXeud+6wSsqSuBSwDIf/DKZjVJxezrG88Gco9GPld+T479DcT2fhj5KWB9KO5dLSD0N4qr+vZN3aWbzpVCb4zS2JIONA8JhxTGrv76Hej8aIVOMFzLlc0i5ma/8GwC8spH5p8OiyIVlf/AirD26fom7pDpq61+XAtpSmRVFiVVLAL2UJfxlySN6thqZl+gKselHXkPaF77jctamfSmt1fM8QRrQCaPRyrETINnPIj5uj2GUHvVKzOu0L7QjhvfqhNRDyPYQN/eYHnMsVet8DccQGvmvbR59+DuOI9lceARRtUGSVyDj8zyqIzAXPOlpVoncNzWA12seX9XmARJxg7aP6vZjgktdllhTUqpWfZs2LjDJB/gvqeZH0fFvuTOwp6bp3QFQE9GrJETW9V3uiV30carfKhfgErAg 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)(376005)(1800799015)(36860700004)(82310400014); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2024 12:54:08.3703 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c0cd6b44-df29-444e-de9e-08dc5aefa48a 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: PH7PR12MB6611 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 Instead of using hardcoded values, use enumerations for mailbox command and sub commands. Signed-off-by: Venkat Kumar Ande --- drivers/net/axgbe/axgbe_ethdev.h | 25 +++++++++++++++++++++++++ drivers/net/axgbe/axgbe_phy_impl.c | 25 +++++++++++++++---------- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/drivers/net/axgbe/axgbe_ethdev.h b/drivers/net/axgbe/axgbe_ethdev.h index 469b3876c0..20b36ced55 100644 --- a/drivers/net/axgbe/axgbe_ethdev.h +++ b/drivers/net/axgbe/axgbe_ethdev.h @@ -230,6 +230,31 @@ enum axgbe_mdio_mode { AXGBE_MDIO_MODE_CL45, }; +enum axgbe_mb_cmd { + AXGBE_MB_CMD_POWER_OFF = 0, + AXGBE_MB_CMD_SET_1G, + AXGBE_MB_CMD_SET_2_5G, + AXGBE_MB_CMD_SET_10G_SFI, + AXGBE_MB_CMD_SET_10G_KR, + AXGBE_MB_CMD_RRC +}; + +enum axgbe_mb_subcmd { + AXGBE_MB_SUBCMD_NONE = 0, + + /* 10GbE SFP subcommands */ + AXGBE_MB_SUBCMD_ACTIVE = 0, + AXGBE_MB_SUBCMD_PASSIVE_1M, + AXGBE_MB_SUBCMD_PASSIVE_3M, + AXGBE_MB_SUBCMD_PASSIVE_OTHER, + + /* 1GbE Mode subcommands */ + AXGBE_MB_SUBCMD_10MBITS = 0, + AXGBE_MB_SUBCMD_100MBITS, + AXGBE_MB_SUBCMD_1G_SGMII, + AXGBE_MB_SUBCMD_1G_KX +}; + struct axgbe_phy { uint32_t supported; uint32_t advertising; diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c index a58d51d606..8cc99d3a6b 100644 --- a/drivers/net/axgbe/axgbe_phy_impl.c +++ b/drivers/net/axgbe/axgbe_phy_impl.c @@ -1217,7 +1217,7 @@ static void axgbe_phy_pll_ctrl(struct axgbe_port *pdata, bool enable) } static void axgbe_phy_perform_ratechange(struct axgbe_port *pdata, - unsigned int cmd, unsigned int sub_cmd) + enum axgbe_mb_cmd cmd, enum axgbe_mb_subcmd sub_cmd) { unsigned int s0 = 0; unsigned int wait; @@ -1262,7 +1262,7 @@ static void axgbe_phy_rrc(struct axgbe_port *pdata) /* Receiver Reset Cycle */ - axgbe_phy_perform_ratechange(pdata, 5, 0); + axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_RRC, AXGBE_MB_SUBCMD_NONE); PMD_DRV_LOG(DEBUG, "receiver reset complete\n"); } @@ -1272,7 +1272,7 @@ static void axgbe_phy_power_off(struct axgbe_port *pdata) struct axgbe_phy_data *phy_data = pdata->phy_data; /* Power off */ - axgbe_phy_perform_ratechange(pdata, 0, 0); + axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_POWER_OFF, AXGBE_MB_SUBCMD_NONE); phy_data->cur_mode = AXGBE_MODE_UNKNOWN; @@ -1287,14 +1287,18 @@ static void axgbe_phy_sfi_mode(struct axgbe_port *pdata) /* 10G/SFI */ if (phy_data->sfp_cable != AXGBE_SFP_CABLE_PASSIVE) { - axgbe_phy_perform_ratechange(pdata, 3, 0); + axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_10G_SFI, + AXGBE_MB_SUBCMD_ACTIVE); } else { if (phy_data->sfp_cable_len <= 1) - axgbe_phy_perform_ratechange(pdata, 3, 1); + axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_10G_SFI, + AXGBE_MB_SUBCMD_PASSIVE_1M); else if (phy_data->sfp_cable_len <= 3) - axgbe_phy_perform_ratechange(pdata, 3, 2); + axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_10G_SFI, + AXGBE_MB_SUBCMD_PASSIVE_3M); else - axgbe_phy_perform_ratechange(pdata, 3, 3); + axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_10G_SFI, + AXGBE_MB_SUBCMD_PASSIVE_OTHER); } phy_data->cur_mode = AXGBE_MODE_SFI; @@ -1309,7 +1313,8 @@ static void axgbe_phy_kr_mode(struct axgbe_port *pdata) axgbe_phy_set_redrv_mode(pdata); /* 10G/KR */ - axgbe_phy_perform_ratechange(pdata, 4, 0); + axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_10G_KR, + AXGBE_MB_SUBCMD_NONE); phy_data->cur_mode = AXGBE_MODE_KR; PMD_DRV_LOG(DEBUG, "10GbE KR mode set\n"); @@ -1322,7 +1327,7 @@ static void axgbe_phy_kx_2500_mode(struct axgbe_port *pdata) axgbe_phy_set_redrv_mode(pdata); /* 2.5G/KX */ - axgbe_phy_perform_ratechange(pdata, 2, 0); + axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_2_5G, AXGBE_MB_SUBCMD_NONE); phy_data->cur_mode = AXGBE_MODE_KX_2500; } @@ -1333,7 +1338,7 @@ static void axgbe_phy_sgmii_1000_mode(struct axgbe_port *pdata) axgbe_phy_set_redrv_mode(pdata); /* 1G/SGMII */ - axgbe_phy_perform_ratechange(pdata, 1, 2); + axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_1G, AXGBE_MB_SUBCMD_1G_SGMII); phy_data->cur_mode = AXGBE_MODE_SGMII_1000; }