Skip to content

Commit fd8b625

Browse files
author
Herton R. Krzesinski
committed
Merge: octeontx2: add Admin/Physical/Virtual Function drivers
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/2057 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2040643 This enables the Octeon TX2 drivers (for the Admin/Physical/Virtual Functions). The next-to-last commit marks all three as tech preview. Signed-off-by: Michal Schmidt <mschmidt@redhat.com> Approved-by: Íñigo Huguet <ihuguet@redhat.com> Approved-by: José Ignacio Tornos Martínez <jtornosm@redhat.com> Approved-by: Ivan Vecera <ivecera@redhat.com> Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
2 parents 7821871 + 80fc6b0 commit fd8b625

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+15642
-2201
lines changed

drivers/net/ethernet/marvell/octeontx2/Kconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
#
3-
# Marvell OcteonTX2 drivers configuration
3+
# Marvell RVU Network drivers configuration
44
#
55

66
config OCTEONTX2_MBOX
@@ -31,7 +31,9 @@ config NDC_DIS_DYNAMIC_CACHING
3131
config OCTEONTX2_PF
3232
tristate "Marvell OcteonTX2 NIC Physical Function driver"
3333
select OCTEONTX2_MBOX
34+
select NET_DEVLINK
3435
depends on (64BIT && COMPILE_TEST) || ARM64
36+
select DIMLIB
3537
depends on PCI
3638
depends on PTP_1588_CLOCK_OPTIONAL
3739
help
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0
22
#
3-
# Makefile for Marvell's OcteonTX2 RVU Admin Function driver
3+
# Makefile for Marvell's RVU Admin Function driver
44
#
55

66
ccflags-y += -I$(src)
@@ -10,4 +10,5 @@ obj-$(CONFIG_OCTEONTX2_AF) += rvu_af.o
1010
rvu_mbox-y := mbox.o rvu_trace.o
1111
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 rpm.o rvu_cn10k.o rvu_switch.o
13+
rvu_cpt.o rvu_devlink.o rpm.o rvu_cn10k.o rvu_switch.o \
14+
rvu_sdp.o rvu_npc_hash.o mcs.o mcs_rvu_if.o mcs_cnf10kb.o

0 commit comments

Comments
 (0)