Module Name: src
Committed By: martin
Date: Fri Nov 3 08:59:29 UTC 2023
Modified Files:
src/share/man/man4 [netbsd-10]: mcx.4
src/sys/dev/pci [netbsd-10]: if_mcx.c pcidevs
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #447):
sys/dev/pci/pcidevs: revision 1.1498
sys/dev/pci/if_mcx.c: revision 1.26
share/man/man4/mcx.4: revision 1.3
pcidevs: Add Mellanox ConnectX-6 Lx.
mcx(4): Add Mellanox ConnectX-6 Lx from OpenBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.10.1 src/share/man/man4/mcx.4
cvs rdiff -u -r1.25 -r1.25.4.1 src/sys/dev/pci/if_mcx.c
cvs rdiff -u -r1.1471.2.9 -r1.1471.2.10 src/sys/dev/pci/pcidevs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/mcx.4
diff -u src/share/man/man4/mcx.4:1.2 src/share/man/man4/mcx.4:1.2.10.1
--- src/share/man/man4/mcx.4:1.2 Mon Sep 23 18:26:52 2019
+++ src/share/man/man4/mcx.4 Fri Nov 3 08:59:29 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: mcx.4,v 1.2 2019/09/23 18:26:52 jmcneill Exp $
+.\" $NetBSD: mcx.4,v 1.2.10.1 2023/11/03 08:59:29 martin Exp $
.\"
.\" Copyright (c) 2019 David Gwynne <d...@openbsd.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd September 23, 2019
+.Dd October 26, 2023
.Dt MCX 4
.Os
.Sh NAME
@@ -37,6 +37,10 @@ ConnectX-4 EN
ConnectX-5 EN
.It
ConnectX-6 EN
+.It
+ConnectX-6 Dx EN
+.It
+ConnectX-6 Lx EN
.El
.Sh SEE ALSO
.Xr arp 4 ,
Index: src/sys/dev/pci/if_mcx.c
diff -u src/sys/dev/pci/if_mcx.c:1.25 src/sys/dev/pci/if_mcx.c:1.25.4.1
--- src/sys/dev/pci/if_mcx.c:1.25 Sun Aug 28 07:54:03 2022
+++ src/sys/dev/pci/if_mcx.c Fri Nov 3 08:59:29 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mcx.c,v 1.25 2022/08/28 07:54:03 skrll Exp $ */
+/* $NetBSD: if_mcx.c,v 1.25.4.1 2023/11/03 08:59:29 martin Exp $ */
/* $OpenBSD: if_mcx.c,v 1.101 2021/06/02 19:16:11 patrick Exp $ */
/*
@@ -23,7 +23,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mcx.c,v 1.25 2022/08/28 07:54:03 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mcx.c,v 1.25.4.1 2023/11/03 08:59:29 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2678,7 +2678,8 @@ static const struct {
{ PCI_VENDOR_MELLANOX, PCI_PRODUCT_MELLANOX_MT28800 },
{ PCI_VENDOR_MELLANOX, PCI_PRODUCT_MELLANOX_MT28800VF },
{ PCI_VENDOR_MELLANOX, PCI_PRODUCT_MELLANOX_MT28908 },
- { PCI_VENDOR_MELLANOX, PCI_PRODUCT_MELLANOX_MT2892 },
+ { PCI_VENDOR_MELLANOX, PCI_PRODUCT_MELLANOX_MT2892 },
+ { PCI_VENDOR_MELLANOX, PCI_PRODUCT_MELLANOX_MT2894 },
};
struct mcx_eth_proto_capability {
Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1471.2.9 src/sys/dev/pci/pcidevs:1.1471.2.10
--- src/sys/dev/pci/pcidevs:1.1471.2.9 Wed Oct 18 14:27:37 2023
+++ src/sys/dev/pci/pcidevs Fri Nov 3 08:59:29 2023
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1471.2.9 2023/10/18 14:27:37 martin Exp $
+$NetBSD: pcidevs,v 1.1471.2.10 2023/11/03 08:59:29 martin Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -7667,6 +7667,7 @@ product MELLANOX MT28800VF 0x101a Connec
product MELLANOX MT28908 0x101b ConnectX-6
product MELLANOX MT28908VF 0x101c ConnectX-6 VF
product MELLANOX MT2892 0x101d ConnectX-6 Dx
+product MELLANOX MT2894 0x101f ConnectX-6 Lx
product MELLANOX MT23108 0x5a44 InfiniHost (Tavor)
product MELLANOX MT23108_PCI 0x5a46 InfiniHost PCI Bridge (Tavor)
product MELLANOX MT25204_OLD 0x5e8c InfiniHost III Lx (old Sinai)
