From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) (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 A770A302176; Wed, 28 Jan 2026 07:13:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=67.231.156.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769584399; cv=none; b=l9VyBLSlDlQpJjFvOM782kQXbWAVr2TRjMad6y2A8bzwStrzEcadfa5JS4m/iRJsm7S6Ri6ObGjVuJHEXbtGCQO2NmVb5XKMwWWK2XBotd+56R04HmlCORsZNUHndI0Mo1JSQXPDSzXlxR0OpMCDJqp2FtH01DXC5oVuX1aN/nc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769584399; c=relaxed/simple; bh=1HO+VYJPgXVP389jTvzxn3k+rd+JHVBxbBDQg0ClN5c=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=QvEXR9TiIlFDk7The3OlaA8FpLTuMi5CrC5cyAzd1a7UetPXPNUmbFx3xVTTlzouRLsWxlzar4Xd9AKBQ39tSNBq4TTENhr/B/xFq7Q7Y8V2nFIjpk4p6GGv4DWI/NPfEzlGSAcxHDP8gqaTmpnAUf+wk36BMAjU0RA4Tp39E6c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=marvell.com; spf=pass smtp.mailfrom=marvell.com; dkim=pass (2048-bit key) header.d=marvell.com header.i=@marvell.com header.b=N41nvVV1; arc=none smtp.client-ip=67.231.156.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=marvell.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=marvell.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=marvell.com header.i=@marvell.com header.b="N41nvVV1" Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60RJ2jpm1821718; Tue, 27 Jan 2026 23:12:55 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h= cc:content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=pfpt0220; bh=VlbJJvK6IpboRpYz4UH4gsQ 2zDfM4VZO4JDYTauWRrw=; b=N41nvVV113C98nf2X+EOXIcqepfXcWS9dYuUTdY SmF5nZs4n+zYUhGuW2r/4U2TJ3vMy1NnMDq5x7kG49z206/1G6JYa19bkHEmdfnP tMvKV2pPcWxcOhcCAy15nSoepeWOzsnOBpvp7zidf7aBfw9MS1Ly71tSJP5fchfv ScELRAVFR0w/9OGp09C6BYzXLtAVw6vLSIsfLWZV+PTzpn3985u7+bYEwy/V0GhA 4fzW5Gnv2F+xMZbtmBALcFDyCgZTqVMmcyjJEPAXDv8aAB8RBIQQZNXFEnEvboey uGZBB9qFH6lWgsKkj8/mR/xJ29REu9p4T22GgiDzyoL32Yg== Received: from dc6wp-exch02.marvell.com ([4.21.29.225]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 4bvxfjqwvu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 27 Jan 2026 23:12:55 -0800 (PST) Received: from DC6WP-EXCH02.marvell.com (10.76.176.209) by DC6WP-EXCH02.marvell.com (10.76.176.209) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.25; Tue, 27 Jan 2026 23:12:54 -0800 Received: from maili.marvell.com (10.69.176.80) by DC6WP-EXCH02.marvell.com (10.76.176.209) with Microsoft SMTP Server id 15.2.1544.25 via Frontend Transport; Tue, 27 Jan 2026 23:12:54 -0800 Received: from rkannoth-OptiPlex-7090.. (unknown [10.28.36.165]) by maili.marvell.com (Postfix) with ESMTP id 7F6CB3F7106; Tue, 27 Jan 2026 23:12:51 -0800 (PST) From: Ratheesh Kannoth To: , CC: , , , , , , "Ratheesh Kannoth" Subject: [PATCH net-next v6 00/13] NPC HW block support for cn20k Date: Wed, 28 Jan 2026 12:42:22 +0530 Message-ID: <20260128071235.3577206-1-rkannoth@marvell.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-GUID: yQu6gin4Z-nuGsddx9ncq-xoMFkLH0jn X-Proofpoint-ORIG-GUID: yQu6gin4Z-nuGsddx9ncq-xoMFkLH0jn X-Authority-Analysis: v=2.4 cv=S9LUAYsP c=1 sm=1 tr=0 ts=6979b6f7 cx=c_pps a=gIfcoYsirJbf48DBMSPrZA==:117 a=gIfcoYsirJbf48DBMSPrZA==:17 a=vUbySO9Y5rIA:10 a=VkNPw1HP01LnGYTKEx00:22 a=VwQbUJbxAAAA:8 a=M5GUcnROAAAA:8 a=A1wDlwXRn1NGPBHeO_kA:9 a=OBjm3rFKGHvpk9ecZwUJ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTI4MDA1NyBTYWx0ZWRfX9NQZGTWiBee8 o3D7T2kUtvurpfkj4R8RM+UhySlWik59CMSsGOtPPxvakea6n2jgEoxsn1h2Jy3Aa7j4HrieaFT BldC/57T5x/eW01WUPKjEbjWBgPXee5DMko+yf7uoLVDdUdJe3u5CDucbYIHpcXhGGRMxH2SmA/ /B/bXr5VmbjEjppTHmbKt6tdiZ7XNdCBqKxata/dHPuAwfVXuH8NDa/pN6g3LQ9UjYtMF7dkbUb 3SHehbSOkjTSLlv6jx8u1yy9UnR3bbl5Pa4zF/y+9IV1mk7no2kLr7yQFA/upU/T9cVpNmONhrZ E5j6YJJqO9ZrttTcJrStZMZmKNulV2fwSgr2GjZNdwJ1uCJT+MBkkDA8n+7bGV2bAZYRuvLCbQs eTvU06nxmmmD6UGKvzN2G990o9cZ9bCEtW8/ZZsSGq72TrBUkrzhioJb3NyFiAgzLvj30MHTMUV DSTF99iyMx4a43ZABpw== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-01-28_01,2026-01-27_03,2025-10-01_01 This patchset adds comprehensive support for the CN20K NPC architecture. CN20K introduces significant changes in MCAM layout, parser design, KPM/KPU mapping, index management, virtual index handling, and dynamic rule installation. The patches update the AF, PF/VF, and common layers to correctly support these new capabilities while preserving compatibility with previous silicon variants. MCAM on CN20K differs from older designs: the hardware now contains two vertical banks of depth 8192, and thirty-two horizontal subbanks of depth 256. Each subbank can be configured as x2 or x4, enabling 256-bit or 512-bit key storage. Several allocation models are added to support this layout, including contiguous and non-contiguous allocation with or without reference ranges and priorities. Parser and extraction logic are also enhanced. CN20K introduces a new profile model where up to twenty-four extractors may be configured for each parsing profile. A new KPM profile scheme is added, grouping sixteen KPUs into eight KPM profiles, each formed by two KPUs. Support is added for default index allocation for CN20K-specific MCAM entry structures, virtual index allocation, improved defragmentation, and TC rule installation by allowing the AF driver to determine required x2/x4 rule width during flow install. Ratheesh Kannoth (7): octeontx2-af: npc: cn20k: Index management Add CN20K MCAM allocation support. Implements contiguous and non-contiguous allocation models with ref, limit, contig, priority, and count support. octeontx2-af: npc: cn20k: Allocate default MCAM indexes Allocate default MCAM entries dynamically in descending index order during NIX LF attach, reducing MCAM wastage octeontx2-af: npc: cn20k: Prepare for new SoC Introduce MCAM metadata structure so low-level functions no longer receive SoC-specific structures directly. octeontx2-af: npc: cn20k: virtual index support Add virtual MCAM index allocation and improve CN20K MCAM defragmentation handling. Track virtual indexes and restore statistics correctly. octeontx2-af: npc: cn20k: Allocate MCAM entry for flow installation Extend install_flow mailbox so AF can determine rule width and complete allocation and installation in a single exchange. octeontx2-af: npc: cn20k: add debugfs support Debugfs entries to show mcam layout and default mcam entry allocations Legacy debugfs entries are modified to show hardware priority on cn20k SoC. octeontx-af: npc: Use common structures Low level functions should use maximum mcam size array and modify cam0 and cam1. This is a cleanup patch. Subbaraya Sundeep (1): octeontx2-pf: cn20k: Add TC rules support Add full TC dynamic rule support for CN20K. Handle x2/x4 rule widths, dynamic allocation, and shifting restrictions when mixed rule sizes exist. Suman Ghosh (5): octeontx2-af: npc: cn20k: KPM profile changes Add support for CN20K KPM profiles. Sixteen KPUs are grouped into eight KPM configurations to improve resource usage octeontx2-af: npc: cn20k: Add default profile Update mkex profile for CN20K and mark unused objects with may_be_unused to silence compiler warnings. ocetontx2-af: npc: cn20k: MKEX profile support Add support for the new CN20K parser profile. Introduces the extractor-based model with up to twenty-four extractors per profile. octeontx2-af: npc: cn20k: Use common APIs Update common MCAM APIs for CN20K. Add new register handling, new access algorithms, and CN20K-specific index management. octeontx2-af: npc: cn20k: Add new mailboxes for CN20K silicon Add CN20K-specific MCAM mailbox messages for updated mcam_entry layout and avoid breaking backward compatibility. .../ethernet/marvell/octeontx2/af/Makefile | 2 +- .../marvell/octeontx2/af/cn20k/debugfs.c | 273 + .../marvell/octeontx2/af/cn20k/debugfs.h | 3 + .../marvell/octeontx2/af/cn20k/mbox_init.c | 17 + .../ethernet/marvell/octeontx2/af/cn20k/npc.c | 4421 +++++++++++++++++ .../ethernet/marvell/octeontx2/af/cn20k/npc.h | 340 ++ .../ethernet/marvell/octeontx2/af/cn20k/reg.h | 65 + .../ethernet/marvell/octeontx2/af/common.h | 4 - .../net/ethernet/marvell/octeontx2/af/mbox.h | 172 +- .../net/ethernet/marvell/octeontx2/af/npc.h | 2 + .../marvell/octeontx2/af/npc_profile.h | 84 +- .../net/ethernet/marvell/octeontx2/af/rvu.c | 94 +- .../net/ethernet/marvell/octeontx2/af/rvu.h | 18 +- .../marvell/octeontx2/af/rvu_debugfs.c | 76 +- .../marvell/octeontx2/af/rvu_devlink.c | 90 +- .../ethernet/marvell/octeontx2/af/rvu_nix.c | 1 - .../ethernet/marvell/octeontx2/af/rvu_npc.c | 580 ++- .../ethernet/marvell/octeontx2/af/rvu_npc.h | 21 + .../marvell/octeontx2/af/rvu_npc_fs.c | 693 ++- .../marvell/octeontx2/af/rvu_npc_fs.h | 14 +- .../marvell/octeontx2/af/rvu_npc_hash.c | 128 +- .../marvell/octeontx2/af/rvu_npc_hash.h | 2 +- .../ethernet/marvell/octeontx2/nic/cn20k.c | 265 + .../ethernet/marvell/octeontx2/nic/cn20k.h | 13 + .../marvell/octeontx2/nic/otx2_common.h | 35 + .../marvell/octeontx2/nic/otx2_flows.c | 267 +- .../ethernet/marvell/octeontx2/nic/otx2_tc.c | 77 +- 27 files changed, 7286 insertions(+), 471 deletions(-) create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.c create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.h create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.h -- v1 -> v2: Addressed comments v2 -> v3: Resolved build errors, addressed comments v3 -> v4: Address comments from Jakub https://lore.kernel.org/netdev/20260109054828.1822307-12-rkannoth@marvell.com/T/#t v4 -> v5: Addressed comments from Jakub https://lore.kernel.org/netdev/20260113101658.4144610-6-rkannoth@marvell.com/ v5 -> v6: Addressed Jakub comments. https://lore.kernel.org/netdev/20260126123254.1000480-11-rkannoth@marvell.com/T/#t 2.43.0