From nobody Wed Dec 17 08:59:22 2025 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2070.outbound.protection.outlook.com [40.107.237.70]) (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 AD7B6232368; Fri, 9 May 2025 15:54:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.70 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746806049; cv=fail; b=EmFfT4TqMLN1c1KX/2ThS2urOcwggB7q0p85Zvlu845yKiseo3q5MT56fYJaFcb4ZuzJb6DOs3Mk4oidAlVa1ozVCodjr45Nx/yiuY3+KNpes242VR852hwQXy9unGDsLt9VhI+unDyV/WQyGijr3X3/kwyYC03KdNc7ItEMF98= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746806049; c=relaxed/simple; bh=N56JMvcqjB7KIcdVOQH2uOJ+HLzo6H1q/26iqKzjR6o=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=q2wNIBiG11b9oaKTFf4PBHO9Jfu/mU+Uf1EHSW071G3VpcyUSekTmqaNGaMOeoObBobNYMbru01ovwdGWcRDUC0Ku5nrMjrMidvWhrBxPIeIug4pPOLYIIY1WVrIkXruPVuxiU1ou04FxSxO3AXHil70OZUqTyM0fhBDaq132tE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=DEdcppJu; arc=fail smtp.client-ip=40.107.237.70 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="DEdcppJu" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=owlb7uXCvTdKIw83jqwpFgvSEAAYmJ5bxG3M9nQ57B3JV5WU9VhHxWMMnlSl1bEyI4g88qjr3GDS833ekloNDu8kfEMNkMbUvMJnetLYeDJX/KJtDy+JfCBEc9D4RLo5E6K9H/DpmK16uw1cOzWth2zJZJjlD6MqsumXCuwRG6sTIV2iCBLegKyHi6irp6MR1E+fUPWS+iF9iUwZGWdmfGrdbmlDcTEK4ivjwTMFted8fLQweDuSymHFS6oNguQTAsoNJKRiRc+Mc5eFG2QBaCXoMGSoLfn6ckRsB2dFFJS4xcWEy5Wb7rcRnXSm0/XYgmxaraBjdE09/Fnvfhkq3g== 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=DvIcfp8idZp7VuLuD+VK+dMpE9Ed8TMSTsEaPy5opJU=; b=Hudw6n9vGJUNH6t7rmNa2w5hSHQgIBV2lkwNGF+hlRRuGsBC5nzdZX3gJT6fZSVdFGl3Ux87gdKucm4Rl1036GRHQg3qjAXNvrMINfPz8BPKy8oR1QA94OxblwggiFGrx7A0exOifGNRlfEKeen9u9hyETq60aBy3FnDkqcyAXeWM6pPwk/ZAk/fzhnbHm9CBsSZwa+dUTsNcFYpRjEGj9iicNKnyEhcV26VGjAx7EVnJ9EIjaFUEmJmyNhF6hQxoM6nwmlQcOckEKxIiDeWcECq11mlir7y4lKJEfxt9K1YVZUXXvuZDvFTAl0fWEt6loERTTI2T7pTdj9nfY3euA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.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=DvIcfp8idZp7VuLuD+VK+dMpE9Ed8TMSTsEaPy5opJU=; b=DEdcppJuQAJvHkjxE3HMd5PbqYjbAlVwKVEoCDoijQOXgSq7qDlT9UmKDtqgr5Xns35BOelPvrZoAYgKIHuWaW2b89+D+e10RIUhK8GYp4DJ71nOqmW1mcfHomhWMFoBeFZvdvkKN2F9jTULxmuVbFn6q2kobq3DLFdGO6cFcsg= Received: from MW4PR03CA0007.namprd03.prod.outlook.com (2603:10b6:303:8f::12) by SJ0PR12MB7007.namprd12.prod.outlook.com (2603:10b6:a03:486::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.23; Fri, 9 May 2025 15:54:01 +0000 Received: from SJ5PEPF000001C9.namprd05.prod.outlook.com (2603:10b6:303:8f:cafe::fc) by MW4PR03CA0007.outlook.office365.com (2603:10b6:303:8f::12) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8699.32 via Frontend Transport; Fri, 9 May 2025 15:54:01 +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 SJ5PEPF000001C9.mail.protection.outlook.com (10.167.242.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 15:54:00 +0000 Received: from airavat.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.39; Fri, 9 May 2025 10:53:57 -0500 From: Raju Rangoju To: , , , , , CC: , , , Raju Rangoju Subject: [PATCH net-next v3 1/5] amd-xgbe: reorganize the code of XPCS access Date: Fri, 9 May 2025 21:23:21 +0530 Message-ID: <20250509155325.720499-2-Raju.Rangoju@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509155325.720499-1-Raju.Rangoju@amd.com> References: <20250509155325.720499-1-Raju.Rangoju@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: SJ5PEPF000001C9:EE_|SJ0PR12MB7007:EE_ X-MS-Office365-Filtering-Correlation-Id: 140a24e7-eabf-45e7-d9e9-08dd8f11b756 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?3WbgRK+TT02Wn/84lOOWUjzExHWUy9VIJuFyUXEDwXCQ3G6ox5/B6dVIe7o4?= =?us-ascii?Q?rPCdu6TOfd0vX49vsVBPMqGJx6ym4hD2KkkibO88jCDQURPJQpUzIsRZcml6?= =?us-ascii?Q?Y9OPvseELsT/VOrUAkhcdM/2PX0v+Zye2Kw/vqlKoTnlDIsHOZgJD7k9Spet?= =?us-ascii?Q?FXzfA0zIeht8EVxBbxrLwLo80bZryPh4gyu11Rs+aYyaUTOENIcYtxzYWNwE?= =?us-ascii?Q?r1v9Ok2vm+oHoAbSKUp5kK/audpLc9nwUlG8gH0Q5GCBe39yvJw112QiKkwG?= =?us-ascii?Q?NoydjDlBwICxss+Mg/YZEN8MaJeihoCPK05Y6bM/X2ahaetqgPKctz0NbMuR?= =?us-ascii?Q?OY9qRoxLB+aCZwhNq5RI7qnnjZeAPjDxOBEaBMxIkYH5wr6Q9gIRdcSzHgtE?= =?us-ascii?Q?7a/QVR9Rhrk7pWlE4UUvvcshV+gK+V7DjY9Hej5kwcJTQveeqdWG2iNluYPy?= =?us-ascii?Q?IMWmFZCO5Fk6Mbq5WP82fjfGCkaMIgg2HRX5k1c/B43ZO+0PR7gbX6o3Pix1?= =?us-ascii?Q?nBMcHKKYI73VVHW8XRpm0qVA11YgTgPztSeD13KNi9mqoe33RXKebIx1veYq?= =?us-ascii?Q?Fuw6Xx4J/r2W1xx7qT3lxYjoJyS8ajRHhbHXNnzKKtrfct4lr/YpU6hGEJoT?= =?us-ascii?Q?2d0jISDBGLLifNsKSjpy2szXt2bqyhF5DaaqYi+uPgLQqo4Y42tW9jtsXeD2?= =?us-ascii?Q?Q9yfZW4iWozVDABovV7nbGusB68HMqcC/c7TymCMJ3oOR/53aL5XrC9ZCwiy?= =?us-ascii?Q?MmYGVmqD/8rf2WizBN9mlISxGqKTAHbSvzKEuEAON0AhCS22zFFmaBBTZO08?= =?us-ascii?Q?1Ko04Nt9DdNt9htPfwfW7lUgUzxT0eNGEKhcg1d+MNgYqlktZNs28cP3rBIJ?= =?us-ascii?Q?NWdz4UAvGE4e6xFIBW/CGFK60myygalapTNaOuMp/oLWj6n96VTUK42y0t62?= =?us-ascii?Q?fC7sKRsO9r+vyKHu40hLRdsYZenQR2UghQVEFg5pNv60rNy1Ftvz9irgv2wn?= =?us-ascii?Q?6dA4IaacENL1kXjjSBV91X0n5+oHyO/eZvFJHIoLo0xyH0LKLU53ZeJcxqJW?= =?us-ascii?Q?c3cLChws0GoNNPV8zsjSxOdr1UsQMRzvDs7d16p/1GCmYZbwY0TMswp6/n6+?= =?us-ascii?Q?42ll6xCKtJ0Iog519da52GlqtuzFL4OulvzUSZmtSfELiH9ALlyN1FGuHPKU?= =?us-ascii?Q?PJokjhHd+VKpPjqrSAZqZtIy5jWGV9UIPXN/eCKK0rvxTqp+ZkDDf+y7Gta8?= =?us-ascii?Q?ZJitPtf7o49NjcNZk0bfbehszkzxpGY/WXqtS1LfRcJNXBH20r/cfzxPoqzV?= =?us-ascii?Q?w6wEcrboSN0x5PlPiHjAqNu8qnu08lmgvbktA7+sQ4S1xM6VBPHQpaSsM5xC?= =?us-ascii?Q?xpNKSBRYVm6K/IC/imjzmxDTc2kN2LG8v9PDtM5LmJwyW1FzVnkhuywuTiX2?= =?us-ascii?Q?bzh3fs7dlmLmjYggTVRfLyvn8kMi065xEe8fFRFsdmm9A/cx2GxUkOUH2Qd7?= =?us-ascii?Q?o0U777snys7QPz6clJk/cWahgDTDmp48L354?= 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)(82310400026)(1800799024)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 15:54:00.8314 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 140a24e7-eabf-45e7-d9e9-08dd8f11b756 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: SJ5PEPF000001C9.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB7007 Content-Type: text/plain; charset="utf-8" The xgbe_{read/write}_mmd_regs_v* functions have common code which can be moved to helper functions. Add new helper functions to calculate the mmd_address for v1/v2 of xpcs access. Signed-off-by: Raju Rangoju Reviewed-by: Simon Horman --- Changes since v2: - follow reverse Xmass tree ordering - line wrap to 80 columns wide drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 65 +++++++++++------------- 1 file changed, 29 insertions(+), 36 deletions(-) diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/etherne= t/amd/xgbe/xgbe-dev.c index d9c8f2af20ae..cdab1c24dd69 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c @@ -1053,18 +1053,19 @@ static int xgbe_set_gpio(struct xgbe_prv_data *pdat= a, unsigned int gpio) return 0; } =20 -static int xgbe_read_mmd_regs_v2(struct xgbe_prv_data *pdata, int prtad, - int mmd_reg) +static unsigned int xgbe_get_mmd_address(struct xgbe_prv_data *pdata, + int mmd_reg) { - unsigned long flags; - unsigned int mmd_address, index, offset; - int mmd_data; - - if (mmd_reg & XGBE_ADDR_C45) - mmd_address =3D mmd_reg & ~XGBE_ADDR_C45; - else - mmd_address =3D (pdata->mdio_mmd << 16) | (mmd_reg & 0xffff); + return (mmd_reg & XGBE_ADDR_C45) ? + mmd_reg & ~XGBE_ADDR_C45 : + (pdata->mdio_mmd << 16) | (mmd_reg & 0xffff); +} =20 +static void xgbe_get_pcs_index_and_offset(struct xgbe_prv_data *pdata, + unsigned int mmd_address, + unsigned int *index, + unsigned int *offset) +{ /* The PCS registers are accessed using mmio. The underlying * management interface uses indirect addressing to access the MMD * register sets. This requires accessing of the PCS register in two @@ -1075,8 +1076,20 @@ static int xgbe_read_mmd_regs_v2(struct xgbe_prv_dat= a *pdata, int prtad, * offset 1 bit and reading 16 bits of data. */ mmd_address <<=3D 1; - index =3D mmd_address & ~pdata->xpcs_window_mask; - offset =3D pdata->xpcs_window + (mmd_address & pdata->xpcs_window_mask); + *index =3D mmd_address & ~pdata->xpcs_window_mask; + *offset =3D pdata->xpcs_window + (mmd_address & pdata->xpcs_window_mask); +} + +static int xgbe_read_mmd_regs_v2(struct xgbe_prv_data *pdata, int prtad, + int mmd_reg) +{ + unsigned int mmd_address, index, offset; + unsigned long flags; + int mmd_data; + + mmd_address =3D xgbe_get_mmd_address(pdata, mmd_reg); + + xgbe_get_pcs_index_and_offset(pdata, mmd_address, &index, &offset); =20 spin_lock_irqsave(&pdata->xpcs_lock, flags); XPCS32_IOWRITE(pdata, pdata->xpcs_window_sel_reg, index); @@ -1092,23 +1105,9 @@ static void xgbe_write_mmd_regs_v2(struct xgbe_prv_d= ata *pdata, int prtad, unsigned long flags; unsigned int mmd_address, index, offset; =20 - if (mmd_reg & XGBE_ADDR_C45) - mmd_address =3D mmd_reg & ~XGBE_ADDR_C45; - else - mmd_address =3D (pdata->mdio_mmd << 16) | (mmd_reg & 0xffff); + mmd_address =3D xgbe_get_mmd_address(pdata, mmd_reg); =20 - /* The PCS registers are accessed using mmio. The underlying - * management interface uses indirect addressing to access the MMD - * register sets. This requires accessing of the PCS register in two - * phases, an address phase and a data phase. - * - * The mmio interface is based on 16-bit offsets and values. All - * register offsets must therefore be adjusted by left shifting the - * offset 1 bit and writing 16 bits of data. - */ - mmd_address <<=3D 1; - index =3D mmd_address & ~pdata->xpcs_window_mask; - offset =3D pdata->xpcs_window + (mmd_address & pdata->xpcs_window_mask); + xgbe_get_pcs_index_and_offset(pdata, mmd_address, &index, &offset); =20 spin_lock_irqsave(&pdata->xpcs_lock, flags); XPCS32_IOWRITE(pdata, pdata->xpcs_window_sel_reg, index); @@ -1123,10 +1122,7 @@ static int xgbe_read_mmd_regs_v1(struct xgbe_prv_dat= a *pdata, int prtad, unsigned int mmd_address; int mmd_data; =20 - if (mmd_reg & XGBE_ADDR_C45) - mmd_address =3D mmd_reg & ~XGBE_ADDR_C45; - else - mmd_address =3D (pdata->mdio_mmd << 16) | (mmd_reg & 0xffff); + mmd_address =3D xgbe_get_mmd_address(pdata, mmd_reg); =20 /* The PCS registers are accessed using mmio. The underlying APB3 * management interface uses indirect addressing to access the MMD @@ -1151,10 +1147,7 @@ static void xgbe_write_mmd_regs_v1(struct xgbe_prv_d= ata *pdata, int prtad, unsigned int mmd_address; unsigned long flags; =20 - if (mmd_reg & XGBE_ADDR_C45) - mmd_address =3D mmd_reg & ~XGBE_ADDR_C45; - else - mmd_address =3D (pdata->mdio_mmd << 16) | (mmd_reg & 0xffff); + mmd_address =3D xgbe_get_mmd_address(pdata, mmd_reg); =20 /* The PCS registers are accessed using mmio. The underlying APB3 * management interface uses indirect addressing to access the MMD --=20 2.34.1 From nobody Wed Dec 17 08:59:22 2025 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2051.outbound.protection.outlook.com [40.107.236.51]) (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 B5B63235072; Fri, 9 May 2025 15:54:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.51 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746806053; cv=fail; b=dKY0Q5ADkzQ+4dBqcZvQwkNyu/+1WgGuSY/LYSCG+WEJsHl5yc1UPP01RtN/8CY2HpkWUapXJqKpdxUzecphIu2kVgD+Dwq7VyQcz1LYin3Ra8ET80WLqOHGVz9uQUlLPLOYTeNRX08Eo8N9NhnbW/85j2ICQc7r5mKubCYuLLI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746806053; c=relaxed/simple; bh=RFJ4hVQD5aXRs4DmdYwUBgxhIdKpwqb1cRj9BfD8bXY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Xn4abbOmd/94oNXtsjen3SH5qAbe9IQg9OgwQOjieiqYr1e1cuZSjotuVf79sFCJ2Ut2Pt78WdTmIFFFfVKpGUgr1gtv0CxzFz8hrt9Oe0m3G/ILDSRHRznG7nr3qF+6vvKd8gRcz1n6d+hD+L5OgV8efGqF3cNFZ6cbp0gJANw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=hRIioSPb; arc=fail smtp.client-ip=40.107.236.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="hRIioSPb" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=D7BC8xCCGwQ0mMXKYEr50fYMYfIsJWx0u6XX9tGtUK1ms5tG/tRzHNqylfhk8VBCXa6OnizR+xHYsS7YftmOq5AgJOHZZ4SciBe2RvuyYW0LXaIl/dpx7NUCxBrRU1px09GaDNwYdpeLTVn2mVysO/Jp7bf3MFlTMw5vS7gUwWVjjRUyfOvH+OY4jAMaNlcLRfu2xy6oFP/MFjcdJJnc0fCRRRzRjma8drfBWyIWhPjgGuYugWd+OicvGbmmAnz5IzKy372pF72tdF0tOs6Xwijx+WDD3gnXN4C1c5qJ7PqhXHGpTuZ86sh/FCUTXHIQ6dbvTW9Uux3f76cSTDpYqw== 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=xi2jvWxnEFE6LJfsHyc+cxcxxUcudINwoObWqx/9bHY=; b=ZtModoiD8je4q1LZLW2GhC9iiCPYdYTEiHhXeuS0bE2Z3fUY4t8kN3Wtw+HWaCTayOfjHHGNb4Wb8ql1ZpN8bWcI6g1XZs1NqxISeCdhzFYVUsuMpyoPzjhvjdSAT6HnuKWt05kn0ovYxx0Pjx2ALfzyfcWcWbwusHJDsl03Y9BfWoXpV+0DjS4xTCrQ74K2v3659LV3G/+J99xjck/Fq0+O+TS8Vj3tvWmqamzlPSUmA/DscGpvcr6EBW7chd5bzugewqEMEZD42k81MPuLtQdjbn2oBzgk/OwQvbdlD8a9pf663L8Qs4Vv7UEUDQUzCSS6nC4t0B89yVA2iygl5g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.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=xi2jvWxnEFE6LJfsHyc+cxcxxUcudINwoObWqx/9bHY=; b=hRIioSPbLKRAGZhp+uf65mpf2Za5ERc/BjxHoA8TOx4IpUH1HhxDcJjJ4F67SZdgGEoo3NLRLbmA3Y/YDDTSNmZyc96Xk+KuYjPlxtBzgCMN5hGcK5vx+gl1tsEQD2lIHHgiGbT2ANKOS+8XqTx3bZ7f+wba8wtsTxrdT7ZRO48= Received: from SJ0PR13CA0179.namprd13.prod.outlook.com (2603:10b6:a03:2c7::34) by CY8PR12MB8213.namprd12.prod.outlook.com (2603:10b6:930:71::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.20; Fri, 9 May 2025 15:54:07 +0000 Received: from SJ5PEPF000001CE.namprd05.prod.outlook.com (2603:10b6:a03:2c7:cafe::31) by SJ0PR13CA0179.outlook.office365.com (2603:10b6:a03:2c7::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8722.21 via Frontend Transport; Fri, 9 May 2025 15:54:07 +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 SJ5PEPF000001CE.mail.protection.outlook.com (10.167.242.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 15:54:07 +0000 Received: from airavat.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.39; Fri, 9 May 2025 10:54:01 -0500 From: Raju Rangoju To: , , , , , CC: , , , Raju Rangoju Subject: [PATCH net-next v3 2/5] amd-xgbe: reorganize the xgbe_pci_probe() code path Date: Fri, 9 May 2025 21:23:22 +0530 Message-ID: <20250509155325.720499-3-Raju.Rangoju@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509155325.720499-1-Raju.Rangoju@amd.com> References: <20250509155325.720499-1-Raju.Rangoju@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: SJ5PEPF000001CE:EE_|CY8PR12MB8213:EE_ X-MS-Office365-Filtering-Correlation-Id: 634ef5f7-e3b7-4981-3ba3-08dd8f11bb0f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?0bfafhcXrJJVuO+kI22nmIk2jZ5OtmL3KYBRtczmXetAMa1p/PV927ahmK1H?= =?us-ascii?Q?KQ3UGCTpKnRJ72KC7r9BUDj8t4Jcu5QRJKLisYWsX/0cy+/IT3sIq5sCJ2kG?= =?us-ascii?Q?d2Cann+7bsWzUKV4VU+qMgSmZBqQHkokxJFo+YGaQQQXJm8vOIx+kJzFLeQe?= =?us-ascii?Q?L60fHGZw1IGQ6UUN0I2iFOVZ8D2jPaVZcWd92QNzhk1dOuTqkhofO3T7faCE?= =?us-ascii?Q?wKSFhl37f0qgvU+B7Ntw9manJOrdLp7vJT/95HkBrNKmkc1ISfjS8hE8+06s?= =?us-ascii?Q?yt3zc+a7uhT/axBWEjb5nVBVVw+frd66yroKYALYoJhpUkGEGGuYP6S0iLZJ?= =?us-ascii?Q?GRl2YHCPAJtJc7QyCVbqMNyZNUgDRjUx5mXHQkbTQqzTGHhnhIvPgJmiFR5B?= =?us-ascii?Q?jSptSz78YR/w1u9JrCh8hDVJBrevS0MTu/k41v8oIBbdHDKvzr9+YvrjWtQE?= =?us-ascii?Q?HpuhC2XCDf07OtWmyIUYOfzDnoEsmSE0P6CvvOlsIwdjsWKXW4dB4v9QQqx7?= =?us-ascii?Q?zfzEbAiOerYPoHM5Suml0oWmT0OqRk3zFkeatG6Gk5fhaNLtwJR81lYEpmE9?= =?us-ascii?Q?bGguhUVWKFX3CgONtWrUVScYH1hV9lZlSfkSTZaMqf7o1H/BeOyrnEBGBHiq?= =?us-ascii?Q?zU3tekw+wOuVFYrl+YjyeD4UDr/q839ROK6o+jnzE3s0n/JlnAyLp1Nxf2Cs?= =?us-ascii?Q?mIjVXKlco8dGxvCNMaFs7cXOLLaxZhH9ukcr4v2t9zLEJl1y3yt59aW0GBco?= =?us-ascii?Q?a3KCkfphgIEYZi4jSqQcF+msFdb5Wzut0XLEG8hG5Rr9maa9e3tcQyq4U45U?= =?us-ascii?Q?ehyWCjG2rTWXYrRu+7dkDACpWQFwPY0MUjyB/gyU+Z+WP3D7I3RtdTIqxyYX?= =?us-ascii?Q?/vU18AIFZxNoPzFzASxqGsppwsj9cT++hTvbuN1YchD1qTa+7+DZnAvBPMUR?= =?us-ascii?Q?nV21d9FWe5cmfgA7Fnr5gyOTLwt7s3b0qwT6veqFnL26Uka8Hd+QmtJaBTEL?= =?us-ascii?Q?Rr4kWASwkobFh8F9NNFfJkKjfkHouoEoN1SA1tiwITsx0talsiYQ8M2vnmpx?= =?us-ascii?Q?F6MsnOkQh/xGcds96YzoPVb9B6zJxk3vHTqHSBBERAnDHDyCJHj9RNvy0lCU?= =?us-ascii?Q?dFuhV3i955npKcweXuhF5otjutCEv+T3/Lw/WfMkxo6FPbE224f2B6Nja4eW?= =?us-ascii?Q?S3aOgDBLjXCpgeEl2lAVkecuXLLhnFVG3twix8ncixk+kQ+pvKq3ushbvobS?= =?us-ascii?Q?M0dlOKEj7rVwdhruWDH2ejuBmHkKs4cBa2pDSrwgGW3NLYqF33h1zEJruGf4?= =?us-ascii?Q?k6WEt45kygNU+QfSg88mL2GCmjoa8+6rYSGZI4eVDZv5LjfC6oL4IJtsyoL8?= =?us-ascii?Q?bBuBLaIeq7AM569vP2WYhW0rVC+j5K5g5t/FAseX62s6uv+x2KdEttSUR0kt?= =?us-ascii?Q?qNYVfIgDJN0ZbDy5WPxIYxBXxkesy2TBPeqHhmc/CIl/HQi13TwFzTL4PyL7?= =?us-ascii?Q?KO6fbAzXhFLSgPKvGzp4NkNLPPnSrsGHPvXv?= 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)(82310400026)(36860700013)(1800799024)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 15:54:07.0730 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 634ef5f7-e3b7-4981-3ba3-08dd8f11bb0f 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: SJ5PEPF000001CE.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB8213 Content-Type: text/plain; charset="utf-8" Reorganize the xgbe_pci_probe() code path to convert if/else statements to switch case to help add future code. This helps code look cleaner. Signed-off-by: Raju Rangoju Reviewed-by: Simon Horman --- drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 35 ++++++++++++++---------- drivers/net/ethernet/amd/xgbe/xgbe.h | 4 +++ 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-pci.c b/drivers/net/etherne= t/amd/xgbe/xgbe-pci.c index 3e9f31256dce..d36446e76d0a 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-pci.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-pci.c @@ -165,20 +165,27 @@ static int xgbe_pci_probe(struct pci_dev *pdev, const= struct pci_device_id *id) =20 /* Set the PCS indirect addressing definition registers */ rdev =3D pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0)); - if (rdev && - (rdev->vendor =3D=3D PCI_VENDOR_ID_AMD) && (rdev->device =3D=3D 0x15d= 0)) { - pdata->xpcs_window_def_reg =3D PCS_V2_RV_WINDOW_DEF; - pdata->xpcs_window_sel_reg =3D PCS_V2_RV_WINDOW_SELECT; - } else if (rdev && (rdev->vendor =3D=3D PCI_VENDOR_ID_AMD) && - (rdev->device =3D=3D 0x14b5)) { - pdata->xpcs_window_def_reg =3D PCS_V2_YC_WINDOW_DEF; - pdata->xpcs_window_sel_reg =3D PCS_V2_YC_WINDOW_SELECT; - - /* Yellow Carp devices do not need cdr workaround */ - pdata->vdata->an_cdr_workaround =3D 0; - - /* Yellow Carp devices do not need rrc */ - pdata->vdata->enable_rrc =3D 0; + if (rdev && rdev->vendor =3D=3D PCI_VENDOR_ID_AMD) { + switch (rdev->device) { + case XGBE_RV_PCI_DEVICE_ID: + pdata->xpcs_window_def_reg =3D PCS_V2_RV_WINDOW_DEF; + pdata->xpcs_window_sel_reg =3D PCS_V2_RV_WINDOW_SELECT; + break; + case XGBE_YC_PCI_DEVICE_ID: + pdata->xpcs_window_def_reg =3D PCS_V2_YC_WINDOW_DEF; + pdata->xpcs_window_sel_reg =3D PCS_V2_YC_WINDOW_SELECT; + + /* Yellow Carp devices do not need cdr workaround */ + pdata->vdata->an_cdr_workaround =3D 0; + + /* Yellow Carp devices do not need rrc */ + pdata->vdata->enable_rrc =3D 0; + break; + default: + pdata->xpcs_window_def_reg =3D PCS_V2_WINDOW_DEF; + pdata->xpcs_window_sel_reg =3D PCS_V2_WINDOW_SELECT; + break; + } } else { pdata->xpcs_window_def_reg =3D PCS_V2_WINDOW_DEF; pdata->xpcs_window_sel_reg =3D PCS_V2_WINDOW_SELECT; diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/am= d/xgbe/xgbe.h index 8ac0f3a22fb6..37e5f8fad6b2 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe.h +++ b/drivers/net/ethernet/amd/xgbe/xgbe.h @@ -238,6 +238,10 @@ (_src)->link_modes._sname, \ __ETHTOOL_LINK_MODE_MASK_NBITS) =20 +/* XGBE PCI device id */ +#define XGBE_RV_PCI_DEVICE_ID 0x15d0 +#define XGBE_YC_PCI_DEVICE_ID 0x14b5 + struct xgbe_prv_data; =20 struct xgbe_packet_data { --=20 2.34.1 From nobody Wed Dec 17 08:59:22 2025 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2041.outbound.protection.outlook.com [40.107.244.41]) (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 98752233D91; Fri, 9 May 2025 15:54:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.41 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746806056; cv=fail; b=UMcVqWqjsyUaDL3LqNxzW5WB7D1EXXhYbV37PKlj4Qf6i8eUd/tNDL8VFznkTn9MNpSRU/XcZas0B7a7jp4qIkpcBb5ao3JPFaqMhCri2uGgVJu+zemtoqOubHwXwwTkP05H05vSdu7Z+iOcQiDauig1c+PHiYj934A3m9TXLKg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746806056; c=relaxed/simple; bh=upH+YjrvKrzdqDULqC5qnxjElnbz5p7hgHEN9PMwycU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MMzdBbnfDcaqyJ35K+BVX4jobHPip4RJ+f9zMw5ZsIJK9JE7uCzVdLLeTn5C11+W5uThZpPLdDEuKHaWqDxtVSvr23uV8SNha5+mR5wXW1FQanpl0qH+FZQy/oCvWCSFSEvdfUJgUw8KIBEx9bkK+L0sKMyliMWD4hAAZRuUu44= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=TMF7j1NG; arc=fail smtp.client-ip=40.107.244.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="TMF7j1NG" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=MPw9kQQS8GppgNb8rQfB/InmqOf50urU5G8cz/2sBYHGBRbguHFccGXUWMqrH1CalVQ9pFT3Icdc0hhXlWJ5s/+Eii1RUAh5bAZ2F1kbFElAaztq/1po1SWIEaA8ON7pHkVQSVvSEyvn8Wo15QqTy9RZ/PtqEKq5EM3Rb3RcGJJ8NeJqAg4fn8OnrBT4LB1YjGH3oTwaGjbP4oWD1e+EGvzwUnEuhnhs48nYxVeO1fZIyBovD1znwhPYNHxCPwu3FBVH8BFKcieJlySBt+3sQkt7/smd7GhHuE0XXtzAGpK4fix6wQdoOdwNLkfBlpxwTQe93C7m5zPUVGwiHde4/A== 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=QuFrFFrqcVu5xCFcZWV9+ZKUK6boYGiow5zl/yxS5aw=; b=SpO3YFLsuzrQU4mOE8oMjutq8a/2ZnxKheYT9kLIC15gIhes6cOTUO71ipjDoTsDIPIXd8hQUyBDuNMNW+ux+QsU/FLHhfpLM+P6Lr+H75Ex7hNh11n56w1dyPgw6E9Zd05t9+U9RXUiD/BXkJ5ggbgfIhokZ5SjqJoEef9FP0Qt62ivLmDcvAHAOPC80H6+i5EoxN+O74lp/aSfSq9BT+ZaHk5+ayYlFPKwI4tzi4e/rA9O8FT59dfL+ebeKP6KcsexI20L+YkYom5+VOKv8Y+v6WY9GymQPEkKv2/GoG8VKAkn+ZiMkvHAqRJMKVM9A5Qc3oQYU4syZQHIGDApSQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.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=QuFrFFrqcVu5xCFcZWV9+ZKUK6boYGiow5zl/yxS5aw=; b=TMF7j1NGBvxx3HnLGzLk3HeGvi4NAk3an6NdHcon4WgcuM14SWUtkoHsCB7YlWeVNshxIiP01KL/iJ+aWJ4ZPoLLH50yvsymHNDIGpfb1Lzm9LKjNCybwaqPFlf5ttxc4nR14iEePELKSSsznfLCqqVKweiF2BnwHSlMu6IMvpg= Received: from SJ0PR05CA0169.namprd05.prod.outlook.com (2603:10b6:a03:339::24) by PH7PR12MB9224.namprd12.prod.outlook.com (2603:10b6:510:2e7::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.22; Fri, 9 May 2025 15:54:10 +0000 Received: from SJ5PEPF000001CD.namprd05.prod.outlook.com (2603:10b6:a03:339:cafe::3d) by SJ0PR05CA0169.outlook.office365.com (2603:10b6:a03:339::24) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8722.19 via Frontend Transport; Fri, 9 May 2025 15:54:10 +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 SJ5PEPF000001CD.mail.protection.outlook.com (10.167.242.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 15:54:10 +0000 Received: from airavat.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.39; Fri, 9 May 2025 10:54:06 -0500 From: Raju Rangoju To: , , , , , CC: , , , Raju Rangoju , "Sudheesh Mavila" Subject: [PATCH net-next v3 3/5] amd-xgbe: add support for new XPCS routines Date: Fri, 9 May 2025 21:23:23 +0530 Message-ID: <20250509155325.720499-4-Raju.Rangoju@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509155325.720499-1-Raju.Rangoju@amd.com> References: <20250509155325.720499-1-Raju.Rangoju@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: SJ5PEPF000001CD:EE_|PH7PR12MB9224:EE_ X-MS-Office365-Filtering-Correlation-Id: ad3191d3-6f7d-4332-fd88-08dd8f11bcd0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?qrRwVIpalZY01uutcHTyCxScY+6HsQsAoBY3HtBvBL3pc7im5l58qGUK3TZg?= =?us-ascii?Q?cxV6TW8cAtdOsloLGclHdpzhuMnnc03+z2hyH0pQExWtv9m+ufuRaLzHQYaf?= =?us-ascii?Q?v5p2f9NyZcN8q9lGdYjFrtQH2qfLZhtwZlNqeTvw2algQb8n5MGfIwsbfDeX?= =?us-ascii?Q?s3ystVWdZrDvX8hafTCx2SN65Dt8nstUHckeMGq2lDrwT0xrSPRt7HF7xluD?= =?us-ascii?Q?AVuLBBGEMih3tb3iS6wI2yPGO7aANJvALmzJG60x/Nr+WHYDek8y4wRJ1GIr?= =?us-ascii?Q?/X+NOWNzl2w4CFB0ZAAC4olhPYbBPA+I0HCaXUvA5vbHzZDja3/rPbJeLo9G?= =?us-ascii?Q?/okNTKUJt77v9rmrmoiADLYJBelBRSd/oPd3e0+RhsokZ2xwCZNJ3mE0Z1ev?= =?us-ascii?Q?IAL0tq4BBXYf6l3oZBLc1xQ+/AwpS5PdV63l+izfhAgPW4oJGd3a/6HBA8hU?= =?us-ascii?Q?0OCH9cZdwjEDhvk8THBYPg3vkOIkWU9CoHE02jXF3eRv6HNK495gXDkRsi1R?= =?us-ascii?Q?n2Hu3tfCMG7J8OWCvHdK5tU+nSg7GWORunGUCcXxirXERGjfPRXGGm1Etm3h?= =?us-ascii?Q?+XzmumfrMW6aUxGUA4u5aNR5+TF1gYx5/M7HOOPoEZDx0KmOmWAM7fQD9GDZ?= =?us-ascii?Q?tRaCJD25nPu2hsXgpjvVNHl6aP6wtDUX5zbRQks4mez/K2fUJCdm/Qxo2mon?= =?us-ascii?Q?sJrPHAPrdLoHlWlbakD6b5O3xcgsU68CLVd15RTLu60uxpOm6xVfDYuwfp60?= =?us-ascii?Q?dA3tGTIKlnT6XbBn5OoBev3V5mC7YOLSnydhcUOhqJetBhgpqgjTISjPl4j4?= =?us-ascii?Q?uI+1WjfX7xzGeP7xf43pNQjzq/xMiMg1af/e8Xjrp9g5kHTIOsxSfr/6ZhuQ?= =?us-ascii?Q?P9aCi+128jQhKvAf20Fb4xoeQU+nOSftcVG8oYRXVwll4E2ucUfp3yygzX3S?= =?us-ascii?Q?f5t2Z4O2BXR2VB8y4qyvJsXmpTm8byBAYT1WGDOj8x59/7moO2hJ3iK7V969?= =?us-ascii?Q?3xj1xYw7gdn0DotxRAs5hnRhXedNvAdbxf8WzE6o+5LwGuq0Jzdw14cj8sFa?= =?us-ascii?Q?YWNkpmiv8U0N0tuYO0jlM8kAhvr7t6KlELCEGWo5g6dW95IS9oZeoAdXWWm4?= =?us-ascii?Q?t+mDIbg0ySRkOs/Ljji/HF9IA20MaOoMPjlq8hb95lnsracHNHyAtddoTLAp?= =?us-ascii?Q?0exDoA4IfdhYKn8BHiNrj5tQpXb8grmj817S2Ho0engG3c/0EMdoYv4fmmTk?= =?us-ascii?Q?3DZYSm4l2+CZFB2xJxT9mweorDJmc6e20Rj99p/m+0PwIJR3GP3rBr3OtC3t?= =?us-ascii?Q?f4oOIPUeCzJk319HOiNlyS+m5Xrbf5Huqi5gU2hR6QQ2d6qvTtb0pEiJAzOi?= =?us-ascii?Q?AvmuBGtI2cJhlkx3B2rpXKGfkn4vYWFLqJtsVLVlZ9g7rjPx5sxltr99oBGP?= =?us-ascii?Q?8GdDuLJcZzrWAsrQHwMCDDE+vEZnTEl/Oi7j6UjmKg6irfRKyfpxVsA8H32D?= =?us-ascii?Q?mSah/Ie3mlgyvdUceLuTLcBPYYQoZYSiK5vR?= 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)(82310400026)(376014)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 15:54:10.0070 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ad3191d3-6f7d-4332-fd88-08dd8f11bcd0 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: SJ5PEPF000001CD.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9224 Content-Type: text/plain; charset="utf-8" Add the necessary support to enable Renoir ethernet device. Since the BAR1 address cannot be used to access the XPCS registers on Renoir, use the smn functions. Some of the ethernet add-in-cards have dual PHY but share a single MDIO line (between the ports). In such cases, link inconsistencies are noticed during the heavy traffic and during reboot stress tests. Using smn calls helps avoid such race conditions. Suggested-by: Sudheesh Mavila Signed-off-by: Raju Rangoju Reviewed-by: Simon Horman --- Changes since v2: - include linux/pci.h in xgbe-dev.c to ensure pci_err() is defined - address Checkpatch warning "Improper SPDX comment style" - line wrap to 80 columns wide - use the correct device name Renoir instead of Crater drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 86 ++++++++++++++++++++++++ drivers/net/ethernet/amd/xgbe/xgbe-smn.h | 30 +++++++++ drivers/net/ethernet/amd/xgbe/xgbe.h | 6 ++ 3 files changed, 122 insertions(+) create mode 100644 drivers/net/ethernet/amd/xgbe/xgbe-smn.h diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/etherne= t/amd/xgbe/xgbe-dev.c index cdab1c24dd69..466b5f6e5578 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c @@ -11,9 +11,11 @@ #include #include #include +#include =20 #include "xgbe.h" #include "xgbe-common.h" +#include "xgbe-smn.h" =20 static inline unsigned int xgbe_get_max_frame(struct xgbe_prv_data *pdata) { @@ -1080,6 +1082,84 @@ static void xgbe_get_pcs_index_and_offset(struct xgb= e_prv_data *pdata, *offset =3D pdata->xpcs_window + (mmd_address & pdata->xpcs_window_mask); } =20 +static int xgbe_read_mmd_regs_v3(struct xgbe_prv_data *pdata, int prtad, + int mmd_reg) +{ + unsigned int mmd_address, index, offset; + u32 smn_address; + int mmd_data; + int ret; + + mmd_address =3D xgbe_get_mmd_address(pdata, mmd_reg); + + xgbe_get_pcs_index_and_offset(pdata, mmd_address, &index, &offset); + + smn_address =3D pdata->smn_base + pdata->xpcs_window_sel_reg; + ret =3D amd_smn_write(0, smn_address, index); + if (ret) + return ret; + + ret =3D amd_smn_read(0, pdata->smn_base + offset, &mmd_data); + if (ret) + return ret; + + mmd_data =3D (offset % 4) ? FIELD_GET(XGBE_GEN_HI_MASK, mmd_data) : + FIELD_GET(XGBE_GEN_LO_MASK, mmd_data); + + return mmd_data; +} + +static void xgbe_write_mmd_regs_v3(struct xgbe_prv_data *pdata, int prtad, + int mmd_reg, int mmd_data) +{ + unsigned int pci_mmd_data, hi_mask, lo_mask; + unsigned int mmd_address, index, offset; + struct pci_dev *dev; + u32 smn_address; + int ret; + + dev =3D pdata->pcidev; + mmd_address =3D xgbe_get_mmd_address(pdata, mmd_reg); + + xgbe_get_pcs_index_and_offset(pdata, mmd_address, &index, &offset); + + smn_address =3D pdata->smn_base + pdata->xpcs_window_sel_reg; + ret =3D amd_smn_write(0, smn_address, index); + if (ret) { + pci_err(dev, "Failed to write data 0x%x\n", index); + return; + } + + ret =3D amd_smn_read(0, pdata->smn_base + offset, &pci_mmd_data); + if (ret) { + pci_err(dev, "Failed to read data\n"); + return; + } + + if (offset % 4) { + hi_mask =3D FIELD_PREP(XGBE_GEN_HI_MASK, mmd_data); + lo_mask =3D FIELD_GET(XGBE_GEN_LO_MASK, pci_mmd_data); + } else { + hi_mask =3D FIELD_PREP(XGBE_GEN_HI_MASK, + FIELD_GET(XGBE_GEN_HI_MASK, pci_mmd_data)); + lo_mask =3D FIELD_GET(XGBE_GEN_LO_MASK, mmd_data); + } + + pci_mmd_data =3D hi_mask | lo_mask; + + ret =3D amd_smn_write(0, smn_address, index); + if (ret) { + pci_err(dev, "Failed to write data 0x%x\n", index); + return; + } + + ret =3D amd_smn_write(0, (pdata->smn_base + offset), pci_mmd_data); + if (ret) { + pci_err(dev, "Failed to write data 0x%x\n", pci_mmd_data); + return; + } +} + static int xgbe_read_mmd_regs_v2(struct xgbe_prv_data *pdata, int prtad, int mmd_reg) { @@ -1174,6 +1254,9 @@ static int xgbe_read_mmd_regs(struct xgbe_prv_data *p= data, int prtad, case XGBE_XPCS_ACCESS_V2: default: return xgbe_read_mmd_regs_v2(pdata, prtad, mmd_reg); + + case XGBE_XPCS_ACCESS_V3: + return xgbe_read_mmd_regs_v3(pdata, prtad, mmd_reg); } } =20 @@ -1184,6 +1267,9 @@ static void xgbe_write_mmd_regs(struct xgbe_prv_data = *pdata, int prtad, case XGBE_XPCS_ACCESS_V1: return xgbe_write_mmd_regs_v1(pdata, prtad, mmd_reg, mmd_data); =20 + case XGBE_XPCS_ACCESS_V3: + return xgbe_write_mmd_regs_v3(pdata, prtad, mmd_reg, mmd_data); + case XGBE_XPCS_ACCESS_V2: default: return xgbe_write_mmd_regs_v2(pdata, prtad, mmd_reg, mmd_data); diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-smn.h b/drivers/net/etherne= t/amd/xgbe/xgbe-smn.h new file mode 100644 index 000000000000..3fd03d39c18a --- /dev/null +++ b/drivers/net/ethernet/amd/xgbe/xgbe-smn.h @@ -0,0 +1,30 @@ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) */ +/* + * Copyright (c) 2014-2025, Advanced Micro Devices, Inc. + * Copyright (c) 2014, Synopsys, Inc. + * All rights reserved + * + * Author: Raju Rangoju + */ + +#ifndef __SMN_H__ +#define __SMN_H__ + +#ifdef CONFIG_AMD_NB + +#include + +#else + +static inline int amd_smn_write(u16 node, u32 address, u32 value) +{ + return -ENODEV; +} + +static inline int amd_smn_read(u16 node, u32 address, u32 *value) +{ + return -ENODEV; +} + +#endif +#endif diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/am= d/xgbe/xgbe.h index 37e5f8fad6b2..44ba6b02cdeb 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe.h +++ b/drivers/net/ethernet/amd/xgbe/xgbe.h @@ -242,6 +242,10 @@ #define XGBE_RV_PCI_DEVICE_ID 0x15d0 #define XGBE_YC_PCI_DEVICE_ID 0x14b5 =20 + /* Generic low and high masks */ +#define XGBE_GEN_HI_MASK GENMASK(31, 16) +#define XGBE_GEN_LO_MASK GENMASK(15, 0) + struct xgbe_prv_data; =20 struct xgbe_packet_data { @@ -460,6 +464,7 @@ enum xgbe_speed { enum xgbe_xpcs_access { XGBE_XPCS_ACCESS_V1 =3D 0, XGBE_XPCS_ACCESS_V2, + XGBE_XPCS_ACCESS_V3, }; =20 enum xgbe_an_mode { @@ -955,6 +960,7 @@ struct xgbe_prv_data { struct device *dev; struct platform_device *phy_platdev; struct device *phy_dev; + unsigned int smn_base; =20 /* Version related data */ struct xgbe_version_data *vdata; --=20 2.34.1 From nobody Wed Dec 17 08:59:22 2025 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2052.outbound.protection.outlook.com [40.107.100.52]) (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 1B8F62356C5; Fri, 9 May 2025 15:54:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.100.52 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746806058; cv=fail; b=PdEknlsn3ntiBec7N7BD+T2NF2KHqXgQ/jw+KTcuW+Pibybb47WpUlcgFaaUAQ/Kf97ui/J8pA+XWJR95XqkjbTP4EW3yf9cNIVAXYEdtQqiEL+28ng9DLyWFwWou+I5jLQefZHZBhtCjPU8VsEzDJ9o1XtPBg36kcKxnTkAO88= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746806058; c=relaxed/simple; bh=GWF7W53RQi51lcM+WXL0Ci+yR2zHjJtSOVtpqRqirIU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Dwcp6UuF5icRz+gV5dHzhJUe4tJLIPXGbaulzs5+mzuY9cv/SDfL0Bq2boSZPdkMdoqL4mit1J9JTx7inqkTKiF0nmtKwQhpTu7tGOmjI7FRu8H5Vyl/QZDMkaeQS7/UcJbPlA+2lyzvQQ5M10x+N5kIe08+1lZfqfawkikxGjU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=laq43jIi; arc=fail smtp.client-ip=40.107.100.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="laq43jIi" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AXt+KEacaSoi9S4XosUSsYke0lsa+yWhifrQsPWKGysO7Wy2NC7B48y6Tm7UFZ34oJHFYSyH52NSCqt5CBI6suxs3vs3/tT+SxDks1NRV03e+T9Fec6KFGII6gKpOsxxWq3+Zt5D1Qe+YWEox6vWI068RFM0XaGu07QbULlJ02Uc0739hjd0Hw5e6ijnTe4mjz0t0jAV3053h6YuDLJOEJh5FxPa/HK2O2GVInMoPduNcNkXCuoBhNxs2nIMt4xVQwr3XPH02OMB4L9Ubyl/lvgaiRqv50JCdFfD6CRJhGOoQw/6c4junMMB4h71aR9UfRnxAl3ZCWT2JqrrseA0iQ== 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=6nB0Y3fejlfzSQx4M3hC4X6Zuys+6d84bMw6gXCXIpI=; b=rNelKAF00+FpaS2Jgyp0bFjBtXnSLEiqfET3bv4NN9YFFExK6wet8xmUVD19euY4D1BvJj37dzOQa0MHjBqg93n1j9+YTLCayFB6gxv9rzqyRvWB1qVMph4Ia1tC0G2cJhhd+En5EsxS+4dszIsO1SA22TfWy7fHFzWzcTN8tgWpPM9U3tTfpMM7SAo+gnscjWm2HacmTtqhaFLOZiDjZ1r5c5+JyCC798HPDZrkTx7OZFOwctYH4BAyYdFq5s4Bdns6aLSarblIio2ei94clBJPOX7oqNWUlK6bCmbvEktJAdg9U+VVai4BYa2D2n4aeN0mfpw03OTWbuzswO3DNw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.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=6nB0Y3fejlfzSQx4M3hC4X6Zuys+6d84bMw6gXCXIpI=; b=laq43jIi57NrvO8JouZZL3q36ME3DgcLSy02gSQFciTEtf61yNm8TnJHHClSSL0/MRdpx7JT+gJ2+vOArO6wuZc97CulzRZ2yFt46fv2U4l80KYRDsBYslcMlodod/kWuJeCtxrTktgfTr1Xwcg6v8RFBplW6geVqZU61loFXaQ= Received: from SJ0PR13CA0180.namprd13.prod.outlook.com (2603:10b6:a03:2c7::35) by DM6PR12MB4354.namprd12.prod.outlook.com (2603:10b6:5:28f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.23; Fri, 9 May 2025 15:54:14 +0000 Received: from SJ5PEPF000001C8.namprd05.prod.outlook.com (2603:10b6:a03:2c7:cafe::81) by SJ0PR13CA0180.outlook.office365.com (2603:10b6:a03:2c7::35) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8722.19 via Frontend Transport; Fri, 9 May 2025 15:54:14 +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 SJ5PEPF000001C8.mail.protection.outlook.com (10.167.242.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 15:54:14 +0000 Received: from airavat.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.39; Fri, 9 May 2025 10:54:10 -0500 From: Raju Rangoju To: , , , , , CC: , , , Raju Rangoju Subject: [PATCH net-next v3 4/5] amd-xgbe: Add XGBE_XPCS_ACCESS_V3 support to xgbe_pci_probe() Date: Fri, 9 May 2025 21:23:24 +0530 Message-ID: <20250509155325.720499-5-Raju.Rangoju@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509155325.720499-1-Raju.Rangoju@amd.com> References: <20250509155325.720499-1-Raju.Rangoju@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: SJ5PEPF000001C8:EE_|DM6PR12MB4354:EE_ X-MS-Office365-Filtering-Correlation-Id: f4d8ca80-5c21-4e73-dff1-08dd8f11bf3b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?bhuEoufhQfviQBF/NDnzFABGtibuxPztwboHwJvvzT6yTT92ew/OE7R/3oMt?= =?us-ascii?Q?ImVXZ0d7VFLhWIiwXOARtQivma6r8WtzDv28zhBv7GeIF+v6yog9IRF8Nob6?= =?us-ascii?Q?JA89LK3wsHT8WD10d1oWEQEtsZTWBNqXQK+M68Cc2UrBH2019Ffqp15hpR4p?= =?us-ascii?Q?jnLK6/5TOLh47bfK3LzmwNCwK1DyugwldlB5DXAX6ImcpyMdEwYdEpX7sD8Z?= =?us-ascii?Q?JcnEeeAebTilVROX17BC2rX0ShaN1Ss4ZloVxa8N4O/pivuiOnYdQPg4ALbP?= =?us-ascii?Q?UpDDfRFTBEBIz3pIdHodNG1qUGf5ifJ/qb4OJXjgEzLf/SlneholXuBS/y57?= =?us-ascii?Q?0WdJlLP0xGUkClzBwJ3ir9nItl6xNSOCwfi6gMAfYVzweKFNp1N4IrfnnWOr?= =?us-ascii?Q?F0CnbVVcwyuBly1YDn9ICMJBLs3xDN8OUq1JiqwFTreWDZy9TKLjwNf7fEIB?= =?us-ascii?Q?zNliBTa8aitJZ73iZ5iAf1mvNk0A74Z2+vkTDr1tn7E+AbJYkM/SvdLW7IS/?= =?us-ascii?Q?M414qMyppsBnoj3aIEYKWoGWbRBu1WDidTKF6z0hG6WQJBg9a/pBKcmtebzq?= =?us-ascii?Q?mXAbDK1mD6GAY9hpXEOdVWd8Eo+S9xBXiHi6ygzKJVk5J8L3F0gxLnMcc7FR?= =?us-ascii?Q?yvwU1vr6OCG5R1oLhQuJ6tAUQtxZhfJ5g/xKydrOQ+o21VHsve+jxymVkRwj?= =?us-ascii?Q?0+IcaUFXVpW1sQNTER/OUxPKUEfggvLhMXBqxDSRa9jHbxzfWKHvyhYETWlM?= =?us-ascii?Q?SvBkb1foL8B//hMydjcr1Vvv3ql9wVVIfOaoqnXtu2eKXVUBq24VaEAXpLwE?= =?us-ascii?Q?iO9jBQF2dhqwiHmLz5f81ItfvD3kw1e4bMWxJwTjmv5artEC3qcQBvZDzVi0?= =?us-ascii?Q?/G9oEQJrpSp2KjYOEnz1n8JJ8nstfOvInHla2WZAdRRm5iAqM0tpzBhL2kSw?= =?us-ascii?Q?tbSwCI4QeO/yRMp/UwM0urZHTyXdAC5NR09tREpW4i5MtgyweGwcGl96jM8a?= =?us-ascii?Q?HY0q7Mu8xdq3d7esgqqQCK/z4wSO8znYlTduspHhsXROLizwf5tAZ88Pz7kV?= =?us-ascii?Q?FJJuJjEkKyD9elLBR8M7cjb920THnuSFYpAgF9Gaghio/PaSx13bhqfGALf2?= =?us-ascii?Q?yh5C94iGChfK2zkE652GSbv9OqV4sxsBAz7ToS8+4Wfq6On5Lr/j1LgFWjGu?= =?us-ascii?Q?+plADaIIh1ulcRcb6m8Ggao/wVF8gkGWU9pE7/TFyAB3KisUhepv7EyfqT9s?= =?us-ascii?Q?PM57r22XFM2nr5hw2NJLQyCx1DgkfZCj+FIq2rLaVgMJ1sFe4sCZpW43cyO3?= =?us-ascii?Q?9v1EoaLY/mwp4goDg/0Dqqlb/sHhJyxBAqXOhxQF9M23tqnE511nkzg8ktt9?= =?us-ascii?Q?tsI7cHsN8XobNe8kNriJR0uOYCT+G/mh6+gQMaEXzW+6q3hHesZ/5LP7WlO/?= =?us-ascii?Q?3Z+y5Ugudy+71eNEIm2ek+KXvGjXkGX2UcQ8b9fKqGFIUegMZLC9SiDi4EEc?= =?us-ascii?Q?ygBoUSG9eWqNhBjWRYcSWY+cU09u5YWdd68g?= 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)(1800799024)(36860700013)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 15:54:14.0768 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f4d8ca80-5c21-4e73-dff1-08dd8f11bf3b 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: SJ5PEPF000001C8.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4354 Content-Type: text/plain; charset="utf-8" A new version of XPCS access routines have been introduced, add the support to xgbe_pci_probe() to use these routines. Signed-off-by: Raju Rangoju Reviewed-by: Simon Horman --- drivers/net/ethernet/amd/xgbe/xgbe-common.h | 5 +++ drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 34 ++++++++++++++++----- drivers/net/ethernet/amd/xgbe/xgbe.h | 1 + 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethe= rnet/amd/xgbe/xgbe-common.h index e3d33f5b9642..e1296cbf4ff3 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h +++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h @@ -791,6 +791,11 @@ #define PCS_V2_RV_WINDOW_SELECT 0x1064 #define PCS_V2_YC_WINDOW_DEF 0x18060 #define PCS_V2_YC_WINDOW_SELECT 0x18064 +#define PCS_V3_RN_WINDOW_DEF 0xf8078 +#define PCS_V3_RN_WINDOW_SELECT 0xf807c + +#define PCS_RN_SMN_BASE_ADDR 0x11e00000 +#define PCS_RN_PORT_ADDR_SIZE 0x100000 =20 /* PCS register entry bit positions and sizes */ #define PCS_V2_WINDOW_DEF_OFFSET_INDEX 6 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-pci.c b/drivers/net/etherne= t/amd/xgbe/xgbe-pci.c index d36446e76d0a..718534d30651 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-pci.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-pci.c @@ -9,6 +9,7 @@ #include #include #include +#include "xgbe-smn.h" =20 #include "xgbe.h" #include "xgbe-common.h" @@ -98,14 +99,14 @@ static int xgbe_config_irqs(struct xgbe_prv_data *pdata) =20 static int xgbe_pci_probe(struct pci_dev *pdev, const struct pci_device_id= *id) { - struct xgbe_prv_data *pdata; - struct device *dev =3D &pdev->dev; void __iomem * const *iomap_table; - struct pci_dev *rdev; + unsigned int port_addr_size, reg; + struct device *dev =3D &pdev->dev; + struct xgbe_prv_data *pdata; unsigned int ma_lo, ma_hi; - unsigned int reg; - int bar_mask; - int ret; + struct pci_dev *rdev; + int bar_mask, ret; + u32 address; =20 pdata =3D xgbe_alloc_pdata(dev); if (IS_ERR(pdata)) { @@ -181,6 +182,10 @@ static int xgbe_pci_probe(struct pci_dev *pdev, const = struct pci_device_id *id) /* Yellow Carp devices do not need rrc */ pdata->vdata->enable_rrc =3D 0; break; + case XGBE_RN_PCI_DEVICE_ID: + pdata->xpcs_window_def_reg =3D PCS_V3_RN_WINDOW_DEF; + pdata->xpcs_window_sel_reg =3D PCS_V3_RN_WINDOW_SELECT; + break; default: pdata->xpcs_window_def_reg =3D PCS_V2_WINDOW_DEF; pdata->xpcs_window_sel_reg =3D PCS_V2_WINDOW_SELECT; @@ -193,7 +198,22 @@ static int xgbe_pci_probe(struct pci_dev *pdev, const = struct pci_device_id *id) pci_dev_put(rdev); =20 /* Configure the PCS indirect addressing support */ - reg =3D XPCS32_IOREAD(pdata, pdata->xpcs_window_def_reg); + if (pdata->vdata->xpcs_access =3D=3D XGBE_XPCS_ACCESS_V3) { + reg =3D XP_IOREAD(pdata, XP_PROP_0); + port_addr_size =3D PCS_RN_PORT_ADDR_SIZE * + XP_GET_BITS(reg, XP_PROP_0, PORT_ID); + pdata->smn_base =3D PCS_RN_SMN_BASE_ADDR + port_addr_size; + + address =3D pdata->smn_base + (pdata->xpcs_window_def_reg); + ret =3D amd_smn_read(0, address, ®); + if (ret) { + pci_err(pdata->pcidev, "Failed to read data\n"); + goto err_pci_enable; + } + } else { + reg =3D XPCS32_IOREAD(pdata, pdata->xpcs_window_def_reg); + } + pdata->xpcs_window =3D XPCS_GET_BITS(reg, PCS_V2_WINDOW_DEF, OFFSET); pdata->xpcs_window <<=3D 6; pdata->xpcs_window_size =3D XPCS_GET_BITS(reg, PCS_V2_WINDOW_DEF, SIZE); diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/am= d/xgbe/xgbe.h index 44ba6b02cdeb..6359bb87dc13 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe.h +++ b/drivers/net/ethernet/amd/xgbe/xgbe.h @@ -241,6 +241,7 @@ /* XGBE PCI device id */ #define XGBE_RV_PCI_DEVICE_ID 0x15d0 #define XGBE_YC_PCI_DEVICE_ID 0x14b5 +#define XGBE_RN_PCI_DEVICE_ID 0x1630 =20 /* Generic low and high masks */ #define XGBE_GEN_HI_MASK GENMASK(31, 16) --=20 2.34.1 From nobody Wed Dec 17 08:59:22 2025 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2063.outbound.protection.outlook.com [40.107.93.63]) (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 C58EB2367B4; Fri, 9 May 2025 15:54:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.63 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746806065; cv=fail; b=DJZN8EzQRZ62hyAbsOBWYWVIa5raR7DzkmGaALEd5bDy7AZKSL377013udXE+t5dTmHaVhsxjtM4BhoBzLZD90tNvBRVNADyr9rTrVAZy1s39uC83k6g4toMf9BjHr4sTlV+gn9LxCVPTH2fP6vJxCi8mrexQLVVMM4t9Q4ih5M= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746806065; c=relaxed/simple; bh=siMaKEfvVBNqGXRDbVlDXftfrO9yMXo24YuOMwE+B/A=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=FmeIFmiwXdvdE56L5UnXgzGvfPRSL4FwM5yVhmL/RFnumalXiblvO8278wjDVwvf235pbWyR2RmTCuOqWAgbQY3SQZyq0DLQZL5mhzu0VDGF3P89MBBouV/g4NSj3+jDA4IxjMvnZPR8Mzh/criusTQTfQb32PJ6L4csPtSYWME= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=EEAliUmn; arc=fail smtp.client-ip=40.107.93.63 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="EEAliUmn" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WcYWM6n560OijB4Ibm4J7tDOhdd9X4ekrwxTFTYEA8/m3lGeGYrPfM1ID1eBCK4BX0W5QmPmUsGDp3P1fbIg0KJWrWkERNRq5V/9svPag/l95L79NCJMgzGtZNtbe5Wfved1kNeD0/D2V20Cv26aI560MDmOwEegQUe6R1ATMx02hKWc4xcagNDT4vuGnDDiq0Xk8m8GlobRs1nfCyBSW+ywkNEhb7Y1789OVMvb2hxUtqIK7OxVputmapc7Z3HL1XLAbVgMA38tBs7XKhtNqHnXN2AtZxPNhl5XJx3q9g93dfpJ8uWinp0YdO+NwG/aCAbjv/hlODCwc6HQ+xI8Sg== 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=jfmZXzlPJM3ugs5Ll1DaUBKGaTXvOvXfpXDnJ7uO0Hc=; b=yzucifx3TjKO21zYI981b27BabQZPWRzCQBy1yxJ2+Lux4gRqRD/SNWNaY0KNPUZ0pedSzk+DSK53dbucAfJp2brPOYVxrC+oKXStLJIcjhg4PcE0vodFL3v9xhrZdvqVMUFG2vGLIwNJ5brqQLA5HEB/NelrAzxb4ztN0sPc0eObBGTx7UJHacDKLosizwjdnUXg1thp25CLT25qOqS6r9j6GDVfpAikfNHoDoS6sYS8PuwVzeA64680NryvCyz86hfHD4lZFcl/Y/FLMCqUd3jdg6Ixscyi9sqgrjh85NfsmS0XIeGd+GdJe/NfsgASoF/HVUivxL/CED0XLIJHw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.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=jfmZXzlPJM3ugs5Ll1DaUBKGaTXvOvXfpXDnJ7uO0Hc=; b=EEAliUmnEb/GwXkzjBI8gxsoFxIIi5pUue6lSMI+TkfEYYg2THGjUAYk7L61kyaUVQE/ZZmjOAAc7U58BlrNWL5+R9YkNXchxPdGUVCT/+9L+loVYsQvTp5agWDpdvLY2V6kpPL/KmW5fSd50iPyoqTCM65UyQwKF9zvE/alj/w= Received: from BYAPR02CA0013.namprd02.prod.outlook.com (2603:10b6:a02:ee::26) by CH2PR12MB4184.namprd12.prod.outlook.com (2603:10b6:610:a7::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.24; Fri, 9 May 2025 15:54:19 +0000 Received: from SJ5PEPF000001CB.namprd05.prod.outlook.com (2603:10b6:a02:ee:cafe::74) by BYAPR02CA0013.outlook.office365.com (2603:10b6:a02:ee::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8699.29 via Frontend Transport; Fri, 9 May 2025 15:54:19 +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 SJ5PEPF000001CB.mail.protection.outlook.com (10.167.242.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 15:54:19 +0000 Received: from airavat.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.39; Fri, 9 May 2025 10:54:15 -0500 From: Raju Rangoju To: , , , , , CC: , , , Raju Rangoju Subject: [PATCH net-next v3 5/5] amd-xgbe: add support for new pci device id 0x1641 Date: Fri, 9 May 2025 21:23:25 +0530 Message-ID: <20250509155325.720499-6-Raju.Rangoju@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509155325.720499-1-Raju.Rangoju@amd.com> References: <20250509155325.720499-1-Raju.Rangoju@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: SJ5PEPF000001CB:EE_|CH2PR12MB4184:EE_ X-MS-Office365-Filtering-Correlation-Id: e1a87614-8e8c-4947-04c5-08dd8f11c260 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?P/x99QuPOuip8IUvoIUabz1e4SQmHNkhgoliGqBuR4C1MbCu8SLt1NjhOWkt?= =?us-ascii?Q?i08bBEHNd7KfbSvhrKmrF04v68ojVmAHmk6puusD7XMl3pkNpvK7/vwvgGhb?= =?us-ascii?Q?+bKdqDx8PbuSM1KZMOWSRCn/Dmw5D+uFF1Zu/InXsoSVPHYbRoGs6xaCSS6h?= =?us-ascii?Q?M6qibnAfC6eDskFNRrDMRYpljfaylFkZp19lCWoBgvgXkLxMoVEgMfvUkEv6?= =?us-ascii?Q?CNsuzkewV3UR9V8qMDCZs2VaYxqW+oey9X/BwNx3bPe6c9uu58KMdB9IVKIM?= =?us-ascii?Q?+OWQrWvqr9xzBpy/w8g5lNIwELIe1/eAQrpyJFr9kY1q1EiFEhb4OR7WsZ4e?= =?us-ascii?Q?iw2wl7W/Ko13okAGhJICITX8ZKce6SM1t8ojZ95jNhuFCD7Ga3YBInwtvqYK?= =?us-ascii?Q?U4d31SeB0EKuu6cYC9XOXKhYJCTb2twW7EbmR9skLEM1orCIolr+SKm5vlv0?= =?us-ascii?Q?JXskx3ExuzpS8N+sa6BFHIL9MBbGKy3CAjfRmecLBlydtyGoFGsT5TUr//pw?= =?us-ascii?Q?fbC01nKHvyKmpTajmg3e/13k20CbzXHiULjYZGu8p7ICFB9os/KjX0+kiOIi?= =?us-ascii?Q?ytcUM/NMjBRCVpULc0G6i0pBPqtQ88HhcoCBWWjd0ZQ7wqEYAYrmmRarjDbj?= =?us-ascii?Q?vAWCH/NK6mdJqi9e4c+eGtXyvjvOLKXfxwvkmV7S6CEYTippgEFhGbrbrfUG?= =?us-ascii?Q?dQJcbSr8uvshhLXc7P1KfPK8ILU6Liz0LUAaegcdLVZv2sCLYMFVS79sYvDB?= =?us-ascii?Q?HSjMjh/q+4DLhY/AHEeTZFFGCRtUxEVtfRwcdrqIzZo3SwuELgUAkYoUKKjh?= =?us-ascii?Q?TKdu7GD1N5aLfQco0wJDLMjWxcEkuQwhO7Uf5FnUDdUBCwkmXcr2fA7rkBSc?= =?us-ascii?Q?0vFnwzd+QzghJ9cMFnL4yBV4AzNCm5Qb6h8eiJ23GFALJhUY0fK2aC7rwuWK?= =?us-ascii?Q?LQMV6jdMOmX5YCl0RL1achtQWzWoCaOHOBDOgbTvoqtxVGNyIaGLhwFjm8Sc?= =?us-ascii?Q?fGAo65Tt3dqi2LhSs+zFK96v8Qh8vp6v8oINDA5q6Z+6Iy9hPlvUauNbGxev?= =?us-ascii?Q?Of1+0thF3d6smWmebZraZQCTUHII5c4XbKWfPSL9rbrsY59Dt8VnbF6cBbqn?= =?us-ascii?Q?Wc7vbVW/rociUYLVD9mdPAif/W/EdWOArYEiJeDhdJJwlzNXw0I8Zf86K7LX?= =?us-ascii?Q?1YjwvimmPcyE/vMzDqF3Tj+fZs0IAl9n048vu1D0RoVpBo4c4LXyLU2T8SSD?= =?us-ascii?Q?z+gTAhwYzxZnaVDzkD9SLJ5mUJz89d0RUVMVV3DO2ZSAPW236RanlurmTXG6?= =?us-ascii?Q?AaQCdyKDbH8jFkilpZJfBfMCMxyA7NXGUj7a7D0FvjRqufH4a3dAN7neC1Uk?= =?us-ascii?Q?QnUGPzsUO0dZvuhHcRPwa6fMypWfGgVKdsXwLtwx/thRf8njLJyfePgnJkHU?= =?us-ascii?Q?oFSmaoN4cNJ+aQfSqbihMP4I3m5St7dL8yEJ4+hXpGlMOmaFIzdY65r5N9E7?= =?us-ascii?Q?+Z6ceZG/ENy3knTmBCgUi0jazF0Ewp4rabZE?= 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)(376014)(82310400026)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 15:54:19.3457 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e1a87614-8e8c-4947-04c5-08dd8f11c260 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: SJ5PEPF000001CB.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4184 Content-Type: text/plain; charset="utf-8" Add support for new pci device id 0x1641 to register Renoir device with PCIe. Signed-off-by: Raju Rangoju Reviewed-by: Simon Horman --- Changes since v2: - use the correct device name Renoir instead of Crater drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-pci.c b/drivers/net/etherne= t/amd/xgbe/xgbe-pci.c index 718534d30651..097ec5e4f261 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-pci.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-pci.c @@ -391,6 +391,22 @@ static int __maybe_unused xgbe_pci_resume(struct devic= e *dev) return ret; } =20 +static struct xgbe_version_data xgbe_v3 =3D { + .init_function_ptrs_phy_impl =3D xgbe_init_function_ptrs_phy_v2, + .xpcs_access =3D XGBE_XPCS_ACCESS_V3, + .mmc_64bit =3D 1, + .tx_max_fifo_size =3D 65536, + .rx_max_fifo_size =3D 65536, + .tx_tstamp_workaround =3D 1, + .ecc_support =3D 1, + .i2c_support =3D 1, + .irq_reissue_support =3D 1, + .tx_desc_prefetch =3D 5, + .rx_desc_prefetch =3D 5, + .an_cdr_workaround =3D 0, + .enable_rrc =3D 0, +}; + static struct xgbe_version_data xgbe_v2a =3D { .init_function_ptrs_phy_impl =3D xgbe_init_function_ptrs_phy_v2, .xpcs_access =3D XGBE_XPCS_ACCESS_V2, @@ -428,6 +444,8 @@ static const struct pci_device_id xgbe_pci_table[] =3D { .driver_data =3D (kernel_ulong_t)&xgbe_v2a }, { PCI_VDEVICE(AMD, 0x1459), .driver_data =3D (kernel_ulong_t)&xgbe_v2b }, + { PCI_VDEVICE(AMD, 0x1641), + .driver_data =3D (kernel_ulong_t)&xgbe_v3 }, /* Last entry must be zero */ { 0, } }; --=20 2.34.1