Skip to content

Commit 1d13115

Browse files
committed
Merge branch 'marvell-cn10k'
Geetha sowjanya says: ==================== Add Marvell CN10K support The current admin function (AF) driver and the netdev driver supports OcteonTx2 silicon variants. The same OcteonTx2's Resource Virtualization Unit (RVU) is carried forward to the next-gen silicon ie OcteonTx3, with some changes and feature enhancements. This patch set adds support for OcteonTx3 (CN10K) silicon and gets the drivers to the same level as OcteonTx2. No new OcteonTx3 specific features are added. Changes cover below HW level differences - PCIe BAR address changes wrt shared mailbox memory region - Receive buffer freeing to HW - Transmit packet's descriptor submission to HW - Programmable HW interface identifiers (channels) - Increased MTU support - A Serdes MAC block (RPM) configuration v5-v6 Rebased on top of latest net-next branch. v4-v5 Fixed sparse warnings. v3-v4 Fixed compiler warnings. v2-v3 Reposting as a single thread. Rebased on top latest net-next branch. v1-v2 Fixed check-patch reported issues. ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents cc6216b + 3ad3f8f commit 1d13115

33 files changed

+2613
-739
lines changed

MAINTAINERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10719,6 +10719,8 @@ M: Sunil Goutham <[email protected]>
1071910719
M: Linu Cherian <[email protected]>
1072010720
M: Geetha sowjanya <[email protected]>
1072110721
M: Jerin Jacob <[email protected]>
10722+
M: hariprasad <[email protected]>
10723+
M: Subbaraya Sundeep <[email protected]>
1072210724
1072310725
S: Supported
1072410726
F: Documentation/networking/device_drivers/ethernet/marvell/octeontx2.rst

drivers/net/ethernet/marvell/octeontx2/af/Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
#
55

66
ccflags-y += -I$(src)
7-
obj-$(CONFIG_OCTEONTX2_MBOX) += octeontx2_mbox.o
8-
obj-$(CONFIG_OCTEONTX2_AF) += octeontx2_af.o
7+
obj-$(CONFIG_OCTEONTX2_MBOX) += rvu_mbox.o
8+
obj-$(CONFIG_OCTEONTX2_AF) += rvu_af.o
99

10-
octeontx2_mbox-y := mbox.o rvu_trace.o
11-
octeontx2_af-y := cgx.o rvu.o rvu_cgx.o rvu_npa.o rvu_nix.o \
10+
rvu_mbox-y := mbox.o rvu_trace.o
11+
rvu_af-y := cgx.o rvu.o rvu_cgx.o rvu_npa.o rvu_nix.o \
1212
rvu_reg.o rvu_npc.o rvu_debugfs.o ptp.o rvu_npc_fs.o \
13-
rvu_cpt.o rvu_devlink.o
13+
rvu_cpt.o rvu_devlink.o rpm.o rvu_cn10k.o

0 commit comments

Comments
 (0)