Skip to content

Commit d8213ef

Browse files
committed
Merge branch 'octeon_ep_vf-driver'
Shinas Rasheed says: ==================== add octeon_ep_vf driver This driver implements networking functionality of Marvell's Octeon PCI Endpoint NIC VF. This driver support following devices: * Network controller: Cavium, Inc. Device b203 * Network controller: Cavium, Inc. Device b403 * Network controller: Cavium, Inc. Device b103 * Network controller: Cavium, Inc. Device b903 * Network controller: Cavium, Inc. Device ba03 * Network controller: Cavium, Inc. Device bc03 * Network controller: Cavium, Inc. Device bd03 Changes: V2: - Removed linux/version.h header file from inclusion in octep_vf_main.c - Corrected Makefile entry to include building octep_vf_mbox.c in [6/8] patch. - Removed redundant vzalloc pointer cast and vfree pointer check in [6/8] patch. V1: https://lore.kernel.org/all/[email protected]/ ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents 3ce4f9c + c902ba3 commit d8213ef

21 files changed

+5342
-0
lines changed

Documentation/networking/device_drivers/ethernet/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ Contents:
4242
intel/ice
4343
marvell/octeontx2
4444
marvell/octeon_ep
45+
marvell/octeon_ep_vf
4546
mellanox/mlx5/index
4647
microsoft/netvsc
4748
neterion/s2io
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
.. SPDX-License-Identifier: GPL-2.0+
2+
3+
=======================================================================
4+
Linux kernel networking driver for Marvell's Octeon PCI Endpoint NIC VF
5+
=======================================================================
6+
7+
Network driver for Marvell's Octeon PCI EndPoint NIC VF.
8+
Copyright (c) 2020 Marvell International Ltd.
9+
10+
Overview
11+
========
12+
This driver implements networking functionality of Marvell's Octeon PCI
13+
EndPoint NIC VF.
14+
15+
Supported Devices
16+
=================
17+
Currently, this driver support following devices:
18+
* Network controller: Cavium, Inc. Device b203
19+
* Network controller: Cavium, Inc. Device b403
20+
* Network controller: Cavium, Inc. Device b103
21+
* Network controller: Cavium, Inc. Device b903
22+
* Network controller: Cavium, Inc. Device ba03
23+
* Network controller: Cavium, Inc. Device bc03
24+
* Network controller: Cavium, Inc. Device bd03

MAINTAINERS

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12861,6 +12861,15 @@ L: [email protected]
1286112861
S: Supported
1286212862
F: drivers/net/ethernet/marvell/octeon_ep
1286312863

12864+
MARVELL OCTEON ENDPOINT VF DRIVER
12865+
M: Veerasenareddy Burru <[email protected]>
12866+
M: Sathesh Edara <[email protected]>
12867+
M: Shinas Rasheed <[email protected]>
12868+
M: Satananda Burla <[email protected]>
12869+
12870+
S: Supported
12871+
F: drivers/net/ethernet/marvell/octeon_ep_vf
12872+
1286412873
MARVELL OCTEONTX2 PHYSICAL FUNCTION DRIVER
1286512874
M: Sunil Goutham <[email protected]>
1286612875
M: Geetha sowjanya <[email protected]>

drivers/net/ethernet/marvell/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ config SKY2_DEBUG
180180

181181
source "drivers/net/ethernet/marvell/octeontx2/Kconfig"
182182
source "drivers/net/ethernet/marvell/octeon_ep/Kconfig"
183+
source "drivers/net/ethernet/marvell/octeon_ep_vf/Kconfig"
183184
source "drivers/net/ethernet/marvell/prestera/Kconfig"
184185

185186
endif # NET_VENDOR_MARVELL

drivers/net/ethernet/marvell/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@ obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o
1212
obj-$(CONFIG_SKGE) += skge.o
1313
obj-$(CONFIG_SKY2) += sky2.o
1414
obj-y += octeon_ep/
15+
obj-y += octeon_ep_vf/
1516
obj-y += octeontx2/
1617
obj-y += prestera/
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
#
3+
# Marvell's Octeon PCI Endpoint NIC VF Driver Configuration
4+
#
5+
6+
config OCTEON_EP_VF
7+
tristate "Marvell Octeon PCI Endpoint NIC VF Driver"
8+
depends on 64BIT
9+
depends on PCI
10+
help
11+
This driver supports networking functionality of Marvell's
12+
Octeon PCI Endpoint NIC VF.
13+
14+
To know the list of devices supported by this driver, refer
15+
documentation in
16+
<file:Documentation/networking/device_drivers/ethernet/marvell/octeon_ep_vf.rst>.
17+
18+
To compile this drivers as a module, choose M here. Name of the
19+
module is octeon_ep_vf.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
#
3+
# Network driver for Marvell's Octeon PCI Endpoint NIC VF
4+
#
5+
6+
obj-$(CONFIG_OCTEON_EP_VF) += octeon_ep_vf.o
7+
8+
octeon_ep_vf-y := octep_vf_main.o octep_vf_cn9k.o octep_vf_cnxk.o \
9+
octep_vf_tx.o octep_vf_rx.o octep_vf_mbox.o \
10+
octep_vf_ethtool.o

0 commit comments

Comments
 (0)