CVS commit: [netbsd-7] src/sys/dev/pci
Module Name:src Committed By: snj Date: Thu Dec 8 07:58:04 UTC 2016 Modified Files: src/sys/dev/pci [netbsd-7]: pcidevs.h pcidevs_data.h Log Message: regen for ticket 1291 To generate a diff of this commit: cvs rdiff -u -r1.1192.2.6 -r1.1192.2.7 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1191.2.6 -r1.1191.2.7 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-7] src/sys/dev/pci
Module Name:src Committed By: snj Date: Thu Dec 8 07:58:04 UTC 2016 Modified Files: src/sys/dev/pci [netbsd-7]: pcidevs.h pcidevs_data.h Log Message: regen for ticket 1291 To generate a diff of this commit: cvs rdiff -u -r1.1192.2.6 -r1.1192.2.7 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1191.2.6 -r1.1191.2.7 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-7] src/sys/dev/pci
Module Name:src Committed By: snj Date: Thu Dec 8 07:56:45 UTC 2016 Modified Files: src/sys/dev/pci [netbsd-7]: pcidevs Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1291): sys/dev/pci/pcidevs: revisions 1.1221-1.1245, 1.1247-1.1262, 1.1264-1.1269, 1.1271-1.1273 - Add SystemBase SB16C1050 UARTs. - Add D-Link DFE520TX (part of PR#49889 reported by Maxim Tsyplakov). - Add Realtek RTL8188EE and RTL8192CE - Add PLX Technology PEX 8111. - Add some Red Hat devices. - Add Samsung SM951. - Add several NVIDIA geforce and NVS cards. - Add some ATI/AMD devices. - Add Radeon HD 2400 and TSB82AA2 IEEE 1394 Host Controller. Reported by T. M. Pederson (PR#40987). - Add some Edimax, AWT, Fusion-io and Ralink devices of ral(4). - Add MSI RT3090, Edimax RT3591, Ralink RT 536[02] and RT5390 of ral(4). - Add vendor ID of Super Micro. - Add MegaRAID SAS3008. - Fix entries. The following problems were found while sorting entries: - Remove the following entries because the value is duplicated: CMDTECH_240 (CMDTECH_AAR_1210SA has the same value) INTEL_C610_SATA_RAID (INTEL_82801H_SATA_RAID has the same vaule) INTEL_C610_PCIE_1_3 (82801BA_HPB has the same value) GEFORCE_610M3 (GEFORCE_610M2 has the same value) - RADEON_RV350_NQ is not 0x4e41 but 0x4e51 - 82801JD_SATA_RAID is not 0x3a02 but 0x3a05. - The following two entries have the same number. Fix one of them: DH89XXCL_USB_2 to 0x23b5(was 0x23b4 (== DH89XXCL_USB_1)) 5500_HB to 0x3404 and change the desc (was 0x3403 (== 3400_HB)) 82X58_PCIE_0_1 to 0x3421(was 0x3420 (== 82X58_PCIE_0_0)) 82801JI_THERMAL to 0x3a32 (was 0x3a30 (== 82801JI_SMB)) - Add the following Intel entries: - PCIe NVMe SSD. - Dual Band Wireless AC 3165. - I219 family Ethernet devices. - Dual Band Wireless AC 3165, 4165 and 8260 devices. - 82597EX_SR (part of PR#47750). - Braswell devices. - Core 6G devices. - 100 series chipset devices. - Xeon D devices. - Xeon 5[56]00 devices. - Xeon E7 v4 devices. - Add "Core i7-6xxxK" to some Intel devices' description. - Fix Intel XE5_V3_IMC1_DDRIO_[34]'s values. - Add another ID for Intel 82Q45 KT. - Add some entries of Intel 965 Express Chipset. - Add some Intel Xeon E5 v3 devices. - Add some Intel 1st gen Core PCI devices. - Add some Intel Core 5G devices. - Add some Intel Core i7-6xxxK devices. - Add some Intel Core i7-800 and i5-700 devices. - Add some Intel 10G devices. - Add ASMedia ASM1042A USB 3.0 Host Controller. - Add ASMEDIA ASM1083/1085/1142. - Add Marvell Armada38x and 88AP510. - Add Qualcomm Atheros QCA986x/988x. - Add Atheros AR9565 Wireless LAN. - Sort entries in device ID's order. - Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.1199.2.6 -r1.1199.2.7 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.1199.2.6 src/sys/dev/pci/pcidevs:1.1199.2.7 --- src/sys/dev/pci/pcidevs:1.1199.2.6 Sun Apr 19 16:26:23 2015 +++ src/sys/dev/pci/pcidevs Thu Dec 8 07:56:45 2016 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1199.2.6 2015/04/19 16:26:23 riz Exp $ +$NetBSD: pcidevs,v 1.1199.2.7 2016/12/08 07:56:45 snj Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -529,10 +529,9 @@ vendor ITE 0x1283 Integrated Technology vendor ESSTECH2 0x1285 ESS Technology vendor TRITECH 0x1292 TriTech Microelectronics vendor KOFAX 0x1296 Kofax Image Products -vendor ALTEON 0x12ae Alteon vendor RISCOM 0x12aa RISCom +vendor ALTEON 0x12ae Alteon vendor USR 0x12b9 US Robotics (3Com) -vendor USR2 0x16ec US Robotics vendor PICTUREEL 0x12c5 Picture Elements vendor NVIDIA_SGS 0x12d2 Nvidia & SGS-Thomson Microelectronics vendor PERICOM 0x12d8 Pericom Semiconductors @@ -568,12 +567,13 @@ vendor ICENSEMBLE 0x1412 IC Ensemble / V vendor MICROSOFT 0x1414 Microsoft vendor OXFORDSEMI 0x1415 Oxford Semiconductor vendor CHELSIO 0x1425 Chelsio Communications +vendor EDIMAX 0x1432 Edimax vendor TAMARACK 0x143d Tamarack Microelectronics vendor SAMSUNGELEC3 0x144d Samsung Electronics (3rd vendor ID) vendor ASKEY 0x144f Askey Computer vendor AVERMEDIA 0x1461 Avermedia Technologies +vendor MSI 0x1462 Micro-star International Co Ltd vendor SYSTEMBASE 0x14a1 System Base -vendor MARVELL2 0x1b4b Marvell vendor AIRONET 0x14b9 Aironet Wireless Communications vendor COMPAL 0x14c0 COMPAL Electronics vendor MYRICOM 0x14c1 Myricom @@ -584,6 +584,7 @@ vendor BROADCOM 0x14e4 Broadcom vendor PLANEX 0x14ea Planex Communications vendor CONEXANT 0x14f1 Conexant Systems vendor DELTA 0x1500 Delta Electronics +vendor MYSON 0x1516 Myson-Century Technology vendor ENE 0x1524 ENE Technology vendor TERRATEC 0x153b TerraTec Electronic vendor PERLE 0x155f Perle Systems @@ -594,18 +595,19 @@ vendor FARADAY 0x159b Faraday Technolog vendor
CVS commit: [netbsd-7] src/sys/dev/pci
Module Name:src Committed By: snj Date: Thu Dec 8 07:56:45 UTC 2016 Modified Files: src/sys/dev/pci [netbsd-7]: pcidevs Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1291): sys/dev/pci/pcidevs: revisions 1.1221-1.1245, 1.1247-1.1262, 1.1264-1.1269, 1.1271-1.1273 - Add SystemBase SB16C1050 UARTs. - Add D-Link DFE520TX (part of PR#49889 reported by Maxim Tsyplakov). - Add Realtek RTL8188EE and RTL8192CE - Add PLX Technology PEX 8111. - Add some Red Hat devices. - Add Samsung SM951. - Add several NVIDIA geforce and NVS cards. - Add some ATI/AMD devices. - Add Radeon HD 2400 and TSB82AA2 IEEE 1394 Host Controller. Reported by T. M. Pederson (PR#40987). - Add some Edimax, AWT, Fusion-io and Ralink devices of ral(4). - Add MSI RT3090, Edimax RT3591, Ralink RT 536[02] and RT5390 of ral(4). - Add vendor ID of Super Micro. - Add MegaRAID SAS3008. - Fix entries. The following problems were found while sorting entries: - Remove the following entries because the value is duplicated: CMDTECH_240 (CMDTECH_AAR_1210SA has the same value) INTEL_C610_SATA_RAID (INTEL_82801H_SATA_RAID has the same vaule) INTEL_C610_PCIE_1_3 (82801BA_HPB has the same value) GEFORCE_610M3 (GEFORCE_610M2 has the same value) - RADEON_RV350_NQ is not 0x4e41 but 0x4e51 - 82801JD_SATA_RAID is not 0x3a02 but 0x3a05. - The following two entries have the same number. Fix one of them: DH89XXCL_USB_2 to 0x23b5(was 0x23b4 (== DH89XXCL_USB_1)) 5500_HB to 0x3404 and change the desc (was 0x3403 (== 3400_HB)) 82X58_PCIE_0_1 to 0x3421(was 0x3420 (== 82X58_PCIE_0_0)) 82801JI_THERMAL to 0x3a32 (was 0x3a30 (== 82801JI_SMB)) - Add the following Intel entries: - PCIe NVMe SSD. - Dual Band Wireless AC 3165. - I219 family Ethernet devices. - Dual Band Wireless AC 3165, 4165 and 8260 devices. - 82597EX_SR (part of PR#47750). - Braswell devices. - Core 6G devices. - 100 series chipset devices. - Xeon D devices. - Xeon 5[56]00 devices. - Xeon E7 v4 devices. - Add "Core i7-6xxxK" to some Intel devices' description. - Fix Intel XE5_V3_IMC1_DDRIO_[34]'s values. - Add another ID for Intel 82Q45 KT. - Add some entries of Intel 965 Express Chipset. - Add some Intel Xeon E5 v3 devices. - Add some Intel 1st gen Core PCI devices. - Add some Intel Core 5G devices. - Add some Intel Core i7-6xxxK devices. - Add some Intel Core i7-800 and i5-700 devices. - Add some Intel 10G devices. - Add ASMedia ASM1042A USB 3.0 Host Controller. - Add ASMEDIA ASM1083/1085/1142. - Add Marvell Armada38x and 88AP510. - Add Qualcomm Atheros QCA986x/988x. - Add Atheros AR9565 Wireless LAN. - Sort entries in device ID's order. - Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.1199.2.6 -r1.1199.2.7 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-7] src/sys/dev/pci
Module Name:src
Committed By: snj
Date: Thu Dec 8 07:52:51 UTC 2016
Modified Files:
src/sys/dev/pci [netbsd-7]: satalink.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1290):
sys/dev/pci/satalink.c: revision 1.53
Remove PCI_PRODUCT_CMDTECH_240's entry because CMDTECH_AAR_1210SA has
the same ID.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.52.4.1 src/sys/dev/pci/satalink.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/satalink.c
diff -u src/sys/dev/pci/satalink.c:1.52 src/sys/dev/pci/satalink.c:1.52.4.1
--- src/sys/dev/pci/satalink.c:1.52 Sat Mar 29 19:28:25 2014
+++ src/sys/dev/pci/satalink.c Thu Dec 8 07:52:51 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: satalink.c,v 1.52 2014/03/29 19:28:25 christos Exp $ */
+/* $NetBSD: satalink.c,v 1.52.4.1 2016/12/08 07:52:51 snj Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: satalink.c,v 1.52 2014/03/29 19:28:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: satalink.c,v 1.52.4.1 2016/12/08 07:52:51 snj Exp $");
#include
#include
@@ -275,11 +275,6 @@ static const struct pciide_product_desc
"Silicon Image SATALink 3112",
sii3112_chip_map,
},
- { PCI_PRODUCT_CMDTECH_240,
- 0,
- "Silicon Image SATALink Sil240",
- sii3112_chip_map,
- },
{ PCI_PRODUCT_CMDTECH_3512,
0,
"Silicon Image SATALink 3512",
CVS commit: [netbsd-7] src/sys/dev/pci
Module Name:src Committed By: snj Date: Thu Dec 8 07:52:51 UTC 2016 Modified Files: src/sys/dev/pci [netbsd-7]: satalink.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1290): sys/dev/pci/satalink.c: revision 1.53 Remove PCI_PRODUCT_CMDTECH_240's entry because CMDTECH_AAR_1210SA has the same ID. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.52.4.1 src/sys/dev/pci/satalink.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/dev/usb
Module Name:src Committed By: snj Date: Thu Dec 8 07:50:17 UTC 2016 Modified Files: src/sys/dev/usb [netbsd-7]: usbdevs.h usbdevs_data.h Log Message: regen for ticket 1289 To generate a diff of this commit: cvs rdiff -u -r1.672.2.5 -r1.672.2.6 src/sys/dev/usb/usbdevs.h cvs rdiff -u -r1.673.2.5 -r1.673.2.6 src/sys/dev/usb/usbdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/dev/usb
Module Name:src Committed By: snj Date: Thu Dec 8 07:50:17 UTC 2016 Modified Files: src/sys/dev/usb [netbsd-7]: usbdevs.h usbdevs_data.h Log Message: regen for ticket 1289 To generate a diff of this commit: cvs rdiff -u -r1.672.2.5 -r1.672.2.6 src/sys/dev/usb/usbdevs.h cvs rdiff -u -r1.673.2.5 -r1.673.2.6 src/sys/dev/usb/usbdevs_data.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/usb/usbdevs.h diff -u src/sys/dev/usb/usbdevs.h:1.672.2.5 src/sys/dev/usb/usbdevs.h:1.672.2.6 --- src/sys/dev/usb/usbdevs.h:1.672.2.5 Sun Sep 18 06:01:05 2016 +++ src/sys/dev/usb/usbdevs.h Thu Dec 8 07:50:15 2016 @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs.h,v 1.672.2.5 2016/09/18 06:01:05 snj Exp $ */ +/* $NetBSD: usbdevs.h,v 1.672.2.6 2016/12/08 07:50:15 snj Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.680.2.5 2016/09/18 06:00:20 snj Exp + * NetBSD: usbdevs,v 1.680.2.6 2016/12/08 07:49:42 snj Exp */ /* @@ -324,6 +324,7 @@ #define USB_VENDOR_ARASAN 0x07da /* Arasan Chip Systems */ #define USB_VENDOR_ALLIEDCABLE 0x07e6 /* Allied Cable */ #define USB_VENDOR_STSN 0x07ef /* STSN */ +#define USB_VENDOR_CENTURY 0x07f7 /* CENTURY Corporation */ #define USB_VENDOR_BEWAN 0x07fa /* Bewan */ #define USB_VENDOR_ZOOM 0x0803 /* Zoom Telephonics */ #define USB_VENDOR_BROADLOGIC 0x0827 /* BroadLogic */ @@ -493,6 +494,7 @@ #define USB_VENDOR_MOBILITY 0x1342 /* Mobility */ #define USB_VENDOR_DICKSMITH 0x1371 /* Dick Smith Electronics */ #define USB_VENDOR_NETGEAR3 0x1385 /* Netgear */ +#define USB_VENDOR_VALIDITY 0x138a /* Validity Sensors, Inc. */ #define USB_VENDOR_BALTECH 0x13ad /* Baltech */ #define USB_VENDOR_CISCOLINKSYS 0x13b1 /* Cisco-Linksys */ #define USB_VENDOR_SHARK 0x13d2 /* Shark */ @@ -557,9 +559,12 @@ #define USB_VENDOR_PARA 0x20b8 /* PARA Industrial */ #define USB_VENDOR_TRENDNET 0x20f4 /* TRENDnet */ #define USB_VENDOR_DLINK3 0x2101 /* D-Link */ +#define USB_VENDOR_VIALABS 0x2109 /* VIA Labs */ #define USB_VENDOR_ERICSSON 0x2282 /* Ericsson */ #define USB_VENDOR_MOTOROLA2 0x22b8 /* Motorola */ #define USB_VENDOR_PINNACLE 0x2304 /* Pinnacle Systems */ +#define USB_VENDOR_ARDUINO 0x2341 /* Arduino SA */ +#define USB_VENDOR_TPLINK 0x2357 /* TP-Link */ #define USB_VENDOR_TRIPPLITE 0x2478 /* Tripp-Lite */ #define USB_VENDOR_HIROSE 0x2631 /* Hirose Electric */ #define USB_VENDOR_NHJ 0x2770 /* NHJ */ @@ -580,6 +585,7 @@ #define USB_VENDOR_SWEEX 0x5173 /* Sweex */ #define USB_VENDOR_ONSPEC2 0x55aa /* OnSpec Electronic Inc. */ #define USB_VENDOR_ZINWELL 0x5a57 /* Zinwell */ +#define USB_VENDOR_INGENIC 0x601a /* Ingenic Semiconductor Ltd. */ #define USB_VENDOR_SITECOM 0x6189 /* Sitecom */ #define USB_VENDOR_SPRINGERDESIGN 0x6400 /* Springer Design, Inc. */ #define USB_VENDOR_ARKMICROCHIPS 0x6547 /* ArkMicroChips */ @@ -592,6 +598,9 @@ #define USB_VENDOR_NETGEAR4 0x9846 /* Netgear */ #define USB_VENDOR_xxFTDI 0x9e88 /* FTDI */ #define USB_VENDOR_CACE 0xcace /* CACE Technologies */ +#define USB_VENDOR_COMPARE 0xcdab /* Compare */ +#define USB_VENDOR_DATAAPEX 0xdaae /* DataApex */ +#define USB_VENDOR_EVOLUTION 0xdeee /* Evolution Robotics */ #define USB_VENDOR_EMPIA 0xeb1a /* eMPIA Technology */ #define USB_VENDOR_HP2 0xf003 /* Hewlett Packard */ #define USB_VENDOR_USRP 0xfffe /* GNU Radio USRP */ @@ -647,6 +656,7 @@ #define USB_PRODUCT_ABOCOM_UFE2000 0x420a /* UFE2000 USB2.0 Fast Ethernet Adapter */ #define USB_PRODUCT_ABOCOM_WL54 0x6001 /* WL54 */ #define USB_PRODUCT_ABOCOM_RTL8192CU 0x8178 /* RTL8192CU */ +#define USB_PRODUCT_ABOCOM_RTL8188EU 0x8179 /* RTL8188EU */ #define USB_PRODUCT_ABOCOM_RTL8188CU_1 0x8188 /* RTL8188CU */ #define USB_PRODUCT_ABOCOM_RTL8188CU_2 0x8189 /* RTL8188CU */ #define USB_PRODUCT_ABOCOM_XX10 0xabc1 /* XX10 */ @@ -863,7 +873,14 @@ #define USB_PRODUCT_APPLE_IPOD_TOUCH_4G 0x129e /* iPod Touch 4G */ #define USB_PRODUCT_APPLE_IPHONE_3G 0x1292 /* iPhone 3G */ #define USB_PRODUCT_APPLE_IPHONE_3GS 0x1294 /* iPhone 3GS */ +#define USB_PRODUCT_APPLE_IPHONE_4 0x1297 /* iPhone 4 */ +#define USB_PRODUCT_APPLE_IPHONE_4_VZW 0x129c /* iPhone 4 (VZW) */ +#define USB_PRODUCT_APPLE_IPHONE_4S 0x12a0 /* iPhone 4S */ +#define USB_PRODUCT_APPLE_IPHONE_5 0x12a8 /* iPhone 5 */ #define USB_PRODUCT_APPLE_IPAD 0x129a /* Apple iPad */ +#define USB_PRODUCT_APPLE_IPAD_2 0x12a2 /* Apple iPad 2 */ +#define USB_PRODUCT_APPLE_IPAD_3 0x12a6 /* Apple iPad 3 */ +#define USB_PRODUCT_APPLE_IPAD_MINI 0x12ab /* Apple iPad Mini */ #define USB_PRODUCT_APPLE_ETHERNET 0x1402 /* Apple USB to Ethernet */ #define USB_PRODUCT_APPLE_BLUETOOTH2 0x8205 /* Bluetooth */ #define USB_PRODUCT_APPLE_BLUETOOTH_HOST_C 0x821f /* Bluetooth USB Host Controller */ @@ -912,8 +929,11 @@ #define USB_PRODUCT_ASUSTEK_USBN10 0x1786 /* USB-N10 */ #define
CVS commit: [netbsd-7] src/sys/dev/usb
Module Name:src Committed By: snj Date: Thu Dec 8 07:49:42 UTC 2016 Modified Files: src/sys/dev/usb [netbsd-7]: usbdevs Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1289): sys/dev/usb/usbdevs: revisions 1.683-1.684, 1.686-1.689, 1.691-1.695, 1.697-1.700, 1.702-1.711, 1.713-1.715, 1.717-1.727 - Add Realtek RTL8152, RTL8153, RTL8192EU. - Add Atheros AR3012. - Add Validity Sensors, Inc. and their devices. PR#45732 from Greg A. Woods. - Add some SMSC devices (PR#49484) - Add Silicon Labs EC3 USB debug adapter. - Add Xbox 360 Wireless Receiver. - Add Arduino, TP-Link, Compare, DataApex, Evoluton Robotics devices. - Add another RTL8192CU device of Asustek. - Add Belkin Components RTL8192CPU, RTL8188CU and F7D2102. - Add another RTL8188CUS. device of Chicony Electronics. - Add another RTL8192CU and DWA-131 rev. B of D-Link. - Add Guillemot RTL8192CU. - Add Hawking RTL8192CU. - Add IO-DATA WN-G150UM and RTL8192CU. - Add another RTL8188RU of Realtek. - Add Huawei U8150, E353_HiLink. - Add vendor ID of Ingenic Semiconductor Ltd. - Add Conexant USB Modem. - Add TI TUSB3410, MSP-FET430UIF and MSP-FET430UIF JTAG. Part of PR#49814. - Add Lenovo ThinkPad Compact USB keyboard with TrackPoint. - Add Panasonic Lumix Camera DMC-FS45 from kern/49809. - Add Asustek USB-N53 and USB-N66. - Add D-Link DWA-1xx devices. - Add Ralink RT3573 and RT5572. - Add Sitecom Europe ET3072 and LN-031. - Add Elecom WDC-433SU2M2. - Add Apple iPhone[45], iPad[23] and iPad Mini. - Add Century CT-USB1HUB. - Add MosChip MCS7832 Ethernet Adapter. - Add another RTL8188CU of Realtek. - Add DisplayLink MIMO, Polaris2 USB dock, Plugable docking station, FY-DVI and FY-DVI2. - Add a NetChip USB-IDE bridge. - Add MS Confort Mouse 6000 from Martijn van Buul (PR#50701). - Add NTT DOCOMO L-05A. - Add Buffalo WI-U2-300D. - Add Sandisk Cruzer (PR#46547). - Add D-Link DWA 125 rev. D1 USB wireless network adapter from Jake Slazenger (part of PR#51529). - Add C-Meida USB Pnp Sound. - Add AboCom RTL8188EU. - Add Intel Advanced-N 6235 Combo Bluetooth. - Add Validity Sensors VFS491. - Add Linksys HG20F9 Ethernet. To generate a diff of this commit: cvs rdiff -u -r1.680.2.5 -r1.680.2.6 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/dev/usb
Module Name:src Committed By: snj Date: Thu Dec 8 07:49:42 UTC 2016 Modified Files: src/sys/dev/usb [netbsd-7]: usbdevs Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1289): sys/dev/usb/usbdevs: revisions 1.683-1.684, 1.686-1.689, 1.691-1.695, 1.697-1.700, 1.702-1.711, 1.713-1.715, 1.717-1.727 - Add Realtek RTL8152, RTL8153, RTL8192EU. - Add Atheros AR3012. - Add Validity Sensors, Inc. and their devices. PR#45732 from Greg A. Woods. - Add some SMSC devices (PR#49484) - Add Silicon Labs EC3 USB debug adapter. - Add Xbox 360 Wireless Receiver. - Add Arduino, TP-Link, Compare, DataApex, Evoluton Robotics devices. - Add another RTL8192CU device of Asustek. - Add Belkin Components RTL8192CPU, RTL8188CU and F7D2102. - Add another RTL8188CUS. device of Chicony Electronics. - Add another RTL8192CU and DWA-131 rev. B of D-Link. - Add Guillemot RTL8192CU. - Add Hawking RTL8192CU. - Add IO-DATA WN-G150UM and RTL8192CU. - Add another RTL8188RU of Realtek. - Add Huawei U8150, E353_HiLink. - Add vendor ID of Ingenic Semiconductor Ltd. - Add Conexant USB Modem. - Add TI TUSB3410, MSP-FET430UIF and MSP-FET430UIF JTAG. Part of PR#49814. - Add Lenovo ThinkPad Compact USB keyboard with TrackPoint. - Add Panasonic Lumix Camera DMC-FS45 from kern/49809. - Add Asustek USB-N53 and USB-N66. - Add D-Link DWA-1xx devices. - Add Ralink RT3573 and RT5572. - Add Sitecom Europe ET3072 and LN-031. - Add Elecom WDC-433SU2M2. - Add Apple iPhone[45], iPad[23] and iPad Mini. - Add Century CT-USB1HUB. - Add MosChip MCS7832 Ethernet Adapter. - Add another RTL8188CU of Realtek. - Add DisplayLink MIMO, Polaris2 USB dock, Plugable docking station, FY-DVI and FY-DVI2. - Add a NetChip USB-IDE bridge. - Add MS Confort Mouse 6000 from Martijn van Buul (PR#50701). - Add NTT DOCOMO L-05A. - Add Buffalo WI-U2-300D. - Add Sandisk Cruzer (PR#46547). - Add D-Link DWA 125 rev. D1 USB wireless network adapter from Jake Slazenger (part of PR#51529). - Add C-Meida USB Pnp Sound. - Add AboCom RTL8188EU. - Add Intel Advanced-N 6235 Combo Bluetooth. - Add Validity Sensors VFS491. - Add Linksys HG20F9 Ethernet. To generate a diff of this commit: cvs rdiff -u -r1.680.2.5 -r1.680.2.6 src/sys/dev/usb/usbdevs 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/usbdevs diff -u src/sys/dev/usb/usbdevs:1.680.2.5 src/sys/dev/usb/usbdevs:1.680.2.6 --- src/sys/dev/usb/usbdevs:1.680.2.5 Sun Sep 18 06:00:20 2016 +++ src/sys/dev/usb/usbdevs Thu Dec 8 07:49:42 2016 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.680.2.5 2016/09/18 06:00:20 snj Exp $ +$NetBSD: usbdevs,v 1.680.2.6 2016/12/08 07:49:42 snj Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -317,6 +317,7 @@ vendor APTIO 0x07d2 Aptio Products vendor ARASAN 0x07da Arasan Chip Systems vendor ALLIEDCABLE 0x07e6 Allied Cable vendor STSN 0x07ef STSN +vendor CENTURY 0x07f7 CENTURY Corporation vendor BEWAN 0x07fa Bewan vendor ZOOM 0x0803 Zoom Telephonics vendor BROADLOGIC 0x0827 BroadLogic @@ -486,6 +487,7 @@ vendor AINCOMM 0x12fd Aincomm vendor MOBILITY 0x1342 Mobility vendor DICKSMITH 0x1371 Dick Smith Electronics vendor NETGEAR3 0x1385 Netgear +vendor VALIDITY 0x138a Validity Sensors, Inc. vendor BALTECH 0x13ad Baltech vendor CISCOLINKSYS 0x13b1 Cisco-Linksys vendor SHARK 0x13d2 Shark @@ -550,9 +552,12 @@ vendor HAUPPAUGE2 0x2040 Hauppauge Compu vendor PARA 0x20b8 PARA Industrial vendor TRENDNET 0x20f4 TRENDnet vendor DLINK3 0x2101 D-Link +vendor VIALABS 0x2109 VIA Labs vendor ERICSSON 0x2282 Ericsson vendor MOTOROLA2 0x22b8 Motorola vendor PINNACLE 0x2304 Pinnacle Systems +vendor ARDUINO 0x2341 Arduino SA +vendor TPLINK 0x2357 TP-Link vendor TRIPPLITE 0x2478 Tripp-Lite vendor HIROSE 0x2631 Hirose Electric vendor NHJ 0x2770 NHJ @@ -573,6 +578,7 @@ vendor AVERATEC 0x50c2 Averatec vendor SWEEX 0x5173 Sweex vendor ONSPEC2 0x55aa OnSpec Electronic Inc. vendor ZINWELL 0x5a57 Zinwell +vendor INGENIC 0x601a Ingenic Semiconductor Ltd. vendor SITECOM 0x6189 Sitecom vendor SPRINGERDESIGN 0x6400 Springer Design, Inc. vendor ARKMICROCHIPS 0x6547 ArkMicroChips @@ -585,6 +591,9 @@ vendor MOSCHIP 0x9710 MosChip Semicondu vendor NETGEAR4 0x9846 Netgear vendor xxFTDI 0x9e88 FTDI vendor CACE 0xcace CACE Technologies +vendor COMPARE 0xcdab Compare +vendor DATAAPEX 0xdaae DataApex +vendor EVOLUTION 0xdeee Evolution Robotics vendor EMPIA 0xeb1a eMPIA Technology vendor HP2 0xf003 Hewlett Packard vendor USRP 0xfffe GNU Radio USRP @@ -640,6 +649,7 @@ product ABOCOM XX9 0x4104 XX9 product ABOCOM UFE2000 0x420a UFE2000 USB2.0 Fast Ethernet Adapter product ABOCOM WL54 0x6001 WL54 product ABOCOM RTL8192CU 0x8178 RTL8192CU +product ABOCOM RTL8188EU 0x8179 RTL8188EU product ABOCOM RTL8188CU_1 0x8188 RTL8188CU product ABOCOM RTL8188CU_2 0x8189 RTL8188CU product ABOCOM XX10 0xabc1 XX10
CVS commit: [netbsd-7] src
Module Name:src Committed By: snj Date: Thu Dec 8 07:43:44 UTC 2016 Modified Files: src/distrib/sets/lists/man [netbsd-7]: mi src/lib/libc/stdlib [netbsd-7]: Makefile.inc Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1288): distrib/sets/lists/man/mi: revisions 1.1521, 1.1522 lib/libc/stdlib/Makefile.inc: revision 1.92 Add malloc.conf.5 (link to jemalloc.3). -- Add malloc.conf.0 to fix build with MKCATPAGES To generate a diff of this commit: cvs rdiff -u -r1.1485.2.10 -r1.1485.2.11 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.82.2.2 -r1.82.2.3 src/lib/libc/stdlib/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1485.2.10 src/distrib/sets/lists/man/mi:1.1485.2.11 --- src/distrib/sets/lists/man/mi:1.1485.2.10 Thu Oct 6 05:51:23 2016 +++ src/distrib/sets/lists/man/mi Thu Dec 8 07:43:44 2016 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1485.2.10 2016/10/06 05:51:23 snj Exp $ +# $NetBSD: mi,v 1.1485.2.11 2016/12/08 07:43:44 snj Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2109,6 +2109,7 @@ ./usr/share/man/cat5/magic.0 man-util-catman .cat ./usr/share/man/cat5/mailer.conf.0 man-mailwrapper-catman .cat ./usr/share/man/cat5/man.conf.0 man-man-catman .cat +./usr/share/man/cat5/malloc.conf.0 man-sys-catman .cat ./usr/share/man/cat5/map3270.0 man-obsolete obsolete ./usr/share/man/cat5/master.0 man-postfix-catman postfix,.cat ./usr/share/man/cat5/master.passwd.0 man-sys-catman .cat @@ -5076,6 +5077,7 @@ ./usr/share/man/html5/lvm.conf.html man-lvm-htmlman lvm,html ./usr/share/man/html5/magic.html man-util-htmlman html ./usr/share/man/html5/mailer.conf.html man-mailwrapper-htmlman html +./usr/share/man/html5/malloc.conf.html man-sys-htmlman html ./usr/share/man/html5/man.conf.html man-man-htmlman html ./usr/share/man/html5/map3270.html man-obsolete obsolete ./usr/share/man/html5/master.html man-postfix-htmlman postfix,html @@ -7995,6 +7997,7 @@ ./usr/share/man/man5/lvm.conf.5 man-lvm-man lvm,.man ./usr/share/man/man5/magic.5 man-util-man .man ./usr/share/man/man5/mailer.conf.5 man-mailwrapper-man .man +./usr/share/man/man5/malloc.conf.5 man-sys-man .man ./usr/share/man/man5/man.conf.5 man-man-man .man ./usr/share/man/man5/map3270.5 man-obsolete obsolete ./usr/share/man/man5/master.5 man-postfix-man postfix,.man Index: src/lib/libc/stdlib/Makefile.inc diff -u src/lib/libc/stdlib/Makefile.inc:1.82.2.2 src/lib/libc/stdlib/Makefile.inc:1.82.2.3 --- src/lib/libc/stdlib/Makefile.inc:1.82.2.2 Sat May 16 17:58:46 2015 +++ src/lib/libc/stdlib/Makefile.inc Thu Dec 8 07:43:44 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.82.2.2 2015/05/16 17:58:46 snj Exp $ +# $NetBSD: Makefile.inc,v 1.82.2.3 2016/12/08 07:43:44 snj Exp $ # from: @(#)Makefile.inc 8.3 (Berkeley) 2/4/95 # stdlib sources @@ -69,6 +69,7 @@ MLINKS+=hcreate.3 hdestroy.3 hcreate.3 h MLINKS+=hcreate.3 hcreate_r.3 hcreate.3 hdestroy_r.3 hcreate.3 hsearch_r.3 MLINKS+=hcreate.3 hdestroy1.3 hcreate.3 hdestroy1_r.3 MLINKS+=insque.3 remque.3 +MLINKS+=jemalloc.3 malloc.conf.5 MLINKS+=lsearch.3 lfind.3 MLINKS+=malloc.3 calloc.3 malloc.3 realloc.3 malloc.3 free.3 MLINKS+=qsort.3 heapsort.3 qsort.3 mergesort.3
CVS commit: [netbsd-7] src
Module Name:src Committed By: snj Date: Thu Dec 8 07:43:44 UTC 2016 Modified Files: src/distrib/sets/lists/man [netbsd-7]: mi src/lib/libc/stdlib [netbsd-7]: Makefile.inc Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1288): distrib/sets/lists/man/mi: revisions 1.1521, 1.1522 lib/libc/stdlib/Makefile.inc: revision 1.92 Add malloc.conf.5 (link to jemalloc.3). -- Add malloc.conf.0 to fix build with MKCATPAGES To generate a diff of this commit: cvs rdiff -u -r1.1485.2.10 -r1.1485.2.11 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.82.2.2 -r1.82.2.3 src/lib/libc/stdlib/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/arch/arm/include
Module Name:src Committed By: snj Date: Thu Dec 8 07:41:14 UTC 2016 Modified Files: src/sys/arch/arm/include [netbsd-7]: armreg.h Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1287): sys/arch/arm/include/armreg.h: revision 1.111 Fix CORTEXA9Rx definitions. To generate a diff of this commit: cvs rdiff -u -r1.97.2.1 -r1.97.2.2 src/sys/arch/arm/include/armreg.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/arch/arm/include/armreg.h diff -u src/sys/arch/arm/include/armreg.h:1.97.2.1 src/sys/arch/arm/include/armreg.h:1.97.2.2 --- src/sys/arch/arm/include/armreg.h:1.97.2.1 Sun Nov 9 16:05:25 2014 +++ src/sys/arch/arm/include/armreg.h Thu Dec 8 07:41:14 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: armreg.h,v 1.97.2.1 2014/11/09 16:05:25 martin Exp $ */ +/* $NetBSD: armreg.h,v 1.97.2.2 2016/12/08 07:41:14 snj Exp $ */ /* * Copyright (c) 1998, 2001 Ben Harris @@ -220,9 +220,10 @@ #define CPU_ID_CORTEXA8R1 0x411fc080 #define CPU_ID_CORTEXA8R2 0x412fc080 #define CPU_ID_CORTEXA8R3 0x413fc080 -#define CPU_ID_CORTEXA9R2 0x411fc090 -#define CPU_ID_CORTEXA9R3 0x412fc090 -#define CPU_ID_CORTEXA9R4 0x413fc090 +#define CPU_ID_CORTEXA9R1 0x411fc090 +#define CPU_ID_CORTEXA9R2 0x412fc090 +#define CPU_ID_CORTEXA9R3 0x413fc090 +#define CPU_ID_CORTEXA9R4 0x414fc090 #define CPU_ID_CORTEXA15R2 0x412fc0f0 #define CPU_ID_CORTEXA15R3 0x413fc0f0 #define CPU_ID_CORTEX_P(n) ((n & 0xff0ff000) == 0x410fc000)
CVS commit: [netbsd-7] src/sys/arch/arm/include
Module Name:src Committed By: snj Date: Thu Dec 8 07:41:14 UTC 2016 Modified Files: src/sys/arch/arm/include [netbsd-7]: armreg.h Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1287): sys/arch/arm/include/armreg.h: revision 1.111 Fix CORTEXA9Rx definitions. To generate a diff of this commit: cvs rdiff -u -r1.97.2.1 -r1.97.2.2 src/sys/arch/arm/include/armreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src
Module Name:src
Committed By: snj
Date: Thu Dec 8 07:34:34 UTC 2016
Modified Files:
src/share/man/man4 [netbsd-7]: sdtemp.4
src/sys/dev/i2c [netbsd-7]: sdtemp.c sdtemp_reg.h
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1286):
sys/dev/i2c/sdtemp.c: revisions 1.26-1.32 via patch
sys/dev/i2c/sdtemp_reg.h: revisions 1.8-1.12
share/man/man4/sdtemp.4: revisions1.5-1.6
Changes for sdtemp(4):
- Add support for Atmel AT30TS00, AT30TSE004, Giantec GT30TS00,
GT34TS02, Microchip MCP9804, MCP98244, IDT TS3000GB[02], TS3001GB2,
TSE2004GB2, On Semiconductor CAT34TS02C and CAT34TS04.
- Add JEDEC TSE2004av support. If a device conforms TES2004av, it can
be used without adding new entry into the matching table.
- Check the temperature resolution field in the capability register
instead of the hard coded value in the match table. With this change,
some devices' temperature resolution would be fixed.
- The resolution register is a vendor specific register.
- All of IDT devices have the resolution register.
- The address of the resolution register of Microchip MCP98244 is
different from other Microchip devices.
- Show accuracy, range, resolution, high voltage standoff and shutdown.
- Show timeout with AB_DEBUG.
- Fix dmesg of STTS2004.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.20.1 src/share/man/man4/sdtemp.4
cvs rdiff -u -r1.23.4.1 -r1.23.4.2 src/sys/dev/i2c/sdtemp.c
cvs rdiff -u -r1.7 -r1.7.4.1 src/sys/dev/i2c/sdtemp_reg.h
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/sdtemp.4
diff -u src/share/man/man4/sdtemp.4:1.4 src/share/man/man4/sdtemp.4:1.4.20.1
--- src/share/man/man4/sdtemp.4:1.4 Tue Oct 11 17:53:27 2011
+++ src/share/man/man4/sdtemp.4 Thu Dec 8 07:34:34 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: sdtemp.4,v 1.4 2011/10/11 17:53:27 njoly Exp $
+.\" $NetBSD: sdtemp.4,v 1.4.20.1 2016/12/08 07:34:34 snj Exp $
.\"
.\" Copyright (c) 2008 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd January 8, 2011
+.Dd July 28, 2016
.Dt SDTEMP 4
.Os
.Sh NAME
@@ -49,7 +49,7 @@ driver provides support for the
.Tn Microchip Technology
MCP9805/98242 and other chips that conform to JEDEC Standard 21-C section
4.7.
-Memory module temperature sensors are optional on DDR2 and DDR3 SDRAM DIMMs.
+Memory module temperature sensors are optional on DDR2 and newer DIMMs.
Sensors provided by this driver, including the on-chip thresholds for the
Alarm Window and Critical level, are accessed through the
.Xr envsys 4
@@ -61,32 +61,51 @@ supports temperature ranges from -256 to
.Pp
Chips supported by the
.Nm
-driver include:
+driver include TSE2004av compliant devices and:
.Pp
.Bl -bullet -offset indent
.It
-.Tn Catalyst
-.Em CAT34TS02
+.Tn Analog Devices
+.Em ADT7408
+.It
+.Tn Atmel
+.Em AT30TS00
+and
+.Em AT30TSE004
+.It
+.Tn On semiconductor (Catalyst)
+.Em CAT34TS02 ,
+.Em CAT34TS02C ,
+.Em CAT34TS04
and
.Em CAT6095
.It
-.Tn Analog Devices
-.Em ADT7408
+.Tn Giantec Semiconductor
+.Em GT30TS00
+and
+.Em GT34TS02
.It
.Tn Integrated Deviced Technology
-.Em TSE2002B3
+.Em TSE2002B3 ,
+.Em TSE2002GB2 ,
+.Em TSE2004GB2 ,
+.Em TS3000B3 ,
+.Em TS3000GB0 ,
+.Em TS3000GB2
and
-.Em TSE3000B3
+.Em TS30001GB2
.It
.Tn Maxim
.Em MAX6604
.It
.Tn Microchip Technology
+.Em MCP9804 ,
.Em MCP9805 ,
.Em MCP9843 ,
.Em MCP98242 ,
-and
.Em MCP98243
+and
+.Em MCP98244
.It
.Tn NXP Semiconductors
.Em SE97
@@ -94,9 +113,12 @@ and
.Em SE98
.It
.Tn STmicroelectronics
-.Em STTS424
+.Em STTS424 ,
+.Em STTS424E ,
+.Em STTS2002 ,
+.Em STTS2004
and
-.Em STTS424E
+.Em STTS3000
.El
.Sh SEE ALSO
.Xr envsys 4 ,
Index: src/sys/dev/i2c/sdtemp.c
diff -u src/sys/dev/i2c/sdtemp.c:1.23.4.1 src/sys/dev/i2c/sdtemp.c:1.23.4.2
--- src/sys/dev/i2c/sdtemp.c:1.23.4.1 Sat Mar 21 17:11:35 2015
+++ src/sys/dev/i2c/sdtemp.c Thu Dec 8 07:34:34 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sdtemp.c,v 1.23.4.1 2015/03/21 17:11:35 snj Exp $*/
+/* $NetBSD: sdtemp.c,v 1.23.4.2 2016/12/08 07:34:34 snj Exp $*/
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.23.4.1 2015/03/21 17:11:35 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.23.4.2 2016/12/08 07:34:34 snj Exp $");
#include
#include
@@ -55,6 +55,9 @@ struct sdtemp_softc {
sysmon_envsys_lim_t sc_deflims;
uint32_t sc_defprops;
int sc_resolution;
+ uint16_t sc_mfgid;
+ uint16_t sc_devid;
+ uint16_t sc_devid_masked;
uint16_t sc_capability;
};
@@ -79,12 +82,15 @@ static int sdtemp_write_16(struct sdtemp
static uint32_t sdtemp_decode_temp(struct sdtemp_softc *, uint16_t);
static bool sdtemp_pmf_suspend(device_t, const pmf_qual_t
CVS commit: [netbsd-7] src
Module Name:src Committed By: snj Date: Thu Dec 8 07:34:34 UTC 2016 Modified Files: src/share/man/man4 [netbsd-7]: sdtemp.4 src/sys/dev/i2c [netbsd-7]: sdtemp.c sdtemp_reg.h Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1286): sys/dev/i2c/sdtemp.c: revisions 1.26-1.32 via patch sys/dev/i2c/sdtemp_reg.h: revisions 1.8-1.12 share/man/man4/sdtemp.4: revisions1.5-1.6 Changes for sdtemp(4): - Add support for Atmel AT30TS00, AT30TSE004, Giantec GT30TS00, GT34TS02, Microchip MCP9804, MCP98244, IDT TS3000GB[02], TS3001GB2, TSE2004GB2, On Semiconductor CAT34TS02C and CAT34TS04. - Add JEDEC TSE2004av support. If a device conforms TES2004av, it can be used without adding new entry into the matching table. - Check the temperature resolution field in the capability register instead of the hard coded value in the match table. With this change, some devices' temperature resolution would be fixed. - The resolution register is a vendor specific register. - All of IDT devices have the resolution register. - The address of the resolution register of Microchip MCP98244 is different from other Microchip devices. - Show accuracy, range, resolution, high voltage standoff and shutdown. - Show timeout with AB_DEBUG. - Fix dmesg of STTS2004. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.20.1 src/share/man/man4/sdtemp.4 cvs rdiff -u -r1.23.4.1 -r1.23.4.2 src/sys/dev/i2c/sdtemp.c cvs rdiff -u -r1.7 -r1.7.4.1 src/sys/dev/i2c/sdtemp_reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-localcount] src/share/man/man9
Module Name:src Committed By: pgoyette Date: Thu Dec 8 06:56:21 UTC 2016 Modified Files: src/share/man/man9 [pgoyette-localcount]: localcount.9 Log Message: Minor tweaks. To generate a diff of this commit: cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/share/man/man9/localcount.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-localcount] src/share/man/man9
Module Name:src Committed By: pgoyette Date: Thu Dec 8 06:56:21 UTC 2016 Modified Files: src/share/man/man9 [pgoyette-localcount]: localcount.9 Log Message: Minor tweaks. To generate a diff of this commit: cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/share/man/man9/localcount.9 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/man9/localcount.9 diff -u src/share/man/man9/localcount.9:1.1.2.6 src/share/man/man9/localcount.9:1.1.2.7 --- src/share/man/man9/localcount.9:1.1.2.6 Wed Aug 3 13:11:36 2016 +++ src/share/man/man9/localcount.9 Thu Dec 8 06:56:21 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: localcount.9,v 1.1.2.6 2016/08/03 13:11:36 pgoyette Exp $ +.\" $NetBSD: localcount.9,v 1.1.2.7 2016/12/08 06:56:21 pgoyette Exp $ .\" .\" Copyright (c) 2016 .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd August 2, 2016 +.Dd December 8, 2016 .Dt LOCALCOUNT 9 .Os .Sh NAME @@ -77,11 +77,13 @@ and almost always more than .Pp As a rough heuristic, .Nm -should be used for classes of objects of which there are maybe a few dozen -instances but not a few thousand instances (e.g. autoconf devices, but not +should be used for classes of objects of which there are perhaps a few dozen +instances (such as +.Xr autoconf 9 +devices) but not thousands of instances (such as network flows) and on which there may be a mixture of long-term I/O waits, such as xyzread for a device xyz(4), and short-term fast operations, such as -xyzioctl(IOC_READ_A_CPU_REG). +.Dv xyzioctl(IOC_READ_A_CPU_REG) . .Sh FUNCTIONS .Bl -tag -width abcd .It Fn localcount_init "lc"
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: msaitoh
Date: Thu Dec 8 06:28:21 UTC 2016
Modified Files:
src/sys/arch/x86/x86: procfs_machdep.c
Log Message:
- Remove "pcommit".
- Add "rdt_a".
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/x86/x86/procfs_machdep.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/x86/procfs_machdep.c
diff -u src/sys/arch/x86/x86/procfs_machdep.c:1.13 src/sys/arch/x86/x86/procfs_machdep.c:1.14
--- src/sys/arch/x86/x86/procfs_machdep.c:1.13 Mon Aug 8 09:39:06 2016
+++ src/sys/arch/x86/x86/procfs_machdep.c Thu Dec 8 06:28:21 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_machdep.c,v 1.13 2016/08/08 09:39:06 msaitoh Exp $ */
+/* $NetBSD: procfs_machdep.c,v 1.14 2016/12/08 06:28:21 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.13 2016/08/08 09:39:06 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.14 2016/12/08 06:28:21 msaitoh Exp $");
#include
#include
@@ -125,9 +125,9 @@ static const char * const x86_features[]
{ /* (9) Intel-defined: 0007 ebx */
"fsgsbase", "tsc_adjust", NULL, "bmi1", "hle", "avx2", NULL, "smep",
- "bmi2", "erms", "invpcid", "rtm", "cqm", NULL, "mpx", NULL,
+ "bmi2", "erms", "invpcid", "rtm", "cqm", NULL, "mpx", "rdt_a",
"avx512f", "avx512dq", "rdseed", "adx",
- "smap", NULL, "pcommit", "clflushopt",
+ "smap", NULL, NULL, "clflushopt",
"clwb", NULL, "avx512pf", "avx512er",
"avx512cd", "sha_ni", "avx512bw", "avx512vl"},
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: msaitoh Date: Thu Dec 8 06:28:21 UTC 2016 Modified Files: src/sys/arch/x86/x86: procfs_machdep.c Log Message: - Remove "pcommit". - Add "rdt_a". To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/x86/x86/procfs_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet
Module Name:src Committed By: ozaki-r Date: Thu Dec 8 06:25:43 UTC 2016 Modified Files: src/sys/netinet: ip_input.c Log Message: Use psref for ip_rtaddr ip_rtaddr will be sleepable soon. So use psref instead of pserialize. To generate a diff of this commit: cvs rdiff -u -r1.345 -r1.346 src/sys/netinet/ip_input.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet
Module Name:src
Committed By: ozaki-r
Date: Thu Dec 8 06:25:43 UTC 2016
Modified Files:
src/sys/netinet: ip_input.c
Log Message:
Use psref for ip_rtaddr
ip_rtaddr will be sleepable soon. So use psref instead of pserialize.
To generate a diff of this commit:
cvs rdiff -u -r1.345 -r1.346 src/sys/netinet/ip_input.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/netinet/ip_input.c
diff -u src/sys/netinet/ip_input.c:1.345 src/sys/netinet/ip_input.c:1.346
--- src/sys/netinet/ip_input.c:1.345 Thu Dec 8 05:16:33 2016
+++ src/sys/netinet/ip_input.c Thu Dec 8 06:25:43 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_input.c,v 1.345 2016/12/08 05:16:33 ozaki-r Exp $ */
+/* $NetBSD: ip_input.c,v 1.346 2016/12/08 06:25:43 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.345 2016/12/08 05:16:33 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.346 2016/12/08 06:25:43 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -287,7 +287,7 @@ static void ipintr(void *);
static void ip_input(struct mbuf *);
static void ip_forward(struct mbuf *, int, struct ifnet *);
static bool ip_dooptions(struct mbuf *);
-static struct in_ifaddr *ip_rtaddr(struct in_addr);
+static struct in_ifaddr *ip_rtaddr(struct in_addr, struct psref *);
static void sysctl_net_inet_ip_setup(struct sysctllog **);
static struct in_ifaddr *ip_match_our_address(struct ifnet *, struct ip *,
@@ -943,7 +943,8 @@ ip_dooptions(struct mbuf *m)
* address is on directly accessible net.
*/
case IPOPT_LSRR:
- case IPOPT_SSRR:
+ case IPOPT_SSRR: {
+ struct psref psref;
if (ip_allowsrcrt == 0) {
type = ICMP_UNREACH;
code = ICMP_UNREACH_NET_PROHIB;
@@ -989,34 +990,35 @@ ip_dooptions(struct mbuf *m)
*/
memcpy((void *)_addr, (void *)(cp + off),
sizeof(ipaddr.sin_addr));
- s = pserialize_read_enter();
if (opt == IPOPT_SSRR) {
-ifa = ifa_ifwithladdr(sintosa());
+ifa = ifa_ifwithladdr_psref(sintosa(),
+);
if (ifa != NULL)
ia = ifatoia(ifa);
else
ia = NULL;
} else {
-ia = ip_rtaddr(ipaddr.sin_addr);
+ia = ip_rtaddr(ipaddr.sin_addr, );
}
if (ia == NULL) {
type = ICMP_UNREACH;
code = ICMP_UNREACH_SRCFAIL;
-pserialize_read_exit(s);
goto bad;
}
ip->ip_dst = ipaddr.sin_addr;
bcopy((void *)>ia_addr.sin_addr,
(void *)(cp + off), sizeof(struct in_addr));
- pserialize_read_exit(s);
+ ia4_release(ia, );
cp[IPOPT_OFFSET] += sizeof(struct in_addr);
/*
* Let ip_intr's mcast routing check handle mcast pkts
*/
forward = !IN_MULTICAST(ip->ip_dst.s_addr);
break;
+ }
- case IPOPT_RR:
+ case IPOPT_RR: {
+ struct psref psref;
if (optlen < IPOPT_OFFSET + sizeof(*cp)) {
code = [IPOPT_OLEN] - (u_char *)ip;
goto bad;
@@ -1037,12 +1039,10 @@ ip_dooptions(struct mbuf *m)
* locate outgoing interface; if we're the destination,
* use the incoming interface (should be same).
*/
- s = pserialize_read_enter();
- ifa = ifa_ifwithaddr(sintosa());
+ ifa = ifa_ifwithaddr_psref(sintosa(), );
if (ifa == NULL) {
-ia = ip_rtaddr(ipaddr.sin_addr);
+ia = ip_rtaddr(ipaddr.sin_addr, );
if (ia == NULL) {
- pserialize_read_exit(s);
type = ICMP_UNREACH;
code = ICMP_UNREACH_HOST;
goto bad;
@@ -1052,9 +1052,10 @@ ip_dooptions(struct mbuf *m)
}
bcopy((void *)>ia_addr.sin_addr,
(void *)(cp + off), sizeof(struct in_addr));
- pserialize_read_exit(s);
+ ia4_release(ia, );
cp[IPOPT_OFFSET] += sizeof(struct in_addr);
break;
+ }
case IPOPT_TS:
code = cp - (u_char *)ip;
@@ -1172,7 +1173,7 @@ bad:
* return internet address info of interface to be used to get there.
*/
static struct in_ifaddr *
-ip_rtaddr(struct in_addr dst)
+ip_rtaddr(struct in_addr dst, struct psref *psref)
{
struct rtentry *rt;
union {
@@ -1190,6 +1191,7 @@ ip_rtaddr(struct in_addr dst)
return NULL;
}
+ ia4_acquire(ifatoia(rt->rt_ifa), psref);
rtcache_unref(rt, ro);
percpu_putref(ipforward_rt_percpu);
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Thu Dec 8 06:11:03 UTC 2016 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: Add CLWB bit. To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/sys/arch/x86/include/specialreg.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/arch/x86/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.90 src/sys/arch/x86/include/specialreg.h:1.91 --- src/sys/arch/x86/include/specialreg.h:1.90 Mon Dec 5 03:59:47 2016 +++ src/sys/arch/x86/include/specialreg.h Thu Dec 8 06:11:03 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.90 2016/12/05 03:59:47 msaitoh Exp $ */ +/* $NetBSD: specialreg.h,v 1.91 2016/12/08 06:11:03 msaitoh Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -340,6 +340,7 @@ #define CPUID_SEF_ADX __BIT(19) #define CPUID_SEF_SMAP __BIT(20) #define CPUID_SEF_CLFLUSHOPT __BIT(23) +#define CPUID_SEF_CLWB __BIT(24) #define CPUID_SEF_PT __BIT(25) #define CPUID_SEF_AVX512PF __BIT(26) #define CPUID_SEF_AVX512ER __BIT(27) @@ -355,7 +356,7 @@ "\15" "QM" "\16" "FPUCSDS" "\17" "MPX" "\20" "PQE" \ "\21" "AVX512F" "\22" "AVX512DQ" "\23" "RDSEED" "\24" "ADX" \ "\25" "SMAP" "\30" "CLFLUSHOPT" \ - "\32" "PT" "\33" "AVX512PF" "\34" "AVX512ER" \ + "\31" "CLWB" "\32" "PT" "\33" "AVX512PF" "\34" "AVX512ER" \ "\35" "AVX512CD""\36" "SHA" "\37" "AVX512BW" "\40" "AVX512VL" /* %ecx */
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Thu Dec 8 06:11:03 UTC 2016 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: Add CLWB bit. To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/sys/arch/x86/include/specialreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: ozaki-r
Date: Thu Dec 8 05:16:34 UTC 2016
Modified Files:
src/sys/dist/pf/net: pf.c
src/sys/external/bsd/ipf/netinet: ip_fil_netbsd.c
src/sys/net: if_stf.c route.h
src/sys/netatalk: ddp_input.c ddp_output.c ddp_usrreq.c
src/sys/netinet: in.c in_gif.c in_pcb.c in_pcb.h ip_etherip.c ip_flow.c
ip_input.c ip_output.c ip_var.h sctp_output.c sctp_pcb.c
sctp_timer.c tcp_input.c tcp_output.c tcp_subr.c
src/sys/netinet6: frag6.c in6_gif.c in6_pcb.c in6_pcb.h in6_src.c
ip6_etherip.c ip6_flow.c ip6_forward.c ip6_input.c ip6_output.c
ip6_var.h
src/sys/netipsec: ipsec.c
Log Message:
Add rtcache_unref to release points of rtentry stemming from rtcache
In the MP-safe world, a rtentry stemming from a rtcache can be freed at any
points. So we need to protect rtentries somehow say by reference couting or
passive references. Regardless of the method, we need to call some release
function of a rtentry after using it.
The change adds a new function rtcache_unref to release a rtentry. At this
point, this function does nothing because for now we don't add a reference
to a rtentry when we get one from a rtcache. We will add something useful
in a further commit.
This change is a part of changes for MP-safe routing table. It is separated
to avoid one big change that makes difficult to debug by bisecting.
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/dist/pf/net/pf.c
cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c
cvs rdiff -u -r1.99 -r1.100 src/sys/net/if_stf.c
cvs rdiff -u -r1.107 -r1.108 src/sys/net/route.h
cvs rdiff -u -r1.28 -r1.29 src/sys/netatalk/ddp_input.c
cvs rdiff -u -r1.19 -r1.20 src/sys/netatalk/ddp_output.c
cvs rdiff -u -r1.69 -r1.70 src/sys/netatalk/ddp_usrreq.c
cvs rdiff -u -r1.189 -r1.190 src/sys/netinet/in.c
cvs rdiff -u -r1.83 -r1.84 src/sys/netinet/in_gif.c
cvs rdiff -u -r1.170 -r1.171 src/sys/netinet/in_pcb.c
cvs rdiff -u -r1.60 -r1.61 src/sys/netinet/in_pcb.h
cvs rdiff -u -r1.17 -r1.18 src/sys/netinet/ip_etherip.c
cvs rdiff -u -r1.77 -r1.78 src/sys/netinet/ip_flow.c
cvs rdiff -u -r1.344 -r1.345 src/sys/netinet/ip_input.c
cvs rdiff -u -r1.263 -r1.264 src/sys/netinet/ip_output.c
cvs rdiff -u -r1.115 -r1.116 src/sys/netinet/ip_var.h
cvs rdiff -u -r1.7 -r1.8 src/sys/netinet/sctp_output.c \
src/sys/netinet/sctp_pcb.c
cvs rdiff -u -r1.2 -r1.3 src/sys/netinet/sctp_timer.c
cvs rdiff -u -r1.349 -r1.350 src/sys/netinet/tcp_input.c
cvs rdiff -u -r1.186 -r1.187 src/sys/netinet/tcp_output.c
cvs rdiff -u -r1.267 -r1.268 src/sys/netinet/tcp_subr.c
cvs rdiff -u -r1.57 -r1.58 src/sys/netinet6/frag6.c
cvs rdiff -u -r1.79 -r1.80 src/sys/netinet6/in6_gif.c
cvs rdiff -u -r1.152 -r1.153 src/sys/netinet6/in6_pcb.c
cvs rdiff -u -r1.46 -r1.47 src/sys/netinet6/in6_pcb.h
cvs rdiff -u -r1.75 -r1.76 src/sys/netinet6/in6_src.c
cvs rdiff -u -r1.18 -r1.19 src/sys/netinet6/ip6_etherip.c
cvs rdiff -u -r1.32 -r1.33 src/sys/netinet6/ip6_flow.c
cvs rdiff -u -r1.81 -r1.82 src/sys/netinet6/ip6_forward.c
cvs rdiff -u -r1.170 -r1.171 src/sys/netinet6/ip6_input.c
cvs rdiff -u -r1.178 -r1.179 src/sys/netinet6/ip6_output.c
cvs rdiff -u -r1.70 -r1.71 src/sys/netinet6/ip6_var.h
cvs rdiff -u -r1.66 -r1.67 src/sys/netipsec/ipsec.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/dist/pf/net/pf.c
diff -u src/sys/dist/pf/net/pf.c:1.74 src/sys/dist/pf/net/pf.c:1.75
--- src/sys/dist/pf/net/pf.c:1.74 Mon Jun 20 06:46:37 2016
+++ src/sys/dist/pf/net/pf.c Thu Dec 8 05:16:33 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pf.c,v 1.74 2016/06/20 06:46:37 knakahara Exp $ */
+/* $NetBSD: pf.c,v 1.75 2016/12/08 05:16:33 ozaki-r Exp $ */
/* $OpenBSD: pf.c,v 1.552.2.1 2007/11/27 16:37:57 henning Exp $ */
/*
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pf.c,v 1.74 2016/06/20 06:46:37 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pf.c,v 1.75 2016/12/08 05:16:33 ozaki-r Exp $");
#include "pflog.h"
@@ -2980,6 +2980,7 @@ pf_calc_mss(struct pf_addr *addr, sa_fam
if ((rt = rtcache_init_noclone(rop)) != NULL) {
mss = rt->rt_ifp->if_mtu - hlen - sizeof(struct tcphdr);
mss = max(tcp_mssdflt, mss);
+ rtcache_unref(rt, rop);
}
rtcache_free(rop);
#endif
@@ -5068,6 +5069,7 @@ pf_routable(struct pf_addr *addr, sa_fam
} u;
struct route ro;
int ret = 1;
+ struct rtentry *rt;
bzero(, sizeof(ro));
switch (af) {
@@ -5084,7 +5086,10 @@ pf_routable(struct pf_addr *addr, sa_fam
}
rtcache_setdst(, );
- ret = rtcache_init() != NULL ? 1 : 0;
+ rt = rtcache_init();
+ ret = rt != NULL ? 1 : 0;
+ if (rt != NULL)
+ rtcache_unref(rt, );
rtcache_free();
return (ret);
@@ -5300,6 +5305,7 @@ pf_route(struct mbuf **m, struct pf_rule
if (rt->rt_flags & RTF_GATEWAY)
dst = rt->rt_gateway;
+ rtcache_unref(rt, ro); /* FIXME dst is
CVS commit: src/sys
Module Name:src Committed By: ozaki-r Date: Thu Dec 8 05:16:34 UTC 2016 Modified Files: src/sys/dist/pf/net: pf.c src/sys/external/bsd/ipf/netinet: ip_fil_netbsd.c src/sys/net: if_stf.c route.h src/sys/netatalk: ddp_input.c ddp_output.c ddp_usrreq.c src/sys/netinet: in.c in_gif.c in_pcb.c in_pcb.h ip_etherip.c ip_flow.c ip_input.c ip_output.c ip_var.h sctp_output.c sctp_pcb.c sctp_timer.c tcp_input.c tcp_output.c tcp_subr.c src/sys/netinet6: frag6.c in6_gif.c in6_pcb.c in6_pcb.h in6_src.c ip6_etherip.c ip6_flow.c ip6_forward.c ip6_input.c ip6_output.c ip6_var.h src/sys/netipsec: ipsec.c Log Message: Add rtcache_unref to release points of rtentry stemming from rtcache In the MP-safe world, a rtentry stemming from a rtcache can be freed at any points. So we need to protect rtentries somehow say by reference couting or passive references. Regardless of the method, we need to call some release function of a rtentry after using it. The change adds a new function rtcache_unref to release a rtentry. At this point, this function does nothing because for now we don't add a reference to a rtentry when we get one from a rtcache. We will add something useful in a further commit. This change is a part of changes for MP-safe routing table. It is separated to avoid one big change that makes difficult to debug by bisecting. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/sys/dist/pf/net/pf.c cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c cvs rdiff -u -r1.99 -r1.100 src/sys/net/if_stf.c cvs rdiff -u -r1.107 -r1.108 src/sys/net/route.h cvs rdiff -u -r1.28 -r1.29 src/sys/netatalk/ddp_input.c cvs rdiff -u -r1.19 -r1.20 src/sys/netatalk/ddp_output.c cvs rdiff -u -r1.69 -r1.70 src/sys/netatalk/ddp_usrreq.c cvs rdiff -u -r1.189 -r1.190 src/sys/netinet/in.c cvs rdiff -u -r1.83 -r1.84 src/sys/netinet/in_gif.c cvs rdiff -u -r1.170 -r1.171 src/sys/netinet/in_pcb.c cvs rdiff -u -r1.60 -r1.61 src/sys/netinet/in_pcb.h cvs rdiff -u -r1.17 -r1.18 src/sys/netinet/ip_etherip.c cvs rdiff -u -r1.77 -r1.78 src/sys/netinet/ip_flow.c cvs rdiff -u -r1.344 -r1.345 src/sys/netinet/ip_input.c cvs rdiff -u -r1.263 -r1.264 src/sys/netinet/ip_output.c cvs rdiff -u -r1.115 -r1.116 src/sys/netinet/ip_var.h cvs rdiff -u -r1.7 -r1.8 src/sys/netinet/sctp_output.c \ src/sys/netinet/sctp_pcb.c cvs rdiff -u -r1.2 -r1.3 src/sys/netinet/sctp_timer.c cvs rdiff -u -r1.349 -r1.350 src/sys/netinet/tcp_input.c cvs rdiff -u -r1.186 -r1.187 src/sys/netinet/tcp_output.c cvs rdiff -u -r1.267 -r1.268 src/sys/netinet/tcp_subr.c cvs rdiff -u -r1.57 -r1.58 src/sys/netinet6/frag6.c cvs rdiff -u -r1.79 -r1.80 src/sys/netinet6/in6_gif.c cvs rdiff -u -r1.152 -r1.153 src/sys/netinet6/in6_pcb.c cvs rdiff -u -r1.46 -r1.47 src/sys/netinet6/in6_pcb.h cvs rdiff -u -r1.75 -r1.76 src/sys/netinet6/in6_src.c cvs rdiff -u -r1.18 -r1.19 src/sys/netinet6/ip6_etherip.c cvs rdiff -u -r1.32 -r1.33 src/sys/netinet6/ip6_flow.c cvs rdiff -u -r1.81 -r1.82 src/sys/netinet6/ip6_forward.c cvs rdiff -u -r1.170 -r1.171 src/sys/netinet6/ip6_input.c cvs rdiff -u -r1.178 -r1.179 src/sys/netinet6/ip6_output.c cvs rdiff -u -r1.70 -r1.71 src/sys/netinet6/ip6_var.h cvs rdiff -u -r1.66 -r1.67 src/sys/netipsec/ipsec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Thu Dec 8 03:25:35 UTC 2016 Modified Files: src/share/mk: bsd.obj.mk Log Message: factor out expression. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/share/mk/bsd.obj.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Thu Dec 8 03:25:35 UTC 2016
Modified Files:
src/share/mk: bsd.obj.mk
Log Message:
factor out expression.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/share/mk/bsd.obj.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.obj.mk
diff -u src/share/mk/bsd.obj.mk:1.49 src/share/mk/bsd.obj.mk:1.50
--- src/share/mk/bsd.obj.mk:1.49 Sun Jan 24 19:43:00 2010
+++ src/share/mk/bsd.obj.mk Wed Dec 7 22:25:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.obj.mk,v 1.49 2010/01/25 00:43:00 christos Exp $
+# $NetBSD: bsd.obj.mk,v 1.50 2016/12/08 03:25:35 christos Exp $
.if !defined(_BSD_OBJ_MK_)
_BSD_OBJ_MK_=1
@@ -37,10 +37,11 @@ obj:
.else
PAWD?= /bin/pwd
-__objdir= obj${OBJMACHINE:D.${MACHINE}}
+__objdirsuffix= ${OBJMACHINE:D.${MACHINE}}
+__objdir= obj${__objdirsuffix}
__usrobjdir= ${BSDOBJDIR}${USR_OBJMACHINE:D.${MACHINE}}
-__usrobjdirpf= ${USR_OBJMACHINE:D:U${OBJMACHINE:D.${MACHINE}}}
+__usrobjdirpf= ${USR_OBJMACHINE:D:U${__objdirsuffix}}
.if defined(BUILDID)
__objdir:= ${__objdir}.${BUILDID}
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Thu Dec 8 03:22:36 UTC 2016
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
move sh3 to new binutils
To generate a diff of this commit:
cvs rdiff -u -r1.993 -r1.994 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.993 src/share/mk/bsd.own.mk:1.994
--- src/share/mk/bsd.own.mk:1.993 Sat Dec 3 11:02:10 2016
+++ src/share/mk/bsd.own.mk Wed Dec 7 22:22:36 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.993 2016/12/03 16:02:10 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.994 2016/12/08 03:22:36 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -150,6 +150,7 @@ EXTERNAL_GDB_SUBDIR= /does/not/exist
${MACHINE_CPU} == "m68k" || \
${MACHINE_ARCH} == "mips64el" || \
${MACHINE_ARCH} == "mips64eb" || \
+${MACHINE_CPU} == "sh3" || \
${MACHINE} == "sparc" || \
${MACHINE} == "sparc64" || \
${MACHINE_ARCH} == "x86_64" || \
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Thu Dec 8 03:22:36 UTC 2016 Modified Files: src/share/mk: bsd.own.mk Log Message: move sh3 to new binutils To generate a diff of this commit: cvs rdiff -u -r1.993 -r1.994 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: ozaki-r Date: Thu Dec 8 01:12:01 UTC 2016 Modified Files: src/sys/arch/arm/omap: if_cpsw.c src/sys/arch/emips/ebus: if_le_ebus.c src/sys/arch/macppc/dev: if_bm.c if_gm.c src/sys/arch/mips/adm5120/dev: if_admsw.c src/sys/arch/mips/alchemy/dev: if_aumac.c src/sys/arch/mips/atheros/dev: if_ae.c src/sys/arch/playstation2/dev: if_smap.c src/sys/arch/powerpc/ibm4xx/dev: if_emac.c src/sys/arch/sgimips/hpc: if_sq.c src/sys/arch/sgimips/mace: if_mec.c src/sys/arch/sun2/dev: if_ec.c src/sys/arch/x86/pci: if_vmx.c src/sys/dev/marvell: if_mvgbe.c if_mvxpe.c src/sys/dev/pci: if_age.c if_alc.c if_bce.c if_bge.c if_bnx.c if_cas.c if_de.c if_dge.c if_et.c if_ipw.c if_iwi.c if_iwm.c if_iwn.c if_lii.c if_msk.c if_nfe.c if_pcn.c if_rtwn.c if_sip.c if_sk.c if_ste.c if_stge.c if_ti.c if_txp.c if_vge.c if_vioif.c if_vr.c if_wm.c if_wpi.c if_xge.c src/sys/dev/pcmcia: if_cnw.c if_malo_pcmcia.c if_xi.c Log Message: Apply deferred if_start framework if_schedule_deferred_start checks if the if_snd queue contains packets, so drivers don't need to check it by themselves. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/omap/if_cpsw.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/emips/ebus/if_le_ebus.c cvs rdiff -u -r1.51 -r1.52 src/sys/arch/macppc/dev/if_bm.c cvs rdiff -u -r1.47 -r1.48 src/sys/arch/macppc/dev/if_gm.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mips/adm5120/dev/if_admsw.c cvs rdiff -u -r1.41 -r1.42 src/sys/arch/mips/alchemy/dev/if_aumac.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/mips/atheros/dev/if_ae.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/playstation2/dev/if_smap.c cvs rdiff -u -r1.45 -r1.46 src/sys/arch/powerpc/ibm4xx/dev/if_emac.c cvs rdiff -u -r1.46 -r1.47 src/sys/arch/sgimips/hpc/if_sq.c cvs rdiff -u -r1.53 -r1.54 src/sys/arch/sgimips/mace/if_mec.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sun2/dev/if_ec.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/x86/pci/if_vmx.c cvs rdiff -u -r1.45 -r1.46 src/sys/dev/marvell/if_mvgbe.c cvs rdiff -u -r1.15 -r1.16 src/sys/dev/marvell/if_mvxpe.c cvs rdiff -u -r1.48 -r1.49 src/sys/dev/pci/if_age.c src/sys/dev/pci/if_ste.c cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pci/if_alc.c cvs rdiff -u -r1.42 -r1.43 src/sys/dev/pci/if_bce.c cvs rdiff -u -r1.298 -r1.299 src/sys/dev/pci/if_bge.c cvs rdiff -u -r1.59 -r1.60 src/sys/dev/pci/if_bnx.c cvs rdiff -u -r1.24 -r1.25 src/sys/dev/pci/if_cas.c cvs rdiff -u -r1.147 -r1.148 src/sys/dev/pci/if_de.c cvs rdiff -u -r1.45 -r1.46 src/sys/dev/pci/if_dge.c src/sys/dev/pci/if_txp.c cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/if_et.c cvs rdiff -u -r1.60 -r1.61 src/sys/dev/pci/if_ipw.c src/sys/dev/pci/if_stge.c cvs rdiff -u -r1.100 -r1.101 src/sys/dev/pci/if_iwi.c cvs rdiff -u -r1.43 -r1.44 src/sys/dev/pci/if_iwm.c cvs rdiff -u -r1.80 -r1.81 src/sys/dev/pci/if_iwn.c cvs rdiff -u -r1.15 -r1.16 src/sys/dev/pci/if_lii.c cvs rdiff -u -r1.52 -r1.53 src/sys/dev/pci/if_msk.c cvs rdiff -u -r1.61 -r1.62 src/sys/dev/pci/if_nfe.c cvs rdiff -u -r1.62 -r1.63 src/sys/dev/pci/if_pcn.c cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/if_rtwn.c cvs rdiff -u -r1.163 -r1.164 src/sys/dev/pci/if_sip.c cvs rdiff -u -r1.82 -r1.83 src/sys/dev/pci/if_sk.c cvs rdiff -u -r1.99 -r1.100 src/sys/dev/pci/if_ti.c cvs rdiff -u -r1.58 -r1.59 src/sys/dev/pci/if_vge.c cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/if_vioif.c cvs rdiff -u -r1.119 -r1.120 src/sys/dev/pci/if_vr.c cvs rdiff -u -r1.455 -r1.456 src/sys/dev/pci/if_wm.c cvs rdiff -u -r1.74 -r1.75 src/sys/dev/pci/if_wpi.c cvs rdiff -u -r1.23 -r1.24 src/sys/dev/pci/if_xge.c cvs rdiff -u -r1.59 -r1.60 src/sys/dev/pcmcia/if_cnw.c cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pcmcia/if_malo_pcmcia.c cvs rdiff -u -r1.78 -r1.79 src/sys/dev/pcmcia/if_xi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: ozaki-r Date: Thu Dec 8 01:12:01 UTC 2016 Modified Files: src/sys/arch/arm/omap: if_cpsw.c src/sys/arch/emips/ebus: if_le_ebus.c src/sys/arch/macppc/dev: if_bm.c if_gm.c src/sys/arch/mips/adm5120/dev: if_admsw.c src/sys/arch/mips/alchemy/dev: if_aumac.c src/sys/arch/mips/atheros/dev: if_ae.c src/sys/arch/playstation2/dev: if_smap.c src/sys/arch/powerpc/ibm4xx/dev: if_emac.c src/sys/arch/sgimips/hpc: if_sq.c src/sys/arch/sgimips/mace: if_mec.c src/sys/arch/sun2/dev: if_ec.c src/sys/arch/x86/pci: if_vmx.c src/sys/dev/marvell: if_mvgbe.c if_mvxpe.c src/sys/dev/pci: if_age.c if_alc.c if_bce.c if_bge.c if_bnx.c if_cas.c if_de.c if_dge.c if_et.c if_ipw.c if_iwi.c if_iwm.c if_iwn.c if_lii.c if_msk.c if_nfe.c if_pcn.c if_rtwn.c if_sip.c if_sk.c if_ste.c if_stge.c if_ti.c if_txp.c if_vge.c if_vioif.c if_vr.c if_wm.c if_wpi.c if_xge.c src/sys/dev/pcmcia: if_cnw.c if_malo_pcmcia.c if_xi.c Log Message: Apply deferred if_start framework if_schedule_deferred_start checks if the if_snd queue contains packets, so drivers don't need to check it by themselves. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/omap/if_cpsw.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/emips/ebus/if_le_ebus.c cvs rdiff -u -r1.51 -r1.52 src/sys/arch/macppc/dev/if_bm.c cvs rdiff -u -r1.47 -r1.48 src/sys/arch/macppc/dev/if_gm.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mips/adm5120/dev/if_admsw.c cvs rdiff -u -r1.41 -r1.42 src/sys/arch/mips/alchemy/dev/if_aumac.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/mips/atheros/dev/if_ae.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/playstation2/dev/if_smap.c cvs rdiff -u -r1.45 -r1.46 src/sys/arch/powerpc/ibm4xx/dev/if_emac.c cvs rdiff -u -r1.46 -r1.47 src/sys/arch/sgimips/hpc/if_sq.c cvs rdiff -u -r1.53 -r1.54 src/sys/arch/sgimips/mace/if_mec.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sun2/dev/if_ec.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/x86/pci/if_vmx.c cvs rdiff -u -r1.45 -r1.46 src/sys/dev/marvell/if_mvgbe.c cvs rdiff -u -r1.15 -r1.16 src/sys/dev/marvell/if_mvxpe.c cvs rdiff -u -r1.48 -r1.49 src/sys/dev/pci/if_age.c src/sys/dev/pci/if_ste.c cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pci/if_alc.c cvs rdiff -u -r1.42 -r1.43 src/sys/dev/pci/if_bce.c cvs rdiff -u -r1.298 -r1.299 src/sys/dev/pci/if_bge.c cvs rdiff -u -r1.59 -r1.60 src/sys/dev/pci/if_bnx.c cvs rdiff -u -r1.24 -r1.25 src/sys/dev/pci/if_cas.c cvs rdiff -u -r1.147 -r1.148 src/sys/dev/pci/if_de.c cvs rdiff -u -r1.45 -r1.46 src/sys/dev/pci/if_dge.c src/sys/dev/pci/if_txp.c cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/if_et.c cvs rdiff -u -r1.60 -r1.61 src/sys/dev/pci/if_ipw.c src/sys/dev/pci/if_stge.c cvs rdiff -u -r1.100 -r1.101 src/sys/dev/pci/if_iwi.c cvs rdiff -u -r1.43 -r1.44 src/sys/dev/pci/if_iwm.c cvs rdiff -u -r1.80 -r1.81 src/sys/dev/pci/if_iwn.c cvs rdiff -u -r1.15 -r1.16 src/sys/dev/pci/if_lii.c cvs rdiff -u -r1.52 -r1.53 src/sys/dev/pci/if_msk.c cvs rdiff -u -r1.61 -r1.62 src/sys/dev/pci/if_nfe.c cvs rdiff -u -r1.62 -r1.63 src/sys/dev/pci/if_pcn.c cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/if_rtwn.c cvs rdiff -u -r1.163 -r1.164 src/sys/dev/pci/if_sip.c cvs rdiff -u -r1.82 -r1.83 src/sys/dev/pci/if_sk.c cvs rdiff -u -r1.99 -r1.100 src/sys/dev/pci/if_ti.c cvs rdiff -u -r1.58 -r1.59 src/sys/dev/pci/if_vge.c cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/if_vioif.c cvs rdiff -u -r1.119 -r1.120 src/sys/dev/pci/if_vr.c cvs rdiff -u -r1.455 -r1.456 src/sys/dev/pci/if_wm.c cvs rdiff -u -r1.74 -r1.75 src/sys/dev/pci/if_wpi.c cvs rdiff -u -r1.23 -r1.24 src/sys/dev/pci/if_xge.c cvs rdiff -u -r1.59 -r1.60 src/sys/dev/pcmcia/if_cnw.c cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pcmcia/if_malo_pcmcia.c cvs rdiff -u -r1.78 -r1.79 src/sys/dev/pcmcia/if_xi.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/arm/omap/if_cpsw.c diff -u src/sys/arch/arm/omap/if_cpsw.c:1.16 src/sys/arch/arm/omap/if_cpsw.c:1.17 --- src/sys/arch/arm/omap/if_cpsw.c:1.16 Thu Aug 4 14:08:23 2016 +++ src/sys/arch/arm/omap/if_cpsw.c Thu Dec 8 01:12:00 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: if_cpsw.c,v 1.16 2016/08/04 14:08:23 kiyohara Exp $ */ +/* $NetBSD: if_cpsw.c,v 1.17 2016/12/08 01:12:00 ozaki-r Exp $ */ /* * Copyright (c) 2013 Jonathan A. Kollasch @@ -53,7 +53,7 @@ */ #include -__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.16 2016/08/04 14:08:23 kiyohara Exp $"); +__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.17 2016/12/08 01:12:00 ozaki-r Exp $"); #include #include @@ -572,6 +572,7 @@ cpsw_attach(device_t parent, device_t se } if_attach(ifp); + if_deferred_start_init(ifp, NULL); ether_ifattach(ifp, sc->sc_enaddr); /* The attach is successful. */ @@ -1303,7 +1304,7 @@ next: ifp->if_timer = 0; if (handled) - cpsw_start(ifp); +
CVS commit: src/sys/net
Module Name:src Committed By: ozaki-r Date: Thu Dec 8 01:06:35 UTC 2016 Modified Files: src/sys/net: if.c if.h Log Message: Introduce deferred if_start framework The framework provides a means to schedule if_start that will be executed in softint later. It intends to be used to avoid calling if_start, especially bpf_mtap, in hardware interrupt. It adds a dedicated softint to a driver if the driver requests to use the framework via if_deferred_start_init. The driver can schedule deferred if_start by if_schedule_deferred_start. Proposed and discussed on tech-kern and tech-net To generate a diff of this commit: cvs rdiff -u -r1.363 -r1.364 src/sys/net/if.c cvs rdiff -u -r1.229 -r1.230 src/sys/net/if.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src
Committed By: ozaki-r
Date: Thu Dec 8 01:06:35 UTC 2016
Modified Files:
src/sys/net: if.c if.h
Log Message:
Introduce deferred if_start framework
The framework provides a means to schedule if_start that will be executed
in softint later. It intends to be used to avoid calling if_start,
especially bpf_mtap, in hardware interrupt.
It adds a dedicated softint to a driver if the driver requests to use the
framework via if_deferred_start_init. The driver can schedule deferred
if_start by if_schedule_deferred_start.
Proposed and discussed on tech-kern and tech-net
To generate a diff of this commit:
cvs rdiff -u -r1.363 -r1.364 src/sys/net/if.c
cvs rdiff -u -r1.229 -r1.230 src/sys/net/if.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/net/if.c
diff -u src/sys/net/if.c:1.363 src/sys/net/if.c:1.364
--- src/sys/net/if.c:1.363 Tue Dec 6 01:23:01 2016
+++ src/sys/net/if.c Thu Dec 8 01:06:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.363 2016/12/06 01:23:01 ozaki-r Exp $ */
+/* $NetBSD: if.c,v 1.364 2016/12/08 01:06:35 ozaki-r Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.363 2016/12/06 01:23:01 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.364 2016/12/08 01:06:35 ozaki-r Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -223,6 +223,16 @@ static int sysctl_percpuq_drops_handler(
static void sysctl_percpuq_setup(struct sysctllog **, const char *,
struct if_percpuq *);
+struct if_deferred_start {
+ struct ifnet *ids_ifp;
+ void (*ids_if_start)(struct ifnet *);
+ void *ids_si;
+};
+
+static void if_deferred_start_softint(void *);
+static void if_deferred_start_common(struct ifnet *);
+static void if_deferred_start_destroy(struct ifnet *);
+
#if defined(INET) || defined(INET6)
static void sysctl_net_pktq_setup(struct sysctllog **, int);
#endif
@@ -953,6 +963,99 @@ bad:
return;
}
+/*
+ * The deferred if_start framework
+ *
+ * The common APIs to defer if_start to softint when if_start is requested
+ * from a device driver running in hardware interrupt context.
+ */
+/*
+ * Call ifp->if_start (or equivalent) in a dedicated softint for
+ * deferred if_start.
+ */
+static void
+if_deferred_start_softint(void *arg)
+{
+ struct if_deferred_start *ids = arg;
+ struct ifnet *ifp = ids->ids_ifp;
+
+#ifdef DEBUG
+ log(LOG_DEBUG, "%s: deferred start on %s\n", __func__,
+ ifp->if_xname);
+#endif
+
+ ids->ids_if_start(ifp);
+}
+
+/*
+ * The default callback function for deferred if_start.
+ */
+static void
+if_deferred_start_common(struct ifnet *ifp)
+{
+
+ if_start_lock(ifp);
+}
+
+static inline bool
+if_snd_is_used(struct ifnet *ifp)
+{
+
+ return ifp->if_transmit == NULL || ifp->if_transmit == if_nulltransmit ||
+ ALTQ_IS_ENABLED(>if_snd);
+}
+
+/*
+ * Schedule deferred if_start.
+ */
+void
+if_schedule_deferred_start(struct ifnet *ifp)
+{
+
+ KASSERT(ifp->if_deferred_start != NULL);
+
+ if (if_snd_is_used(ifp) && IFQ_IS_EMPTY(>if_snd))
+ return;
+
+ softint_schedule(ifp->if_deferred_start->ids_si);
+}
+
+/*
+ * Create an instance of deferred if_start. A driver should call the function
+ * only if the driver needs deferred if_start. Drivers can setup their own
+ * deferred if_start function via 2nd argument.
+ */
+void
+if_deferred_start_init(struct ifnet *ifp, void (*func)(struct ifnet *))
+{
+ struct if_deferred_start *ids;
+
+ ids = kmem_zalloc(sizeof(*ids), KM_SLEEP);
+ if (ids == NULL)
+ panic("kmem_zalloc failed");
+
+ ids->ids_ifp = ifp;
+ ids->ids_si = softint_establish(SOFTINT_NET|SOFTINT_MPSAFE,
+ if_deferred_start_softint, ids);
+ if (func != NULL)
+ ids->ids_if_start = func;
+ else
+ ids->ids_if_start = if_deferred_start_common;
+
+ ifp->if_deferred_start = ids;
+}
+
+static void
+if_deferred_start_destroy(struct ifnet *ifp)
+{
+
+ if (ifp->if_deferred_start == NULL)
+ return;
+
+ softint_disestablish(ifp->if_deferred_start->ids_si);
+ kmem_free(ifp->if_deferred_start, sizeof(*ifp->if_deferred_start));
+ ifp->if_deferred_start = NULL;
+}
/*
* The common interface input routine that is called by device drivers,
@@ -1194,6 +1297,7 @@ if_detach(struct ifnet *ifp)
callout_destroy(ifp->if_slowtimo_ch);
kmem_free(ifp->if_slowtimo_ch, sizeof(*ifp->if_slowtimo_ch));
}
+ if_deferred_start_destroy(ifp);
/*
* Do an if_down() to give protocols a chance to do something.
Index: src/sys/net/if.h
diff -u src/sys/net/if.h:1.229 src/sys/net/if.h:1.230
--- src/sys/net/if.h:1.229 Tue Nov 22 02:06:00 2016
+++ src/sys/net/if.h Thu Dec 8 01:06:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if.h,v 1.229 2016/11/22 02:06:00 ozaki-r Exp $ */
+/* $NetBSD: if.h,v 1.230 2016/12/08 01:06:35 ozaki-r Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -230,6 +230,7 @@ struct bridge_iflist;
struct
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Thu Dec 8 00:15:50 UTC 2016 Modified Files: src/doc [netbsd-7]: CHANGES-7.1 Log Message: 1285 To generate a diff of this commit: cvs rdiff -u -r1.1.2.124 -r1.1.2.125 src/doc/CHANGES-7.1 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-7.1 diff -u src/doc/CHANGES-7.1:1.1.2.124 src/doc/CHANGES-7.1:1.1.2.125 --- src/doc/CHANGES-7.1:1.1.2.124 Tue Dec 6 06:58:05 2016 +++ src/doc/CHANGES-7.1 Thu Dec 8 00:15:50 2016 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.1,v 1.1.2.124 2016/12/06 06:58:05 snj Exp $ +# $NetBSD: CHANGES-7.1,v 1.1.2.125 2016/12/08 00:15:50 snj Exp $ A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1 release: @@ -6978,3 +6978,15 @@ sys/arch/dreamcast/dev/pvr.c 1.36 a junk function pointer. [tsutsui, ticket #1284] +sys/arch/x86/include/cacheinfo.h 1.22 +sys/arch/x86/include/specialreg.h 1.87 and 1.90 +usr.sbin/cpuctl/arch/i386.c 1.72-1.74 + + Changes for x86's cpuctl(8): + - Add Quark X1000, Xeon E[57] v4, Core i7-69xx Extreme, 7th gen Core, + Denverton, Xeon Phi [357]200, Future Xeon and Future Xeon Phi. + - Add SGX, UMIP, RDPID, SGXLC, AVX512DQ, AVX512BW and AVX512VL bit. + - Fix the bit location of CLFLUSHOPT. + - Add new TLB descriptor 0x64 and 0xc4. + [msaitoh, ticket #1285] +
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Thu Dec 8 00:15:50 UTC 2016 Modified Files: src/doc [netbsd-7]: CHANGES-7.1 Log Message: 1285 To generate a diff of this commit: cvs rdiff -u -r1.1.2.124 -r1.1.2.125 src/doc/CHANGES-7.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src
Module Name:src Committed By: snj Date: Thu Dec 8 00:15:25 UTC 2016 Modified Files: src/sys/arch/x86/include [netbsd-7]: cacheinfo.h specialreg.h src/usr.sbin/cpuctl/arch [netbsd-7]: i386.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1285): sys/arch/x86/include/cacheinfo.h: revision 1.22 sys/arch/x86/include/specialreg.h: revisions 1.87 and 1.90 usr.sbin/cpuctl/arch/i386.c: revisions 1.72-1.74 Changes for x86's cpuctl(8): - Add Quark X1000, Xeon E[57] v4, Core i7-69xx Extreme, 7th gen Core, Denverton, Xeon Phi [357]200, Future Xeon and Future Xeon Phi. - Add SGX, UMIP, RDPID, SGXLC, AVX512DQ, AVX512BW and AVX512VL bit. - Fix the bit location of CLFLUSHOPT. - Add new TLB descriptor 0x64 and 0xc4. To generate a diff of this commit: cvs rdiff -u -r1.18.2.2 -r1.18.2.3 src/sys/arch/x86/include/cacheinfo.h cvs rdiff -u -r1.78.4.4 -r1.78.4.5 src/sys/arch/x86/include/specialreg.h cvs rdiff -u -r1.58.2.5 -r1.58.2.6 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/cacheinfo.h diff -u src/sys/arch/x86/include/cacheinfo.h:1.18.2.2 src/sys/arch/x86/include/cacheinfo.h:1.18.2.3 --- src/sys/arch/x86/include/cacheinfo.h:1.18.2.2 Sun Mar 6 17:49:55 2016 +++ src/sys/arch/x86/include/cacheinfo.h Thu Dec 8 00:15:25 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: cacheinfo.h,v 1.18.2.2 2016/03/06 17:49:55 martin Exp $ */ +/* $NetBSD: cacheinfo.h,v 1.18.2.3 2016/12/08 00:15:25 snj Exp $ */ #ifndef _X86_CACHEINFO_H_ #define _X86_CACHEINFO_H_ @@ -234,6 +234,7 @@ __CI_TBL(CAI_DTLB, 0x5c, 0xff, 64, __CI_TBL(CAI_DTLB, 0x5d, 0xff, 64,4 * 1024, "4K/4M: 256 entries"),\ __CI_TBL(CAI_ITLB, 0x61, 0xff, 48,4 * 1024, NULL), \ __CI_TBL(CAI_L1_1GBDTLB,0x63, 4, 4,1024*1024 * 1024, NULL), \ +__CI_TBL(CAI_DTLB, 0x64,4,512,4 * 1024, NULL), \ __CI_TBL(CAI_ITLB, 0x6a,8, 64,4 * 1024, NULL), \ __CI_TBL(CAI_DTLB, 0x6b,8,256,4 * 1024, NULL), \ __CI_TBL(CAI_L2_DTLB2, 0x6c,8,128, 0, "2M/4M: 128 entries"),\ @@ -252,6 +253,7 @@ __CI_TBL(CAI_DTLB2,0xc0,4, 8, __CI_TBL(CAI_L2_STLB2, 0xc1,8,1024, 4 * 1024, "4K/2M: 1024 entries"), \ __CI_TBL(CAI_DTLB2,0xc2,4, 16,4 * 1024, "4K/2M: 16 entries"), \ __CI_TBL(CAI_L2_STLB, 0xc3,6,1536, 4 * 1024, NULL), \ +__CI_TBL(CAI_DTLB2,0xc4,4, 32,4 * 1024, "2M/4M: 32 entries"), \ __CI_TBL(CAI_L2_STLB, 0xca,4,512,4 * 1024, NULL), \ __CI_TBL(CAI_ICACHE, 0x06,4,8 * 1024, 32, NULL), \ __CI_TBL(CAI_ICACHE, 0x08,4, 16 * 1024, 32, NULL), \ Index: src/sys/arch/x86/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.78.4.4 src/sys/arch/x86/include/specialreg.h:1.78.4.5 --- src/sys/arch/x86/include/specialreg.h:1.78.4.4 Sun Mar 6 17:49:55 2016 +++ src/sys/arch/x86/include/specialreg.h Thu Dec 8 00:15:25 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.78.4.4 2016/03/06 17:49:55 martin Exp $ */ +/* $NetBSD: specialreg.h,v 1.78.4.5 2016/12/08 00:15:25 snj Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -318,6 +318,7 @@ /* %ebx */ #define CPUID_SEF_FSGSBASE __BIT(0) #define CPUID_SEF_TSC_ADJUST __BIT(1) +#define CPUID_SEF_SGX __BIT(2) #define CPUID_SEF_BMI1 __BIT(3) #define CPUID_SEF_HLE __BIT(4) #define CPUID_SEF_AVX2 __BIT(5) @@ -332,6 +333,7 @@ #define CPUID_SEF_MPX __BIT(14) #define CPUID_SEF_PQE __BIT(15) #define CPUID_SEF_AVX512F __BIT(16) +#define CPUID_SEF_AVX512DQ __BIT(17) #define CPUID_SEF_RDSEED __BIT(18) #define CPUID_SEF_ADX __BIT(19) #define CPUID_SEF_SMAP __BIT(20) @@ -341,25 +343,32 @@ #define CPUID_SEF_AVX512ER __BIT(27) #define CPUID_SEF_AVX512CD __BIT(28) #define CPUID_SEF_SHA __BIT(29) +#define CPUID_SEF_AVX512BW __BIT(30) +#define CPUID_SEF_AVX512VL __BIT(31) #define CPUID_SEF_FLAGS "\20" \ - "\1" "FSGSBASE" "\2" "TSCADJUST" "\4" "BMI1" \ + "\1" "FSGSBASE" "\2" "TSCADJUST" "\3" "SGX" "\4" "BMI1" \ "\5" "HLE" "\6" "AVX2" "\7" "FDPEXONLY" "\10" "SMEP" \ "\11" "BMI2" "\12" "ERMS" "\13" "INVPCID" "\14" "RTM" \ "\15" "QM" "\16" "FPUCSDS" "\17" "MPX" "\20" "PQE" \ - "\21" "AVX512F" "\23" "RDSEED" "\24" "ADX" \ - "\25" "SMAP" "\26" "CLFLUSHOPT"\ - "\32" "PT" "\33" "AVX512PF""\34" "AVX512ER" \ - "\35" "AVX512CD""\36" "SHA" + "\21" "AVX512F" "\22" "AVX512DQ" "\23" "RDSEED" "\24" "ADX" \ + "\25" "SMAP" "\30" "CLFLUSHOPT" \ + "\32" "PT" "\33" "AVX512PF" "\34" "AVX512ER" \ + "\35" "AVX512CD""\36" "SHA" "\37" "AVX512BW" "\40" "AVX512VL" /* %ecx */ #define CPUID_SEF_PREFETCHWT1 __BIT(0) +#define CPUID_SEF_UMIP __BIT(2) #define CPUID_SEF_PKU __BIT(3) #define CPUID_SEF_OSPKE __BIT(4) +#define CPUID_SEF_RDPID __BIT(22) +#define CPUID_SEF_SGXLC __BIT(30) #define
CVS commit: [netbsd-7] src
Module Name:src Committed By: snj Date: Thu Dec 8 00:15:25 UTC 2016 Modified Files: src/sys/arch/x86/include [netbsd-7]: cacheinfo.h specialreg.h src/usr.sbin/cpuctl/arch [netbsd-7]: i386.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1285): sys/arch/x86/include/cacheinfo.h: revision 1.22 sys/arch/x86/include/specialreg.h: revisions 1.87 and 1.90 usr.sbin/cpuctl/arch/i386.c: revisions 1.72-1.74 Changes for x86's cpuctl(8): - Add Quark X1000, Xeon E[57] v4, Core i7-69xx Extreme, 7th gen Core, Denverton, Xeon Phi [357]200, Future Xeon and Future Xeon Phi. - Add SGX, UMIP, RDPID, SGXLC, AVX512DQ, AVX512BW and AVX512VL bit. - Fix the bit location of CLFLUSHOPT. - Add new TLB descriptor 0x64 and 0xc4. To generate a diff of this commit: cvs rdiff -u -r1.18.2.2 -r1.18.2.3 src/sys/arch/x86/include/cacheinfo.h cvs rdiff -u -r1.78.4.4 -r1.78.4.5 src/sys/arch/x86/include/specialreg.h cvs rdiff -u -r1.58.2.5 -r1.58.2.6 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: src/tests/kernel/arch/amd64
Module Name:src
Committed By: kamil
Date: Wed Dec 7 22:24:44 UTC 2016
Modified Files:
src/tests/kernel/arch/amd64: t_ptrace_wait.c
Log Message:
Stop using atf_utils_fork() in tests/kernel/arch/amd64/t_ptrace_wait.c
Switch from:
child = atf_utils_fork();
to:
ATF_REQUIRE((child = fork()) != -1);
Prefer the latter as working as intended and not outputing to files with
danger to overwrite files' content after each fork in test-suite.
Discussed with Christos Zoulas.
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/kernel/arch/amd64/t_ptrace_wait.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/kernel/arch/amd64/t_ptrace_wait.c
diff -u src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.4 src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.5
--- src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.4 Sun Dec 4 03:38:58 2016
+++ src/tests/kernel/arch/amd64/t_ptrace_wait.c Wed Dec 7 22:24:44 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.4 2016/12/04 03:38:58 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.5 2016/12/07 22:24:44 kamil Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.4 2016/12/04 03:38:58 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.5 2016/12/07 22:24:44 kamil Exp $");
#include
#include
@@ -105,7 +105,7 @@ ATF_TC_BODY(dbregs_print, tc)
size_t i;
printf("Before forking process PID=%d\n", getpid());
- child = atf_utils_fork();
+ ATF_REQUIRE((child = fork()) != -1);
if (child == 0) {
printf("Before calling PT_TRACE_ME from child %d\n", getpid());
FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
@@ -173,7 +173,7 @@ ATF_TC_BODY(dbregs_preserve_dr0, tc)
ATF_REQUIRE_EQ(__arraycount(r2.dbregs), len);
printf("Before forking process PID=%d\n", getpid());
- child = atf_utils_fork();
+ ATF_REQUIRE((child = fork()) != -1);
if (child == 0) {
printf("Before calling PT_TRACE_ME from child %d\n", getpid());
FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
@@ -257,7 +257,7 @@ ATF_TC_BODY(dbregs_preserve_dr1, tc)
ATF_REQUIRE_EQ(__arraycount(r2.dbregs), len);
printf("Before forking process PID=%d\n", getpid());
- child = atf_utils_fork();
+ ATF_REQUIRE((child = fork()) != -1);
if (child == 0) {
printf("Before calling PT_TRACE_ME from child %d\n", getpid());
FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
@@ -341,7 +341,7 @@ ATF_TC_BODY(dbregs_preserve_dr2, tc)
ATF_REQUIRE_EQ(__arraycount(r2.dbregs), len);
printf("Before forking process PID=%d\n", getpid());
- child = atf_utils_fork();
+ ATF_REQUIRE((child = fork()) != -1);
if (child == 0) {
printf("Before calling PT_TRACE_ME from child %d\n", getpid());
FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
@@ -425,7 +425,7 @@ ATF_TC_BODY(dbregs_preserve_dr3, tc)
ATF_REQUIRE_EQ(__arraycount(r2.dbregs), len);
printf("Before forking process PID=%d\n", getpid());
- child = atf_utils_fork();
+ ATF_REQUIRE((child = fork()) != -1);
if (child == 0) {
printf("Before calling PT_TRACE_ME from child %d\n", getpid());
FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
@@ -510,7 +510,7 @@ ATF_TC_BODY(dbregs_preserve_dr0_yield, t
ATF_REQUIRE_EQ(__arraycount(r2.dbregs), len);
printf("Before forking process PID=%d\n", getpid());
- child = atf_utils_fork();
+ ATF_REQUIRE((child = fork()) != -1);
if (child == 0) {
printf("Before calling PT_TRACE_ME from child %d\n", getpid());
FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
@@ -600,7 +600,7 @@ ATF_TC_BODY(dbregs_preserve_dr1_yield, t
ATF_REQUIRE_EQ(__arraycount(r2.dbregs), len);
printf("Before forking process PID=%d\n", getpid());
- child = atf_utils_fork();
+ ATF_REQUIRE((child = fork()) != -1);
if (child == 0) {
printf("Before calling PT_TRACE_ME from child %d\n", getpid());
FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
@@ -690,7 +690,7 @@ ATF_TC_BODY(dbregs_preserve_dr2_yield, t
ATF_REQUIRE_EQ(__arraycount(r2.dbregs), len);
printf("Before forking process PID=%d\n", getpid());
- child = atf_utils_fork();
+ ATF_REQUIRE((child = fork()) != -1);
if (child == 0) {
printf("Before calling PT_TRACE_ME from child %d\n", getpid());
FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
@@ -780,7 +780,7 @@ ATF_TC_BODY(dbregs_preserve_dr3_yield, t
ATF_REQUIRE_EQ(__arraycount(r2.dbregs), len);
printf("Before forking process PID=%d\n", getpid());
- child = atf_utils_fork();
+ ATF_REQUIRE((child = fork()) != -1);
if (child == 0) {
printf("Before calling PT_TRACE_ME from child %d\n", getpid());
FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
@@ -870,7 +870,7 @@ ATF_TC_BODY(dbregs_preserve_dr0_continue
ATF_REQUIRE_EQ(__arraycount(r2.dbregs), len);
printf("Before forking process PID=%d\n", getpid());
- child =
CVS commit: src/tests/kernel/arch/amd64
Module Name:src Committed By: kamil Date: Wed Dec 7 22:24:44 UTC 2016 Modified Files: src/tests/kernel/arch/amd64: t_ptrace_wait.c Log Message: Stop using atf_utils_fork() in tests/kernel/arch/amd64/t_ptrace_wait.c Switch from: child = atf_utils_fork(); to: ATF_REQUIRE((child = fork()) != -1); Prefer the latter as working as intended and not outputing to files with danger to overwrite files' content after each fork in test-suite. Discussed with Christos Zoulas. Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/kernel/arch/amd64/t_ptrace_wait.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src Committed By: christos Date: Wed Dec 7 19:57:09 UTC 2016 Modified Files: src/usr.bin/make: main.c Log Message: Don't apply the suffix (curdir) to MAKEOBJDIR To generate a diff of this commit: cvs rdiff -u -r1.252 -r1.253 src/usr.bin/make/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: christos
Date: Wed Dec 7 19:57:09 UTC 2016
Modified Files:
src/usr.bin/make: main.c
Log Message:
Don't apply the suffix (curdir) to MAKEOBJDIR
To generate a diff of this commit:
cvs rdiff -u -r1.252 -r1.253 src/usr.bin/make/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.252 src/usr.bin/make/main.c:1.253
--- src/usr.bin/make/main.c:1.252 Wed Dec 7 10:00:46 2016
+++ src/usr.bin/make/main.c Wed Dec 7 14:57:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.252 2016/12/07 15:00:46 christos Exp $ */
+/* $NetBSD: main.c,v 1.253 2016/12/07 19:57:09 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.252 2016/12/07 15:00:46 christos Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.253 2016/12/07 19:57:09 christos Exp $";
#else
#include
#ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: main.c,v 1.252 2016/12/07 15:00:46 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.253 2016/12/07 19:57:09 christos Exp $");
#endif
#endif /* not lint */
#endif
@@ -726,13 +726,13 @@ Main_SetObjdir(const char *fmt, ...)
}
static Boolean
-Main_SetVarObjdir(const char *var)
+Main_SetVarObjdir(const char *var, const char *suffix)
{
char *p1, *path;
if ((path = Var_Value(var, VAR_CMD, )) == NULL)
return FALSE;
- (void)Main_SetObjdir("%s%s", path, curdir);
+ (void)Main_SetObjdir("%s%s", path, suffix);
free(p1);
return TRUE;
}
@@ -1120,8 +1120,8 @@ main(int argc, char **argv)
Dir_Init(curdir);
(void)Main_SetObjdir("%s", curdir);
- if (!Main_SetVarObjdir("MAKEOBJDIRPREFIX") &&
- !Main_SetVarObjdir("MAKEOBJDIR") &&
+ if (!Main_SetVarObjdir("MAKEOBJDIRPREFIX", curdir) &&
+ !Main_SetVarObjdir("MAKEOBJDIR", "") &&
!Main_SetObjdir("%s.%s", _PATH_OBJDIR, machine) &&
!Main_SetObjdir("%s", _PATH_OBJDIR))
(void)Main_SetObjdir("%s%s", _PATH_OBJDIRPREFIX, curdir);
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: macallan
Date: Wed Dec 7 18:39:04 UTC 2016
Modified Files:
src/sys/dev/pci: pm3fb.c
Log Message:
- don't flush the engine after every blitter operation
- make sure we don't overrun the pipeline in pm3fb_init()
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/pm3fb.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/pm3fb.c
diff -u src/sys/dev/pci/pm3fb.c:1.2 src/sys/dev/pci/pm3fb.c:1.3
--- src/sys/dev/pci/pm3fb.c:1.2 Wed Dec 7 15:50:30 2016
+++ src/sys/dev/pci/pm3fb.c Wed Dec 7 18:39:04 2016
@@ -603,6 +603,7 @@ static void
pm3fb_init(struct pm3fb_softc *sc)
{
+ pm3fb_wait(sc, 16);
bus_space_write_4(sc->sc_memt, sc->sc_regh, PM3_LB_DESTREAD_MODE, 0);
bus_space_write_4(sc->sc_memt, sc->sc_regh, PM3_LB_DESTREAD_ENABLES, 0);
bus_space_write_4(sc->sc_memt, sc->sc_regh, PM3_LB_SOURCEREAD_MODE, 0);
@@ -619,6 +620,8 @@ pm3fb_init(struct pm3fb_softc *sc)
bus_space_write_4(sc->sc_memt, sc->sc_regh, PM3_STENCIL_MODE, 0);
bus_space_write_4(sc->sc_memt, sc->sc_regh, PM3_STENCIL_DATA, 0);
bus_space_write_4(sc->sc_memt, sc->sc_regh, PM3_COLORDDA_MODE, 0);
+
+ pm3fb_wait(sc, 16);
bus_space_write_4(sc->sc_memt, sc->sc_regh, PM3_TEXTUREADDRESS_MODE, 0);
bus_space_write_4(sc->sc_memt, sc->sc_regh, PM3_TEXTUREINDEX_MODE0, 0);
bus_space_write_4(sc->sc_memt, sc->sc_regh, PM3_TEXTUREINDEX_MODE1, 0);
@@ -635,6 +638,8 @@ pm3fb_init(struct pm3fb_softc *sc)
bus_space_write_4(sc->sc_memt, sc->sc_regh, PM3_CHROMATEST_MODE, 0);
bus_space_write_4(sc->sc_memt, sc->sc_regh, PM3_ALPHATEST_MODE, 0);
bus_space_write_4(sc->sc_memt, sc->sc_regh, PM3_ANTIALIAS_MODE, 0);
+
+ pm3fb_wait(sc, 16);
bus_space_write_4(sc->sc_memt, sc->sc_regh, PM3_YUV_MODE, 0);
bus_space_write_4(sc->sc_memt, sc->sc_regh, PM3_ALPHABLENDCOLOR_MODE, 0);
bus_space_write_4(sc->sc_memt, sc->sc_regh, PM3_ALPHABLENDALPHA_MODE, 0);
@@ -651,6 +656,8 @@ pm3fb_init(struct pm3fb_softc *sc)
bus_space_write_4(sc->sc_memt, sc->sc_regh, PM3_FBDESTREAD_ENABLE,
PM3_FBDESTREAD_SET(0xff, 0xff, 0xff));
bus_space_write_4(sc->sc_memt, sc->sc_regh, PM3_FBDESTREAD_BUFFERADDRESS0, 0);
+
+ pm3fb_wait(sc, 16);
bus_space_write_4(sc->sc_memt, sc->sc_regh, PM3_FBDESTREAD_BUFFEROFFSET0, 0);
bus_space_write_4(sc->sc_memt, sc->sc_regh, PM3_FBDESTREAD_BUFFERWIDTH0,
PM3_FBDESTREAD_BUFFERWIDTH_WIDTH(sc->sc_stride));
@@ -674,6 +681,8 @@ pm3fb_init(struct pm3fb_softc *sc)
bus_space_write_4(sc->sc_memt, sc->sc_regh, PM3_SIZEOF_FRAMEBUFFER, 4095);
bus_space_write_4(sc->sc_memt, sc->sc_regh, PM3_DITHER_MODE, PM3_CF_TO_DIM_CF(4));
bus_space_write_4(sc->sc_memt, sc->sc_regh, PM3_DXDOM, 0);
+
+ pm3fb_wait(sc, 6);
bus_space_write_4(sc->sc_memt, sc->sc_regh, PM3_DXSUB, 0);
bus_space_write_4(sc->sc_memt, sc->sc_regh, PM3_DY, 1 << 16);
bus_space_write_4(sc->sc_memt, sc->sc_regh, PM3_STARTXDOM, 0);
@@ -702,7 +711,9 @@ pm3fb_rectfill(struct pm3fb_softc *sc, i
PM3_RENDER2D_OPERATION_NORMAL | PM3_RENDER2D_SPANOPERATION |
(((he) & 0x0fff) << 16) | ((wi) & 0x0fff));
+#ifdef PM3FB_DEBUG
pm3fb_flush_engine(sc);
+#endif
}
static void
@@ -755,7 +766,9 @@ pm3fb_bitblt(void *cookie, int srcx, int
PM3_RENDER2D_OPERATION_NORMAL | PM3_RENDER2D_SPANOPERATION | PM3_RENDER2D_FBSOURCEREADENABLE |
(((height) & 0x0fff) << 16) | ((width + x_align) & 0x0fff));
+#ifdef PM3FB_DEBUG
pm3fb_flush_engine(sc);
+#endif
}
static void
CVS commit: src/sys/dev/pci
Module Name:src Committed By: macallan Date: Wed Dec 7 18:39:04 UTC 2016 Modified Files: src/sys/dev/pci: pm3fb.c Log Message: - don't flush the engine after every blitter operation - make sure we don't overrun the pipeline in pm3fb_init() To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/pm3fb.c 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: macallan
Date: Wed Dec 7 15:50:30 UTC 2016
Modified Files:
src/sys/dev/pci: pm3fb.c
Log Message:
fix downward scrolling, set BUS_SPACE_MAP_PREFETCHABLE
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/pm3fb.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/pm3fb.c
diff -u src/sys/dev/pci/pm3fb.c:1.1 src/sys/dev/pci/pm3fb.c:1.2
--- src/sys/dev/pci/pm3fb.c:1.1 Sun Nov 20 16:55:18 2016
+++ src/sys/dev/pci/pm3fb.c Wed Dec 7 15:50:30 2016
@@ -427,7 +427,7 @@ pm3fb_mmap(void *v, void *vs, off_t offs
/* 'regular' framebuffer mmap()ing */
if (offset < sc->sc_fbsize) {
pa = bus_space_mmap(sc->sc_memt, sc->sc_fb + offset, 0, prot,
- BUS_SPACE_MAP_LINEAR);
+ BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_PREFETCHABLE);
return pa;
}
@@ -445,7 +445,7 @@ pm3fb_mmap(void *v, void *vs, off_t offs
if ((offset >= sc->sc_fb) && (offset < (sc->sc_fb + sc->sc_fbsize))) {
pa = bus_space_mmap(sc->sc_memt, offset, 0, prot,
- BUS_SPACE_MAP_LINEAR);
+ BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_PREFETCHABLE);
return pa;
}
@@ -713,17 +713,8 @@ pm3fb_bitblt(void *cookie, int srcx, int
int x_align, offset_x, offset_y;
uint32_t dir = 0;
- if (srcx > dstx) {
- offset_x = srcx - dstx;
- } else {
- offset_x = dstx - srcx;
- }
-
- if (srcy > dsty) {
- offset_y = srcy - dsty;
- } else {
- offset_y = dsty - srcy;
- }
+ offset_x = srcx - dstx;
+ offset_y = srcy - dsty;
if (dsty <= srcy) {
dir |= PM3_RENDER2D_YPOSITIVE;
CVS commit: src/sys/dev/pci
Module Name:src Committed By: macallan Date: Wed Dec 7 15:50:30 UTC 2016 Modified Files: src/sys/dev/pci: pm3fb.c Log Message: fix downward scrolling, set BUS_SPACE_MAP_PREFETCHABLE To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/pm3fb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: christos
Date: Wed Dec 7 15:00:46 UTC 2016
Modified Files:
src/usr.bin/make: main.c make.h parse.c
Log Message:
Refactor and simplify objdir setting code.
To generate a diff of this commit:
cvs rdiff -u -r1.251 -r1.252 src/usr.bin/make/main.c
cvs rdiff -u -r1.101 -r1.102 src/usr.bin/make/make.h
cvs rdiff -u -r1.215 -r1.216 src/usr.bin/make/parse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.251 src/usr.bin/make/main.c:1.252
--- src/usr.bin/make/main.c:1.251 Fri Aug 26 19:28:39 2016
+++ src/usr.bin/make/main.c Wed Dec 7 10:00:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.251 2016/08/26 23:28:39 dholland Exp $ */
+/* $NetBSD: main.c,v 1.252 2016/12/07 15:00:46 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.251 2016/08/26 23:28:39 dholland Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.252 2016/12/07 15:00:46 christos Exp $";
#else
#include
#ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: main.c,v 1.251 2016/08/26 23:28:39 dholland Exp $");
+__RCSID("$NetBSD: main.c,v 1.252 2016/12/07 15:00:46 christos Exp $");
#endif
#endif /* not lint */
#endif
@@ -681,18 +681,24 @@ Main_ParseArgLine(const char *line)
}
Boolean
-Main_SetObjdir(const char *path)
+Main_SetObjdir(const char *fmt, ...)
{
struct stat sb;
- char *p = NULL;
- char buf[MAXPATHLEN + 1];
+ char *p, *path;
+ char buf[MAXPATHLEN + 1], pbuf[MAXPATHLEN + 1];
Boolean rc = FALSE;
+ va_list ap;
+
+ va_start(ap, fmt);
+ vsnprintf(path = pbuf, MAXPATHLEN, fmt, ap);
+ va_end(ap);
/* expand variable substitutions */
if (strchr(path, '$') != 0) {
snprintf(buf, MAXPATHLEN, "%s", path);
path = p = Var_Subst(NULL, buf, VAR_GLOBAL, VARF_WANTRES);
- }
+ } else
+ p = NULL;
if (path[0] != '/') {
snprintf(buf, MAXPATHLEN, "%s/%s", curdir, path);
@@ -719,6 +725,18 @@ Main_SetObjdir(const char *path)
return rc;
}
+static Boolean
+Main_SetVarObjdir(const char *var)
+{
+ char *p1, *path;
+ if ((path = Var_Value(var, VAR_CMD, )) == NULL)
+ return FALSE;
+
+ (void)Main_SetObjdir("%s%s", path, curdir);
+ free(p1);
+ return TRUE;
+}
+
/*-
* ReadAllMakefiles --
* wrapper around ReadMakefile() to read all.
@@ -1095,28 +1113,18 @@ main(int argc, char **argv)
* MAKEOBJDIR is set in the environment, try only that value
* and fall back to .CURDIR if it does not exist.
*
- * Otherwise, try _PATH_OBJDIR.MACHINE, _PATH_OBJDIR, and
- * finally _PATH_OBJDIRPREFIX`pwd`, in that order. If none
+ * Otherwise, try _PATH_OBJDIR.MACHINE-MACHINE_ARCH, _PATH_OBJDIR.MACHINE,
+ * and * finally _PATH_OBJDIRPREFIX`pwd`, in that order. If none
* of these paths exist, just use .CURDIR.
*/
Dir_Init(curdir);
- (void)Main_SetObjdir(curdir);
+ (void)Main_SetObjdir("%s", curdir);
- if ((path = Var_Value("MAKEOBJDIRPREFIX", VAR_CMD, )) != NULL) {
- (void)snprintf(mdpath, MAXPATHLEN, "%s%s", path, curdir);
- (void)Main_SetObjdir(mdpath);
- free(p1);
- } else if ((path = Var_Value("MAKEOBJDIR", VAR_CMD, )) != NULL) {
- (void)Main_SetObjdir(path);
- free(p1);
- } else {
- (void)snprintf(mdpath, MAXPATHLEN, "%s.%s", _PATH_OBJDIR, machine);
- if (!Main_SetObjdir(mdpath) && !Main_SetObjdir(_PATH_OBJDIR)) {
- (void)snprintf(mdpath, MAXPATHLEN, "%s%s",
- _PATH_OBJDIRPREFIX, curdir);
- (void)Main_SetObjdir(mdpath);
- }
- }
+ if (!Main_SetVarObjdir("MAKEOBJDIRPREFIX") &&
+ !Main_SetVarObjdir("MAKEOBJDIR") &&
+ !Main_SetObjdir("%s.%s", _PATH_OBJDIR, machine) &&
+ !Main_SetObjdir("%s", _PATH_OBJDIR))
+ (void)Main_SetObjdir("%s%s", _PATH_OBJDIRPREFIX, curdir);
/*
* Initialize archive, target and suffix modules in preparation for
Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.101 src/usr.bin/make/make.h:1.102
--- src/usr.bin/make/make.h:1.101 Fri Aug 26 19:28:39 2016
+++ src/usr.bin/make/make.h Wed Dec 7 10:00:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.101 2016/08/26 23:28:39 dholland Exp $ */
+/* $NetBSD: make.h,v 1.102 2016/12/07 15:00:46 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -488,7 +488,7 @@ char * Check_Cwd_Cmd(const char *);
void Check_Cwd(const char **);
void PrintOnError(GNode *, const char *);
void Main_ExportMAKEFLAGS(Boolean);
-Boolean Main_SetObjdir(const char *);
+Boolean Main_SetObjdir(const char *, ...) MAKE_ATTR_PRINTFLIKE(1, 2);
int mkTempFile(const char *, char **);
int str2Lst_Append(Lst, char *, const char *);
int cached_lstat(const char *, void *);
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.215 src/usr.bin/make/parse.c:1.216
--- src/usr.bin/make/parse.c:1.215 Fri Aug 26
CVS commit: src/usr.bin/make
Module Name:src Committed By: christos Date: Wed Dec 7 15:00:46 UTC 2016 Modified Files: src/usr.bin/make: main.c make.h parse.c Log Message: Refactor and simplify objdir setting code. To generate a diff of this commit: cvs rdiff -u -r1.251 -r1.252 src/usr.bin/make/main.c cvs rdiff -u -r1.101 -r1.102 src/usr.bin/make/make.h cvs rdiff -u -r1.215 -r1.216 src/usr.bin/make/parse.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/m68k/fpe
Module Name:src Committed By: isaki Date: Wed Dec 7 11:27:18 UTC 2016 Modified Files: src/sys/arch/m68k/fpe: fpu_exp.c Log Message: Fix sign of zero in case of x > -(2^18). # By the way, I will modify this case later. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/m68k/fpe/fpu_exp.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/m68k/fpe
Module Name:src
Committed By: isaki
Date: Wed Dec 7 11:27:18 UTC 2016
Modified Files:
src/sys/arch/m68k/fpe: fpu_exp.c
Log Message:
Fix sign of zero in case of x > -(2^18).
# By the way, I will modify this case later.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/m68k/fpe/fpu_exp.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/m68k/fpe/fpu_exp.c
diff -u src/sys/arch/m68k/fpe/fpu_exp.c:1.9 src/sys/arch/m68k/fpe/fpu_exp.c:1.10
--- src/sys/arch/m68k/fpe/fpu_exp.c:1.9 Mon Dec 5 15:31:01 2016
+++ src/sys/arch/m68k/fpe/fpu_exp.c Wed Dec 7 11:27:18 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_exp.c,v 1.9 2016/12/05 15:31:01 isaki Exp $ */
+/* $NetBSD: fpu_exp.c,v 1.10 2016/12/07 11:27:18 isaki Exp $ */
/*
* Copyright (c) 1995 Ken Nakata
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fpu_exp.c,v 1.9 2016/12/05 15:31:01 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_exp.c,v 1.10 2016/12/07 11:27:18 isaki Exp $");
#include
@@ -136,10 +136,12 @@ fpu_etox(struct fpemu *fe)
/* extract k as integer format from fpn format */
j = FP_LG - fp->fp_exp;
if (j < 0) {
- if (fp->fp_sign)
+ if (fp->fp_sign) {
fp->fp_class = FPC_ZERO; /* k < -2^18 */
- else
+ fp->fp_sign = 0;
+ } else {
fp->fp_class = FPC_INF; /* k > 2^18 */
+ }
return fp;
}
k = fp->fp_mant[0] >> j;
CVS commit: src/lib/libc/net
Module Name:src
Committed By: pgoyette
Date: Wed Dec 7 10:03:29 UTC 2016
Modified Files:
src/lib/libc/net: linkaddr.c
Log Message:
Fix comment: s/ACCD/ADDC/
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/lib/libc/net/linkaddr.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/libc/net/linkaddr.c
diff -u src/lib/libc/net/linkaddr.c:1.21 src/lib/libc/net/linkaddr.c:1.22
--- src/lib/libc/net/linkaddr.c:1.21 Wed Dec 7 09:52:34 2016
+++ src/lib/libc/net/linkaddr.c Wed Dec 7 10:03:29 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: linkaddr.c,v 1.21 2016/12/07 09:52:34 kre Exp $ */
+/* $NetBSD: linkaddr.c,v 1.22 2016/12/07 10:03:29 pgoyette Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)linkaddr.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: linkaddr.c,v 1.21 2016/12/07 09:52:34 kre Exp $");
+__RCSID("$NetBSD: linkaddr.c,v 1.22 2016/12/07 10:03:29 pgoyette Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -163,7 +163,7 @@ link_ntoa(const struct sockaddr_dl *sdl)
* complex:
* if (out < obuf + sizeof(obuf) - ((ch) != '\0'))
* *out++ = (ch);
- * so it never returns, and the final ACCD(0) always works
+ * so it never returns, and the final ADDC(0) always works
* but that evaluates 'ch' twice, and is slower, so ...)
*/
obuf[sizeof(obuf) - 1] = '\0';
CVS commit: src/lib/libc/net
Module Name:src Committed By: pgoyette Date: Wed Dec 7 10:03:29 UTC 2016 Modified Files: src/lib/libc/net: linkaddr.c Log Message: Fix comment: s/ACCD/ADDC/ To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/lib/libc/net/linkaddr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/net
Module Name:src
Committed By: kre
Date: Wed Dec 7 09:52:34 UTC 2016
Modified Files:
src/lib/libc/net: linkaddr.c
Log Message:
Actually guarantee that the returned buffer from link_ntoa() is always
NUL terminated, even when called by malicious/broken applications.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/net/linkaddr.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/libc/net/linkaddr.c
diff -u src/lib/libc/net/linkaddr.c:1.20 src/lib/libc/net/linkaddr.c:1.21
--- src/lib/libc/net/linkaddr.c:1.20 Wed Dec 7 03:16:45 2016
+++ src/lib/libc/net/linkaddr.c Wed Dec 7 09:52:34 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: linkaddr.c,v 1.20 2016/12/07 03:16:45 christos Exp $ */
+/* $NetBSD: linkaddr.c,v 1.21 2016/12/07 09:52:34 kre Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)linkaddr.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: linkaddr.c,v 1.20 2016/12/07 03:16:45 christos Exp $");
+__RCSID("$NetBSD: linkaddr.c,v 1.21 2016/12/07 09:52:34 kre Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -153,6 +153,21 @@ link_ntoa(const struct sockaddr_dl *sdl)
*out++ = (ch); \
} while (/*CONSTCOND*/0)
+ /*
+ * This is not needed on the first call, as the static
+ * obuf wil be fully init'd to 0 by default. But after
+ * obuf has been returned to userspace the first time,
+ * anything may have been written to it, so, let's be safe.
+ *
+ * (An alternative method would be to make ADDC() more
+ * complex:
+ * if (out < obuf + sizeof(obuf) - ((ch) != '\0'))
+ * *out++ = (ch);
+ * so it never returns, and the final ACCD(0) always works
+ * but that evaluates 'ch' twice, and is slower, so ...)
+ */
+ obuf[sizeof(obuf) - 1] = '\0';
+
if (sdl->sdl_nlen) {
if (sdl->sdl_nlen >= sizeof(obuf))
i = sizeof(obuf) - 1;
CVS commit: src/lib/libc/net
Module Name:src Committed By: kre Date: Wed Dec 7 09:52:34 UTC 2016 Modified Files: src/lib/libc/net: linkaddr.c Log Message: Actually guarantee that the returned buffer from link_ntoa() is always NUL terminated, even when called by malicious/broken applications. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/lib/libc/net/linkaddr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
