Commit d8213efe authored by David S. Miller's avatar David S. Miller
Browse files

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/20231221092844.2885872-1-srasheed@marvell.com/


====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3ce4f9c3 c902ba32

Documentation/networking/device_drivers/ethernet/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ Contents: 
   intel/ice

   marvell/octeontx2

   marvell/octeon_ep

   marvell/octeon_ep_vf

   mellanox/mlx5/index

   microsoft/netvsc

   neterion/s2io

Documentation/networking/device_drivers/ethernet/marvell/octeon_ep_vf.rst

0 → 100644
+24 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0+



=======================================================================

Linux kernel networking driver for Marvell's Octeon PCI Endpoint NIC VF

=======================================================================



Network driver for Marvell's Octeon PCI EndPoint NIC VF.

Copyright (c) 2020 Marvell International Ltd.



Overview

========

This driver implements networking functionality of Marvell's Octeon PCI

EndPoint NIC VF.



Supported Devices

=================

Currently, 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

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -12861,6 +12861,15 @@ L: netdev@vger.kernel.org 
S:	Supported

F:	drivers/net/ethernet/marvell/octeon_ep









MARVELL OCTEON ENDPOINT VF DRIVER









M:	Veerasenareddy Burru <vburru@marvell.com>









M:	Sathesh Edara <sedara@marvell.com>









M:	Shinas Rasheed <srasheed@marvell.com>









M:	Satananda Burla <sburla@marvell.com>









L:	netdev@vger.kernel.org









S:	Supported









F:	drivers/net/ethernet/marvell/octeon_ep_vf

















MARVELL OCTEONTX2 PHYSICAL FUNCTION DRIVER









M:	Sunil Goutham <sgoutham@marvell.com>









M:	Geetha sowjanya <gakula@marvell.com>
































drivers/net/ethernet/marvell/Kconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -180,6 +180,7 @@ config SKY2_DEBUG

















source "drivers/net/ethernet/marvell/octeontx2/Kconfig"









source "drivers/net/ethernet/marvell/octeon_ep/Kconfig"









source "drivers/net/ethernet/marvell/octeon_ep_vf/Kconfig"









source "drivers/net/ethernet/marvell/prestera/Kconfig"



















endif # NET_VENDOR_MARVELL
























drivers/net/ethernet/marvell/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -12,5 +12,6 @@ obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o







obj-$(CONFIG_SKGE) += skge.o









obj-$(CONFIG_SKY2) += sky2.o









obj-y		+= octeon_ep/









obj-y		+= octeon_ep_vf/









obj-y		+= octeontx2/









obj-y		+= prestera/