CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: martin
Date: Tue Nov 19 08:59:18 UTC 2019
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Looks like this requires pthread.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/external/mit/xorg/lib/gallium/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.38 src/external/mit/xorg/lib/gallium/Makefile:1.39
--- src/external/mit/xorg/lib/gallium/Makefile:1.38 Mon Nov 18 22:26:15 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Tue Nov 19 08:59:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2019/11/18 22:26:15 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2019/11/19 08:59:18 martin Exp $
# Link the gallium mega driver.
@@ -23,6 +23,10 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libd
-I${NETBSDSRCDIR}/external/apache2/llvm/dist/llvm/include \
-I${LLVM_INCLUDE_OBJDIR} -I${NETBSDSRCDIR}/external/apache2/llvm/config
+CFLAGS+= -pthread
+LDFLAGS+= -pthread
+LIBDPLIBS+= pthread ${.CURDIR}/../../../../../lib/libpthread
+
GALLIUM_SUBDIRS= \
auxiliary \
auxiliary/cso_cache \
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: martin Date: Tue Nov 19 08:59:18 UTC 2019 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Looks like this requires pthread. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Tue Nov 19 09:54:07 UTC 2019
Modified Files:
src/sys/dev/pci: if_vge.c
Log Message:
Fixes a bug that "ifmedia vge0 media 1000baseT-FDX" causes device timeout.
If the interface's media is NOT in the "best" mode (i.e. other than IFM_AUTO),
control VGE_DIAGCTL_GMII bit.
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/pci/if_vge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_vge.c
diff -u src/sys/dev/pci/if_vge.c:1.75 src/sys/dev/pci/if_vge.c:1.76
--- src/sys/dev/pci/if_vge.c:1.75 Tue Oct 8 14:26:27 2019
+++ src/sys/dev/pci/if_vge.c Tue Nov 19 09:54:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vge.c,v 1.75 2019/10/08 14:26:27 msaitoh Exp $ */
+/* $NetBSD: if_vge.c,v 1.76 2019/11/19 09:54:07 msaitoh Exp $ */
/*-
* Copyright (c) 2004
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.75 2019/10/08 14:26:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.76 2019/11/19 09:54:07 msaitoh Exp $");
/*
* VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver.
@@ -1916,6 +1916,7 @@ vge_miibus_statchg(struct ifnet *ifp)
struct vge_softc *sc = ifp->if_softc;
struct mii_data *mii = &sc->sc_mii;
struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
+ uint8_t dctl;
/*
* If the user manually selects a media mode, we need to turn
@@ -1928,23 +1929,26 @@ vge_miibus_statchg(struct ifnet *ifp)
* the FDX bit cleared.
*/
+ dctl = CSR_READ_1(sc, VGE_DIAGCTL);
+
switch (IFM_SUBTYPE(ife->ifm_media)) {
case IFM_AUTO:
- CSR_CLRBIT_1(sc, VGE_DIAGCTL, VGE_DIAGCTL_MACFORCE);
- CSR_CLRBIT_1(sc, VGE_DIAGCTL, VGE_DIAGCTL_FDXFORCE);
+ dctl &= ~VGE_DIAGCTL_MACFORCE;
+ dctl &= ~VGE_DIAGCTL_FDXFORCE;
break;
case IFM_1000_T:
- CSR_SETBIT_1(sc, VGE_DIAGCTL, VGE_DIAGCTL_MACFORCE);
- CSR_CLRBIT_1(sc, VGE_DIAGCTL, VGE_DIAGCTL_FDXFORCE);
+ dctl |= VGE_DIAGCTL_MACFORCE;
+ dctl &= ~VGE_DIAGCTL_FDXFORCE;
+ dctl |= VGE_DIAGCTL_GMII;
break;
case IFM_100_TX:
case IFM_10_T:
- CSR_SETBIT_1(sc, VGE_DIAGCTL, VGE_DIAGCTL_MACFORCE);
- if ((ife->ifm_media & IFM_FDX) != 0) {
- CSR_SETBIT_1(sc, VGE_DIAGCTL, VGE_DIAGCTL_FDXFORCE);
- } else {
- CSR_CLRBIT_1(sc, VGE_DIAGCTL, VGE_DIAGCTL_FDXFORCE);
- }
+ dctl |= VGE_DIAGCTL_MACFORCE;
+ dctl &= ~VGE_DIAGCTL_GMII;
+ if ((ife->ifm_media & IFM_FDX) != 0)
+ dctl |= VGE_DIAGCTL_FDXFORCE;
+ else
+ dctl &= ~VGE_DIAGCTL_FDXFORCE;
break;
default:
printf("%s: unknown media type: %x\n",
@@ -1952,6 +1956,8 @@ vge_miibus_statchg(struct ifnet *ifp)
IFM_SUBTYPE(ife->ifm_media));
break;
}
+
+ CSR_WRITE_1(sc, VGE_DIAGCTL, dctl);
}
static int
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Tue Nov 19 09:54:07 UTC 2019 Modified Files: src/sys/dev/pci: if_vge.c Log Message: Fixes a bug that "ifmedia vge0 media 1000baseT-FDX" causes device timeout. If the interface's media is NOT in the "best" mode (i.e. other than IFM_AUTO), control VGE_DIAGCTL_GMII bit. To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 src/sys/dev/pci/if_vge.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src
Module Name:src Committed By: martin Date: Tue Nov 19 10:21:34 UTC 2019 Modified Files: src/share/man/man4 [netbsd-8]: re.4 src/sys/dev/pci [netbsd-8]: if_re_pci.c Log Message: Pull up the following revisions, requested by msaitoh in ticket #1449: sys/dev/pci/if_re_pci.c 1.50 share/man/man4/re.4 1.17-1.18 Add D-Link DGE-530T Rev. C,D and TP-Link TG-3468 v2,v3. Add note about UDP checksum offload feature to the document. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.16.18.1 src/share/man/man4/re.4 cvs rdiff -u -r1.48 -r1.48.2.1 src/sys/dev/pci/if_re_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src
Module Name:src
Committed By: martin
Date: Tue Nov 19 10:21:34 UTC 2019
Modified Files:
src/share/man/man4 [netbsd-8]: re.4
src/sys/dev/pci [netbsd-8]: if_re_pci.c
Log Message:
Pull up the following revisions, requested by msaitoh in ticket #1449:
sys/dev/pci/if_re_pci.c 1.50
share/man/man4/re.4 1.17-1.18
Add D-Link DGE-530T Rev. C,D and TP-Link TG-3468 v2,v3.
Add note about UDP checksum offload feature to the document.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.18.1 src/share/man/man4/re.4
cvs rdiff -u -r1.48 -r1.48.2.1 src/sys/dev/pci/if_re_pci.c
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/re.4
diff -u src/share/man/man4/re.4:1.16 src/share/man/man4/re.4:1.16.18.1
--- src/share/man/man4/re.4:1.16 Tue Mar 18 18:20:39 2014
+++ src/share/man/man4/re.4 Tue Nov 19 10:21:34 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: re.4,v 1.16 2014/03/18 18:20:39 riastradh Exp $
+.\" $NetBSD: re.4,v 1.16.18.1 2019/11/19 10:21:34 martin Exp $
.\"
.\" Copyright (c) 2003
.\" Bill Paul . All rights reserved.
@@ -32,7 +32,7 @@
.\"
.\" $FreeBSD: src/share/man/man4/re.4,v 1.4 2004/03/04 06:42:46 sanpei Exp $
.\"
-.Dd April 6, 2013
+.Dd November 18, 2019
.Dt RE 4
.Os
.Sh NAME
@@ -66,9 +66,13 @@ Corega CG-LAPCIGT Gigabit Ethernet (8169
.It
D-Link DGE-528T Gigabit Ethernet (8169S)
.It
+D-Link DGE-530T rev. C & D Gigabit Ethernet (8169)
+.It
US Robotics (3Com) USR997902 Gigabit Ethernet (8169S)
.It
Linksys EG1032 rev. 3 Gigabit Ethernet (8169S)
+.It
+TP-Link TG-3468 v2 & v3 Gigabit Ethernet (8168)
.El
.Pp
NICs based on the 8139C+ are capable of 10 and 100Mbps speeds over
@@ -78,7 +82,7 @@ NICs based on the 8169, 8169S, 8168, and
.Pp
All NICs supported by the
.Nm
-driver have TCP/IP checksum offload and hardware VLAN tagging/insertion
+driver have IP/TCP/UDP checksum offload and hardware VLAN tagging/insertion
features, and use a descriptor-based DMA mechanism.
They are also capable of TCP large send (TCP segmentation offload).
.Pp
Index: src/sys/dev/pci/if_re_pci.c
diff -u src/sys/dev/pci/if_re_pci.c:1.48 src/sys/dev/pci/if_re_pci.c:1.48.2.1
--- src/sys/dev/pci/if_re_pci.c:1.48 Thu May 18 18:33:48 2017
+++ src/sys/dev/pci/if_re_pci.c Tue Nov 19 10:21:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_re_pci.c,v 1.48 2017/05/18 18:33:48 jakllsch Exp $ */
+/* $NetBSD: if_re_pci.c,v 1.48.2.1 2019/11/19 10:21:34 martin Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -46,7 +46,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_re_pci.c,v 1.48 2017/05/18 18:33:48 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_re_pci.c,v 1.48.2.1 2019/11/19 10:21:34 martin Exp $");
#include
@@ -99,6 +99,9 @@ static const struct rtk_type re_devs[] =
{ PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8168,
RTK_8168,
"RealTek 8168/8111 PCIe Gigabit Ethernet" },
+ { PCI_VENDOR_NCUBE, PCI_PRODUCT_NCUBE_TG3648,
+ RTK_8168,
+ "TP-Link TG-3468 v2 (RTL8168) Gigabit Ethernet" },
{ PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8169,
RTK_8169,
"RealTek 8169/8110 Gigabit Ethernet" },
@@ -111,6 +114,9 @@ static const struct rtk_type re_devs[] =
{ PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DGE528T,
RTK_8169,
"D-Link DGE-528T Gigabit Ethernet" },
+ { PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DGE530T_C1,
+ RTK_8169,
+ "D-Link DGE-530T C1 Gigabit Ethernet" },
{ PCI_VENDOR_USR2, PCI_PRODUCT_USR2_USR997902,
RTK_8169,
"US Robotics (3Com) USR997902 Gigabit Ethernet" },
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Nov 19 10:36:48 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-8]: pcidevs Log Message: Pull up the following revisions, requested by msaitoh in ticket #1448: sys/dev/pci/pcidevs 1.1384-1.1391 - Add micron/crucial SM2263 NVMe. - Add some device found on ASUS X570-P with Ryzen 3200G CPU. - Spell it "PCIe' when using the name. - Add Mellanox ConnectX-4, ConnectX-4 Lx, ConnectX-5, and ConnectX-5 Ex - Modify Attansic Ethernet devices' description to clarify. - Add Killer E2400 and E2500. - Spell "controller" correctly. - Add Realtek RTL8125. - Update Intel's NVMe SSDs. - Add Intel Apollo Lake TXE HECI. - Add D-Link DGE-530T C1 and TP-Link TG-3468 v2. To generate a diff of this commit: cvs rdiff -u -r1.1289.2.16 -r1.1289.2.17 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/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1289.2.16 src/sys/dev/pci/pcidevs:1.1289.2.17 --- src/sys/dev/pci/pcidevs:1.1289.2.16 Tue Aug 6 15:51:07 2019 +++ src/sys/dev/pci/pcidevs Tue Nov 19 10:36:47 2019 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1289.2.16 2019/08/06 15:51:07 martin Exp $ +$NetBSD: pcidevs,v 1.1289.2.17 2019/11/19 10:36:47 martin Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -686,6 +686,7 @@ vendor ADP2 0x9005 Adaptec (2nd PCI Ven vendor ATRONICS 0x907f Atronics vendor NETMOS 0x9710 Netmos vendor PARALLELS 0x Parallels +vendor MICRON 0xc0a9 Micron/Crucial Technology vendor CHRYSALIS 0xcafe Chrysalis-ITS vendor MIDDLE_DIGITAL 0xdeaf Middle Digital vendor ARC 0xedd8 ARC Logic @@ -963,10 +964,10 @@ product AMAZON NVME 0x8061 NVMe SSD product AMAZON ENA 0xec20 Elastic Network Adapter /* AMD products */ -product AMD AMD64_HT 0x1100 K8 AMD64 HyperTransport Configuration -product AMD AMD64_ADDR 0x1101 K8 AMD64 Address Map Configuration -product AMD AMD64_DRAM 0x1102 K8 AMD64 DRAM Configuration -product AMD AMD64_MISC 0x1103 K8 AMD64 Miscellaneous Configuration +product AMD AMD64_HT 0x1100 K8 AMD64 HyperTransport Configuration +product AMD AMD64_ADDR 0x1101 K8 AMD64 Address Map Configuration +product AMD AMD64_DRAM 0x1102 K8 AMD64 DRAM Configuration +product AMD AMD64_MISC 0x1103 K8 AMD64 Miscellaneous Configuration product AMD AMD64_F10_HT 0x1200 AMD64 Family10h HyperTransport Configuration product AMD AMD64_F10_ADDR 0x1201 AMD64 Family10h Address Map Configuration product AMD AMD64_F10_DRAM 0x1202 AMD64 Family10h DRAM Configuration @@ -977,140 +978,145 @@ product AMD AMD64_F11_ADDR 0x1301 AMD64 product AMD AMD64_F11_DRAM 0x1302 AMD64 Family11h DRAM Configuration product AMD AMD64_F11_MISC 0x1303 AMD64 Family11h Miscellaneous Configuration product AMD AMD64_F11_LINK 0x1304 AMD64 Family11h Link Configuration -product AMD F15_10_PF_0 0x1400 Family15h Processor Function 0 -product AMD F15_10_PF_1 0x1401 Family15h Processor Function 1 -product AMD F15_10_PF_2 0x1402 Family15h Processor Function 2 -product AMD F15_10_PF_3 0x1403 Family15h Processor Function 3 -product AMD F15_10_PF_4 0x1404 Family15h Processor Function 4 -product AMD F15_10_PF_5 0x1405 Family15h Processor Function 5 -product AMD F15_10_RC 0x1410 Family15h Root Complex -product AMD F15_10_RP_2 0x1412 Family15h Root Port -product AMD F15_10_RP_3 0x1413 Family15h Root Port -product AMD F15_10_RP_4 0x1414 Family15h Root Port -product AMD F15_10_RP_5 0x1415 Family15h Root Port -product AMD F15_10_RP_6 0x1416 Family15h Root Port -product AMD F15_10_RP_7 0x1417 Family15h Root Port -product AMD F15_10_RP_8 0x1418 Family15h Root Port +product AMD F15_10_PF_0 0x1400 Family15h Processor Function 0 +product AMD F15_10_PF_1 0x1401 Family15h Processor Function 1 +product AMD F15_10_PF_2 0x1402 Family15h Processor Function 2 +product AMD F15_10_PF_3 0x1403 Family15h Processor Function 3 +product AMD F15_10_PF_4 0x1404 Family15h Processor Function 4 +product AMD F15_10_PF_5 0x1405 Family15h Processor Function 5 +product AMD F15_10_RC 0x1410 Family15h Root Complex +product AMD F15_10_RP_2 0x1412 Family15h Root Port +product AMD F15_10_RP_3 0x1413 Family15h Root Port +product AMD F15_10_RP_4 0x1414 Family15h Root Port +product AMD F15_10_RP_5 0x1415 Family15h Root Port +product AMD F15_10_RP_6 0x1416 Family15h Root Port +product AMD F15_10_RP_7 0x1417 Family15h Root Port +product AMD F15_10_RP_8 0x1418 Family15h Root Port product AMD F15_10_IOMMU 0x1419 Family15h IOMMU -product AMD F15_30_PF_0 0x141a Family15h Processor Function 0 -product AMD F15_30_PF_1 0x141b Family15h Processor Function 1 -product AMD F15_30_PF_2 0x141c Family15h Processor Function 2 -product AMD F15_30_PF_3 0x141d Family15h Processor Function 3 -product AMD F15_30_PF_4 0x141e Family15h Processor Function 4 -product AMD F15_30_PF_5 0x141f Family15h Processor Function 5 -product AMD F15_30_RC 0x1422 Family15h Root Complex
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Nov 19 10:36:48 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-8]: pcidevs Log Message: Pull up the following revisions, requested by msaitoh in ticket #1448: sys/dev/pci/pcidevs 1.1384-1.1391 - Add micron/crucial SM2263 NVMe. - Add some device found on ASUS X570-P with Ryzen 3200G CPU. - Spell it "PCIe' when using the name. - Add Mellanox ConnectX-4, ConnectX-4 Lx, ConnectX-5, and ConnectX-5 Ex - Modify Attansic Ethernet devices' description to clarify. - Add Killer E2400 and E2500. - Spell "controller" correctly. - Add Realtek RTL8125. - Update Intel's NVMe SSDs. - Add Intel Apollo Lake TXE HECI. - Add D-Link DGE-530T C1 and TP-Link TG-3468 v2. To generate a diff of this commit: cvs rdiff -u -r1.1289.2.16 -r1.1289.2.17 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Nov 19 10:40:40 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-8]: pcidevs.h pcidevs_data.h Log Message: regen for ticket #1448 To generate a diff of this commit: cvs rdiff -u -r1.1281.2.16 -r1.1281.2.17 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1280.2.16 -r1.1280.2.17 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Nov 19 10:40:40 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-8]: pcidevs.h pcidevs_data.h Log Message: regen for ticket #1448 To generate a diff of this commit: cvs rdiff -u -r1.1281.2.16 -r1.1281.2.17 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1280.2.16 -r1.1280.2.17 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src
Module Name:src Committed By: martin Date: Tue Nov 19 10:45:11 UTC 2019 Modified Files: src/sys/arch/x86/include [netbsd-8]: specialreg.h src/usr.sbin/cpuctl/arch [netbsd-8]: i386.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1450): usr.sbin/cpuctl/arch/i386.c: revision 1.108 sys/arch/x86/include/specialreg.h: revision 1.158 Add the following bit definitions from the latest Intel SDM: - CET shadow stack - Fast Short REP MOV - Hybrid part - CET Indirect Branch Tracking 0x7d and 0x7e are for 10th generation Core (Ice Lake). To generate a diff of this commit: cvs rdiff -u -r1.98.2.16 -r1.98.2.17 src/sys/arch/x86/include/specialreg.h cvs rdiff -u -r1.74.6.7 -r1.74.6.8 src/usr.sbin/cpuctl/arch/i386.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src
Module Name:src
Committed By: martin
Date: Tue Nov 19 10:45:11 UTC 2019
Modified Files:
src/sys/arch/x86/include [netbsd-8]: specialreg.h
src/usr.sbin/cpuctl/arch [netbsd-8]: i386.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1450):
usr.sbin/cpuctl/arch/i386.c: revision 1.108
sys/arch/x86/include/specialreg.h: revision 1.158
Add the following bit definitions from the latest Intel SDM:
- CET shadow stack
- Fast Short REP MOV
- Hybrid part
- CET Indirect Branch Tracking
0x7d and 0x7e are for 10th generation Core (Ice Lake).
To generate a diff of this commit:
cvs rdiff -u -r1.98.2.16 -r1.98.2.17 src/sys/arch/x86/include/specialreg.h
cvs rdiff -u -r1.74.6.7 -r1.74.6.8 src/usr.sbin/cpuctl/arch/i386.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.98.2.16 src/sys/arch/x86/include/specialreg.h:1.98.2.17
--- src/sys/arch/x86/include/specialreg.h:1.98.2.16 Tue Nov 12 18:28:40 2019
+++ src/sys/arch/x86/include/specialreg.h Tue Nov 19 10:45:11 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: specialreg.h,v 1.98.2.16 2019/11/12 18:28:40 martin Exp $ */
+/* $NetBSD: specialreg.h,v 1.98.2.17 2019/11/19 10:45:11 martin Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -400,6 +400,7 @@
#define CPUID_SEF_OSPKE __BIT(4) /* OS has set CR4.PKE to ena. protec. keys */
#define CPUID_SEF_WAITPKG __BIT(5) /* TPAUSE,UMONITOR,UMWAIT */
#define CPUID_SEF_AVX512_VBMI2 __BIT(6) /* AVX-512 Vector Byte Manipulation 2 */
+#define CPUID_SEF_CET_SS __BIT(7) /* CET shadow stack */
#define CPUID_SEF_GFNI __BIT(8)
#define CPUID_SEF_VAES __BIT(9)
#define CPUID_SEF_VPCLMULQDQ __BIT(10)
@@ -415,7 +416,7 @@
#define CPUID_SEF_FLAGS1 "\177\20" \
"b\0PREFETCHWT1\0" "b\1AVX512_VBMI\0" "b\2UMIP\0" "b\3PKU\0" \
- "b\4OSPKE\0" "b\5WAITPKG\0" "b\6AVX512_VBMI2\0" \
+ "b\4OSPKE\0" "b\5WAITPKG\0" "b\6AVX512_VBMI2\0" "b\7CET_SS\0" \
"b\10GFNI\0" "b\11VAES\0" "b\12VPCLMULQDQ\0" "b\13AVX512_VNNI\0"\
"b\14AVX512_BITALG\0" "b\16AVX512_VPOPCNTDQ\0" \
"f\21\5MAWAU\0" \
@@ -426,8 +427,11 @@
/* %edx */
#define CPUID_SEF_AVX512_4VNNIW __BIT(2)
#define CPUID_SEF_AVX512_4FMAPS __BIT(3)
+#define CPUID_SEF_FSREP_MOV __BIT(4) /* Fast Short REP MOV */
#define CPUID_SEF_MD_CLEAR __BIT(10)
#define CPUID_SEF_TSX_FORCE_ABORT __BIT(13) /* MSR_TSX_FORCE_ABORT bit 0 */
+#define CPUID_SEF_HYBRID __BIT(15) /* Hybrid part */
+#define CPUID_SEF_CET_IBT __BIT(20) /* CET Indirect Branch Tracking */
#define CPUID_SEF_IBRS __BIT(26) /* IBRS / IBPB Speculation Control */
#define CPUID_SEF_STIBP __BIT(27) /* STIBP Speculation Control */
#define CPUID_SEF_L1D_FLUSH __BIT(28) /* IA32_FLUSH_CMD MSR */
@@ -437,8 +441,10 @@
#define CPUID_SEF_FLAGS2 "\20" \
"\3" "AVX512_4VNNIW" "\4" "AVX512_4FMAPS" \
+ "\5" "FSREP_MOV" \
"\13" "MD_CLEAR" \
- "\16" "TSX_FORCE_ABORT"\
+ "\16" "TSX_FORCE_ABORT" "\20" "HYBRID" \
+ "\25" "CET_IBT" \
"\33" "IBRS" "\34" "STIBP" \
"\35" "L1D_FLUSH" "\36" "ARCH_CAP" "\37CORE_CAP" "\40" "SSBD"
Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.74.6.7 src/usr.sbin/cpuctl/arch/i386.c:1.74.6.8
--- src/usr.sbin/cpuctl/arch/i386.c:1.74.6.7 Fri Aug 16 15:36:17 2019
+++ src/usr.sbin/cpuctl/arch/i386.c Tue Nov 19 10:45:11 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.74.6.7 2019/08/16 15:36:17 martin Exp $ */
+/* $NetBSD: i386.c,v 1.74.6.8 2019/11/19 10:45:11 martin Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.74.6.7 2019/08/16 15:36:17 martin Exp $");
+__RCSID("$NetBSD: i386.c,v 1.74.6.8 2019/11/19 10:45:11 martin Exp $");
#endif /* not lint */
#include
@@ -385,8 +385,8 @@ const struct cpu_cpuid_nameclass i386_cp
[0x6a] = "Future Xeon (Ice Lake)",
[0x6c] = "Future Xeon (Ice Lake)",
[0x7a] = "Atom (Goldmont Plus)",
-[0x7d] = "Future Core (Ice Lake)",
-[0x7e] = "Future Core (Ice Lake)",
+[0x7d] = "10th gen Core (Ice Lake)",
+[0x7e] = "10th gen Core (Ice Lake)",
[0x85] = "Xeon Phi 7215, 7285, 7295 (Knights Mill)",
[0x86] = "Atom (Tremont)",
[0x8e] = "7th or 8th gen Core (Kaby Lake, Coffee Lake) or Xeon E (Coffee Lake)",
CVS commit: [netbsd-8] src/sys/dev/pci/ixgbe
Module Name:src Committed By: martin Date: Tue Nov 19 10:48:15 UTC 2019 Modified Files: src/sys/dev/pci/ixgbe [netbsd-8]: ixgbe.c ixv.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1451): sys/dev/pci/ixgbe/ixgbe.c: revision 1.216 sys/dev/pci/ixgbe/ixv.c: revision 1.141 Print MAC address. XXX Should we move such type of printf() to ether_ifattach? To generate a diff of this commit: cvs rdiff -u -r1.88.2.36 -r1.88.2.37 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.56.2.27 -r1.56.2.28 src/sys/dev/pci/ixgbe/ixv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/ixgbe/ixgbe.c diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.36 src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.37 --- src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.36 Thu Oct 17 18:39:41 2019 +++ src/sys/dev/pci/ixgbe/ixgbe.c Tue Nov 19 10:48:15 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ixgbe.c,v 1.88.2.36 2019/10/17 18:39:41 martin Exp $ */ +/* $NetBSD: ixgbe.c,v 1.88.2.37 2019/11/19 10:48:15 martin Exp $ */ /** @@ -1333,6 +1333,8 @@ ixgbe_setup_interface(device_t dev, stru } adapter->ipq = if_percpuq_create(&adapter->osdep.ec.ec_if); ether_ifattach(ifp, adapter->hw.mac.addr); + aprint_normal_dev(dev, "Ethernet address %s\n", + ether_sprintf(adapter->hw.mac.addr)); /* * We use per TX queue softint, so if_deferred_start_init() isn't * used. Index: src/sys/dev/pci/ixgbe/ixv.c diff -u src/sys/dev/pci/ixgbe/ixv.c:1.56.2.27 src/sys/dev/pci/ixgbe/ixv.c:1.56.2.28 --- src/sys/dev/pci/ixgbe/ixv.c:1.56.2.27 Thu Nov 14 15:53:39 2019 +++ src/sys/dev/pci/ixgbe/ixv.c Tue Nov 19 10:48:15 2019 @@ -1,4 +1,4 @@ -/*$NetBSD: ixv.c,v 1.56.2.27 2019/11/14 15:53:39 martin Exp $*/ +/*$NetBSD: ixv.c,v 1.56.2.28 2019/11/19 10:48:15 martin Exp $*/ /** @@ -1623,6 +1623,8 @@ ixv_setup_interface(device_t dev, struct } adapter->ipq = if_percpuq_create(&adapter->osdep.ec.ec_if); ether_ifattach(ifp, adapter->hw.mac.addr); + aprint_normal_dev(dev, "Ethernet address %s\n", + ether_sprintf(adapter->hw.mac.addr)); /* * We use per TX queue softint, so if_deferred_start_init() isn't * used.
CVS commit: [netbsd-8] src/sys/dev/pci/ixgbe
Module Name:src Committed By: martin Date: Tue Nov 19 10:48:15 UTC 2019 Modified Files: src/sys/dev/pci/ixgbe [netbsd-8]: ixgbe.c ixv.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1451): sys/dev/pci/ixgbe/ixgbe.c: revision 1.216 sys/dev/pci/ixgbe/ixv.c: revision 1.141 Print MAC address. XXX Should we move such type of printf() to ether_ifattach? To generate a diff of this commit: cvs rdiff -u -r1.88.2.36 -r1.88.2.37 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.56.2.27 -r1.56.2.28 src/sys/dev/pci/ixgbe/ixv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/kern
Module Name:src Committed By: martin Date: Tue Nov 19 10:50:26 UTC 2019 Modified Files: src/sys/kern [netbsd-8]: sys_ptrace_common.c Log Message: Pull up following revision(s) (requested by rin in ticket #1452): sys/kern/sys_ptrace_common.c: revision 1.72 Fix pointer arithmetic for 32-bit process on LP64 kernel in process_auxv_offset(). Now, PIOD_READ_AUXV works fine with COMPAT_NETBSD32. XXX pullup to netbsd-9 and netbsd-8 To generate a diff of this commit: cvs rdiff -u -r1.22.2.6 -r1.22.2.7 src/sys/kern/sys_ptrace_common.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/sys_ptrace_common.c diff -u src/sys/kern/sys_ptrace_common.c:1.22.2.6 src/sys/kern/sys_ptrace_common.c:1.22.2.7 --- src/sys/kern/sys_ptrace_common.c:1.22.2.6 Sun Aug 4 11:05:29 2019 +++ src/sys/kern/sys_ptrace_common.c Tue Nov 19 10:50:25 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sys_ptrace_common.c,v 1.22.2.6 2019/08/04 11:05:29 martin Exp $ */ +/* $NetBSD: sys_ptrace_common.c,v 1.22.2.7 2019/11/19 10:50:25 martin Exp $ */ /*- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. @@ -118,7 +118,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sys_ptrace_common.c,v 1.22.2.6 2019/08/04 11:05:29 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sys_ptrace_common.c,v 1.22.2.7 2019/11/19 10:50:25 martin Exp $"); #ifdef _KERNEL_OPT #include "opt_ptrace.h" @@ -1506,7 +1506,15 @@ process_auxv_offset(struct proc *p, stru if (pss.ps_envstr == NULL) return EIO; - uio->uio_offset += (off_t)(vaddr_t)(pss.ps_envstr + pss.ps_nenvstr + 1); +#ifdef COMPAT_NETBSD32 + if (p->p_flag & PK_32) + uio->uio_offset += (off_t)((vaddr_t)pss.ps_envstr + + sizeof(uint32_t) * (pss.ps_nenvstr + 1)); + else +#endif + uio->uio_offset += (off_t)(vaddr_t)(pss.ps_envstr + + pss.ps_nenvstr + 1); + #ifdef __MACHINE_STACK_GROWS_UP if (uio->uio_offset < off) return EIO;
CVS commit: [netbsd-8] src/sys/kern
Module Name:src Committed By: martin Date: Tue Nov 19 10:50:26 UTC 2019 Modified Files: src/sys/kern [netbsd-8]: sys_ptrace_common.c Log Message: Pull up following revision(s) (requested by rin in ticket #1452): sys/kern/sys_ptrace_common.c: revision 1.72 Fix pointer arithmetic for 32-bit process on LP64 kernel in process_auxv_offset(). Now, PIOD_READ_AUXV works fine with COMPAT_NETBSD32. XXX pullup to netbsd-9 and netbsd-8 To generate a diff of this commit: cvs rdiff -u -r1.22.2.6 -r1.22.2.7 src/sys/kern/sys_ptrace_common.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Tue Nov 19 10:51:52 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Tickets #1448 - #1452 To generate a diff of this commit: cvs rdiff -u -r1.1.2.67 -r1.1.2.68 src/doc/CHANGES-8.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.2 diff -u src/doc/CHANGES-8.2:1.1.2.67 src/doc/CHANGES-8.2:1.1.2.68 --- src/doc/CHANGES-8.2:1.1.2.67 Mon Nov 18 19:29:27 2019 +++ src/doc/CHANGES-8.2 Tue Nov 19 10:51:52 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.2,v 1.1.2.67 2019/11/18 19:29:27 martin Exp $ +# $NetBSD: CHANGES-8.2,v 1.1.2.68 2019/11/19 10:51:52 martin Exp $ A complete list of changes from the NetBSD 8.1 release to the NetBSD 8.2 release: @@ -1612,3 +1612,49 @@ sys/dev/hyperv/if_hvn.c1.7 Fixed incorrect m_defrag return value check. [nonaka, ticket #1447] +sys/dev/pci/pcidevs 1.1384-1.1391 +sys/dev/pci/pcidevs.h regen +sys/dev/pci/pcidevs_data.h regen + + - Add micron/crucial SM2263 NVMe. + - Add some device found on ASUS X570-P with Ryzen 3200G CPU. + - Spell it "PCIe' when using the name. + - Add Mellanox ConnectX-4, ConnectX-4 Lx, ConnectX-5, and ConnectX-5 Ex + - Modify Attansic Ethernet devices' description to clarify. + - Add Killer E2400 and E2500. + - Spell "controller" correctly. + - Add Realtek RTL8125. + - Update Intel's NVMe SSDs. + - Add Intel Apollo Lake TXE HECI. + - Add D-Link DGE-530T C1 and TP-Link TG-3468 v2. + [msaitoh, ticket #1448] + +sys/dev/pci/if_re_pci.c 1.50 +share/man/man4/re.4 1.17-1.18 + + Add D-Link DGE-530T Rev. C,D and TP-Link TG-3468 v2,v3. + Add note about UDP checksum offload feature to the document. + [msaitoh, ticket #1449] + +sys/arch/x86/include/specialreg.h 1.158 +usr.sbin/cpuctl/arch/i386.c 1.108 + + Add the following bit definitions from the latest Intel SDM: + - CET shadow stack + - Fast Short REP MOV + - Hybrid part + - CET Indirect Branch Tracking + 0x7d and 0x7e are for 10th generation Core (Ice Lake). + [msaitoh, ticket #1450] + +sys/dev/pci/ixgbe/ixgbe.c 1.216 +sys/dev/pci/ixgbe/ixv.c1.141 + + Print MAC address. + [msaitoh, ticket #1451] + +sys/kern/sys_ptrace_common.c 1.72 + + ptrace(2): fix PIOD_READ_AUXV for COMPAT_NETBSD32. + [rin, ticket #1452] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Tue Nov 19 10:51:52 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Tickets #1448 - #1452 To generate a diff of this commit: cvs rdiff -u -r1.1.2.67 -r1.1.2.68 src/doc/CHANGES-8.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/share/examples/npf
Module Name:src Committed By: martin Date: Tue Nov 19 10:56:35 UTC 2019 Modified Files: src/share/examples/npf [netbsd-9]: soho_gw-npf.conf Log Message: Pull up following revision(s) (requested by sevan in ticket #444): share/examples/npf/soho_gw-npf.conf: revision 1.13 share/examples/npf/soho_gw-npf.conf: revision 1.14 share/examples/npf/soho_gw-npf.conf: revision 1.15 share/examples/npf/soho_gw-npf.conf: revision 1.16 share/examples/npf/soho_gw-npf.conf: revision 1.17 share/examples/npf/soho_gw-npf.conf: revision 1.18 share/examples/npf/soho_gw-npf.conf: revision 1.19 share/examples/npf/soho_gw-npf.conf: revision 1.20 Drop the final keyword to use the default policy of last matching rule wins default policy is to blockall Add descriptions for all rules and make use of localnet variable in place of direct IP address improve description pastos Passive FTP works as a client without this and we're not hosting an FTP server (port are not listed in services_tcp) Add support for blacklistd Rename the block table to something else to make it easier to differentiate between action and name. Use this table as the example for populating by npfctl. Drop the int-block table, it's quite cumbersome to have a firewall which needs the internal network lists added if reboot. Use the localnet variable to indicated which network we should pass in traffic from instead. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.12.2.1 src/share/examples/npf/soho_gw-npf.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/share/examples/npf
Module Name:src
Committed By: martin
Date: Tue Nov 19 10:56:35 UTC 2019
Modified Files:
src/share/examples/npf [netbsd-9]: soho_gw-npf.conf
Log Message:
Pull up following revision(s) (requested by sevan in ticket #444):
share/examples/npf/soho_gw-npf.conf: revision 1.13
share/examples/npf/soho_gw-npf.conf: revision 1.14
share/examples/npf/soho_gw-npf.conf: revision 1.15
share/examples/npf/soho_gw-npf.conf: revision 1.16
share/examples/npf/soho_gw-npf.conf: revision 1.17
share/examples/npf/soho_gw-npf.conf: revision 1.18
share/examples/npf/soho_gw-npf.conf: revision 1.19
share/examples/npf/soho_gw-npf.conf: revision 1.20
Drop the final keyword to use the default policy of last matching rule wins
default policy is to blockall
Add descriptions for all rules and make use of localnet variable in
place of direct IP address
improve description
pastos
Passive FTP works as a client without this and we're not hosting an FTP
server (port are not listed in services_tcp)
Add support for blacklistd
Rename the block table to something else to make it easier to differentiate
between action and name. Use this table as the example for populating by
npfctl.
Drop the int-block table, it's quite cumbersome to have a firewall which
needs the internal network lists added if reboot. Use the localnet
variable to indicated which network we should pass in traffic from instead.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.2.1 src/share/examples/npf/soho_gw-npf.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/examples/npf/soho_gw-npf.conf
diff -u src/share/examples/npf/soho_gw-npf.conf:1.12 src/share/examples/npf/soho_gw-npf.conf:1.12.2.1
--- src/share/examples/npf/soho_gw-npf.conf:1.12 Thu Apr 11 10:17:21 2019
+++ src/share/examples/npf/soho_gw-npf.conf Tue Nov 19 10:56:35 2019
@@ -1,4 +1,4 @@
-# $NetBSD: soho_gw-npf.conf,v 1.12 2019/04/11 10:17:21 sevan Exp $
+# $NetBSD: soho_gw-npf.conf,v 1.12.2.1 2019/11/19 10:56:35 martin Exp $
#
# SOHO border
#
@@ -12,10 +12,9 @@ $ext_addrs = ifaddrs(wm0)
$int_if = "wm1"
-# a table to house e.g. block candidates in
-table type ipset file "/usr/share/examples/npf/hashtablefile"
-# feed this using e.g.: npfctl table "int-block" add 198.51.100.16/29
-table type lpm
+# a "naughty" step^W table to house blocked candidates in
+# feed this using e.g.: npfctl table "naughty" add 203.0.113.99
+table type ipset
$services_tcp = { http, https, smtp, domain, 6000, 9022 }
$services_udp = { domain, ntp, 6000 }
@@ -24,38 +23,56 @@ $localnet = { 198.51.100.0/24 }
# NAT outgoing to the address of the external interface
# Note: if $ext_if has multiple IP addresses (e.g. IPv6 as well),
# then the translation address has to be specified explicitly.
-map $ext_if dynamic 198.51.100.0/24 -> $ext_v4
+map $ext_if dynamic $localnet -> $ext_v4
# NAT traffic arriving on port 9022 of the external interface address
# to host 198.51.100.2 port 22
map $ext_if dynamic 198.51.100.2 port 22 <- $ext_v4 port 9022
procedure "log" {
+ # Send log events to npflog0, see npfd(8)
log: npflog0
}
group "external" on $ext_if {
- pass stateful out final all
+ # Allow all outbound traffic
+ pass stateful out all
- block in final from
- pass stateful in final family inet4 proto tcp to $ext_v4 port ssh \
+ # Block inbound traffic from those on the naughty table
+ block in from
+
+ # Placeholder for blacklistd (configuration separate) to add blocked hosts
+ ruleset "blacklistd"
+
+ # Allow inbound SSH and log all connection attempts
+ pass stateful in family inet4 proto tcp to $ext_v4 port ssh \
apply "log"
- pass stateful in final proto tcp to $ext_addrs port $services_tcp
- pass stateful in final proto udp to $ext_addrs port $services_udp
- # Passive FTP
- pass stateful in final proto tcp to $ext_addrs port 49151-65535
- # Traceroute
- pass stateful in final proto udp to $ext_addrs port 33434-33600
+ # Allow inbound traffic for services hosted on TCP
+ pass stateful in proto tcp to $ext_addrs port $services_tcp
+
+ # Allow inbound traffic for services hosted on UDP
+ pass stateful in proto udp to $ext_addrs port $services_udp
+
+ # Allow being tracerouted
+ pass stateful in proto udp to $ext_addrs port 33434-33600
}
group "internal" on $int_if {
- block in all
- pass in final from
- pass out final all
+ # Allow inbound traffic from LAN
+ pass in from $localnet
+
+ # All outbound traffic to LAN
+ pass out all
}
group default {
- pass final on lo0 all
- block all
+ # Default deny, otherwise last matching rule wins
+ block all apply "log"
+
+ # Don't block loopback
+ pass on lo0 all
+
+ # Allow incoming IPv4 pings
+ pass in family inet4 proto icmp icmp-type echo all
}
CVS commit: [netbsd-9] src/share/examples/npf
Module Name:src Committed By: martin Date: Tue Nov 19 10:58:30 UTC 2019 Modified Files: src/share/examples/npf [netbsd-9]: host-npf.conf Log Message: Pull up following revision(s) (requested by sevan in ticket #445): share/examples/npf/host-npf.conf: revision 1.11 With bin/54124 fixed, the rule needs to be explicitly set to stateful. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.10.2.1 src/share/examples/npf/host-npf.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/share/examples/npf
Module Name:src
Committed By: martin
Date: Tue Nov 19 10:58:30 UTC 2019
Modified Files:
src/share/examples/npf [netbsd-9]: host-npf.conf
Log Message:
Pull up following revision(s) (requested by sevan in ticket #445):
share/examples/npf/host-npf.conf: revision 1.11
With bin/54124 fixed, the rule needs to be explicitly set to stateful.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.2.1 src/share/examples/npf/host-npf.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/examples/npf/host-npf.conf
diff -u src/share/examples/npf/host-npf.conf:1.10 src/share/examples/npf/host-npf.conf:1.10.2.1
--- src/share/examples/npf/host-npf.conf:1.10 Tue Apr 16 10:52:28 2019
+++ src/share/examples/npf/host-npf.conf Tue Nov 19 10:58:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: host-npf.conf,v 1.10 2019/04/16 10:52:28 sevan Exp $
+# $NetBSD: host-npf.conf,v 1.10.2.1 2019/11/19 10:58:30 martin Exp $
#
# Simple ruleset for a host with (i.e., not routing) two interfaces,
# ethernet and wifi.
@@ -31,7 +31,7 @@ group "wired" on $wired_if {
ruleset "blacklistd"
# Allow SSH on wired interface and log all connection attempts
-pass in on $wired_if proto tcp to $wired_addrs port ssh apply "log"
+pass stateful in on $wired_if proto tcp to $wired_addrs port ssh apply "log"
}
group "wifi" on $wifi_if {
CVS commit: [netbsd-9] src
Module Name:src
Committed By: martin
Date: Tue Nov 19 11:01:27 UTC 2019
Modified Files:
src/lib/libossaudio [netbsd-9]: ossaudio.c
src/sys/compat/ossaudio [netbsd-9]: ossaudio.c
Log Message:
Pull up following revision(s) (requested by isaki in ticket #446):
lib/libossaudio/ossaudio.c: revision 1.37
lib/libossaudio/ossaudio.c: revision 1.38
sys/compat/ossaudio/ossaudio.c: revision 1.77
sys/compat/ossaudio/ossaudio.c: revision 1.78
Use record.sample_rate for recording on SNDCTL_DSP_SPEED.
Fix PR lib/54667.
Use record.sample_rate for recording on SNDCTL_DSP_SPEED.
It's kernel side of PR lib/54667.
Use record field for recording even on
SNDCTL_DSP_STEREO, SNDCTL_DSP_SETFMT, and SNDCTL_DSP_CHANNELS.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.36.2.1 src/lib/libossaudio/ossaudio.c
cvs rdiff -u -r1.74.4.1 -r1.74.4.2 src/sys/compat/ossaudio/ossaudio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libossaudio/ossaudio.c
diff -u src/lib/libossaudio/ossaudio.c:1.36 src/lib/libossaudio/ossaudio.c:1.36.2.1
--- src/lib/libossaudio/ossaudio.c:1.36 Sat Feb 2 04:52:16 2019
+++ src/lib/libossaudio/ossaudio.c Tue Nov 19 11:01:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ossaudio.c,v 1.36 2019/02/02 04:52:16 isaki Exp $ */
+/* $NetBSD: ossaudio.c,v 1.36.2.1 2019/11/19 11:01:27 martin Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: ossaudio.c,v 1.36 2019/02/02 04:52:16 isaki Exp $");
+__RCSID("$NetBSD: ossaudio.c,v 1.36.2.1 2019/11/19 11:01:27 martin Exp $");
/*
* This is an OSS (Linux) sound API emulator.
@@ -57,6 +57,10 @@ __RCSID("$NetBSD: ossaudio.c,v 1.36 2019
#define TO_OSSVOL(x) (((x) * 100 + 127) / 255)
#define FROM_OSSVOL(x) x) > 100 ? 100 : (x)) * 255 + 50) / 100)
+#define GETPRINFO(info, name) \
+ (((info)->mode == AUMODE_RECORD) \
+ ? (info)->record.name : (info)->play.name)
+
static struct audiodevinfo *getdevinfo(int);
static void setblocksize(int, struct audio_info *);
@@ -104,6 +108,8 @@ audio_ioctl(int fd, unsigned long com, v
char version[32] = "4.01";
char license[16] = "NetBSD";
u_int u;
+ u_int encoding;
+ u_int precision;
int idat, idata;
int retval;
int i;
@@ -134,7 +140,7 @@ audio_ioctl(int fd, unsigned long com, v
retval = ioctl(fd, AUDIO_GETBUFINFO, &tmpinfo);
if (retval < 0)
return retval;
- INTARG = tmpinfo.play.sample_rate;
+ INTARG = GETPRINFO(&tmpinfo, sample_rate);
break;
case SNDCTL_DSP_STEREO:
AUDIO_INITINFO(&tmpinfo);
@@ -144,7 +150,7 @@ audio_ioctl(int fd, unsigned long com, v
retval = ioctl(fd, AUDIO_GETBUFINFO, &tmpinfo);
if (retval < 0)
return retval;
- INTARG = tmpinfo.play.channels - 1;
+ INTARG = GETPRINFO(&tmpinfo, channels) - 1;
break;
case SNDCTL_DSP_GETBLKSIZE:
retval = ioctl(fd, AUDIO_GETBUFINFO, &tmpinfo);
@@ -243,7 +249,9 @@ audio_ioctl(int fd, unsigned long com, v
retval = ioctl(fd, AUDIO_GETBUFINFO, &tmpinfo);
if (retval < 0)
return retval;
- switch (tmpinfo.play.encoding) {
+ encoding = GETPRINFO(&tmpinfo, encoding);
+ precision = GETPRINFO(&tmpinfo, precision);
+ switch (encoding) {
case AUDIO_ENCODING_ULAW:
idat = AFMT_MU_LAW;
break;
@@ -251,33 +259,33 @@ audio_ioctl(int fd, unsigned long com, v
idat = AFMT_A_LAW;
break;
case AUDIO_ENCODING_SLINEAR_LE:
- if (tmpinfo.play.precision == 32)
+ if (precision == 32)
idat = AFMT_S32_LE;
- else if (tmpinfo.play.precision == 24)
+ else if (precision == 24)
idat = AFMT_S24_LE;
- else if (tmpinfo.play.precision == 16)
+ else if (precision == 16)
idat = AFMT_S16_LE;
else
idat = AFMT_S8;
break;
case AUDIO_ENCODING_SLINEAR_BE:
- if (tmpinfo.play.precision == 32)
+ if (precision == 32)
idat = AFMT_S32_BE;
- else if (tmpinfo.play.precision == 24)
+ else if (precision == 24)
idat = AFMT_S24_BE;
- else if (tmpinfo.play.precision == 16)
+ else if (precision == 16)
idat = AFMT_S16_BE;
else
idat = AFMT_S8;
break;
case AUDIO_ENCODING_ULINEAR_LE:
- if (tmpinfo.play.precision == 16)
+ if (precision == 16)
idat = AFMT_U16_LE;
else
idat = AFMT_U8;
break;
case AUDIO_ENCODING_ULINEAR_BE:
- if (tmpinfo.play.precision == 16)
+ if (precision == 16)
idat = AFMT_U16_BE;
else
idat = AFMT_U8;
@@ -303,7 +311,7 @@ audio_ioctl(int fd, unsigned long com, v
retval = ioctl(fd, AUDIO_GETBUFINFO, &tmpinfo);
if (retval < 0)
return retval;
- INTARG = tmpinfo.play.channels;
+ INTARG = GETPRINFO(&tmpinfo, channels);
break;
case SOUND_PCM_WRITE_FILTER:
case SOUND_PCM_READ_FILTER:
Index: src/sys/compat/ossaudio/ossaudio.c
diff -u src/sys/compat/ossaudio/ossaudio.c:1.74.4.1 src/sys/compat/ossaudio/ossaudio.c:1.74.4.2
--- src/sys/compat/ossaudio/ossaudio.c:1.74.4.1 Fri Sep 13
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Tue Nov 19 11:01:27 UTC 2019 Modified Files: src/lib/libossaudio [netbsd-9]: ossaudio.c src/sys/compat/ossaudio [netbsd-9]: ossaudio.c Log Message: Pull up following revision(s) (requested by isaki in ticket #446): lib/libossaudio/ossaudio.c: revision 1.37 lib/libossaudio/ossaudio.c: revision 1.38 sys/compat/ossaudio/ossaudio.c: revision 1.77 sys/compat/ossaudio/ossaudio.c: revision 1.78 Use record.sample_rate for recording on SNDCTL_DSP_SPEED. Fix PR lib/54667. Use record.sample_rate for recording on SNDCTL_DSP_SPEED. It's kernel side of PR lib/54667. Use record field for recording even on SNDCTL_DSP_STEREO, SNDCTL_DSP_SETFMT, and SNDCTL_DSP_CHANNELS. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.36.2.1 src/lib/libossaudio/ossaudio.c cvs rdiff -u -r1.74.4.1 -r1.74.4.2 src/sys/compat/ossaudio/ossaudio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/usb
Module Name:src Committed By: martin Date: Tue Nov 19 12:56:48 UTC 2019 Modified Files: src/sys/dev/usb [netbsd-9]: uaudio.c Log Message: Pull up following revision(s) (requested by isaki in ticket #447): sys/dev/usb/uaudio.c: revision 1.162 Use kmem_zalloc() instead of kmem_alloc() to initialize structure. struct audio_format added a member since isaki-audio2. Fix PR kern/54662 "uaudio sometimes not recognized". To generate a diff of this commit: cvs rdiff -u -r1.161 -r1.161.2.1 src/sys/dev/usb/uaudio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Tue Nov 19 12:56:48 UTC 2019
Modified Files:
src/sys/dev/usb [netbsd-9]: uaudio.c
Log Message:
Pull up following revision(s) (requested by isaki in ticket #447):
sys/dev/usb/uaudio.c: revision 1.162
Use kmem_zalloc() instead of kmem_alloc() to initialize structure.
struct audio_format added a member since isaki-audio2.
Fix PR kern/54662 "uaudio sometimes not recognized".
To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.161.2.1 src/sys/dev/usb/uaudio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/uaudio.c
diff -u src/sys/dev/usb/uaudio.c:1.161 src/sys/dev/usb/uaudio.c:1.161.2.1
--- src/sys/dev/usb/uaudio.c:1.161 Thu Jun 6 12:59:33 2019
+++ src/sys/dev/usb/uaudio.c Tue Nov 19 12:56:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uaudio.c,v 1.161 2019/06/06 12:59:33 isaki Exp $ */
+/* $NetBSD: uaudio.c,v 1.161.2.1 2019/11/19 12:56:48 martin Exp $ */
/*
* Copyright (c) 1999, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.161 2019/06/06 12:59:33 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.161.2.1 2019/11/19 12:56:48 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1795,13 +1795,12 @@ uaudio_identify_as(struct uaudio_softc *
}
/* build audio_format array */
- sc->sc_formats = kmem_alloc(sizeof(struct audio_format) * sc->sc_nalts,
+ sc->sc_formats = kmem_zalloc(sizeof(struct audio_format) * sc->sc_nalts,
KM_SLEEP);
sc->sc_nformats = sc->sc_nalts;
for (i = 0; i < sc->sc_nalts; i++) {
auf = &sc->sc_formats[i];
t1desc = sc->sc_alts[i].asf1desc;
- auf->driver_data = NULL;
if (UE_GET_DIR(sc->sc_alts[i].edesc->bEndpointAddress) == UE_DIR_OUT)
auf->mode = AUMODE_PLAY;
else
CVS commit: [netbsd-9] src/sys/dev/audio
Module Name:src Committed By: martin Date: Tue Nov 19 12:58:30 UTC 2019 Modified Files: src/sys/dev/audio [netbsd-9]: audio.c Log Message: Pull up following revision(s) (requested by isaki in ticket #448): sys/dev/audio/audio.c: revision 1.33 Fix a wrong calculation of recording ring buffer. Reported on http://mail-index.netbsd.org/current-users/2019/11/04/msg036976.html To generate a diff of this commit: cvs rdiff -u -r1.28.2.3 -r1.28.2.4 src/sys/dev/audio/audio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/audio
Module Name:src Committed By: martin Date: Tue Nov 19 12:58:30 UTC 2019 Modified Files: src/sys/dev/audio [netbsd-9]: audio.c Log Message: Pull up following revision(s) (requested by isaki in ticket #448): sys/dev/audio/audio.c: revision 1.33 Fix a wrong calculation of recording ring buffer. Reported on http://mail-index.netbsd.org/current-users/2019/11/04/msg036976.html To generate a diff of this commit: cvs rdiff -u -r1.28.2.3 -r1.28.2.4 src/sys/dev/audio/audio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/audio/audio.c diff -u src/sys/dev/audio/audio.c:1.28.2.3 src/sys/dev/audio/audio.c:1.28.2.4 --- src/sys/dev/audio/audio.c:1.28.2.3 Sun Oct 6 11:02:32 2019 +++ src/sys/dev/audio/audio.c Tue Nov 19 12:58:29 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: audio.c,v 1.28.2.3 2019/10/06 11:02:32 martin Exp $ */ +/* $NetBSD: audio.c,v 1.28.2.4 2019/11/19 12:58:29 martin Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -142,7 +142,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.28.2.3 2019/10/06 11:02:32 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.28.2.4 2019/11/19 12:58:29 martin Exp $"); #ifdef _KERNEL_OPT #include "audio.h" @@ -4510,7 +4510,7 @@ audio_track_record(audio_track_t *track) int bytes1; int bytes2; - bytes1 = auring_get_contig_used(usrbuf); + bytes1 = auring_get_contig_free(usrbuf); KASSERT(bytes1 % framesize == 0); memcpy((uint8_t *)usrbuf->mem + auring_tail(usrbuf), (uint8_t *)outbuf->mem + outbuf->head * framesize,
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Nov 19 13:03:32 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up following revision(s) (requested by msaitoh in ticket #449): sys/dev/pci/pcidevs: revision 1.1388 sys/dev/pci/pcidevs: revision 1.1389 sys/dev/pci/pcidevs: revision 1.1390 sys/dev/pci/pcidevs: revision 1.1391 Spell controller correctly Add Realtek RTL8125. - Update Intel's NVMe SSDs. - Modify 0x0953's description to "750 or DC P3[567]00 SSD" - Add DC P4[56]00 - Add Apollo Lake TXE HECI. Add D-Link DGE-530T C1 and TP-Link TG-3468 v2. To generate a diff of this commit: cvs rdiff -u -r1.1383.2.3 -r1.1383.2.4 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/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1383.2.3 src/sys/dev/pci/pcidevs:1.1383.2.4 --- src/sys/dev/pci/pcidevs:1.1383.2.3 Thu Oct 24 16:12:42 2019 +++ src/sys/dev/pci/pcidevs Tue Nov 19 13:03:32 2019 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1383.2.3 2019/10/24 16:12:42 martin Exp $ +$NetBSD: pcidevs,v 1.1383.2.4 2019/11/19 13:03:32 martin Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -2513,6 +2513,7 @@ product DLINK DL4000 0x4000 DL-4000 Gig product DLINK DGE550SX 0x4001 DGE-550SX product DLINK DFE520TX 0x4200 DFE-520TX 10/100 Ethernet product DLINK DGE528T 0x4300 DGE-528T Gigabit Ethernet +product DLINK DGE530T_C1 0x4302 DGE-530T C1 product DLINK DGE560T 0x4b00 DGE-560T Gigabit Ethernet product DLINK DGE560T_2 0x4b01 DGE-560T_2 Gigabit Ethernet product DLINK DGE560SX 0x4b02 DGE-560SX @@ -3117,7 +3118,7 @@ product INTEL X1000_HS_UART 0x0936 Quark product INTEL X1000_MAC 0x0937 Quark X1000 10/100 Ethernet MAC product INTEL X1000_EHCI 0x0939 Quark X1000 EHCI product INTEL X1000_OHCI 0x093a Quark X1000 OHCI -product INTEL PCIE_NVME_SSD 0x0953 PCIe NVMe SSD +product INTEL PCIE_NVME_SSD 0x0953 750 or DC P3[567]00 SSD product INTEL X1000_HB 0x0958 Quark X1000 Host Bridge product INTEL WIFI_LINK_7265_1 0x095a Dual Band Wireless AC 7265 product INTEL WIFI_LINK_7265_2 0x095b Dual Band Wireless AC 7265 @@ -3142,6 +3143,8 @@ product INTEL CORE4G_S_ULT_GT3 0x0a2a HD product INTEL CORE4G_R_ULT_GT3_1 0x0a2b HD Graphics product INTEL CORE4G_R_ULT_GT3_2 0x0a2e Iris Graphics 5100 product INTEL DC_P3520_SSD 0x0a53 SSD DC P3520 +product INTEL DC_P4500_SSD 0x0a54 SSD DC P4500 +product INTEL DC_P4600_SSD 0x0a55 SSD DC P4600 product INTEL HASWELL_HOST_DRAM 0x0c00 Haswell Host Bridge, DRAM product INTEL HASWELL_PCIE16 0x0c01 Haswell PCI-E x16 Controller product INTEL HASWELL_PCIE8 0x0c05 Haswell PCI-E x8 Controller @@ -4944,6 +4947,9 @@ product INTEL APL_P2SB 0x5a92 Apollo La product INTEL APL_PMC 0x5a94 Apollo Lake PMC product INTEL APL_FASTSPI 0x5a96 Apollo Lake Fast SPI product INTEL APL_HDA 0x5a98 Apollo Lake HD Audio +product INTEL APL_TXE_HECI_1 0x5a9a Apollo Lake TXE HECI1 +product INTEL APL_TXE_HECI_2 0x5a9c Apollo Lake TXE HECI2 +product INTEL APL_TXE_HECI_3 0x5a9e Apollo Lake TXE HECI3 product INTEL APL_ISH 0x5aa2 Apollo Lake Integrated Sensor Hub product INTEL APL_XHCI 0x5aa8 Apollo Lake USB Host (xHCI) product INTEL APL_XDCI 0x5aaa Apollo Lake USB Device (xDCI) @@ -5960,6 +5966,9 @@ product MYRICOM MYRINET 0x8043 Myrinet /* Myson-Century Technology products */ product MYSON MTD803 0x0803 MTD803 3-in-1 Fast Ethernet Controller +/* Ncube products */ +product NCUBE TG3648 0x8168 TP-Link TG-3468 v2 Gigabit Ethernet + /* National Datacomm products */ product NDC NCP130 0x0130 NCP130 Wireless NIC product NDC NCP130A2 0x0131 NCP130 rev A2 Wireless NIC @@ -6839,7 +6848,7 @@ product PROMISE PDC20271 0x6269 PDC20271 product PROMISE PDC20617 0x6617 PDC20617 Dual Ultra/133 IDE Controller product PROMISE PDC20620 0x6620 PDC20620 Dual Ultra/133 IDE Controller product PROMISE PDC20621 0x6621 PDC20621 Dual Ultra/133 IDE Controller -product PROMISE PDC20618 0x6626 PDC20618 Dual Ultra/133 IDE Controler +product PROMISE PDC20618 0x6626 PDC20618 Dual Ultra/133 IDE Controller product PROMISE PDC20619 0x6629 PDC20619 Dual Ultra/133 IDE Controller product PROMISE PDC20277 0x7275 PDC20277 Ultra/133 IDE Controller @@ -7031,6 +7040,7 @@ product REALTEK RTL8411 0x5289 RTL8411 product REALTEK RT8029 0x8029 8029 Ethernet product REALTEK RT8139D 0x8039 8139D 10/100 Ethernet product REALTEK RT8100 0x8100 8100 10/100 Ethernet +product REALTEK RT8125 0x8125 8129 10/100/1G/2.5G Ethernet product REALTEK RT8129 0x8129 8129 10/100 Ethernet product REALTEK RT8101E 0x8136 8100E/8101E/8102E 10/100 Ethernet product REALTEK RT8138 0x8138 8138 10/100 Ethernet
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Nov 19 13:03:32 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up following revision(s) (requested by msaitoh in ticket #449): sys/dev/pci/pcidevs: revision 1.1388 sys/dev/pci/pcidevs: revision 1.1389 sys/dev/pci/pcidevs: revision 1.1390 sys/dev/pci/pcidevs: revision 1.1391 Spell controller correctly Add Realtek RTL8125. - Update Intel's NVMe SSDs. - Modify 0x0953's description to "750 or DC P3[567]00 SSD" - Add DC P4[56]00 - Add Apollo Lake TXE HECI. Add D-Link DGE-530T C1 and TP-Link TG-3468 v2. To generate a diff of this commit: cvs rdiff -u -r1.1383.2.3 -r1.1383.2.4 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Nov 19 13:04:44 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs.h pcidevs_data.h Log Message: Regen for ticket #449 To generate a diff of this commit: cvs rdiff -u -r1.1371.2.3 -r1.1371.2.4 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1370.2.3 -r1.1370.2.4 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Nov 19 13:07:37 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: if_msk.c if_skreg.h Log Message: Pull up following revision(s) (requested by msaitoh in ticket #450): sys/dev/pci/if_msk.c: revision 1.94 sys/dev/pci/if_skreg.h: revision 1.27 Make Yukon EX, FE+, SUPR stable. The code is mainly taken from FreeBSD. At least, this change made my own Yukon EX machine (HP ProBook 4501s) much stable than before. To generate a diff of this commit: cvs rdiff -u -r1.91.2.1 -r1.91.2.2 src/sys/dev/pci/if_msk.c cvs rdiff -u -r1.26 -r1.26.4.1 src/sys/dev/pci/if_skreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Tue Nov 19 13:10:51 UTC 2019 Modified Files: src/share/man/man4 [netbsd-9]: re.4 src/sys/dev/pci [netbsd-9]: if_re_pci.c Log Message: Pull up the following revisions, requested by msaitoh in ticket #451: sys/dev/pci/if_re_pci.c 1.50 (patch) share/man/man4/re.4 1.17-1.18 (patch) Add D-Link DGE-530T Rev. C,D and TP-Link TG-3468 v2,v3. Add note about UDP checksum offload feature to the document. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.16.28.1 src/share/man/man4/re.4 cvs rdiff -u -r1.49 -r1.49.4.1 src/sys/dev/pci/if_re_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Tue Nov 19 13:15:57 UTC 2019 Modified Files: src/sys/arch/x86/include [netbsd-9]: specialreg.h src/usr.sbin/cpuctl/arch [netbsd-9]: i386.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #452): usr.sbin/cpuctl/arch/i386.c: revision 1.108 sys/arch/x86/include/specialreg.h: revision 1.158 Add the following bit definitions from the latest Intel SDM: - CET shadow stack - Fast Short REP MOV - Hybrid part - CET Indirect Branch Tracking 0x7d and 0x7e are for 10th generation Core (Ice Lake). To generate a diff of this commit: cvs rdiff -u -r1.150.2.4 -r1.150.2.5 src/sys/arch/x86/include/specialreg.h cvs rdiff -u -r1.104.2.3 -r1.104.2.4 src/usr.sbin/cpuctl/arch/i386.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Tue Nov 19 13:07:37 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: if_msk.c if_skreg.h
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #450):
sys/dev/pci/if_msk.c: revision 1.94
sys/dev/pci/if_skreg.h: revision 1.27
Make Yukon EX, FE+, SUPR stable. The code is mainly taken from FreeBSD.
At least, this change made my own Yukon EX machine (HP ProBook 4501s) much
stable than before.
To generate a diff of this commit:
cvs rdiff -u -r1.91.2.1 -r1.91.2.2 src/sys/dev/pci/if_msk.c
cvs rdiff -u -r1.26 -r1.26.4.1 src/sys/dev/pci/if_skreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_msk.c
diff -u src/sys/dev/pci/if_msk.c:1.91.2.1 src/sys/dev/pci/if_msk.c:1.91.2.2
--- src/sys/dev/pci/if_msk.c:1.91.2.1 Thu Oct 24 16:19:23 2019
+++ src/sys/dev/pci/if_msk.c Tue Nov 19 13:07:37 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_msk.c,v 1.91.2.1 2019/10/24 16:19:23 martin Exp $ */
+/* $NetBSD: if_msk.c,v 1.91.2.2 2019/11/19 13:07:37 martin Exp $ */
/* $OpenBSD: if_msk.c,v 1.79 2009/10/15 17:54:56 deraadt Exp $ */
/*
@@ -52,7 +52,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.91.2.1 2019/10/24 16:19:23 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.91.2.2 2019/11/19 13:07:37 martin Exp $");
#include
#include
@@ -887,10 +887,27 @@ void
mskc_reset(struct sk_softc *sc)
{
uint32_t imtimer_ticks, reg1;
+ uint16_t status;
int reg;
DPRINTFN(2, ("mskc_reset\n"));
+ /* Disable ASF */
+ if ((sc->sk_type == SK_YUKON_EX) || (sc->sk_type == SK_YUKON_SUPR)) {
+ CSR_WRITE_4(sc, SK_Y2_CPU_WDOG, 0);
+ status = CSR_READ_2(sc, SK_Y2_ASF_HCU_CCSR);
+ /* Clear AHB bridge & microcontroller reset. */
+ status &= ~(SK_Y2_ASF_HCU_CSSR_ARB_RST |
+ SK_Y2_ASF_HCU_CSSR_CPU_RST_MODE);
+ /* Clear ASF microcontroller state. */
+ status &= ~SK_Y2_ASF_HCU_CSSR_UC_STATE_MSK;
+ status &= ~SK_Y2_ASF_HCU_CSSR_CPU_CLK_DIVIDE_MSK;
+ CSR_WRITE_2(sc, SK_Y2_ASF_HCU_CCSR, status);
+ CSR_WRITE_4(sc, SK_Y2_CPU_WDOG, 0);
+ } else
+ CSR_WRITE_1(sc, SK_Y2_ASF_CSR, SK_Y2_ASF_RESET);
+ CSR_WRITE_2(sc, SK_CSR, SK_CSR_ASF_OFF);
+
CSR_WRITE_1(sc, SK_CSR, SK_CSR_SW_RESET);
CSR_WRITE_1(sc, SK_CSR, SK_CSR_MASTER_RESET);
@@ -963,10 +980,6 @@ mskc_reset(struct sk_softc *sc)
DPRINTFN(2, ("mskc_reset: sk_link_ctrl=%x\n",
CSR_READ_2(sc, SK_LINK_CTRL)));
- /* Disable ASF */
- CSR_WRITE_1(sc, SK_Y2_ASF_CSR, SK_Y2_ASF_RESET);
- CSR_WRITE_2(sc, SK_CSR, SK_CSR_ASF_OFF);
-
/* Clear I2C IRQ noise */
CSR_WRITE_4(sc, SK_I2CHWIRQ, 1);
@@ -1102,9 +1115,9 @@ msk_reset(struct sk_if_softc *sc_if)
{
/* GMAC and GPHY Reset */
SK_IF_WRITE_4(sc_if, 0, SK_GMAC_CTRL, SK_GMAC_RESET_SET);
- SK_IF_WRITE_4(sc_if, 0, SK_GPHY_CTRL, SK_GPHY_RESET_SET);
+ SK_IF_WRITE_1(sc_if, 0, SK_GPHY_CTRL, SK_GPHY_RESET_SET);
DELAY(1000);
- SK_IF_WRITE_4(sc_if, 0, SK_GPHY_CTRL, SK_GPHY_RESET_CLEAR);
+ SK_IF_WRITE_1(sc_if, 0, SK_GPHY_CTRL, SK_GPHY_RESET_CLEAR);
SK_IF_WRITE_4(sc_if, 0, SK_GMAC_CTRL, SK_GMAC_LOOP_OFF |
SK_GMAC_PAUSE_ON | SK_GMAC_RESET_CLEAR);
}
@@ -2410,17 +2423,31 @@ msk_init_yukon(struct sk_if_softc *sc_if
/* Configure RX MAC FIFO */
SK_IF_WRITE_1(sc_if, 0, SK_RXMF1_CTRL_TEST, SK_RFCTL_RESET_CLEAR);
- SK_IF_WRITE_2(sc_if, 0, SK_RXMF1_CTRL_TEST, SK_RFCTL_OPERATION_ON |
- SK_RFCTL_FIFO_FLUSH_ON);
-
- /* Increase flush threshold to 64 bytes */
- SK_IF_WRITE_2(sc_if, 0, SK_RXMF1_FLUSH_THRESHOLD,
- SK_RFCTL_FIFO_THRESHOLD + 1);
+ v = SK_RFCTL_OPERATION_ON | SK_RFCTL_FIFO_FLUSH_ON;
+ if ((sc->sk_type == SK_YUKON_EX) || (sc->sk_type == SK_YUKON_FE_P))
+ v |= SK_RFCTL_RX_OVER_ON;
+ SK_IF_WRITE_2(sc_if, 0, SK_RXMF1_CTRL_TEST, v);
+
+ if ((sc->sk_type == SK_YUKON_FE_P) &&
+ (sc->sk_rev == SK_YUKON_FE_P_REV_A0))
+ v = 0x178; /* Magic value */
+ else {
+ /* Increase flush threshold to 64 bytes */
+ v = SK_RFCTL_FIFO_THRESHOLD + 1;
+ }
+ SK_IF_WRITE_2(sc_if, 0, SK_RXMF1_FLUSH_THRESHOLD, v);
/* Configure TX MAC FIFO */
SK_IF_WRITE_1(sc_if, 0, SK_TXMF1_CTRL_TEST, SK_TFCTL_RESET_CLEAR);
SK_IF_WRITE_2(sc_if, 0, SK_TXMF1_CTRL_TEST, SK_TFCTL_OPERATION_ON);
+ if ((sc->sk_type == SK_YUKON_FE_P) &&
+ (sc->sk_rev == SK_YUKON_FE_P_REV_A0)) {
+ v = SK_IF_READ_2(sc_if, 0, SK_TXMF1_END);
+ v &= ~SK_TXEND_WM_ON;
+ SK_IF_WRITE_2(sc_if, 0, SK_TXMF1_END, v);
+ }
+
#if 1
SK_YU_WRITE_2(sc_if, YUKON_GPCR, YU_GPCR_TXEN | YU_GPCR_RXEN);
#endif
@@ -2457,7 +2484,7 @@ msk_init(struct ifnet *ifp)
/* Configure transmit arbiter(s) */
SK_IF_WRITE_1(sc_if, 0, SK_TXAR1_COUNTERCTL, SK_TXARCTL_ON);
#if 0
- SK_TXARCTL_ON | SK_TXARCTL_FSYNC_ON);
+/* SK_TXARCTL_ON | SK_TXARCTL_FSYNC_ON); */
#endif
if (sc->sk_ramsize) {
@@ -2565,6 +2592,13 @@ msk_init(struct ifnet *ifp)
SK_IF_WRITE_2(sc_if, 0, SK_RXQ1_Y2_PREF_PUTIDX,
sc_if->sk_cdata.sk_rx_prod);
+
+ if ((sc->sk
CVS commit: [netbsd-9] src
Module Name:src
Committed By: martin
Date: Tue Nov 19 13:10:51 UTC 2019
Modified Files:
src/share/man/man4 [netbsd-9]: re.4
src/sys/dev/pci [netbsd-9]: if_re_pci.c
Log Message:
Pull up the following revisions, requested by msaitoh in ticket #451:
sys/dev/pci/if_re_pci.c 1.50 (patch)
share/man/man4/re.4 1.17-1.18 (patch)
Add D-Link DGE-530T Rev. C,D and TP-Link TG-3468 v2,v3.
Add note about UDP checksum offload feature to the document.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.28.1 src/share/man/man4/re.4
cvs rdiff -u -r1.49 -r1.49.4.1 src/sys/dev/pci/if_re_pci.c
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/re.4
diff -u src/share/man/man4/re.4:1.16 src/share/man/man4/re.4:1.16.28.1
--- src/share/man/man4/re.4:1.16 Tue Mar 18 18:20:39 2014
+++ src/share/man/man4/re.4 Tue Nov 19 13:10:51 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: re.4,v 1.16 2014/03/18 18:20:39 riastradh Exp $
+.\" $NetBSD: re.4,v 1.16.28.1 2019/11/19 13:10:51 martin Exp $
.\"
.\" Copyright (c) 2003
.\" Bill Paul . All rights reserved.
@@ -32,7 +32,7 @@
.\"
.\" $FreeBSD: src/share/man/man4/re.4,v 1.4 2004/03/04 06:42:46 sanpei Exp $
.\"
-.Dd April 6, 2013
+.Dd November 18, 2019
.Dt RE 4
.Os
.Sh NAME
@@ -66,9 +66,13 @@ Corega CG-LAPCIGT Gigabit Ethernet (8169
.It
D-Link DGE-528T Gigabit Ethernet (8169S)
.It
+D-Link DGE-530T rev. C & D Gigabit Ethernet (8169)
+.It
US Robotics (3Com) USR997902 Gigabit Ethernet (8169S)
.It
Linksys EG1032 rev. 3 Gigabit Ethernet (8169S)
+.It
+TP-Link TG-3468 v2 & v3 Gigabit Ethernet (8168)
.El
.Pp
NICs based on the 8139C+ are capable of 10 and 100Mbps speeds over
@@ -78,7 +82,7 @@ NICs based on the 8169, 8169S, 8168, and
.Pp
All NICs supported by the
.Nm
-driver have TCP/IP checksum offload and hardware VLAN tagging/insertion
+driver have IP/TCP/UDP checksum offload and hardware VLAN tagging/insertion
features, and use a descriptor-based DMA mechanism.
They are also capable of TCP large send (TCP segmentation offload).
.Pp
Index: src/sys/dev/pci/if_re_pci.c
diff -u src/sys/dev/pci/if_re_pci.c:1.49 src/sys/dev/pci/if_re_pci.c:1.49.4.1
--- src/sys/dev/pci/if_re_pci.c:1.49 Tue Nov 13 20:12:45 2018
+++ src/sys/dev/pci/if_re_pci.c Tue Nov 19 13:10:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_re_pci.c,v 1.49 2018/11/13 20:12:45 jdolecek Exp $ */
+/* $NetBSD: if_re_pci.c,v 1.49.4.1 2019/11/19 13:10:50 martin Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -46,7 +46,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_re_pci.c,v 1.49 2018/11/13 20:12:45 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_re_pci.c,v 1.49.4.1 2019/11/19 13:10:50 martin Exp $");
#include
@@ -99,6 +99,9 @@ static const struct rtk_type re_devs[] =
{ PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8168,
RTK_8168,
"RealTek 8168/8111 PCIe Gigabit Ethernet" },
+ { PCI_VENDOR_NCUBE, PCI_PRODUCT_NCUBE_TG3648,
+ RTK_8168,
+ "TP-Link TG-3468 v2 (RTL8168) Gigabit Ethernet" },
{ PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8169,
RTK_8169,
"RealTek 8169/8110 Gigabit Ethernet" },
@@ -111,6 +114,9 @@ static const struct rtk_type re_devs[] =
{ PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DGE528T,
RTK_8169,
"D-Link DGE-528T Gigabit Ethernet" },
+ { PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DGE530T_C1,
+ RTK_8169,
+ "D-Link DGE-530T C1 Gigabit Ethernet" },
{ PCI_VENDOR_USR2, PCI_PRODUCT_USR2_USR997902,
RTK_8169,
"US Robotics (3Com) USR997902 Gigabit Ethernet" },
CVS commit: [netbsd-9] src/sys/kern
Module Name:src Committed By: martin Date: Tue Nov 19 13:22:01 UTC 2019 Modified Files: src/sys/kern [netbsd-9]: sys_ptrace_common.c Log Message: Pull up following revision(s) (requested by rin in ticket #455): sys/kern/sys_ptrace_common.c: revision 1.72 Fix pointer arithmetic for 32-bit process on LP64 kernel in process_auxv_offset(). Now, PIOD_READ_AUXV works fine with COMPAT_NETBSD32. XXX pullup to netbsd-9 and netbsd-8 To generate a diff of this commit: cvs rdiff -u -r1.58.2.10 -r1.58.2.11 src/sys/kern/sys_ptrace_common.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/sys_ptrace_common.c diff -u src/sys/kern/sys_ptrace_common.c:1.58.2.10 src/sys/kern/sys_ptrace_common.c:1.58.2.11 --- src/sys/kern/sys_ptrace_common.c:1.58.2.10 Mon Nov 11 17:11:07 2019 +++ src/sys/kern/sys_ptrace_common.c Tue Nov 19 13:22:01 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sys_ptrace_common.c,v 1.58.2.10 2019/11/11 17:11:07 martin Exp $ */ +/* $NetBSD: sys_ptrace_common.c,v 1.58.2.11 2019/11/19 13:22:01 martin Exp $ */ /*- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. @@ -118,7 +118,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sys_ptrace_common.c,v 1.58.2.10 2019/11/11 17:11:07 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sys_ptrace_common.c,v 1.58.2.11 2019/11/19 13:22:01 martin Exp $"); #ifdef _KERNEL_OPT #include "opt_ptrace.h" @@ -1635,7 +1635,15 @@ process_auxv_offset(struct proc *p, stru if (pss.ps_envstr == NULL) return EIO; - uio->uio_offset += (off_t)(vaddr_t)(pss.ps_envstr + pss.ps_nenvstr + 1); +#ifdef COMPAT_NETBSD32 + if (p->p_flag & PK_32) + uio->uio_offset += (off_t)((vaddr_t)pss.ps_envstr + + sizeof(uint32_t) * (pss.ps_nenvstr + 1)); + else +#endif + uio->uio_offset += (off_t)(vaddr_t)(pss.ps_envstr + + pss.ps_nenvstr + 1); + #ifdef __MACHINE_STACK_GROWS_UP if (uio->uio_offset < off) return EIO;
CVS commit: [netbsd-9] src/sys/dev/pci/ixgbe
Module Name:src Committed By: martin Date: Tue Nov 19 13:17:44 UTC 2019 Modified Files: src/sys/dev/pci/ixgbe [netbsd-9]: ixgbe.c ixv.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #453): sys/dev/pci/ixgbe/ixgbe.c: revision 1.216 sys/dev/pci/ixgbe/ixv.c: revision 1.141 Print MAC address. XXX Should we move such type of printf() to ether_ifattach? To generate a diff of this commit: cvs rdiff -u -r1.199.2.6 -r1.199.2.7 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.125.2.6 -r1.125.2.7 src/sys/dev/pci/ixgbe/ixv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/ixgbe/ixgbe.c diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.199.2.6 src/sys/dev/pci/ixgbe/ixgbe.c:1.199.2.7 --- src/sys/dev/pci/ixgbe/ixgbe.c:1.199.2.6 Thu Oct 17 19:09:14 2019 +++ src/sys/dev/pci/ixgbe/ixgbe.c Tue Nov 19 13:17:44 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ixgbe.c,v 1.199.2.6 2019/10/17 19:09:14 martin Exp $ */ +/* $NetBSD: ixgbe.c,v 1.199.2.7 2019/11/19 13:17:44 martin Exp $ */ /** @@ -1338,6 +1338,8 @@ ixgbe_setup_interface(device_t dev, stru } adapter->ipq = if_percpuq_create(&adapter->osdep.ec.ec_if); ether_ifattach(ifp, adapter->hw.mac.addr); + aprint_normal_dev(dev, "Ethernet address %s\n", + ether_sprintf(adapter->hw.mac.addr)); /* * We use per TX queue softint, so if_deferred_start_init() isn't * used. Index: src/sys/dev/pci/ixgbe/ixv.c diff -u src/sys/dev/pci/ixgbe/ixv.c:1.125.2.6 src/sys/dev/pci/ixgbe/ixv.c:1.125.2.7 --- src/sys/dev/pci/ixgbe/ixv.c:1.125.2.6 Thu Nov 14 15:30:19 2019 +++ src/sys/dev/pci/ixgbe/ixv.c Tue Nov 19 13:17:44 2019 @@ -1,4 +1,4 @@ -/*$NetBSD: ixv.c,v 1.125.2.6 2019/11/14 15:30:19 martin Exp $*/ +/*$NetBSD: ixv.c,v 1.125.2.7 2019/11/19 13:17:44 martin Exp $*/ /** @@ -1610,6 +1610,8 @@ ixv_setup_interface(device_t dev, struct } adapter->ipq = if_percpuq_create(&adapter->osdep.ec.ec_if); ether_ifattach(ifp, adapter->hw.mac.addr); + aprint_normal_dev(dev, "Ethernet address %s\n", + ether_sprintf(adapter->hw.mac.addr)); /* * We use per TX queue softint, so if_deferred_start_init() isn't * used.
CVS commit: [netbsd-9] src/sys/dev/pci/ixgbe
Module Name:src Committed By: martin Date: Tue Nov 19 13:17:44 UTC 2019 Modified Files: src/sys/dev/pci/ixgbe [netbsd-9]: ixgbe.c ixv.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #453): sys/dev/pci/ixgbe/ixgbe.c: revision 1.216 sys/dev/pci/ixgbe/ixv.c: revision 1.141 Print MAC address. XXX Should we move such type of printf() to ether_ifattach? To generate a diff of this commit: cvs rdiff -u -r1.199.2.6 -r1.199.2.7 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.125.2.6 -r1.125.2.7 src/sys/dev/pci/ixgbe/ixv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/kern
Module Name:src Committed By: martin Date: Tue Nov 19 13:22:01 UTC 2019 Modified Files: src/sys/kern [netbsd-9]: sys_ptrace_common.c Log Message: Pull up following revision(s) (requested by rin in ticket #455): sys/kern/sys_ptrace_common.c: revision 1.72 Fix pointer arithmetic for 32-bit process on LP64 kernel in process_auxv_offset(). Now, PIOD_READ_AUXV works fine with COMPAT_NETBSD32. XXX pullup to netbsd-9 and netbsd-8 To generate a diff of this commit: cvs rdiff -u -r1.58.2.10 -r1.58.2.11 src/sys/kern/sys_ptrace_common.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/share/man/man7
Module Name:src Committed By: martin Date: Tue Nov 19 13:20:08 UTC 2019 Modified Files: src/share/man/man7 [netbsd-9]: ascii.7 Log Message: Pull up following revision(s) (requested by sevan in ticket #454): share/man/man7/ascii.7: revision 1.14 share/man/man7/ascii.7: revision 1.15 Document standards and correct history. via Free / OpenBSD. Sync with FreeBSD which capitalizes the control character names, and adds a binary set. Add a table with the full names for the control character set. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.13.6.1 src/share/man/man7/ascii.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src
Committed By: martin
Date: Tue Nov 19 13:15:57 UTC 2019
Modified Files:
src/sys/arch/x86/include [netbsd-9]: specialreg.h
src/usr.sbin/cpuctl/arch [netbsd-9]: i386.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #452):
usr.sbin/cpuctl/arch/i386.c: revision 1.108
sys/arch/x86/include/specialreg.h: revision 1.158
Add the following bit definitions from the latest Intel SDM:
- CET shadow stack
- Fast Short REP MOV
- Hybrid part
- CET Indirect Branch Tracking
0x7d and 0x7e are for 10th generation Core (Ice Lake).
To generate a diff of this commit:
cvs rdiff -u -r1.150.2.4 -r1.150.2.5 src/sys/arch/x86/include/specialreg.h
cvs rdiff -u -r1.104.2.3 -r1.104.2.4 src/usr.sbin/cpuctl/arch/i386.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.150.2.4 src/sys/arch/x86/include/specialreg.h:1.150.2.5
--- src/sys/arch/x86/include/specialreg.h:1.150.2.4 Tue Nov 12 18:24:37 2019
+++ src/sys/arch/x86/include/specialreg.h Tue Nov 19 13:15:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: specialreg.h,v 1.150.2.4 2019/11/12 18:24:37 martin Exp $ */
+/* $NetBSD: specialreg.h,v 1.150.2.5 2019/11/19 13:15:57 martin Exp $ */
/*
* Copyright (c) 2014-2019 The NetBSD Foundation, Inc.
@@ -447,6 +447,7 @@
#define CPUID_SEF_OSPKE __BIT(4) /* OS has set CR4.PKE to ena. protec. keys */
#define CPUID_SEF_WAITPKG __BIT(5) /* TPAUSE,UMONITOR,UMWAIT */
#define CPUID_SEF_AVX512_VBMI2 __BIT(6) /* AVX-512 Vector Byte Manipulation 2 */
+#define CPUID_SEF_CET_SS __BIT(7) /* CET shadow stack */
#define CPUID_SEF_GFNI __BIT(8)
#define CPUID_SEF_VAES __BIT(9)
#define CPUID_SEF_VPCLMULQDQ __BIT(10)
@@ -462,7 +463,7 @@
#define CPUID_SEF_FLAGS1 "\177\20" \
"b\0PREFETCHWT1\0" "b\1AVX512_VBMI\0" "b\2UMIP\0" "b\3PKU\0" \
- "b\4OSPKE\0" "b\5WAITPKG\0" "b\6AVX512_VBMI2\0" \
+ "b\4OSPKE\0" "b\5WAITPKG\0" "b\6AVX512_VBMI2\0" "b\7CET_SS\0" \
"b\10GFNI\0" "b\11VAES\0" "b\12VPCLMULQDQ\0" "b\13AVX512_VNNI\0"\
"b\14AVX512_BITALG\0" "b\16AVX512_VPOPCNTDQ\0" \
"f\21\5MAWAU\0" \
@@ -473,8 +474,11 @@
/* %edx */
#define CPUID_SEF_AVX512_4VNNIW __BIT(2)
#define CPUID_SEF_AVX512_4FMAPS __BIT(3)
+#define CPUID_SEF_FSREP_MOV __BIT(4) /* Fast Short REP MOV */
#define CPUID_SEF_MD_CLEAR __BIT(10)
#define CPUID_SEF_TSX_FORCE_ABORT __BIT(13) /* MSR_TSX_FORCE_ABORT bit 0 */
+#define CPUID_SEF_HYBRID __BIT(15) /* Hybrid part */
+#define CPUID_SEF_CET_IBT __BIT(20) /* CET Indirect Branch Tracking */
#define CPUID_SEF_IBRS __BIT(26) /* IBRS / IBPB Speculation Control */
#define CPUID_SEF_STIBP __BIT(27) /* STIBP Speculation Control */
#define CPUID_SEF_L1D_FLUSH __BIT(28) /* IA32_FLUSH_CMD MSR */
@@ -484,8 +488,10 @@
#define CPUID_SEF_FLAGS2 "\20" \
"\3" "AVX512_4VNNIW" "\4" "AVX512_4FMAPS" \
+ "\5" "FSREP_MOV" \
"\13" "MD_CLEAR" \
- "\16" "TSX_FORCE_ABORT"\
+ "\16" "TSX_FORCE_ABORT" "\20" "HYBRID" \
+ "\25" "CET_IBT" \
"\33" "IBRS" "\34" "STIBP" \
"\35" "L1D_FLUSH" "\36" "ARCH_CAP" "\37CORE_CAP" "\40" "SSBD"
Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.104.2.3 src/usr.sbin/cpuctl/arch/i386.c:1.104.2.4
--- src/usr.sbin/cpuctl/arch/i386.c:1.104.2.3 Thu Oct 17 18:56:25 2019
+++ src/usr.sbin/cpuctl/arch/i386.c Tue Nov 19 13:15:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.104.2.3 2019/10/17 18:56:25 martin Exp $ */
+/* $NetBSD: i386.c,v 1.104.2.4 2019/11/19 13:15:57 martin Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.104.2.3 2019/10/17 18:56:25 martin Exp $");
+__RCSID("$NetBSD: i386.c,v 1.104.2.4 2019/11/19 13:15:57 martin Exp $");
#endif /* not lint */
#include
@@ -386,8 +386,8 @@ const struct cpu_cpuid_nameclass i386_cp
[0x6a] = "Future Xeon (Ice Lake)",
[0x6c] = "Future Xeon (Ice Lake)",
[0x7a] = "Atom (Goldmont Plus)",
-[0x7d] = "Future Core (Ice Lake)",
-[0x7e] = "Future Core (Ice Lake)",
+[0x7d] = "10th gen Core (Ice Lake)",
+[0x7e] = "10th gen Core (Ice Lake)",
[0x85] = "Xeon Phi 7215, 7285, 7295 (Knights Mill)",
[0x86] = "Atom (Tremont)",
[0x8e] = "7th or 8th gen Core (Kaby Lake, Coffee Lake) or Xeon E (Coffee Lake)",
CVS commit: [netbsd-9] src/share/man/man7
Module Name:src
Committed By: martin
Date: Tue Nov 19 13:20:08 UTC 2019
Modified Files:
src/share/man/man7 [netbsd-9]: ascii.7
Log Message:
Pull up following revision(s) (requested by sevan in ticket #454):
share/man/man7/ascii.7: revision 1.14
share/man/man7/ascii.7: revision 1.15
Document standards and correct history.
via Free / OpenBSD.
Sync with FreeBSD which capitalizes the control character names, and adds
a binary set.
Add a table with the full names for the control character set.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.6.1 src/share/man/man7/ascii.7
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/man7/ascii.7
diff -u src/share/man/man7/ascii.7:1.13 src/share/man/man7/ascii.7:1.13.6.1
--- src/share/man/man7/ascii.7:1.13 Sun Feb 11 13:31:17 2018
+++ src/share/man/man7/ascii.7 Tue Nov 19 13:20:07 2019
@@ -1,5 +1,4 @@
-.\" $NetBSD: ascii.7,v 1.13 2018/02/11 13:31:17 wiz Exp $
-.\"
+.\" $NetBSD: ascii.7,v 1.13.6.1 2019/11/19 13:20:07 martin Exp $
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -28,23 +27,26 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ascii.7 8.1 (Berkeley) 6/5/93
+.\" $FreeBSD: head/share/man/man7/ascii.7 325217 2017-10-31 06:43:37Z eadler $
.\"
-.Dd February 8, 2017
+.Dd November 19, 2019
.Dt ASCII 7
.Os
.Sh NAME
.Nm ascii
-.Nd octal, hexadecimal and decimal ASCII character sets
+.Nd octal, hexadecimal, decimal and binary
+.Tn ASCII
+character sets
.Sh DESCRIPTION
The
.Nm octal
set:
.Bd -literal -offset left
-000 nul 001 soh 002 stx 003 etx 004 eot 005 enq 006 ack 007 bel
-010 bs 011 ht 012 nl 013 vt 014 np 015 cr 016 so 017 si
-020 dle 021 dc1 022 dc2 023 dc3 024 dc4 025 nak 026 syn 027 etb
-030 can 031 em 032 sub 033 esc 034 fs 035 gs 036 rs 037 us
-040 sp 041 ! 042 " 043 # 044 $ 045 % 046 & 047 '
+000 NUL 001 SOH 002 STX 003 ETX 004 EOT 005 ENQ 006 ACK 007 BEL
+010 BS 011 HT 012 LF 013 VT 014 FF 015 CR 016 SO 017 SI
+020 DLE 021 DC1 022 DC2 023 DC3 024 DC4 025 NAK 026 SYN 027 ETB
+030 CAN 031 EM 032 SUB 033 ESC 034 FS 035 GS 036 RS 037 US
+040 SP 041 ! 042 " 043 # 044 $ 045 % 046 & 047 '
050 ( 051 ) 052 * 053 + 054 , 055 - 056 . 057 /
060 0 061 1 062 2 063 3 064 4 065 5 066 6 067 7
070 8 071 9 072 : 073 ; 074 < 075 = 076 > 077 ?
@@ -55,18 +57,18 @@ set:
140 ` 141 a 142 b 143 c 144 d 145 e 146 f 147 g
150 h 151 i 152 j 153 k 154 l 155 m 156 n 157 o
160 p 161 q 162 r 163 s 164 t 165 u 166 v 167 w
-170 x 171 y 172 z 173 { 174 | 175 } 176 ~ 177 del
+170 x 171 y 172 z 173 { 174 | 175 } 176 ~ 177 DEL
.Ed
.Pp
The
.Nm hexadecimal
set:
.Bd -literal -offset left
-00 nul 01 soh 02 stx 03 etx 04 eot 05 enq 06 ack 07 bel
-08 bs09 ht0a nl0b vt0c np0d cr0e so0f si
-10 dle 11 dc1 12 dc2 13 dc3 14 dc4 15 nak 16 syn 17 etb
-18 can 19 em1a sub 1b esc 1c fs1d gs1e rs1f us
-20 sp21 !22 "23 #24 $25 %26 &27 '
+00 NUL 01 SOH 02 STX 03 ETX 04 EOT 05 ENQ 06 ACK 07 BEL
+08 BS09 HT0a LF0b VT0c FF0d CR0e SO0f SI
+10 DLE 11 DC1 12 DC2 13 DC3 14 DC4 15 NAK 16 SYN 17 ETB
+18 CAN 19 EM1a SUB 1b ESC 1c FS1d GS1e RS1f US
+20 SP21 !22 "23 #24 $25 %26 &27 '
28 (29 )2a *2b +2c ,2d -2e .2f /
30 031 132 233 334 435 536 637 7
38 839 93a :3b ;3c <3d =3e >3f ?
@@ -77,18 +79,18 @@ set:
60 \`61 a62 b63 c64 d65 e66 f67 g
68 h69 i6a j6b k6c l6d m6e n6f o
70 p71 q72 r73 s74 t75 u76 v77 w
-78 x79 y7a z7b {7c |7d }7e ~7f del
+78 x79 y7a z7b {7c |7d }7e ~7f DEL
.Ed
.Pp
The
.Nm decimal
set:
.Bd -literal -offset left
- 0 nul1 soh2 stx3 etx4 eot5 enq6 ack7 bel
- 8 bs 9 ht10 nl11 vt12 np13 cr14 so15 si
- 16 dle 17 dc1 18 dc2 19 dc3 20 dc4 21 nak 22 syn 23 etb
- 24 can 25 em26 sub 27 esc 28 fs29 gs30 rs31 us
- 32 sp33 !34 "35 #36 $37 %38 &39 '
+ 0 NUL1 SOH2 STX3 ETX4 EOT5 ENQ6 ACK7 BEL
+ 8 BS 9 HT10 LF11 VT12 FF13 CR14 SO15 SI
+ 16 DLE 17 DC1 18 DC2 19 DC3 20 DC4 21 NAK 22 SYN 23 ETB
+ 24
CVS commit: [netbsd-9] src/sys/compat/netbsd32
Module Name:src
Committed By: martin
Date: Tue Nov 19 13:33:21 UTC 2019
Modified Files:
src/sys/compat/netbsd32 [netbsd-9]: netbsd32_signal.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #456):
sys/compat/netbsd32/netbsd32_signal.c: revision 1.46
sys/compat/netbsd32/netbsd32_signal.c: revision 1.47
sys/compat/netbsd32/netbsd32_signal.c: revision 1.48
sys/compat/netbsd32/netbsd32_signal.c: revision 1.49
sys/compat/netbsd32/netbsd32_signal.c: revision 1.50
Belatedly catch up with kern_sig.c rev 1.358:
Provide syscall information with SIGTRAP TRAP_SCE/TRAP_SCX so that
picotrace/truss, for example, works fine on COMPAT_NETBSD32.
With some minor changes:
- Centralize netbsd32_si{,32}_si{32,}() into netbsd32_ksi{,32}_ksi{32,}().
- Provide si_status with SIGCHLD.
- Remove the remaining of SA.
Sort by signal numbers as far as possible, adjust locations of functions.
No functional changes intended.
XXX
pullup to netbsd-9
Provide _ptrace_state for SIGTRAP with TRAP_EXEC, TRAP_CHLD, or TRAP_LWP.
Pointed out by kamil. Thanks!
XXX
pullup to netbsd-9
When converting siginfo, examine si_code at the beginning,
as explained in siginfo(2).
- If it is SI_NOINFO, there's no additional information.
- If it is non-positive, i.e., codes described in siginfo(2),
we need to fill in _rt.
XXX
Description for SA_ASYNCIO in siginfo(2) seems outdated;
neither si_fd nor si_band are filled in with that code.
XXX
pullup to netbsd-9
TRAP_EXEC does not have extra fields to be filled in at the moment.
Explicitly ignore fields for now.
Pointed out by kamil. Thanks!
XXX
pullup to netbsd-9
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.45.8.1 src/sys/compat/netbsd32/netbsd32_signal.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/compat/netbsd32
Module Name:src
Committed By: martin
Date: Tue Nov 19 13:33:21 UTC 2019
Modified Files:
src/sys/compat/netbsd32 [netbsd-9]: netbsd32_signal.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #456):
sys/compat/netbsd32/netbsd32_signal.c: revision 1.46
sys/compat/netbsd32/netbsd32_signal.c: revision 1.47
sys/compat/netbsd32/netbsd32_signal.c: revision 1.48
sys/compat/netbsd32/netbsd32_signal.c: revision 1.49
sys/compat/netbsd32/netbsd32_signal.c: revision 1.50
Belatedly catch up with kern_sig.c rev 1.358:
Provide syscall information with SIGTRAP TRAP_SCE/TRAP_SCX so that
picotrace/truss, for example, works fine on COMPAT_NETBSD32.
With some minor changes:
- Centralize netbsd32_si{,32}_si{32,}() into netbsd32_ksi{,32}_ksi{32,}().
- Provide si_status with SIGCHLD.
- Remove the remaining of SA.
Sort by signal numbers as far as possible, adjust locations of functions.
No functional changes intended.
XXX
pullup to netbsd-9
Provide _ptrace_state for SIGTRAP with TRAP_EXEC, TRAP_CHLD, or TRAP_LWP.
Pointed out by kamil. Thanks!
XXX
pullup to netbsd-9
When converting siginfo, examine si_code at the beginning,
as explained in siginfo(2).
- If it is SI_NOINFO, there's no additional information.
- If it is non-positive, i.e., codes described in siginfo(2),
we need to fill in _rt.
XXX
Description for SA_ASYNCIO in siginfo(2) seems outdated;
neither si_fd nor si_band are filled in with that code.
XXX
pullup to netbsd-9
TRAP_EXEC does not have extra fields to be filled in at the moment.
Explicitly ignore fields for now.
Pointed out by kamil. Thanks!
XXX
pullup to netbsd-9
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.45.8.1 src/sys/compat/netbsd32/netbsd32_signal.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_signal.c
diff -u src/sys/compat/netbsd32/netbsd32_signal.c:1.45 src/sys/compat/netbsd32/netbsd32_signal.c:1.45.8.1
--- src/sys/compat/netbsd32/netbsd32_signal.c:1.45 Sun Dec 17 20:59:27 2017
+++ src/sys/compat/netbsd32/netbsd32_signal.c Tue Nov 19 13:33:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_signal.c,v 1.45 2017/12/17 20:59:27 christos Exp $ */
+/* $NetBSD: netbsd32_signal.c,v 1.45.8.1 2019/11/19 13:33:21 martin Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.45 2017/12/17 20:59:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.45.8.1 2019/11/19 13:33:21 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ktrace.h"
@@ -188,173 +188,181 @@ netbsd32___sigaction_sigtramp(struct lwp
void
netbsd32_ksi32_to_ksi(struct _ksiginfo *si, const struct __ksiginfo32 *si32)
{
+ size_t i;
+
memset(si, 0, sizeof (*si));
si->_signo = si32->_signo;
si->_code = si32->_code;
si->_errno = si32->_errno;
+ if (si32->_code == SI_NOINFO)
+ return;
+ else if (si32->_code <= 0) /* codes described in siginfo(2) */
+ goto fill_rt;
+
switch (si32->_signo) {
case SIGILL:
+ case SIGFPE:
case SIGBUS:
case SIGSEGV:
- case SIGFPE:
- case SIGTRAP:
+fill_fault:
si->_reason._fault._addr =
NETBSD32IPTR64(si32->_reason._fault._addr);
si->_reason._fault._trap = si32->_reason._fault._trap;
break;
+ case SIGTRAP:
+ switch (si32->_code) {
+ case TRAP_EXEC:
+ break;
+ case TRAP_CHLD:
+ case TRAP_LWP:
+ si->_reason._ptrace_state._pe_report_event =
+ si32->_reason._ptrace_state._pe_report_event;
+CTASSERT(sizeof(si->_reason._ptrace_state._option._pe_other_pid) ==
+sizeof(si->_reason._ptrace_state._option._pe_lwp));
+ si->_reason._ptrace_state._option._pe_other_pid =
+ si32->_reason._ptrace_state._option._pe_other_pid;
+ break;
+ case TRAP_SCE:
+ case TRAP_SCX:
+ si->_reason._syscall._sysnum =
+ si32->_reason._syscall._sysnum;
+ si->_reason._syscall._retval[0] =
+ si32->_reason._syscall._retval[0];
+ si->_reason._syscall._retval[1] =
+ si32->_reason._syscall._retval[1];
+ si->_reason._syscall._error =
+ si32->_reason._syscall._error;
+ for (i = 0;
+ i < __arraycount(si->_reason._syscall._args); i++)
+si->_reason._syscall._args[i] =
+si32->_reason._syscall._args[i];
+ break;
+ default:
+ goto fill_fault;
+ }
+ break;
case SIGALRM:
case SIGVTALRM:
case SIGPROF:
default: /* see sigqueue() and kill1() */
+fill_rt:
si->_reason._rt._pid = si32->_reason._rt._pid;
si->_reason._rt._uid = si32->_reason._rt._uid;
si->_reason._rt._value.sival_int =
si32->_reason._rt._value.sival_int;
break;
+ case SIGURG:
+ case SIGIO:
+ si->_reason._poll._band = si32->_reason._poll._band;
+ si->_reason._poll._fd = si32->_reason._poll._fd;
+ break;
case SIGCHLD:
si->_reason._child._pid = si32->_reason._child._pid;
si->_reason._child._uid = si32->_reason._child
CVS commit: [netbsd-9] src/sys/compat
Module Name:src
Committed By: martin
Date: Tue Nov 19 13:36:25 UTC 2019
Modified Files:
src/sys/compat/netbsd32 [netbsd-9]: netbsd32.h
src/sys/compat/sys [netbsd-9]: siginfo.h
Log Message:
Pull up following revision(s) (requested by rin in ticket #457):
sys/compat/sys/siginfo.h: revision 1.9
sys/compat/netbsd32/netbsd32.h: revision 1.131
8-byte objects on i386 or arm-oabi are aligned in 4-byte boundary.
Therefore, we must use __attribute__((__aligned__(4))) for them.
netbsd32_{,u}int64 are provided for this purpose. However, we
cannot use it in due to circular dependency
b/w .
In order to distangle it, we choose here to have a duplicate type,
netbsd32_siginfo_uint64, in . The equivalence
with netbsd32_uint64 is asserted in .
Now, gdb for i386 works again on amd64 kernel.
Based on patch provided by kamil. Thanks!
XXX
pullup to netbsd-9
To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.123.4.1 src/sys/compat/netbsd32/netbsd32.h
cvs rdiff -u -r1.7.2.1 -r1.7.2.2 src/sys/compat/sys/siginfo.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32.h
diff -u src/sys/compat/netbsd32/netbsd32.h:1.123 src/sys/compat/netbsd32/netbsd32.h:1.123.4.1
--- src/sys/compat/netbsd32/netbsd32.h:1.123 Wed Feb 20 06:04:28 2019
+++ src/sys/compat/netbsd32/netbsd32.h Tue Nov 19 13:36:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32.h,v 1.123 2019/02/20 06:04:28 mrg Exp $ */
+/* $NetBSD: netbsd32.h,v 1.123.4.1 2019/11/19 13:36:25 martin Exp $ */
/*
* Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green
@@ -162,6 +162,10 @@ typedef int64_t netbsd32_int64 NETBSD32_
typedef uint64_t netbsd32_uint64 NETBSD32_INT64_ALIGN;
#undef NETBSD32_INT64_ALIGN
+/* Type used in siginfo, avoids circular dependencies between headers. */
+CTASSERT(sizeof(netbsd32_uint64) == sizeof(netbsd32_siginfo_uint64));
+CTASSERT(__alignof__(netbsd32_uint64) == __alignof__(netbsd32_siginfo_uint64));
+
/*
* all pointers are netbsd32_pointer_t (defined in )
*/
Index: src/sys/compat/sys/siginfo.h
diff -u src/sys/compat/sys/siginfo.h:1.7.2.1 src/sys/compat/sys/siginfo.h:1.7.2.2
--- src/sys/compat/sys/siginfo.h:1.7.2.1 Tue Oct 15 18:32:13 2019
+++ src/sys/compat/sys/siginfo.h Tue Nov 19 13:36:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: siginfo.h,v 1.7.2.1 2019/10/15 18:32:13 martin Exp $ */
+/* $NetBSD: siginfo.h,v 1.7.2.2 2019/11/19 13:36:25 martin Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -34,6 +34,15 @@
#ifdef _KERNEL
+/* Avoids circular dependency with machine/netbsd32_machdep.h */
+#if defined(__x86_64__) || (defined(__arm__) && defined(__ARM_EABI__))
+#define NETBSD32_SIGINFO_UINT64_ALIGN __attribute__((__aligned__(4)))
+#else
+#define NETBSD32_SIGINFO_UINT64_ALIGN __attribute__((__aligned__(8)))
+#endif
+typedef uint64_t netbsd32_siginfo_uint64 NETBSD32_SIGINFO_UINT64_ALIGN;
+#undef NETBSD32_SIGINFO_UINT64_ALIGN
+
typedef union sigval32 {
int sival_int;
uint32_t sival_ptr;
@@ -73,7 +82,7 @@ struct __ksiginfo32 {
int _sysnum;
int _retval[2];
int _error;
- uint64_t _args[8]; /* SYS_MAXSYSARGS */
+ netbsd32_siginfo_uint64 _args[8]; /* SYS_MAXSYSARGS */
} _syscall;
struct {
CVS commit: [netbsd-9] src/sys/compat
Module Name:src
Committed By: martin
Date: Tue Nov 19 13:36:25 UTC 2019
Modified Files:
src/sys/compat/netbsd32 [netbsd-9]: netbsd32.h
src/sys/compat/sys [netbsd-9]: siginfo.h
Log Message:
Pull up following revision(s) (requested by rin in ticket #457):
sys/compat/sys/siginfo.h: revision 1.9
sys/compat/netbsd32/netbsd32.h: revision 1.131
8-byte objects on i386 or arm-oabi are aligned in 4-byte boundary.
Therefore, we must use __attribute__((__aligned__(4))) for them.
netbsd32_{,u}int64 are provided for this purpose. However, we
cannot use it in due to circular dependency
b/w .
In order to distangle it, we choose here to have a duplicate type,
netbsd32_siginfo_uint64, in . The equivalence
with netbsd32_uint64 is asserted in .
Now, gdb for i386 works again on amd64 kernel.
Based on patch provided by kamil. Thanks!
XXX
pullup to netbsd-9
To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.123.4.1 src/sys/compat/netbsd32/netbsd32.h
cvs rdiff -u -r1.7.2.1 -r1.7.2.2 src/sys/compat/sys/siginfo.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Nov 19 13:38:30 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #444 - #457 To generate a diff of this commit: cvs rdiff -u -r1.1.2.108 -r1.1.2.109 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Nov 19 13:38:30 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #444 - #457 To generate a diff of this commit: cvs rdiff -u -r1.1.2.108 -r1.1.2.109 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.108 src/doc/CHANGES-9.0:1.1.2.109 --- src/doc/CHANGES-9.0:1.1.2.108 Tue Nov 19 06:21:24 2019 +++ src/doc/CHANGES-9.0 Tue Nov 19 13:38:30 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.108 2019/11/19 06:21:24 msaitoh Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.109 2019/11/19 13:38:30 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -5928,3 +5928,97 @@ usr.sbin/sysinst/arch/i386/md.c 1.25-1 Fix KASLR support for amd64. [martin, ticket #443] + +share/examples/npf/soho_gw-npf.conf 1.13-1.20 + + Modernize the example, improve readability and add more descriptions. + Add support for blacklistd. + [sevan, ticket #444] + +share/examples/npf/host-npf.conf 1.11 + + With bin/54124 fixed, the rule needs to be explicitly set to stateful. + [sevan, ticket #445] + +lib/libossaudio/ossaudio.c 1.37,1.38 +sys/compat/ossaudio/ossaudio.c 1.77,1.78 + + PR lib/54667: use record.sample_rate for recording on SNDCTL_DSP_SPEED. + Use record field for recording even on SNDCTL_DSP_STEREO, + SNDCTL_DSP_SETFMT, and SNDCTL_DSP_CHANNELS. + [isaki, ticket #446] + +sys/dev/usb/uaudio.c1.162 + + PR kern/54662: properly initialize audio format descriptors. + [isaki, ticket #447] + +sys/dev/audio/audio.c1.33 + + Fix a wrong calculation of recording ring buffer. + [isaki, ticket #448] + +sys/dev/pci/pcidevs1.1388-1.1391 +sys/dev/pci/pcidevs.h(regen) +sys/dev/pci/pcidevs_data.h (regen) + + Spell controller correctly. + Add Realtek RTL8125. + Update Intel's NVMe SSDs. + Add Apollo Lake TXE HECI. + Add D-Link DGE-530T C1 and TP-Link TG-3468 v2. + [msaitoh, ticket #449] + +sys/dev/pci/if_msk.c1.94 +sys/dev/pci/if_skreg.h1.27 + + Make Yukon EX, FE+, SUPR stable. + [msaitoh, ticket #450] + +sys/dev/pci/if_re_pci.c 1.50 (patch) +share/man/man4/re.4 1.17-1.18 (patch) + + Add D-Link DGE-530T Rev. C,D and TP-Link TG-3468 v2,v3. + Add note about UDP checksum offload feature to the document. + [msaitoh, ticket #451] + +sys/arch/x86/include/specialreg.h 1.158 +usr.sbin/cpuctl/arch/i386.c 1.108 + + Add the following bit definitions from the latest Intel SDM: + - CET shadow stack + - Fast Short REP MOV + - Hybrid part + - CET Indirect Branch Tracking + 0x7d and 0x7e are for 10th generation Core (Ice Lake). + [msaitoh, ticket #452] + +sys/dev/pci/ixgbe/ixgbe.c 1.216 +sys/dev/pci/ixgbe/ixv.c1.141 + + Print MAC address. + [msaitoh, ticket #453] + +share/man/man7/ascii.71.14,1.15 + + Document standards and correct history. + Add a table with the full names for the control character set. + [sevan, ticket #454] + +sys/kern/sys_ptrace_common.c 1.72 + + ptrace(2): fix PIOD_READ_AUXV for COMPAT_NETBSD32. + [rin, ticket #455] + +sys/compat/netbsd32/netbsd32_signal.c 1.46-1.50 + + Modernize signal handling codes in COMPAT_NETBSD32. + [rin, ticket #456] + +sys/compat/netbsd32/netbsd32.h 1.131 +sys/compat/sys/siginfo.h 1.9 + + Fix alignment of netbsd32 compat structures, detangle cyclic + dependencies in headers. + [rin, ticket #457] +
CVS commit: [phil-wifi] src/sys/net80211
Module Name:src Committed By: phil Date: Tue Nov 19 19:17:48 UTC 2019 Modified Files: src/sys/net80211 [phil-wifi]: ieee80211_ratectl.c Log Message: Add a FreeBSD ifdef To generate a diff of this commit: cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/net80211/ieee80211_ratectl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/net80211/ieee80211_ratectl.c diff -u src/sys/net80211/ieee80211_ratectl.c:1.1.2.4 src/sys/net80211/ieee80211_ratectl.c:1.1.2.5 --- src/sys/net80211/ieee80211_ratectl.c:1.1.2.4 Mon Jun 10 22:09:46 2019 +++ src/sys/net80211/ieee80211_ratectl.c Tue Nov 19 19:17:48 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ieee80211_ratectl.c,v 1.1.2.4 2019/06/10 22:09:46 christos Exp $ */ +/* $NetBSD: ieee80211_ratectl.c,v 1.1.2.5 2019/11/19 19:17:48 phil Exp $ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD @@ -29,12 +29,14 @@ #include #ifdef __NetBSD__ -__KERNEL_RCSID(0, "$NetBSD: ieee80211_ratectl.c,v 1.1.2.4 2019/06/10 22:09:46 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ieee80211_ratectl.c,v 1.1.2.5 2019/11/19 19:17:48 phil Exp $"); #endif #ifdef _KERNEL_OPT +#ifdef __FreeBSD__ #include "opt-wlan.h" #endif +#endif #include #include
CVS commit: [phil-wifi] src/sys/net80211
Module Name:src Committed By: phil Date: Tue Nov 19 19:17:16 UTC 2019 Modified Files: src/sys/net80211 [phil-wifi]: ieee80211_netbsd.c Log Message: Fix an ifdef To generate a diff of this commit: cvs rdiff -u -r1.31.2.8 -r1.31.2.9 src/sys/net80211/ieee80211_netbsd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [phil-wifi] src/sys/net80211
Module Name:src Committed By: phil Date: Tue Nov 19 19:17:48 UTC 2019 Modified Files: src/sys/net80211 [phil-wifi]: ieee80211_ratectl.c Log Message: Add a FreeBSD ifdef To generate a diff of this commit: cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/net80211/ieee80211_ratectl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [phil-wifi] src/sys/net80211
Module Name:src
Committed By: phil
Date: Tue Nov 19 19:17:16 UTC 2019
Modified Files:
src/sys/net80211 [phil-wifi]: ieee80211_netbsd.c
Log Message:
Fix an ifdef
To generate a diff of this commit:
cvs rdiff -u -r1.31.2.8 -r1.31.2.9 src/sys/net80211/ieee80211_netbsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net80211/ieee80211_netbsd.c
diff -u src/sys/net80211/ieee80211_netbsd.c:1.31.2.8 src/sys/net80211/ieee80211_netbsd.c:1.31.2.9
--- src/sys/net80211/ieee80211_netbsd.c:1.31.2.8 Mon Jun 10 22:09:46 2019
+++ src/sys/net80211/ieee80211_netbsd.c Tue Nov 19 19:17:16 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_netbsd.c,v 1.31.2.8 2019/06/10 22:09:46 christos Exp $ */
+/* $NetBSD: ieee80211_netbsd.c,v 1.31.2.9 2019/11/19 19:17:16 phil Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
@@ -29,7 +29,7 @@
#include
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_netbsd.c,v 1.31.2.8 2019/06/10 22:09:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_netbsd.c,v 1.31.2.9 2019/11/19 19:17:16 phil Exp $");
#endif
/*
@@ -333,7 +333,7 @@ static struct sysctllog *ieee80211_sysct
static void
ieee80211_sysctl_setup(void)
{
-#ifdef notyet
+#ifdef IEEE80211_DEBUG
int rc;
#endif
const struct sysctlnode *rnode;
CVS commit: src/sys/arch/sparc64/dev
Module Name:src Committed By: palle Date: Tue Nov 19 20:07:30 UTC 2019 Modified Files: src/sys/arch/sparc64/dev: vdsk.c Log Message: sun4v: added support for handling of opcode SCSI_MAINTENANCE_IN when using ldom based virtual disk To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sparc64/dev/vdsk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc64/dev
Module Name:src Committed By: palle Date: Tue Nov 19 20:07:30 UTC 2019 Modified Files: src/sys/arch/sparc64/dev: vdsk.c Log Message: sun4v: added support for handling of opcode SCSI_MAINTENANCE_IN when using ldom based virtual disk To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sparc64/dev/vdsk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/dev/vdsk.c diff -u src/sys/arch/sparc64/dev/vdsk.c:1.4 src/sys/arch/sparc64/dev/vdsk.c:1.5 --- src/sys/arch/sparc64/dev/vdsk.c:1.4 Tue Oct 1 18:00:07 2019 +++ src/sys/arch/sparc64/dev/vdsk.c Tue Nov 19 20:07:30 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: vdsk.c,v 1.4 2019/10/01 18:00:07 chs Exp $ */ +/* $NetBSD: vdsk.c,v 1.5 2019/11/19 20:07:30 palle Exp $ */ /* $OpenBSD: vdsk.c,v 1.46 2015/01/25 21:42:13 kettenis Exp $ */ /* * Copyright (c) 2009, 2011 Mark Kettenis @@ -1049,6 +1049,7 @@ vdsk_scsi_cmd(struct vdsk_softc *sc, str case START_STOP: case SCSI_PREVENT_ALLOW_MEDIUM_REMOVAL: case SCSI_MODE_SENSE_6: + case SCSI_MAINTENANCE_IN: vdsk_scsi_done(xs, XS_NOERROR); return;
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: martin
Date: Wed Nov 20 06:23:31 UTC 2019
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Restrict -Wl,-z,defs to x86 and aarch64 for now to avoid global build
lossage. Suggested by mrg.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/external/mit/xorg/lib/gallium/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.39 src/external/mit/xorg/lib/gallium/Makefile:1.40
--- src/external/mit/xorg/lib/gallium/Makefile:1.39 Tue Nov 19 08:59:18 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Wed Nov 20 06:23:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2019/11/19 08:59:18 martin Exp $
+# $NetBSD: Makefile,v 1.40 2019/11/20 06:23:31 martin Exp $
# Link the gallium mega driver.
@@ -1086,7 +1086,10 @@ LLVMRT_LIBS+= \
.endif # ${BUILD_LLVM_PIPE} == 1 || ${BUILD_RADEON} == 1
-LDFLAGS+= -Wl,--version-script=${X11SRCDIR.Mesa}/src/gallium/targets/dri/dri.sym -Wl,-z,defs
+LDFLAGS+= -Wl,--version-script=${X11SRCDIR.Mesa}/src/gallium/targets/dri/dri.sym
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE_CPU} == "aarch64"
+LDFLAGS+= -Wl,-z,defs
+.endif
## build mesagallium parts
MESA_SRC_MODULES= main math vbo state_tracker program asm_s
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: martin Date: Wed Nov 20 06:23:31 UTC 2019 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Restrict -Wl,-z,defs to x86 and aarch64 for now to avoid global build lossage. Suggested by mrg. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
