From nobody Tue Sep 29 13:19:51 2026 Received: from CY3PR05CU001.outbound.protection.outlook.com (mail-westcentralusazon11013002.outbound.protection.outlook.com [40.93.201.2]) (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 A23C93CF1F2; Fri, 7 Aug 2026 09:50:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.201.2 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786096237; cv=fail; b=ZE0GhIr85aAGnJI72Gc/UKMRd7oZs6nURkqmxyv0CxaXnR7anCsNCgetbTnee1WvNdMqoljptPKO0K0Sqdh0y4NcIwbSa+UpO88xjdiQLcXMUYfu1Fs6t6WYS/gmRkcVtthyQmMORvrpCDYlc6uMiVe0AjS6bJNJfHuc4bLIw08= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786096237; c=relaxed/simple; bh=hSDUaNnA6t1J1l9ruMzpSdiYmnccDx9mBokbR0dJ2kA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=pKlFl2z35yrEx6yqlVTrT+ij6qrYqzoQ8k+zTarGj1dLcbaGLzCHRmTwLpi6zNj1Qp7OOPvP4ytTc4GSe+zLkN6KRfkFE8AcggZ0LsRFHCqX6qEHu1kYIpCO8xzj+nv5Cc3vtWGWfkqkKDo5JeD5IdiqfCRmMsfPh3PP1YF3mlE= 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=NKaQG5xt; arc=fail smtp.client-ip=40.93.201.2 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="NKaQG5xt" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wIw/OC0uXS1Hos0JlrJ07jXcO5E838OuIu4K4JFgrYk+gENmXGupEzViSsqmTjpO4pubqZ0OKWcTpoYmqxKa0+ogJjfnlU02bQh3w473f+RDCFxM37cHTQSHM5V8pSMrgE8+xxlWsn1s36fH+pkhJ27OEeXPKixm7gMvqhQL28X5GnynKl0hMbJDxHqWsfk2WTExR9y5PN/EtzdRMcNAMsqHXVC0fTg7/5zoe+ZHY1C1K8Knn+yrobFpwtMxQtzTc2dOSLcrSgwy2In6zRQxKfTxRH6yr2irQ/3ovkOQ3rXJuayTJqO1jFueBMvLL49hwn17zPpaJph0tEigC/tTew== 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=xwZ7kvkovkJ/1+8RUsGdVvqIjA1ijGgP/y0x2A19h9o=; b=W3JfrcVjS1pZR3zhvOIEhP7N5hpLndn+abcR861WQVY53WNCKjHUv3SwazFq+DSZemYkd2oHix7WVkM+22b9U1w0NM7vrDvlTk+yo1JBAihbp8liurpP/CDjbJ2X1thxXkMPGybjzi5+KqWz0QpEYp7DrXhd9Z0iXD4Sfwd1IESd6OwUAq5sO0qAZlmf0FkLdJPs6ZmVaYAJT87ukskXvBDRfTDvQ0Ui/gTg/KWyAcx58LX46rq5xbE7vySQ6dQeBD17wANHNzKKPQ8JkrfzhaXbjCFIYE6boXe1eZk9HGnf7pp1BcwCy0AtZvMY5PqtcC33R93rzURNEyqzc0E91Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=bootlin.com 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=xwZ7kvkovkJ/1+8RUsGdVvqIjA1ijGgP/y0x2A19h9o=; b=NKaQG5xtMdmalW98ojacGWsySD0sC343uUotL5QJK43uCtxVHCo0zDQLJQZc3dsUNsszUi7miOXuJk2+HaElqjbbDIG7cDfLT4ML8qdM2+kZDfRi0StI1YkgzNgF0wvDW+/q/V/dTrIuUEDb1x5JNB9yTuMYY2dRaIwyB6qJyaU= Received: from MN0P220CA0025.NAMP220.PROD.OUTLOOK.COM (2603:10b6:208:52e::33) by CH2PR12MB4167.namprd12.prod.outlook.com (2603:10b6:610:7a::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.292.20; Fri, 7 Aug 2026 09:50:30 +0000 Received: from MN1PEPF0000F0E0.namprd04.prod.outlook.com (2603:10b6:208:52e:cafe::a0) by MN0P220CA0025.outlook.office365.com (2603:10b6:208:52e::33) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.292.23 via Frontend Transport; Fri, 7 Aug 2026 09:50:30 +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=satlexmb08.amd.com; pr=C Received: from satlexmb08.amd.com (165.204.84.17) by MN1PEPF0000F0E0.mail.protection.outlook.com (10.167.242.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.315.6 via Frontend Transport; Fri, 7 Aug 2026 09:50:29 +0000 Received: from satlexmb10.amd.com (10.181.42.219) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Fri, 7 Aug 2026 04:50:20 -0500 Received: from satlexmb08.amd.com (10.181.42.217) by satlexmb10.amd.com (10.181.42.219) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Fri, 7 Aug 2026 04:50:19 -0500 Received: from xhdvineethc40.xilinx.com (10.180.168.240) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server id 15.2.2562.41 via Frontend Transport; Fri, 7 Aug 2026 04:50:16 -0500 From: Vineeth Karumanchi To: , , , , , , CC: , , , Subject: [PATCH net-next 1/4] net: macb: Rename MACB_CAPS_QBV to MACB_CAPS_TC Date: Fri, 7 Aug 2026 15:20:09 +0530 Message-ID: <20260807095012.640223-2-vineeth.karumanchi@amd.com> X-Mailer: git-send-email 2.44.4 In-Reply-To: <20260807095012.640223-1-vineeth.karumanchi@amd.com> References: <20260807095012.640223-1-vineeth.karumanchi@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-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN1PEPF0000F0E0:EE_|CH2PR12MB4167:EE_ X-MS-Office365-Filtering-Correlation-Id: d09e89ee-f422-4a6f-636b-08def46950c0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|23010399003|36860700016|376014|56012099006|11063799006|5023799004|10067099003|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: VXj3R9R/VXpFQVvr3Mg7AESoi2hTwDEO/3P6KI/MDSFtkHkUyvs5xnheW7zpl6npC23fmTTvyYC+UYbNVo+kaQpQIgu6yDbtNb/l9S9/FiJpol62L+ePsRJjgZYRShd1oPdhiPljjidMKLMbvZvki67BFHNmRiOFuNCn2av/HIGZul+RmUm4Ue08Rh1wDENEULygPrpPdUF5OZWooyvwqtiWl8cHQWeWf4OrXN7rYKpENDqaLbwFu84B3Ao8hhd6XQAMUtxmZblx6G4d7qeAeUin3rCBkhOe9U/3uKo6KdOg6hZhGol/DAQYzfi4FvBDJdsdg2Rh9QBMB4YpczCHg9qOXuIsn/lMF8ECI5zVUMP3Ji2ZpJYnTJN+eNMeG4iiRDAvxgvCgzNcKr2Dtt/M8Ozorrm2UZ/fKnBm9nvpjRykZ5jfO59X+JeCpG2kr8sVHdPT46j13xwN/bdEduTa9meSNC6D1qgahuOyZAQxWmUjtEn/dGastxcm7DVP9rcKDPgTRRGNSs/vK4ULkb73Zf8kNrSWynUjvniks1PF0IFyzAd/F5C3/9Q4SIltAD3W3+ObrfFnN/pONkaqAAVJkFEVQ1pZTHtwEuZlrojgjTHV+wAnxT4YJwMQQR/D/wEoOUXN03ybcDM6t2t81CjIG+KUREM+vcx67GL1/OpViqq5WcbsPv9YOICcsz5ChgFgnVQQo9PYunzmInvlGyBRwA== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb08.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(82310400026)(23010399003)(36860700016)(376014)(56012099006)(11063799006)(5023799004)(10067099003)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Lf9ppvenqXB5cHfmTAlg7COAtO3AtKrosz7ZFZnYKeKjU0Ap1OpbLCRVZxQem6HF64+ZnNS0oRTKYUHxDAl12Ydrzl2fvRgO5U17rU7DxAAZv6uDH/LV2dL9Skpzov+i6/Abqn4EEfE6sROpqWUGoNZCCULDM6olFdt/R74a9bmCfZFIMdywZKpd/5uLsZXg4cuq2XpVjolLDdgH3GIF7ULAWF6RkR25pUcdXJ4ckDBkveaBtme+S64m7gh3GF/sPi6aGPqO7wkVLzLZ8rFPJLCdEn/6G9u2pdTf9bdyJxbBCCcT1IxJ89XFduTwtokYdK7rsZX0GxVLFbfKDEJy/cJCSy0bQCzDP9MsUEd3cIKdORoh2cIwn8TtEx8Tj84vJpUD/qxAvp/QJBrkrRkI9jPOSCnjgtsUKWVrSv6dscf68kGdQ0O85/ITmHRvoT3l X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Aug 2026 09:50:29.6284 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d09e89ee-f422-4a6f-636b-08def46950c0 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=[satlexmb08.amd.com] X-MS-Exchange-CrossTenant-AuthSource: MN1PEPF0000F0E0.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4167 Content-Type: text/plain; charset="utf-8" The MACB_CAPS_QBV capability flag was originally introduced to gate TAPRIO/QBV support. However, GEM IP versions that support QBV also implement multiple TSN clauses. Replace this with a generic capability flag that can be reused by other TSN features. Rename MACB_CAPS_QBV to MACB_CAPS_TC to better reflect its role as a general traffic-class offload capability. The supported TSN clauses are handled through macb_setup_tc(). Signed-off-by: Vineeth Karumanchi --- drivers/net/ethernet/cadence/macb.h | 2 +- drivers/net/ethernet/cadence/macb_main.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cad= ence/macb.h index a11052565436..f24df25923d7 100644 --- a/drivers/net/ethernet/cadence/macb.h +++ b/drivers/net/ethernet/cadence/macb.h @@ -768,7 +768,7 @@ #define MACB_CAPS_MIIONRGMII BIT(9) #define MACB_CAPS_NEED_TSUCLK BIT(10) #define MACB_CAPS_QUEUE_DISABLE BIT(11) -#define MACB_CAPS_QBV BIT(12) +#define MACB_CAPS_TC BIT(12) #define MACB_CAPS_PCS BIT(13) #define MACB_CAPS_HIGH_SPEED BIT(14) #define MACB_CAPS_CLK_HW_CHG BIT(15) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/etherne= t/cadence/macb_main.c index d394f1f43b68..29c93df1444c 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -4846,8 +4846,8 @@ static int macb_init_dflt(struct platform_device *pde= v) dev->hw_features |=3D NETIF_F_HW_CSUM | NETIF_F_RXCSUM; if (bp->caps & MACB_CAPS_SG_DISABLED) dev->hw_features &=3D ~NETIF_F_SG; - /* Enable HW_TC if hardware supports QBV */ - if (bp->caps & MACB_CAPS_QBV) + /* Enable TC offload for TSN-capable hardware */ + if (bp->caps & MACB_CAPS_TC) dev->hw_features |=3D NETIF_F_HW_TC; =20 dev->features =3D dev->hw_features; @@ -5678,7 +5678,7 @@ static const struct macb_config versal_config =3D { .caps =3D MACB_CAPS_GIGABIT_MODE_AVAILABLE | MACB_CAPS_JUMBO | MACB_CAPS_GEM_HAS_PTP | MACB_CAPS_BD_RD_PREFETCH | MACB_CAPS_NEED_TSUCLK | MACB_CAPS_QUEUE_DISABLE | - MACB_CAPS_QBV | + MACB_CAPS_TC | MACB_CAPS_USRIO_HAS_MII, .dma_burst_length =3D 16, .init =3D init_reset_optional, --=20 2.44.4 From nobody Tue Sep 29 13:19:51 2026 Received: from SN4PR2101CU001.outbound.protection.outlook.com (mail-southcentralusazon11012061.outbound.protection.outlook.com [40.93.195.61]) (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 266353DD518; Fri, 7 Aug 2026 09:50:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.195.61 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786096242; cv=fail; b=O5AuAO3a9T1NKMYKTogAWctnQWB8C3lKx39Q/oSnh7ihGgymFclKAsX6awLb3++hDarJdcXzkE/B4bIb7BiBofqKq4lpSbhq5kFNqXhpTFfK+XnhxaoTiKtr56RF6ABNwO0tSAtrEZr7+vJ8twt90xHE/uAyY78XFN9ipQmr2Uo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786096242; c=relaxed/simple; bh=wFEp2xXc+xM+2IuyRXXu9lU0h5KQCHKxOwSQ02tUPLE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qeZwCxI8uwHxxJsOZS2NF7JqhqVRatZCfM7iV/b0HfquGkLq5FRqzc54R7D3Kh0mGKKzmegdGC1hi9xEhRGDKXTwO880+A+qVpXVXmy9hYI71Xo4bN+afBMCEsD4N3LMbJXmsu1p+/DDnB1hQ1UMhOvmL3unBlyvXzCP0CpXaOA= 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=HPDOTRgi; arc=fail smtp.client-ip=40.93.195.61 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="HPDOTRgi" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AUoGYu5Q/f7gCqsbcxItejrdQYaiNs6dOFArdF6lv8AalUYojw4+oz5idfFVsQzcCpS9FgYQ/WxIrFCSmrl3AEqUQaZCNliSwyAqNA20+3WNHglHiGiQebDyWYrNFAU1Kvu6RH2tL4Gcy3+YIfUMUUxaqd28ybGLw17qPYhK5OcFEPUNC5Wlxsx1564ebamcNbthP/QAeiY+KCpjNbQ6b3EfBHfmtLTEX336AnrNgZpmkBCM5aBy6lIYzuAmqm10kVpLPjmwOKKANxfO5tOhcV8K4MU0G1S2xYWOe7qBIVMHQ53sYBVr6eez2NI++YSYRMcySnwmg43baO2zxjTBVQ== 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=/v1qj2GGX/dyA2R4qR/YpM5HkkNQo6xviR0hMv9POIs=; b=HwnpZE/QGtroi+GYAW2DB+LlYbFPE6OaiPXgMiMfqAmJO/wlcE/vjn8Ioy72pwuEYwIN7dUjagvWFU9ciyX3wkbsPk55nIIVSBdEhGJ27pvZR0UVbRLCq/Tnoa4vuvcA2QDOJdroX2JIhXgDCQgz0H1AK6SDG8qn0Ogy0KIdUWDHhRuqK7dIcRvJ5CeIc+I6e2gn4RwdbmTrv0ZuCJ7SIXDUSsIGLHn9KukG93KJwdRtaMxiFaJkkiKOPW3fFYsptqAQkfUv4cPkbpg4m23cvUn+wYf09MVhOMtj/OhCrr4M32cYqy4l74lqHOw1f6GEmhUJIBYMOayg706ZgAQA+Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=bootlin.com 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=/v1qj2GGX/dyA2R4qR/YpM5HkkNQo6xviR0hMv9POIs=; b=HPDOTRgiskBqkl+sMAA0x1NZa8VANDD3jWUG0yNULImgZQ81ZvwRYdroZAA9piB55+deXziGxh5ulGuqhO9hPFcsag/Vd0RTqqQclfJ4Hp7Ge/IOxwmklrIipYA82Im+VtK+7EdvZVRPDTRME7lBhEJ1v3PDmJHE2DLDnCp3wGA= Received: from MN0PR03CA0002.namprd03.prod.outlook.com (2603:10b6:208:52f::31) by DS7PR12MB8289.namprd12.prod.outlook.com (2603:10b6:8:d8::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.292.20; Fri, 7 Aug 2026 09:50:36 +0000 Received: from BL6PEPF0001AB77.namprd02.prod.outlook.com (2603:10b6:208:52f:cafe::82) by MN0PR03CA0002.outlook.office365.com (2603:10b6:208:52f::31) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.292.23 via Frontend Transport; Fri, 7 Aug 2026 09:50:36 +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=satlexmb08.amd.com; pr=C Received: from satlexmb08.amd.com (165.204.84.17) by BL6PEPF0001AB77.mail.protection.outlook.com (10.167.242.170) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.315.6 via Frontend Transport; Fri, 7 Aug 2026 09:50:35 +0000 Received: from satlexmb08.amd.com (10.181.42.217) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Fri, 7 Aug 2026 04:50:22 -0500 Received: from xhdvineethc40.xilinx.com (10.180.168.240) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server id 15.2.2562.41 via Frontend Transport; Fri, 7 Aug 2026 04:50:19 -0500 From: Vineeth Karumanchi To: , , , , , , CC: , , , Subject: [PATCH net-next 2/4] net: macb: Move TC capability and PM checks to macb_setup_tc() Date: Fri, 7 Aug 2026 15:20:10 +0530 Message-ID: <20260807095012.640223-3-vineeth.karumanchi@amd.com> X-Mailer: git-send-email 2.44.4 In-Reply-To: <20260807095012.640223-1-vineeth.karumanchi@amd.com> References: <20260807095012.640223-1-vineeth.karumanchi@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-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB77:EE_|DS7PR12MB8289:EE_ X-MS-Office365-Filtering-Correlation-Id: 9aa68c91-28ff-48cc-59c1-08def469546b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700016|376014|23010399003|82310400026|11063799006|56012099006|10067099003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: K0sYzsrQePEilu0Ca7FCltDWDIkH7mat3agYszLVmVUlHRPoYYBf45DD6fV65+iGnrra75RlPaeAyvFcilr7EDPJyxZ//maef6CQkXynXhRCnI45pQKKcaj+97yv9stUKIoF4nVVe6SEkFG8MEN9gQPBuS2osbZ/p28fnxk/xnSJcaLolg89nZeFTPa1jgqLLSi/fFgt5XyM4ku84Nv10fiAAmRjKAUUfaG/kC8vOyuUxPmlbI4cloHq8Fwr9wT4ysPBVUKvMy36/dUvRcoZsAoDIy9waDjtMMpvvY9gs8YLCNGzil3VMrtQEasMkFhY6l9r0WU+Opdcx3jpWGnvMk/xQACq9GgIeiEuuZ/14zAvxnqF0jj5B5elPryAc32/P19TxoFi7+0yXJs1GkFUudP1gRE+kdTs5vjh7lVpiM6mLQ3MdGD0WqNvMqeIaCtSb4w3bSWq6fznvGiASBBEK2y2lS7+GsE+PeRAlGY2tThejavBkYVwG+GYe1odabqsGM5QAFrl/KLqw+YVVcUzF0kUB9qV9szkfa92iPR1cQKHiZkjoeppbW1YqUa0rTq6DDZ5fouIB2BpU6JfVWOavyb7Fz8pOPVDKWE/Lh6OiLbObWnr2X9z1B++Wovu5pMx7PgzQZqD/5k/tmSdL7mZ7N3TlCcsJiI6RbX5AtlDa8Gw0TnFnXvGLJ4CayIqEGy1WMCnKrkWhjHw49jygWrqUA== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb08.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700016)(376014)(23010399003)(82310400026)(11063799006)(56012099006)(10067099003)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: q/fRPdL1fzIq35/l0HXLl+iIRIE/g8Qs1o7Yb+qE/5Mw9EAfhiF7FxhTqhMaVwO73GsWguVQL9DwmsBNITeexopbMfwvafOuyKcEYI/N6Qpup8THqLLDXd6yzoLnAylMIxq5HUoFnVcy9OmwOk2RVIGD5RTM5xuKNLvBvWhZjBNJAPhtIUpcWiAJxDwFimYdDgGpknMWFZtPiRQTTXrc4C35MT2AWVaGG0DokLkB37DkqWBCiTMcRmqQATLVQLkwlX36aUZfWYbHjn+p2qMKTgfUTYyTxrcog6chE9Dx3QfzkmEWwnY+g1pldJzw1oON5o8K/ulHoEkKGDnrAt5e+BUhm9ekP/C63mlEzyD61nfJpswzoLRfYCu9EU3FQpRYZYn5qMRL2xpc/janMIRgrLsltxyFLsbs3OBHfBoQbJns00l1qJ5ilOEJbfKmMjCl X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Aug 2026 09:50:35.7814 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9aa68c91-28ff-48cc-59c1-08def469546b 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=[satlexmb08.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF0001AB77.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB8289 Content-Type: text/plain; charset="utf-8" Move the NETIF_F_HW_TC capability check and the runtime PM suspend guard from macb_setup_taprio() into the common macb_setup_tc() entry point. These preconditions apply to all hardware TC offload paths routed through ndo_setup_tc(), not just TAPRIO. Centralizing them avoids duplicating the same checks as new TC qdisc types are added. Signed-off-by: Vineeth Karumanchi Reviewed-by: Th=C3=A9o Lebrun --- drivers/net/ethernet/cadence/macb_main.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/etherne= t/cadence/macb_main.c index 29c93df1444c..508d952e2ae7 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -4499,18 +4499,8 @@ static void macb_taprio_destroy(struct net_device *n= dev) static int macb_setup_taprio(struct net_device *ndev, struct tc_taprio_qopt_offload *taprio) { - struct macb *bp =3D netdev_priv(ndev); int err =3D 0; =20 - if (unlikely(!(ndev->hw_features & NETIF_F_HW_TC))) - return -EOPNOTSUPP; - - /* Check if Device is in runtime suspend */ - if (unlikely(pm_runtime_suspended(&bp->pdev->dev))) { - netdev_err(ndev, "Device is in runtime suspend\n"); - return -EOPNOTSUPP; - } - switch (taprio->cmd) { case TAPRIO_CMD_REPLACE: err =3D macb_taprio_setup_replace(ndev, taprio); @@ -4528,9 +4518,22 @@ static int macb_setup_taprio(struct net_device *ndev, static int macb_setup_tc(struct net_device *dev, enum tc_setup_type type, void *type_data) { + struct macb *bp; + if (!dev || !type_data) return -EINVAL; =20 + bp =3D netdev_priv(dev); + + if (unlikely(!(dev->hw_features & NETIF_F_HW_TC))) + return -EOPNOTSUPP; + + /* Check if Device is in runtime suspend */ + if (unlikely(pm_runtime_suspended(&bp->pdev->dev))) { + netdev_err(dev, "Device is in runtime suspend\n"); + return -EOPNOTSUPP; + } + switch (type) { case TC_SETUP_QDISC_TAPRIO: return macb_setup_taprio(dev, type_data); --=20 2.44.4 From nobody Tue Sep 29 13:19:51 2026 Received: from BYAPR05CU005.outbound.protection.outlook.com (mail-westusazon11010037.outbound.protection.outlook.com [52.101.85.37]) (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 9AEF73E63A4; Fri, 7 Aug 2026 09:50:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.85.37 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786096238; cv=fail; b=HtFa+LKN1nM0HHODZElvJS/QIieO9qEz+thZUAes276g7NNriOSpDw/1uXIJoQUPAN9ytD35WoOdbBatQXPOztKT6Amn7uwUvKNyrrkYmTTYTzjHUVQvig1cGJwe9SlqyNldy8LbMohhVGwyEraLm5s8dRYQj7G0CiJSY4Gd6N0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786096238; c=relaxed/simple; bh=4Bws6HnIDlgC+E31lqedBS8jcW55xbuUPuWvTei5TpI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Ilti4D+GSIjRg8qk4whT8MR5g8Lqy4Pma5DtyJqe13DxqP8vfkvZUxB8e4erXWzFv1fkn0Wm1OuMoVCfoI328N+FaTwG/bDmYhyD49kvmfXG4q6jwA+6lq5ywHtGI/SSh7GRIiBIlWRXIaNQt2+5oDxBC/p1K+dKr2GeywxdyyI= 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=Wqo/8h5O; arc=fail smtp.client-ip=52.101.85.37 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="Wqo/8h5O" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=EaUZLs8YcXexm+I/NaRDeTKsZBTINpd/csHcSeH+1Pru5CGE36+0U+7oR3Av7scmPUAHRoPsWmslj9K9PoP8IoclFO4D1sdio3U6GwWNdHvOiqEpFF7daARgJT3/KzuXockCIMhyamRpgjW66esYNEQiO7F+n5x/Drk+fUsxgwuwy4OPuKoGZOCkazBqUXZMq4xg+QGWgamGRgbS845pEBgqmR1T1RErQnVkT2fGvGXTEo3ieGNJ2Z92bA64jQkK76c1CN0uGE3g/C3QnCCH/GT5inmtp24kypfQhIZAtkBdWewx4MQlHs8ojE4VKhLcWo/S1wkKTmVdVzZQwzFp9g== 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=EBDfLn4ZfX8bCFrdM375szH+rT5KMoaYpRTRK4BXkF4=; b=ktkEgvnx9Lzz1pVyhDSfC4mxtXIZUFog7InJ6jRDolh5DfKHNN/qh59vYS4OMYIeaKEgqz8d+Trc4fl1AQVRkW6mcmFj4x//Mgpp92g2MS5vu3ZVCE8XL7plT77MByzNfSffKf/cGVcx1jUnNxMzSnrDTr6GUKFX7iz21D8AY8USx/e7X94ZHfXN42+XZecT0izgkqWLck4jrNJyU2UqJlVV6O1kWhb0z5oiN1ky5ViP5dE1kWEisvwpYQh7A+LGNhQYA4GiGkY66virbNgmKGTy1afjwE04suY1oTGYottR6rfqU7W2mnDzVaqy1j9wo+nnv7tMZo+9lDipDLj3Lg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=bootlin.com 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=EBDfLn4ZfX8bCFrdM375szH+rT5KMoaYpRTRK4BXkF4=; b=Wqo/8h5OGP4RG+qIlaqwFnSVh8y1eNhTdYMjknMJ8n0DO05KFqpWxNc3oXpdQjhDm4UdWXwH3gIxi4lu1oizM8Ob3IPqyhPkwZ0Lpo6DHpP9SueZUp8U7K3jvibiEGgG9NROSLOHByitrtwAu+WskgNJNQq3zr+IJ/1h0ZIfrKQ= Received: from IA1P220CA0018.NAMP220.PROD.OUTLOOK.COM (2603:10b6:208:464::9) by LV9PR12MB9781.namprd12.prod.outlook.com (2603:10b6:408:2f6::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.292.19; Fri, 7 Aug 2026 09:50:32 +0000 Received: from BL02EPF0002992A.namprd02.prod.outlook.com (2603:10b6:208:464:cafe::45) by IA1P220CA0018.outlook.office365.com (2603:10b6:208:464::9) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.292.23 via Frontend Transport; Fri, 7 Aug 2026 09:50:32 +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=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BL02EPF0002992A.mail.protection.outlook.com (10.167.249.55) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.315.6 via Frontend Transport; Fri, 7 Aug 2026 09:50:32 +0000 Received: from satlexmb10.amd.com (10.181.42.219) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Fri, 7 Aug 2026 04:50:27 -0500 Received: from satlexmb08.amd.com (10.181.42.217) by satlexmb10.amd.com (10.181.42.219) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Fri, 7 Aug 2026 04:50:26 -0500 Received: from xhdvineethc40.xilinx.com (10.180.168.240) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server id 15.2.2562.41 via Frontend Transport; Fri, 7 Aug 2026 04:50:23 -0500 From: Vineeth Karumanchi To: , , , , , , CC: , , , Subject: [PATCH net-next 3/4] net: macb: Add MQPRIO qdisc hardware offload support Date: Fri, 7 Aug 2026 15:20:11 +0530 Message-ID: <20260807095012.640223-4-vineeth.karumanchi@amd.com> X-Mailer: git-send-email 2.44.4 In-Reply-To: <20260807095012.640223-1-vineeth.karumanchi@amd.com> References: <20260807095012.640223-1-vineeth.karumanchi@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-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0002992A:EE_|LV9PR12MB9781:EE_ X-MS-Office365-Filtering-Correlation-Id: f9e85c64-2823-4550-b893-08def469525d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700016|82310400026|1800799024|376014|23010399003|18002099003|22082099003|11063799006|56012099006|6133799003|10067099003; X-Microsoft-Antispam-Message-Info: +0rNEXrXBUKbdDE3iHaGAQo6Yd+fks51qUErC7z/E4p1iqC6kXeYw90ZWOvaLBQtTWJ3WzsCkkzLhTywmRO0U3rq3RdMYQOqYFwzsMF8akozkLXvr+hfGldM2elBSRm9NQkTfb1kGI2pl5u9SEXAqyBgeK2PuBajdCcnezDWWiSGvpQH/ULgvu3Jt8CfTir6RhDCVyYZbplPTWw4TyDY0Zb7pE95EZTsXBliuxOIKLmJNPU8odI2RxllPWB2iHjo5g34SE5FXPxB7j41Jncfm+PmFbkJEIjixJdL8+/neugncMC6I0Kup7ffKDuXD8adFph4fQhRerzxOFNwTvniZ0InQjFCN3pcZXYWPRZhBhunVGOC8VcpoEtUaFV/PpyFFFeFFsQqWoWrBszlHg7nXLvUTosSRmPz6HAKiRfRhhx4fm9qT33TQtxU8F4VaGnPyLWzp7elIJgxaEdvEMuYhgXKsDLzF2l/GFH5CGpbW+n64K+9TWGqV4oJ+8PvyQA1gpa8tYjrKaMfq0Scre1d3NHC4pP6sj81MEv3ilgba7vMn93kuOY5kYbM8L3wOb7vgJYy7SkwHc9STvjwFLCpxj33HngCCpSr/aUxltnRwrNX4HM1dN87pPPoFR+fu4+qLU9vLw6lRfbVrzBp7pWVaJ6T1CobcVIVNj3HoNka1P5FbCb9uVhlUcd2Dbb7X4rbP7+bvNgfOfHr9i8R0tU1TQ== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700016)(82310400026)(1800799024)(376014)(23010399003)(18002099003)(22082099003)(11063799006)(56012099006)(6133799003)(10067099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: o9lMCuUICL02Y1taiDV0VGo+YMiOlF7y+jGtLDxQgE+lfruI4miX6TXuGDyIn2FYU4shKr5PgVSzJc3Ic8kFFplRgZxQPaC2eVJPhwjJOEXx1bs/Tz8R06Tyt79/TAFauNhAhs7efIhIXD2f3H73zckV9FP1wLvbr8PtLScfFJrDZORAIWTm5KORQ3AfZIWN7iyfmtbpnGGyb/IkRTHIssdLf2F7n0gUvpDe53WuZK6F8Qt9x3fB2/vZbVFnSnrsNZH+udOuZ/pXc2/q8MJ26M/Kz4yWs37Y/PGnFirsVkTx11Oki8fpX7dHm+VGyU8AnVJvJJXA2jLvd0ApGmYDow1kmLUadwYJ9VHCq30uGe7BGfnuM8tt+taPnwvUlvTPMBxePNYWjn3uO6W8EsUxrhrPJCK94qbwK2mZS9sbvYUwztURHcScdg2W7NO0fi11 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Aug 2026 09:50:32.3379 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f9e85c64-2823-4550-b893-08def469525d 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=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0002992A.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV9PR12MB9781 Content-Type: text/plain; charset="utf-8" Add support for TC_SETUP_QDISC_MQPRIO hardware offload, allowing traffic class to queue mapping via the mqprio qdisc. Implement macb_setup_mqprio() which configures TC-to-queue mappings through netdev_set_num_tc() and netdev_set_tc_queue(), and resets them when num_tc is zero. The driver advertises TC_MQPRIO_HW_OFFLOAD_TCS offload level. Add macb_tc_query_caps() to report mqprio capabilities. Setting validate_queue_counts to true delegates queue count and overlap validation to the mqprio core via mqprio_validate_queue_counts(), avoiding redundant checks in the driver. Signed-off-by: Vineeth Karumanchi --- drivers/net/ethernet/cadence/macb_main.c | 59 ++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/etherne= t/cadence/macb_main.c index 508d952e2ae7..00355cc4b434 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -4515,6 +4515,60 @@ static int macb_setup_taprio(struct net_device *ndev, return err; } =20 +static int macb_setup_mqprio(struct net_device *ndev, + struct tc_mqprio_qopt_offload *mqprio) +{ + struct tc_mqprio_qopt *qopt =3D &mqprio->qopt; + u8 num_tc =3D qopt->num_tc; + int err; + u8 i; + + /* Handle reset case early */ + if (!num_tc) { + netdev_reset_tc(ndev); + return 0; + } + + /* Configure traffic classes */ + qopt->hw =3D TC_MQPRIO_HW_OFFLOAD_TCS; + + err =3D netdev_set_num_tc(ndev, num_tc); + if (err) + return err; + + for (i =3D 0; i < num_tc; i++) { + err =3D netdev_set_tc_queue(ndev, i, qopt->count[i], + qopt->offset[i]); + if (err) + goto err_reset_tc; + + netdev_dbg(ndev, "MQPRIO: TC%d -> queue %u (count=3D%u)\n", + i, qopt->offset[i], qopt->count[i]); + } + + return 0; + +err_reset_tc: + netdev_reset_tc(ndev); + return err; +} + +static int macb_tc_query_caps(struct net_device *dev, + struct tc_query_caps_base *base) +{ + switch (base->type) { + case TC_SETUP_QDISC_MQPRIO: { + struct tc_mqprio_caps *caps =3D base->caps; + + caps->validate_queue_counts =3D true; + + return 0; + } + default: + return -EOPNOTSUPP; + } +} + static int macb_setup_tc(struct net_device *dev, enum tc_setup_type type, void *type_data) { @@ -4523,6 +4577,9 @@ static int macb_setup_tc(struct net_device *dev, enum= tc_setup_type type, if (!dev || !type_data) return -EINVAL; =20 + if (type =3D=3D TC_QUERY_CAPS) + return macb_tc_query_caps(dev, type_data); + bp =3D netdev_priv(dev); =20 if (unlikely(!(dev->hw_features & NETIF_F_HW_TC))) @@ -4535,6 +4592,8 @@ static int macb_setup_tc(struct net_device *dev, enum= tc_setup_type type, } =20 switch (type) { + case TC_SETUP_QDISC_MQPRIO: + return macb_setup_mqprio(dev, type_data); case TC_SETUP_QDISC_TAPRIO: return macb_setup_taprio(dev, type_data); default: --=20 2.44.4 From nobody Tue Sep 29 13:19:51 2026 Received: from SJ2PR03CU001.outbound.protection.outlook.com (mail-westusazon11012065.outbound.protection.outlook.com [52.101.43.65]) (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 307A13F823E; Fri, 7 Aug 2026 09:50:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.43.65 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786096250; cv=fail; b=Jbn373UFy8XDPjE826LUb/u+FhC/DxripJ2BVPo9LDEVP0jQ5FKC1cpfsaGhPNgR+vsOkGNPNwKmPzGZjaaW+TzwXkI7Zr5AQGg/eGD/Xja8XquF52nIs2W2sVSmREHhVN0FTAAdP4Cz0L2n0ITzs9THYyvt5TzS9mNwjV8uKRs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786096250; c=relaxed/simple; bh=czV+8XHY1SSDsW/dccm+8gGpjjV213OxYW7C4MXoXRQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=G9PrBv3TUMx0vhX5AQhnIjyTbOZ2V2qhf+LW+/QaYYan8nBplikDCkF8iqoIEcRucjE038zqWROCAeIv9dY2iU8T9sRSL/xVDutEweELq6YcrWSyNrZC2sacjzbQ++QbfTFFrUtWUivmj0YnNj93PL/W675/7cyqfalho7asx24= 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=lZgYP+KH; arc=fail smtp.client-ip=52.101.43.65 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="lZgYP+KH" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Ldk/as/YQa/O636keEc44LhIBeFvJpKN3163tAiBBlpchqf5v34v8m4AwtdCKSu64Ea6gJLIQ6keOeDAxu23nzAJt28jfmB5YsSgXoHrDE6ba27s9VeIbmy5qhjLsv1p4UkGWbZ6RyiNUw0bntfrsusCspLGVjA9NIQEcIaVFggG8O1w2MXXJ468oy77jt8K3VgJ+5wDxUwTrc9Eox0d/s7KtO34ieevTnXbMjyrDH7EiDLJvjnC/IG8mmXqtU0DRn99nidiZeBWU7R6gFtBFw8v3fa7kVRxi0m+pgANl+EPlFUI7h2frgkYlEh2jYBxyVlPNjtluIliWTRWN3hd5Q== 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=6SSuR5LNJj9qtvA5V2Ns+rN+mL1X8mHZzc40O5Ak2fA=; b=ebb5Lt7NJfKSpuPdEXrnTiCUnzz5Vsy3UG10qasuAKCC0tTvnLEfwtOA1AzpCK9HikwY4SjCza/FE/kM0YA5zfRPZA0gzlpqiH73ThJXQ9//CYbuHKmb5WdMLcs1/N3xsk2ES+Snb4BN6nbFVwGQ0X7q8u2F/vTguREawu0UVoGq3d0Mf6NfIf5wivRcCiOgEvch1wAK7Usq2VbpXpjdS4NbrG+Db1KRk+KJUatlc4W/ITto45qcHlWFSW16vtx7WvyXG6mE9NDlwyCiouMGoS7ZqnDVEbcTsEklTn/bEVc89L2B3WenQe2omp3CS2fFeSSl4Ly5KCy96HZYOBPOOw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=bootlin.com 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=6SSuR5LNJj9qtvA5V2Ns+rN+mL1X8mHZzc40O5Ak2fA=; b=lZgYP+KHYNwfniudjTiGY4AXII8nlaZpL5prG2YirPDv/FOo/4k3y9/ekjQOG9DY2e/rl6aQ8Q1G9asIxSbzaIm90f1iDBpeE5upMOLqqEExp0T1nV9fnXeFCILv+Ksbm5DHeCDldY3YgiSPbsU7395fqHaknlAZPbZ+VBXoLA8= Received: from MN2PR06CA0030.namprd06.prod.outlook.com (2603:10b6:208:23d::35) by SA1PR12MB5639.namprd12.prod.outlook.com (2603:10b6:806:22b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.292.19; Fri, 7 Aug 2026 09:50:43 +0000 Received: from BL6PEPF0001AB78.namprd02.prod.outlook.com (2603:10b6:208:23d:cafe::aa) by MN2PR06CA0030.outlook.office365.com (2603:10b6:208:23d::35) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.292.23 via Frontend Transport; Fri, 7 Aug 2026 09:50:43 +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=satlexmb08.amd.com; pr=C Received: from satlexmb08.amd.com (165.204.84.17) by BL6PEPF0001AB78.mail.protection.outlook.com (10.167.242.171) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.315.6 via Frontend Transport; Fri, 7 Aug 2026 09:50:42 +0000 Received: from satlexmb10.amd.com (10.181.42.219) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Fri, 7 Aug 2026 04:50:30 -0500 Received: from satlexmb08.amd.com (10.181.42.217) by satlexmb10.amd.com (10.181.42.219) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Fri, 7 Aug 2026 04:50:29 -0500 Received: from xhdvineethc40.xilinx.com (10.180.168.240) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server id 15.2.2562.41 via Frontend Transport; Fri, 7 Aug 2026 04:50:26 -0500 From: Vineeth Karumanchi To: , , , , , , CC: , , , Subject: [PATCH net-next 4/4] net: macb: Add TSN CBS TC offload support Date: Fri, 7 Aug 2026 15:20:12 +0530 Message-ID: <20260807095012.640223-5-vineeth.karumanchi@amd.com> X-Mailer: git-send-email 2.44.4 In-Reply-To: <20260807095012.640223-1-vineeth.karumanchi@amd.com> References: <20260807095012.640223-1-vineeth.karumanchi@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-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB78:EE_|SA1PR12MB5639:EE_ X-MS-Office365-Filtering-Correlation-Id: 43e575ec-0d70-402e-ecdb-08def46958b6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700016|23010399003|376014|82310400026|1800799024|6133799003|10067099003|56012099006|11063799006|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: 3f4z/oDqg49G1kjr32ZMDMBmcdXcfKeFFw8CE9x4pteakDd2wpiAd5zMiVo5Oz/0H98JI65OuUqbvKjhboWvNAdtzqtOtdcJHpdxLyuV+MeUZLDQE0K5hMZnhTZ3h+xttR2EDenaOaRuVzoNeo8qxFMx3TH+MdqgBMxw5uHFmsra1dHHbV57OQWX6l3SH2BARE/NxVwdT8++G5VvU/bswYT9Zu6z3p9UhD/fV8ifbMd3fEQEMOt/kdy0uKzupHslDo7XnI1jrRCA5xZ3a+FBXDtK4fN40Zp0hrsSndltlxKIiAtp1CElLSW85ByGYH3LcV1TKXXONso6dVBM6uqO7Gq/BrYjOcKalzGjiJeCFteWgNgf8xgIjbJpaFBf35gFmb2m0RFkLPkoniKT3uemkRur214EQ2R2v8Lu4zzob+olnKxjhCMNG9RX6WUys/SyQUjgC+/3cJDGRDgcIM1OYLI6yNXVRRMsCtCHn0xYNc2667wk+QCtikIOt+MybIqnRQ3SXsWq1ad48rLUTg68u/UM1DQ3eOZB+as8Q8rkSukLlB8UY0UUImr5w4jLLMUr5dUfR5PiBOdoF3IAiUVfWmxPaTPxpVNa4b5oalchKtS5ZMDgTIv/c0dZbKLalGn9CblnHryQzeLR8OX9dwmBoqNLQkW6kbnKg6on1a+fGaEkqKw8MM1sBLeqn8GXzZP7B2c0rZYNGMzyVW6cwmah3g== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb08.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700016)(23010399003)(376014)(82310400026)(1800799024)(6133799003)(10067099003)(56012099006)(11063799006)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: b1RVWCsWLoCwWB06ELrew9TjgLK+XLUsKDshGZgdyK/wUYlnZ46zR3BM9rHBugMn6//sH7W16NkFbhfbWqaMmm39Nf0IiXsRXhpMhodqlKl2V/hgB04LDoqN1Z1vo9kpwzDsAB0nUD753j+XrDgVxD8Ay+ssfoJipTFccYw4zmDsHXOA/VIEKmnNPB1hiHe7OuuVXo0Jy4EfarQj/ey0qwsfAba54d4Piz+PJOYzwjScDDHMqeZdLR/dp6Q/gC8qd+r/sQb5pIjKxG2dA/AGLHuH2pkeV8SFEngBYlC8Ulns+mK88mPNUvKPD6vDooqj8GJeZolKK1WTC+fR+SNVXtuilduoCmlj3P4/Z+x5xvV/EFFK2FPu4UDIC0wMUpgZzgdqW2XwXz+Td9YI08uPhh0cgj+qWqpRtXYigrrPfDPbgjDbB4USHvHeDqU4QM5I X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Aug 2026 09:50:42.9886 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 43e575ec-0d70-402e-ecdb-08def46958b6 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=[satlexmb08.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF0001AB78.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB5639 Content-Type: text/plain; charset="utf-8" Add Credit-Based Shaper (CBS/IEEE 802.1Qav) TC offload support for time-sensitive networking on GEM hardware. CBS is restricted to the two highest-priority queues: Queue A (num_queues - 1) and Queue B (num_queues - 2), matching hardware capability. The idle slope register value is computed differently based on hardware variant: high-speed GEM scales idleslope linearly to the full 32-bit register range relative to link speed, while standard GEM multiplies by a port rate factor derived from the interface width (125 for 1G GMII, 250 for 10/100M MII). Validate that idleslope is positive and does not exceed the link speed, preventing negative values from bypassing the bounds check due to signed-to-unsigned promotion. Signed-off-by: Vineeth Karumanchi --- drivers/net/ethernet/cadence/macb.h | 9 ++ drivers/net/ethernet/cadence/macb_main.c | 121 +++++++++++++++++++++++ 2 files changed, 130 insertions(+) diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cad= ence/macb.h index f24df25923d7..d5b28459fd75 100644 --- a/drivers/net/ethernet/cadence/macb.h +++ b/drivers/net/ethernet/cadence/macb.h @@ -184,6 +184,9 @@ #define GEM_DCFG8 0x029C /* Design Config 8 */ #define GEM_DCFG10 0x02A4 /* Design Config 10 */ #define GEM_DCFG12 0x02AC /* Design Config 12 */ +#define GEM_CBS_CONTROL 0x04BC /* CBS Control Register */ +#define GEM_CBS_IDLESLOPE_Q_A 0x04C0 /* CBS IdleSlope Queue A */ +#define GEM_CBS_IDLESLOPE_Q_B 0x04C4 /* CBS IdleSlope Queue B */ #define GEM_ENST_CONTROL 0x0880 /* ENST control register */ #define GEM_USX_CONTROL 0x0A80 /* High speed PCS control register */ #define GEM_USX_STATUS 0x0A88 /* High speed PCS status register */ @@ -224,6 +227,12 @@ #define GEM_ENST_ON_TIME(hw_q) (0x0820 + ((hw_q) << 2)) #define GEM_ENST_OFF_TIME(hw_q) (0x0840 + ((hw_q) << 2)) =20 +/* Bitfields in CBS_CONTROL */ +#define GEM_CBS_ENABLE_QUEUE_A_OFFSET 0 +#define GEM_CBS_ENABLE_QUEUE_A_SIZE 1 +#define GEM_CBS_ENABLE_QUEUE_B_OFFSET 1 +#define GEM_CBS_ENABLE_QUEUE_B_SIZE 1 + /* Bitfields in ENST_CONTROL */ #define GEM_ENST_DISABLE_QUEUE_OFFSET 16 =20 diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/etherne= t/cadence/macb_main.c index 00355cc4b434..a0a68490519e 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -99,6 +99,10 @@ struct sifive_fu540_macb_mgmt { =20 #define MACB_MDIO_TIMEOUT 1000000 /* in usecs */ =20 +/* CBS port transmit rate factors: 1000/interface_width */ +#define MACB_CBS_PORT_RATE_1G 125 /* 1000/8 for GMII (8-bit) */ +#define MACB_CBS_PORT_RATE_10_100M 250 /* 1000/4 for MII (4-bit) */ + /* DMA buffer descriptor might be different size * depends on hardware configuration: * @@ -4515,6 +4519,121 @@ static int macb_setup_taprio(struct net_device *nde= v, return err; } =20 +static int macb_cbs_get_queue_params(struct macb *bp, u8 queue_num, + u32 *enable_bit, bool *is_queue_a) +{ + /* Queue A is highest priority (num_queues - 1) */ + if (queue_num =3D=3D bp->num_queues - 1) { + *enable_bit =3D GEM_BIT(CBS_ENABLE_QUEUE_A); + *is_queue_a =3D true; + return 0; + } + + /* Queue B is second highest priority (num_queues - 2) */ + if (queue_num =3D=3D bp->num_queues - 2) { + *enable_bit =3D GEM_BIT(CBS_ENABLE_QUEUE_B); + *is_queue_a =3D false; + return 0; + } + + return -EINVAL; +} + +static int macb_cbs_add(struct net_device *ndev, + struct tc_cbs_qopt_offload *qopt) +{ + u32 enable_bit, idleslope, speed_kbps, ctrl; + struct macb *bp =3D netdev_priv(ndev); + struct ethtool_link_ksettings kset; + bool is_queue_a; + int err; + + err =3D macb_cbs_get_queue_params(bp, qopt->queue, &enable_bit, &is_queue= _a); + if (err) { + netdev_err(ndev, "CBS: Queue %d not eligible (only top 2 queues support = CBS)\n", + qopt->queue); + return -EINVAL; + } + + /* idleslope is calibrated for the current link speed; CBS is not + * reprogrammed on link-speed changes, so it must be reconfigured + * if the link speed changes. + */ + phylink_ethtool_ksettings_get(bp->phylink, &kset); + + if (!kset.base.speed || kset.base.speed =3D=3D SPEED_UNKNOWN) { + netdev_err(ndev, "CBS: Invalid link speed\n"); + return -EINVAL; + } + + speed_kbps =3D kset.base.speed * 1000; + + if (qopt->idleslope <=3D 0 || (u32)qopt->idleslope > speed_kbps) { + netdev_err(ndev, "CBS: invalid idleslope %d (must be 1..%u kbps)\n", + qopt->idleslope, speed_kbps); + return -EINVAL; + } + + /* Calculate idleslope for hardware register: + * - High-speed GEM: scale to full 32-bit register range + * - Standard MACB: multiply by port transmit rate factor + */ + if (bp->caps & MACB_CAPS_HIGH_SPEED) + idleslope =3D DIV_ROUND_UP_ULL((u64)qopt->idleslope * U32_MAX, speed_kbp= s); + else + idleslope =3D (u32)qopt->idleslope * (kset.base.speed >=3D 1000 ? + MACB_CBS_PORT_RATE_1G : MACB_CBS_PORT_RATE_10_100M); + + scoped_guard(spinlock_irqsave, &bp->lock) { + /* Disable CBS for the queue before updating idleslope */ + ctrl =3D gem_readl(bp, CBS_CONTROL) & ~enable_bit; + gem_writel(bp, CBS_CONTROL, ctrl); + /* Update idleslope for the queue */ + if (is_queue_a) + gem_writel(bp, CBS_IDLESLOPE_Q_A, idleslope); + else + gem_writel(bp, CBS_IDLESLOPE_Q_B, idleslope); + + /* Re-enable CBS for the queue with new idleslope */ + gem_writel(bp, CBS_CONTROL, ctrl | enable_bit); + } + + netdev_dbg(ndev, "CBS: Configured queue %d with idleslope 0x%x\n", + qopt->queue, idleslope); + + return 0; +} + +static void macb_cbs_destroy(struct net_device *ndev, u8 queue_num) +{ + struct macb *bp =3D netdev_priv(ndev); + bool is_queue_a; + u32 enable_bit; + + if (macb_cbs_get_queue_params(bp, queue_num, &enable_bit, &is_queue_a)) + return; + + scoped_guard(spinlock_irqsave, &bp->lock) { + gem_writel(bp, CBS_CONTROL, gem_readl(bp, CBS_CONTROL) & ~enable_bit); + if (is_queue_a) + gem_writel(bp, CBS_IDLESLOPE_Q_A, 0); + else + gem_writel(bp, CBS_IDLESLOPE_Q_B, 0); + } + + netdev_dbg(ndev, "CBS: Disabled queue %d\n", queue_num); +} + +static int macb_setup_cbs(struct net_device *ndev, + struct tc_cbs_qopt_offload *qopt) +{ + if (qopt->enable) + return macb_cbs_add(ndev, qopt); + + macb_cbs_destroy(ndev, qopt->queue); + return 0; +} + static int macb_setup_mqprio(struct net_device *ndev, struct tc_mqprio_qopt_offload *mqprio) { @@ -4594,6 +4713,8 @@ static int macb_setup_tc(struct net_device *dev, enum= tc_setup_type type, switch (type) { case TC_SETUP_QDISC_MQPRIO: return macb_setup_mqprio(dev, type_data); + case TC_SETUP_QDISC_CBS: + return macb_setup_cbs(dev, type_data); case TC_SETUP_QDISC_TAPRIO: return macb_setup_taprio(dev, type_data); default: --=20 2.44.4