CVS commit: src/share/man/man9
Module Name:src Committed By: riastradh Date: Sat May 7 05:46:35 UTC 2016 Modified Files: src/share/man/man9: wapbl.9 Log Message: Fix statement of what write-ahead means. Contrast with roll-back. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/share/man/man9/wapbl.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/wapbl.9 diff -u src/share/man/man9/wapbl.9:1.10 src/share/man/man9/wapbl.9:1.11 --- src/share/man/man9/wapbl.9:1.10 Wed Apr 1 22:51:33 2015 +++ src/share/man/man9/wapbl.9 Sat May 7 05:46:35 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: wapbl.9,v 1.10 2015/04/01 22:51:33 riastradh Exp $ +.\" $NetBSD: wapbl.9,v 1.11 2016/05/07 05:46:35 riastradh Exp $ .\" .\" Copyright (c) 2015 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -97,7 +97,8 @@ batches of writes are issued atomically only physical blocks, not logical file system operations, are stored in the log .It write-ahead -blocks are written to the log before being written to the disk +before writing a block to disk, its new content, rather than its old +content for roll-back, is recorded in the log .El .Pp When a file system using
CVS commit: src/lib/libedit
Module Name:src
Committed By: christos
Date: Fri May 6 21:01:19 UTC 2016
Modified Files:
src/lib/libedit: readline.c
Log Message:
fix logic (Ingo Schwarze)
To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/lib/libedit/readline.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/libedit/readline.c
diff -u src/lib/libedit/readline.c:1.128 src/lib/libedit/readline.c:1.129
--- src/lib/libedit/readline.c:1.128 Mon Apr 18 13:01:19 2016
+++ src/lib/libedit/readline.c Fri May 6 17:01:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: readline.c,v 1.128 2016/04/18 17:01:19 christos Exp $ */
+/* $NetBSD: readline.c,v 1.129 2016/05/06 21:01:19 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include "config.h"
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.128 2016/04/18 17:01:19 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.129 2016/05/06 21:01:19 christos Exp $");
#endif /* not lint && not SCCSID */
#include
@@ -1592,7 +1592,7 @@ history_set_pos(int pos)
int curr_num;
if (pos >= history_length || pos < 0)
- return -1;
+ return 0;
(void)history(h, , H_CURR);
curr_num = ev.num;
@@ -1603,9 +1603,9 @@ history_set_pos(int pos)
*/
if (history(h, , H_DELDATA, pos, (void **)-1)) {
(void)history(h, , H_SET, curr_num);
- return -1;
+ return 0;
}
- return 0;
+ return 1;
}
@@ -1688,7 +1688,7 @@ history_search_pos(const char *str,
return -1;
curr_num = ev.num;
- if (history_set_pos(off) != 0 || history(h, , H_CURR) != 0)
+ if (!history_set_pos(off) || history(h, , H_CURR) != 0)
return -1;
for (;;) {
CVS commit: src/sys/dev/usb
Module Name:src Committed By: christos Date: Fri May 6 20:12:54 UTC 2016 Modified Files: src/sys/dev/usb: uhci.c Log Message: - don't require the lock if we are polling (early autoconf) - unfold a line To generate a diff of this commit: cvs rdiff -u -r1.271 -r1.272 src/sys/dev/usb/uhci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/uhci.c diff -u src/sys/dev/usb/uhci.c:1.271 src/sys/dev/usb/uhci.c:1.272 --- src/sys/dev/usb/uhci.c:1.271 Fri May 6 09:03:06 2016 +++ src/sys/dev/usb/uhci.c Fri May 6 16:12:54 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: uhci.c,v 1.271 2016/05/06 13:03:06 skrll Exp $ */ +/* $NetBSD: uhci.c,v 1.272 2016/05/06 20:12:54 christos Exp $ */ /* * Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.271 2016/05/06 13:03:06 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.272 2016/05/06 20:12:54 christos Exp $"); #include "opt_usb.h" @@ -1105,7 +1105,7 @@ uhci_remove_hs_ctrl(uhci_softc_t *sc, uh uhci_soft_qh_t *pqh; uint32_t elink; - KASSERT(mutex_owned(>sc_lock)); + KASSERT(sc->sc_bus.ub_usepolling || mutex_owned(>sc_lock)); UHCIHIST_FUNC(); UHCIHIST_CALLED(); DPRINTFN(10, "sqh %p", sqh, 0, 0, 0); @@ -1146,8 +1146,7 @@ uhci_remove_hs_ctrl(uhci_softc_t *sc, uh pqh->hlink = sqh->hlink; pqh->qh.qh_hlink = sqh->qh.qh_hlink; usb_syncmem(>dma, pqh->offs + offsetof(uhci_qh_t, qh_hlink), - sizeof(pqh->qh.qh_hlink), - BUS_DMASYNC_PREWRITE); + sizeof(pqh->qh.qh_hlink), BUS_DMASYNC_PREWRITE); delay(UHCI_QH_REMOVE_DELAY); if (sc->sc_hctl_end == sqh) sc->sc_hctl_end = pqh; @@ -1185,7 +1184,7 @@ uhci_remove_ls_ctrl(uhci_softc_t *sc, uh uhci_soft_qh_t *pqh; uint32_t elink; - KASSERT(mutex_owned(>sc_lock)); + KASSERT(sc->sc_bus.ub_usepolling || mutex_owned(>sc_lock)); UHCIHIST_FUNC(); UHCIHIST_CALLED(); DPRINTFN(10, "sqh %p", sqh, 0, 0, 0);
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: snj Date: Fri May 6 18:50:37 UTC 2016 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: 1351, 1362, 1366 To generate a diff of this commit: cvs rdiff -u -r1.1.2.246 -r1.1.2.247 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.246 src/doc/CHANGES-6.2:1.1.2.247 --- src/doc/CHANGES-6.2:1.1.2.246 Fri May 6 09:19:15 2016 +++ src/doc/CHANGES-6.2 Fri May 6 18:50:37 2016 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.246 2016/05/06 09:19:15 snj Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.247 2016/05/06 18:50:37 snj Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -13845,3 +13845,84 @@ doc/3RDPARTY patch Update OpenSSL to 1.0.1t. [spz, ticket #1379] +etc/namedb/root.cache1.19 + + Update to 2015120100. + * Addresses of H.ROOT-SERVERS.NET has updated. + * Make IPv6 address lower case. + [taca, ticket #1351] + +etc/ssh/ssh_known_hosts1.9 + + Add keys for wip.pkgsrc.org. + [wiz, ticket #1362] + +sys/dev/pci/if_wm.c1.281, 1.318, 1.320, 1.324-1.332, 1.334, 1.336, 1.343-1.344, 1.347-1.348, 1.350, 1.376-1.382, 1.386-1.387, 1.389 via patch +sys/dev/pci/if_wmreg.h1.68-1.70, 1.73-1.77, 1.79-1.80, 1.82, 1.86-1.88 via patch +sys/dev/pci/if_wmvar.h1.22-1.23, 1.25-1.30 via patch +sys/dev/mii/igphy.c1.25 +sys/dev/mii/ukphy.c1.48 + + Sync wm(4) as of if_wm.c rev 1.389 except SERDES, MSI/MSI-X, multiqueue + and NET_MPSAFE: + - Set ICH9 and ICH10's PBA size to 14K if the RX buffer size is more + than 4096. Almost the same as other OSes. + - For 82576 and newer devices, the PBA register is deleted. Don't write + PBA for those chips. Also change the calculation of RX packet buffer + size in new way. + - Print NVM image version and option ROM version. + - Add workaround for I210 Errata 25 and I211 Errata 10 (PLL bug). This + workaround is required if the NVM image version < 3.25. + - Fix a bug that wm_detach() didn't unmap the FHASH's area. Now + "drvctl -d wm0" -> "drvctl -r pci0" works on ICH* and PCH*. + - Add workaround for 82574 Errata 25 and 82583 Errata 12 "Dropped RX + packets" and for 82573 (unknown). Set GCR_L1_ACT_WITHOUT_L0S_RX bit. + The NVM Image version 2.1.4 and newer have this workaround. + - Check PHY type correctly. This change is required to use igphy(4) + device correctly. + - Disable LPLU (Low Power Link Up) on D0 state on 82574, 82583 and ICH* + too. + - Call wm_get_hw_control() correctly. This change fixes a bug that some + AMT based systems doesn't linkup at 1000BaseT. The problem was + observed on HP Compaq dc7700. A lot of fixes have been done for wm(4) + and igphy(4), so now PR#44893 should be fixed. + - Call wm_get_wakeup(sc) before checking WM_F_HAS_AMT. It's required to + check the existence of AMT correctly. + - Fix a problem that wm_gate_hw_phy_config_ich8lan() isn't called in + wm_reset() on PCH2. + - Clear WMREG_WUC in wm_reset() if the chip >= 82544. This might fix + the behavior on suspend/resume. + - Fix logic of wm_check_reset_block() on ICH* and PCH*. This change + might fix a problem that PHY's read/write functions can't get + semaphore. + - On ICH8, call wm_gig_downshift_workaround_ich8lan() when link changed + down. + - Drop PHY_CTRL_GBE_DIS explicitly in wm_lplu_d0_disable() in case BIOS + sets this bit. + - Fix two bugs in wm_kmrn_lock_loss_workaround_ich8lan(). Now the + function checks the status correctly but it causes linkdown up to 10 + times, so it's disabled for the time being. + - PR/50527: David Binderman: Fix impossible code. Odd offsets need + special treatment. + - Fix RAL table's size of PCH2 and PCH_LPT. + - PCH_LPT (and newer device) is required to check FWSM_WLOCK_MAC bit to + determine the range of the RAL. + - Use sc->sc_itr instead of hard-coded number. + - Rename wm_tbi_check_link() to wm_tbi_tick() because this function + acts as mii_tick(). + - ACK Accelerate Disable in the RFCTL register is not bit 13 but 12. + No binary change because this definition has not used yet. + - Add ACK data Disable bit's definition (not used yet). + - PHY_CTRL_GBE_DIS is not bit 4 but bit 6. This change has no any + effect by default because WM_WOL is not defined yet and + m_kmrn_lock_loss_workaround_ich8lan() is broken. + - Fix wm_check_mng_mode_ich8lan(). This function is used only when + WM_WOL is defined and it's disabled by default. + - Rename wm_check_reset_block() to wm_phy_resetisblocked() and make it + returns bool. No functional change. + - Reorder function definitions and macro definitions. No functional + change. + - Fix comment. Add comment. Update comment. + - KNF. + [msaitoh, ticket #1366] +
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: snj Date: Fri May 6 18:42:49 UTC 2016 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.6 Log Message: 1351, 1362 To generate a diff of this commit: cvs rdiff -u -r1.1.2.62 -r1.1.2.63 src/doc/CHANGES-6.1.6 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-6.1.6 diff -u src/doc/CHANGES-6.1.6:1.1.2.62 src/doc/CHANGES-6.1.6:1.1.2.63 --- src/doc/CHANGES-6.1.6:1.1.2.62 Fri May 6 09:19:43 2016 +++ src/doc/CHANGES-6.1.6 Fri May 6 18:42:49 2016 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.6,v 1.1.2.62 2016/05/06 09:19:43 snj Exp $ +# $NetBSD: CHANGES-6.1.6,v 1.1.2.63 2016/05/06 18:42:49 snj Exp $ A complete list of changes from the NetBSD 6.1.5 release to the NetBSD 6.1.6 release: @@ -7911,3 +7911,15 @@ doc/3RDPARTY patch Update OpenSSL to 1.0.1t. [spz, ticket #1379] +etc/namedb/root.cache1.19 + + Update to 2015120100. + * Addresses of H.ROOT-SERVERS.NET has updated. + * Make IPv6 address lower case. + [taca, ticket #1351] + +etc/ssh/ssh_known_hosts1.9 + + Add keys for wip.pkgsrc.org. + [wiz, ticket #1362] +
CVS commit: [netbsd-6] src/sys/dev
Module Name:src Committed By: snj Date: Fri May 6 18:43:35 UTC 2016 Modified Files: src/sys/dev/mii [netbsd-6]: igphy.c ukphy.c src/sys/dev/pci [netbsd-6]: if_wm.c if_wmreg.h if_wmvar.h Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1366): sys/dev/pci/if_wm.c: 1.281, 1.318, 1.320, 1.324-1.332, 1.334, 1.336, 1.343-1.344, 1.347-1.348, 1.350, 1.376-1.382, 1.386-1.387, 1.389 via patch sys/dev/pci/if_wmreg.h: 1.68-1.70, 1.73-1.77, 1.79-1.80, 1.82, 1.86-1.88 via patch sys/dev/pci/if_wmvar.h: 1.22-1.23, 1.25-1.30 via patch sys/dev/mii/igphy.c: 1.25 sys/dev/mii/ukphy.c: 1.48 Sync wm(4) as of if_wm.c rev 1.389 except SERDES, MSI/MSI-X, multiqueue and NET_MPSAFE: - Set ICH9 and ICH10's PBA size to 14K if the RX buffer size is more than 4096. Almost the same as other OSes. - For 82576 and newer devices, the PBA register is deleted. Don't write PBA for those chips. Also change the calculation of RX packet buffer size in new way. - Print NVM image version and option ROM version. - Add workaround for I210 Errata 25 and I211 Errata 10 (PLL bug). This workaround is required if the NVM image version < 3.25. - Fix a bug that wm_detach() didn't unmap the FHASH's area. Now "drvctl -d wm0" -> "drvctl -r pci0" works on ICH* and PCH*. - Add workaround for 82574 Errata 25 and 82583 Errata 12 "Dropped RX packets" and for 82573 (unknown). Set GCR_L1_ACT_WITHOUT_L0S_RX bit. The NVM Image version 2.1.4 and newer have this workaround. - Check PHY type correctly. This change is required to use igphy(4) device correctly. - Disable LPLU (Low Power Link Up) on D0 state on 82574, 82583 and ICH* too. - Call wm_get_hw_control() correctly. This change fixes a bug that some AMT based systems doesn't linkup at 1000BaseT. The problem was observed on HP Compaq dc7700. A lot of fixes have been done for wm(4) and igphy(4), so now PR#44893 should be fixed. - Call wm_get_wakeup(sc) before checking WM_F_HAS_AMT. It's required to check the existence of AMT correctly. - Fix a problem that wm_gate_hw_phy_config_ich8lan() isn't called in wm_reset() on PCH2. - Clear WMREG_WUC in wm_reset() if the chip >= 82544. This might fix the behavior on suspend/resume. - Fix logic of wm_check_reset_block() on ICH* and PCH*. This change might fix a problem that PHY's read/write functions can't get semaphore. - On ICH8, call wm_gig_downshift_workaround_ich8lan() when link changed down. - Drop PHY_CTRL_GBE_DIS explicitly in wm_lplu_d0_disable() in case BIOS sets this bit. - Fix two bugs in wm_kmrn_lock_loss_workaround_ich8lan(). Now the function checks the status correctly but it causes linkdown up to 10 times, so it's disabled for the time being. - PR/50527: David Binderman: Fix impossible code. Odd offsets need special treatment. - Fix RAL table's size of PCH2 and PCH_LPT. - PCH_LPT (and newer device) is required to check FWSM_WLOCK_MAC bit to determine the range of the RAL. - Use sc->sc_itr instead of hard-coded number. - Rename wm_tbi_check_link() to wm_tbi_tick() because this function acts as mii_tick(). - ACK Accelerate Disable in the RFCTL register is not bit 13 but 12. No binary change because this definition has not used yet. - Add ACK data Disable bit's definition (not used yet). - PHY_CTRL_GBE_DIS is not bit 4 but bit 6. This change has no any effect by default because WM_WOL is not defined yet and m_kmrn_lock_loss_workaround_ich8lan() is broken. - Fix wm_check_mng_mode_ich8lan(). This function is used only when WM_WOL is defined and it's disabled by default. - Rename wm_check_reset_block() to wm_phy_resetisblocked() and make it returns bool. No functional change. - Reorder function definitions and macro definitions. No functional change. - Fix comment. Add comment. Update comment. - KNF. To generate a diff of this commit: cvs rdiff -u -r1.21.16.1 -r1.21.16.2 src/sys/dev/mii/igphy.c cvs rdiff -u -r1.43 -r1.43.14.1 src/sys/dev/mii/ukphy.c cvs rdiff -u -r1.227.2.18 -r1.227.2.19 src/sys/dev/pci/if_wm.c cvs rdiff -u -r1.46.2.8 -r1.46.2.9 src/sys/dev/pci/if_wmreg.h cvs rdiff -u -r1.12.10.6 -r1.12.10.7 src/sys/dev/pci/if_wmvar.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/mii/igphy.c diff -u src/sys/dev/mii/igphy.c:1.21.16.1 src/sys/dev/mii/igphy.c:1.21.16.2 --- src/sys/dev/mii/igphy.c:1.21.16.1 Sun Nov 9 12:13:15 2014 +++ src/sys/dev/mii/igphy.c Fri May 6 18:43:34 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: igphy.c,v 1.21.16.1 2014/11/09 12:13:15 martin Exp $ */ +/* $NetBSD: igphy.c,v 1.21.16.2 2016/05/06 18:43:34 snj Exp $ */ /* * The Intel copyright applies to the analog register setup, and the @@ -70,7 +70,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: igphy.c,v 1.21.16.1 2014/11/09 12:13:15 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: igphy.c,v 1.21.16.2 2016/05/06 18:43:34 snj Exp $");
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: snj Date: Fri May 6 18:39:50 UTC 2016 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.7 Log Message: 1351, 1362 To generate a diff of this commit: cvs rdiff -u -r1.1.2.64 -r1.1.2.65 src/doc/CHANGES-6.0.7 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-6.0.7 diff -u src/doc/CHANGES-6.0.7:1.1.2.64 src/doc/CHANGES-6.0.7:1.1.2.65 --- src/doc/CHANGES-6.0.7:1.1.2.64 Fri May 6 09:20:15 2016 +++ src/doc/CHANGES-6.0.7 Fri May 6 18:39:50 2016 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.7,v 1.1.2.64 2016/05/06 09:20:15 snj Exp $ +# $NetBSD: CHANGES-6.0.7,v 1.1.2.65 2016/05/06 18:39:50 snj Exp $ A complete list of changes from the NetBSD 6.0.6 release to the NetBSD 6.0.7 release: @@ -8191,3 +8191,15 @@ doc/3RDPARTY patch Update OpenSSL to 1.0.1t. [spz, ticket #1379] +etc/namedb/root.cache1.19 + + Update to 2015120100. + * Addresses of H.ROOT-SERVERS.NET has updated. + * Make IPv6 address lower case. + [taca, ticket #1351] + +etc/ssh/ssh_known_hosts1.9 + + Add keys for wip.pkgsrc.org. + [wiz, ticket #1362] +
CVS commit: [netbsd-6-0] src/etc/ssh
Module Name:src Committed By: snj Date: Fri May 6 18:38:26 UTC 2016 Modified Files: src/etc/ssh [netbsd-6-0]: ssh_known_hosts Log Message: Pull up following revision(s) (requested by wiz in ticket #1362): etc/ssh/ssh_known_hosts: revision 1.9 Add keys for wip.pkgsrc.org. To generate a diff of this commit: cvs rdiff -u -r1.7.12.1 -r1.7.12.2 src/etc/ssh/ssh_known_hosts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/ssh/ssh_known_hosts diff -u src/etc/ssh/ssh_known_hosts:1.7.12.1 src/etc/ssh/ssh_known_hosts:1.7.12.2 --- src/etc/ssh/ssh_known_hosts:1.7.12.1 Fri Sep 20 03:14:52 2013 +++ src/etc/ssh/ssh_known_hosts Fri May 6 18:38:26 2016 @@ -1,4 +1,4 @@ -# $NetBSD: ssh_known_hosts,v 1.7.12.1 2013/09/20 03:14:52 riz Exp $ +# $NetBSD: ssh_known_hosts,v 1.7.12.2 2016/05/06 18:38:26 snj Exp $ # anoncvs.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA3QiBl8leG9fqIJpKeNov0PKq5YryFFiroMWOPUv4hDFn8R0jC07YVaR/OSBrr37CTmGX5AFceXPzoFnLlwCqWR7rXg4NR75FTlTp9CG9EBAEtU8mee27KDrUFBTZdfVl2+aRYoAI5fTXA+0vpIO68Cq843vRWUZCcwinS4cNLUU= @@ -48,4 +48,7 @@ babylon5.netbsd.org ssh-rsa B3NzaC1y babylon5.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAGezUIquRab5bDygg8gme0Xu5K2V2YOJf2GeChuL7ZjLwjb5trRNkZ2VlS/rbp8vUkcQ5q5s6HnnuaY/3xTIpR7DwF3TqCSbf74e8i2HJ/AaD9w9TWm1kmXLVhHTH0lEX1a91HX1MBqonw6N10roOPmNjiwWbV5VkdqMSSwk3nREnS5Zg== # +wip.pkgsrc.org ssh-rsa B3NzaC1yc2EDAQABAAABAQDNc90vEP32OwsKkkHXQkUkkZYM155HZSoCIEQovICKQfeZ/MtEt2I4rINKlvmw+SEsbHvidiHRGk1V2c6/9aPjrzu7QkIkFZ5KgDyRDOrnQh2ZYwSU8AVRggb3lom616nYKhLw1S7y9rUlBDjhhSGr7GdCPKyQlzcfuIZLTR981TcRE1rUwOzwSZANh478U3eLIcF7ZB0Q+24l4sImcCh8o11sMXZpJB0i63m8sHr37JxvgOAxKLJ2rvUV0lq8F0NEr9zIpPPV0CCXOYS6UbkTaAAU5x6qFA+Yb5cRMVFno57A/jsi+1qGFpXFq05eVE76yczeKpa4b2Dd8f1yVx17 +wip.pkgsrc.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAC/6upkeVmje3znifKezKD9rtZEzr63ACPTmhtki7vAXgv2KRnyc6KBIZkycaCChZZJ5hM/TKsVnq6GbbU70+SUhgDNEWQXtjkk0ADpJLXLtL9tG6LMA2Cf8xSQf1sCv3hpE3IiKK6lq9EE9+kjqHlEMqxcOtTK2aMSvkpwcF4Udg7w8g== +#
CVS commit: [netbsd-6-1] src/etc/ssh
Module Name:src Committed By: snj Date: Fri May 6 18:37:59 UTC 2016 Modified Files: src/etc/ssh [netbsd-6-1]: ssh_known_hosts Log Message: Pull up following revision(s) (requested by wiz in ticket #1362): etc/ssh/ssh_known_hosts: revision 1.9 Add keys for wip.pkgsrc.org. To generate a diff of this commit: cvs rdiff -u -r1.7.20.1 -r1.7.20.2 src/etc/ssh/ssh_known_hosts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/ssh/ssh_known_hosts diff -u src/etc/ssh/ssh_known_hosts:1.7.20.1 src/etc/ssh/ssh_known_hosts:1.7.20.2 --- src/etc/ssh/ssh_known_hosts:1.7.20.1 Fri Sep 20 03:15:28 2013 +++ src/etc/ssh/ssh_known_hosts Fri May 6 18:37:59 2016 @@ -1,4 +1,4 @@ -# $NetBSD: ssh_known_hosts,v 1.7.20.1 2013/09/20 03:15:28 riz Exp $ +# $NetBSD: ssh_known_hosts,v 1.7.20.2 2016/05/06 18:37:59 snj Exp $ # anoncvs.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA3QiBl8leG9fqIJpKeNov0PKq5YryFFiroMWOPUv4hDFn8R0jC07YVaR/OSBrr37CTmGX5AFceXPzoFnLlwCqWR7rXg4NR75FTlTp9CG9EBAEtU8mee27KDrUFBTZdfVl2+aRYoAI5fTXA+0vpIO68Cq843vRWUZCcwinS4cNLUU= @@ -48,4 +48,7 @@ babylon5.netbsd.org ssh-rsa B3NzaC1y babylon5.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAGezUIquRab5bDygg8gme0Xu5K2V2YOJf2GeChuL7ZjLwjb5trRNkZ2VlS/rbp8vUkcQ5q5s6HnnuaY/3xTIpR7DwF3TqCSbf74e8i2HJ/AaD9w9TWm1kmXLVhHTH0lEX1a91HX1MBqonw6N10roOPmNjiwWbV5VkdqMSSwk3nREnS5Zg== # +wip.pkgsrc.org ssh-rsa B3NzaC1yc2EDAQABAAABAQDNc90vEP32OwsKkkHXQkUkkZYM155HZSoCIEQovICKQfeZ/MtEt2I4rINKlvmw+SEsbHvidiHRGk1V2c6/9aPjrzu7QkIkFZ5KgDyRDOrnQh2ZYwSU8AVRggb3lom616nYKhLw1S7y9rUlBDjhhSGr7GdCPKyQlzcfuIZLTR981TcRE1rUwOzwSZANh478U3eLIcF7ZB0Q+24l4sImcCh8o11sMXZpJB0i63m8sHr37JxvgOAxKLJ2rvUV0lq8F0NEr9zIpPPV0CCXOYS6UbkTaAAU5x6qFA+Yb5cRMVFno57A/jsi+1qGFpXFq05eVE76yczeKpa4b2Dd8f1yVx17 +wip.pkgsrc.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAC/6upkeVmje3znifKezKD9rtZEzr63ACPTmhtki7vAXgv2KRnyc6KBIZkycaCChZZJ5hM/TKsVnq6GbbU70+SUhgDNEWQXtjkk0ADpJLXLtL9tG6LMA2Cf8xSQf1sCv3hpE3IiKK6lq9EE9+kjqHlEMqxcOtTK2aMSvkpwcF4Udg7w8g== +#
CVS commit: [netbsd-6] src/etc/ssh
Module Name:src Committed By: snj Date: Fri May 6 18:37:38 UTC 2016 Modified Files: src/etc/ssh [netbsd-6]: ssh_known_hosts Log Message: Pull up following revision(s) (requested by wiz in ticket #1362): etc/ssh/ssh_known_hosts: revision 1.9 Add keys for wip.pkgsrc.org. To generate a diff of this commit: cvs rdiff -u -r1.7.6.1 -r1.7.6.2 src/etc/ssh/ssh_known_hosts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/ssh/ssh_known_hosts diff -u src/etc/ssh/ssh_known_hosts:1.7.6.1 src/etc/ssh/ssh_known_hosts:1.7.6.2 --- src/etc/ssh/ssh_known_hosts:1.7.6.1 Fri Sep 20 03:14:17 2013 +++ src/etc/ssh/ssh_known_hosts Fri May 6 18:37:38 2016 @@ -1,4 +1,4 @@ -# $NetBSD: ssh_known_hosts,v 1.7.6.1 2013/09/20 03:14:17 riz Exp $ +# $NetBSD: ssh_known_hosts,v 1.7.6.2 2016/05/06 18:37:38 snj Exp $ # anoncvs.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA3QiBl8leG9fqIJpKeNov0PKq5YryFFiroMWOPUv4hDFn8R0jC07YVaR/OSBrr37CTmGX5AFceXPzoFnLlwCqWR7rXg4NR75FTlTp9CG9EBAEtU8mee27KDrUFBTZdfVl2+aRYoAI5fTXA+0vpIO68Cq843vRWUZCcwinS4cNLUU= @@ -48,4 +48,7 @@ babylon5.netbsd.org ssh-rsa B3NzaC1y babylon5.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAGezUIquRab5bDygg8gme0Xu5K2V2YOJf2GeChuL7ZjLwjb5trRNkZ2VlS/rbp8vUkcQ5q5s6HnnuaY/3xTIpR7DwF3TqCSbf74e8i2HJ/AaD9w9TWm1kmXLVhHTH0lEX1a91HX1MBqonw6N10roOPmNjiwWbV5VkdqMSSwk3nREnS5Zg== # +wip.pkgsrc.org ssh-rsa B3NzaC1yc2EDAQABAAABAQDNc90vEP32OwsKkkHXQkUkkZYM155HZSoCIEQovICKQfeZ/MtEt2I4rINKlvmw+SEsbHvidiHRGk1V2c6/9aPjrzu7QkIkFZ5KgDyRDOrnQh2ZYwSU8AVRggb3lom616nYKhLw1S7y9rUlBDjhhSGr7GdCPKyQlzcfuIZLTR981TcRE1rUwOzwSZANh478U3eLIcF7ZB0Q+24l4sImcCh8o11sMXZpJB0i63m8sHr37JxvgOAxKLJ2rvUV0lq8F0NEr9zIpPPV0CCXOYS6UbkTaAAU5x6qFA+Yb5cRMVFno57A/jsi+1qGFpXFq05eVE76yczeKpa4b2Dd8f1yVx17 +wip.pkgsrc.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAC/6upkeVmje3znifKezKD9rtZEzr63ACPTmhtki7vAXgv2KRnyc6KBIZkycaCChZZJ5hM/TKsVnq6GbbU70+SUhgDNEWQXtjkk0ADpJLXLtL9tG6LMA2Cf8xSQf1sCv3hpE3IiKK6lq9EE9+kjqHlEMqxcOtTK2aMSvkpwcF4Udg7w8g== +#
CVS commit: [netbsd-6-0] src/etc/namedb
Module Name:src Committed By: snj Date: Fri May 6 18:34:56 UTC 2016 Modified Files: src/etc/namedb [netbsd-6-0]: root.cache Log Message: Pull up following revision(s) (requested by taca in ticket #1351): etc/namedb/root.cache: revision 1.19 Update to 2015120100. * Addresses of H.ROOT-SERVERS.NET has updated. * Make IPv6 address lower case. To generate a diff of this commit: cvs rdiff -u -r1.16.10.2 -r1.16.10.3 src/etc/namedb/root.cache Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/namedb/root.cache diff -u src/etc/namedb/root.cache:1.16.10.2 src/etc/namedb/root.cache:1.16.10.3 --- src/etc/namedb/root.cache:1.16.10.2 Thu Aug 7 07:37:59 2014 +++ src/etc/namedb/root.cache Fri May 6 18:34:56 2016 @@ -1,4 +1,4 @@ -; $NetBSD: root.cache,v 1.16.10.2 2014/08/07 07:37:59 msaitoh Exp $ +; $NetBSD: root.cache,v 1.16.10.3 2016/05/06 18:34:56 snj Exp $ ; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the "cache . " @@ -10,32 +10,32 @@ ; on server FTP.INTERNIC.NET ; -OR-RS.INTERNIC.NET ; -; last update:June 2, 2014 -; related version of root zone: 2014060201 +; last update:December 01, 2015 +; related version of root zone: 2015120100 ; ; formerly NS.INTERNIC.NET ; -.360 IN NSA.ROOT-SERVERS.NET. +.360 NSA.ROOT-SERVERS.NET. A.ROOT-SERVERS.NET. 360 A 198.41.0.4 -A.ROOT-SERVERS.NET. 360 2001:503:BA3E::2:30 +A.ROOT-SERVERS.NET. 360 2001:503:ba3e::2:30 ; ; FORMERLY NS1.ISI.EDU ; .360 NSB.ROOT-SERVERS.NET. B.ROOT-SERVERS.NET. 360 A 192.228.79.201 -B.ROOT-SERVERS.NET. 360 2001:500:84::B +B.ROOT-SERVERS.NET. 360 2001:500:84::b ; ; FORMERLY C.PSI.NET ; .360 NSC.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 360 A 192.33.4.12 -C.ROOT-SERVERS.NET. 360 2001:500:2::C +C.ROOT-SERVERS.NET. 360 2001:500:2::c ; ; FORMERLY TERP.UMD.EDU ; .360 NSD.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 360 A 199.7.91.13 -D.ROOT-SERVERS.NET. 360 2001:500:2D::D +D.ROOT-SERVERS.NET. 360 2001:500:2d::d ; ; FORMERLY NS.NASA.GOV ; @@ -46,7 +46,7 @@ E.ROOT-SERVERS.NET. 360 A ; .360 NSF.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 360 A 192.5.5.241 -F.ROOT-SERVERS.NET. 360 2001:500:2F::F +F.ROOT-SERVERS.NET. 360 2001:500:2f::f ; ; FORMERLY NS.NIC.DDN.MIL ; @@ -56,26 +56,26 @@ G.ROOT-SERVERS.NET. 360 A ; FORMERLY AOS.ARL.ARMY.MIL ; .360 NSH.ROOT-SERVERS.NET. -H.ROOT-SERVERS.NET. 360 A 128.63.2.53 -H.ROOT-SERVERS.NET. 360 2001:500:1::803F:235 +H.ROOT-SERVERS.NET. 360 A 198.97.190.53 +H.ROOT-SERVERS.NET. 360 2001:500:1::53 ; ; FORMERLY NIC.NORDU.NET ; .360 NSI.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 360 A 192.36.148.17 -I.ROOT-SERVERS.NET. 360 2001:7FE::53 +I.ROOT-SERVERS.NET. 360 2001:7fe::53 ; ; OPERATED BY VERISIGN, INC. ; .360 NSJ.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 360 A 192.58.128.30 -J.ROOT-SERVERS.NET. 360 2001:503:C27::2:30 +J.ROOT-SERVERS.NET. 360 2001:503:c27::2:30 ; ; OPERATED BY RIPE NCC ; .360 NSK.ROOT-SERVERS.NET. K.ROOT-SERVERS.NET. 360 A 193.0.14.129 -K.ROOT-SERVERS.NET. 360 2001:7FD::1 +K.ROOT-SERVERS.NET. 360 2001:7fd::1 ; ; OPERATED BY ICANN ; @@ -87,5 +87,5 @@ L.ROOT-SERVERS.NET. 360 AA ; .360 NSM.ROOT-SERVERS.NET. M.ROOT-SERVERS.NET. 360 A 202.12.27.33 -M.ROOT-SERVERS.NET. 360 2001:DC3::35 -; End of File +M.ROOT-SERVERS.NET. 360 2001:dc3::35 +; End of file
CVS commit: [netbsd-6-1] src/etc/namedb
Module Name:src Committed By: snj Date: Fri May 6 18:33:59 UTC 2016 Modified Files: src/etc/namedb [netbsd-6-1]: root.cache Log Message: Pull up following revision(s) (requested by taca in ticket #1351): etc/namedb/root.cache: revision 1.19 Update to 2015120100. * Addresses of H.ROOT-SERVERS.NET has updated. * Make IPv6 address lower case. To generate a diff of this commit: cvs rdiff -u -r1.16.4.1.2.1 -r1.16.4.1.2.2 src/etc/namedb/root.cache Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/namedb/root.cache diff -u src/etc/namedb/root.cache:1.16.4.1.2.1 src/etc/namedb/root.cache:1.16.4.1.2.2 --- src/etc/namedb/root.cache:1.16.4.1.2.1 Thu Aug 7 06:59:33 2014 +++ src/etc/namedb/root.cache Fri May 6 18:33:59 2016 @@ -1,4 +1,4 @@ -; $NetBSD: root.cache,v 1.16.4.1.2.1 2014/08/07 06:59:33 msaitoh Exp $ +; $NetBSD: root.cache,v 1.16.4.1.2.2 2016/05/06 18:33:59 snj Exp $ ; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the "cache . " @@ -10,32 +10,32 @@ ; on server FTP.INTERNIC.NET ; -OR-RS.INTERNIC.NET ; -; last update:June 2, 2014 -; related version of root zone: 2014060201 +; last update:December 01, 2015 +; related version of root zone: 2015120100 ; ; formerly NS.INTERNIC.NET ; -.360 IN NSA.ROOT-SERVERS.NET. +.360 NSA.ROOT-SERVERS.NET. A.ROOT-SERVERS.NET. 360 A 198.41.0.4 -A.ROOT-SERVERS.NET. 360 2001:503:BA3E::2:30 +A.ROOT-SERVERS.NET. 360 2001:503:ba3e::2:30 ; ; FORMERLY NS1.ISI.EDU ; .360 NSB.ROOT-SERVERS.NET. B.ROOT-SERVERS.NET. 360 A 192.228.79.201 -B.ROOT-SERVERS.NET. 360 2001:500:84::B +B.ROOT-SERVERS.NET. 360 2001:500:84::b ; ; FORMERLY C.PSI.NET ; .360 NSC.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 360 A 192.33.4.12 -C.ROOT-SERVERS.NET. 360 2001:500:2::C +C.ROOT-SERVERS.NET. 360 2001:500:2::c ; ; FORMERLY TERP.UMD.EDU ; .360 NSD.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 360 A 199.7.91.13 -D.ROOT-SERVERS.NET. 360 2001:500:2D::D +D.ROOT-SERVERS.NET. 360 2001:500:2d::d ; ; FORMERLY NS.NASA.GOV ; @@ -46,7 +46,7 @@ E.ROOT-SERVERS.NET. 360 A ; .360 NSF.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 360 A 192.5.5.241 -F.ROOT-SERVERS.NET. 360 2001:500:2F::F +F.ROOT-SERVERS.NET. 360 2001:500:2f::f ; ; FORMERLY NS.NIC.DDN.MIL ; @@ -56,26 +56,26 @@ G.ROOT-SERVERS.NET. 360 A ; FORMERLY AOS.ARL.ARMY.MIL ; .360 NSH.ROOT-SERVERS.NET. -H.ROOT-SERVERS.NET. 360 A 128.63.2.53 -H.ROOT-SERVERS.NET. 360 2001:500:1::803F:235 +H.ROOT-SERVERS.NET. 360 A 198.97.190.53 +H.ROOT-SERVERS.NET. 360 2001:500:1::53 ; ; FORMERLY NIC.NORDU.NET ; .360 NSI.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 360 A 192.36.148.17 -I.ROOT-SERVERS.NET. 360 2001:7FE::53 +I.ROOT-SERVERS.NET. 360 2001:7fe::53 ; ; OPERATED BY VERISIGN, INC. ; .360 NSJ.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 360 A 192.58.128.30 -J.ROOT-SERVERS.NET. 360 2001:503:C27::2:30 +J.ROOT-SERVERS.NET. 360 2001:503:c27::2:30 ; ; OPERATED BY RIPE NCC ; .360 NSK.ROOT-SERVERS.NET. K.ROOT-SERVERS.NET. 360 A 193.0.14.129 -K.ROOT-SERVERS.NET. 360 2001:7FD::1 +K.ROOT-SERVERS.NET. 360 2001:7fd::1 ; ; OPERATED BY ICANN ; @@ -87,5 +87,5 @@ L.ROOT-SERVERS.NET. 360 AA ; .360 NSM.ROOT-SERVERS.NET. M.ROOT-SERVERS.NET. 360 A 202.12.27.33 -M.ROOT-SERVERS.NET. 360 2001:DC3::35 -; End of File +M.ROOT-SERVERS.NET. 360 2001:dc3::35 +; End of file
CVS commit: [netbsd-6] src/etc/namedb
Module Name:src Committed By: snj Date: Fri May 6 18:33:30 UTC 2016 Modified Files: src/etc/namedb [netbsd-6]: root.cache Log Message: Pull up following revision(s) (requested by taca in ticket #1351): etc/namedb/root.cache: revision 1.19 Update to 2015120100. * Addresses of H.ROOT-SERVERS.NET has updated. * Make IPv6 address lower case. To generate a diff of this commit: cvs rdiff -u -r1.16.4.4 -r1.16.4.5 src/etc/namedb/root.cache Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/namedb/root.cache diff -u src/etc/namedb/root.cache:1.16.4.4 src/etc/namedb/root.cache:1.16.4.5 --- src/etc/namedb/root.cache:1.16.4.4 Thu Aug 7 06:52:53 2014 +++ src/etc/namedb/root.cache Fri May 6 18:33:30 2016 @@ -1,4 +1,4 @@ -; $NetBSD: root.cache,v 1.16.4.4 2014/08/07 06:52:53 msaitoh Exp $ +; $NetBSD: root.cache,v 1.16.4.5 2016/05/06 18:33:30 snj Exp $ ; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the "cache . " @@ -10,32 +10,32 @@ ; on server FTP.INTERNIC.NET ; -OR-RS.INTERNIC.NET ; -; last update:June 2, 2014 -; related version of root zone: 2014060201 +; last update:December 01, 2015 +; related version of root zone: 2015120100 ; ; formerly NS.INTERNIC.NET ; -.360 IN NSA.ROOT-SERVERS.NET. +.360 NSA.ROOT-SERVERS.NET. A.ROOT-SERVERS.NET. 360 A 198.41.0.4 -A.ROOT-SERVERS.NET. 360 2001:503:BA3E::2:30 +A.ROOT-SERVERS.NET. 360 2001:503:ba3e::2:30 ; ; FORMERLY NS1.ISI.EDU ; .360 NSB.ROOT-SERVERS.NET. B.ROOT-SERVERS.NET. 360 A 192.228.79.201 -B.ROOT-SERVERS.NET. 360 2001:500:84::B +B.ROOT-SERVERS.NET. 360 2001:500:84::b ; ; FORMERLY C.PSI.NET ; .360 NSC.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 360 A 192.33.4.12 -C.ROOT-SERVERS.NET. 360 2001:500:2::C +C.ROOT-SERVERS.NET. 360 2001:500:2::c ; ; FORMERLY TERP.UMD.EDU ; .360 NSD.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 360 A 199.7.91.13 -D.ROOT-SERVERS.NET. 360 2001:500:2D::D +D.ROOT-SERVERS.NET. 360 2001:500:2d::d ; ; FORMERLY NS.NASA.GOV ; @@ -46,7 +46,7 @@ E.ROOT-SERVERS.NET. 360 A ; .360 NSF.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 360 A 192.5.5.241 -F.ROOT-SERVERS.NET. 360 2001:500:2F::F +F.ROOT-SERVERS.NET. 360 2001:500:2f::f ; ; FORMERLY NS.NIC.DDN.MIL ; @@ -56,26 +56,26 @@ G.ROOT-SERVERS.NET. 360 A ; FORMERLY AOS.ARL.ARMY.MIL ; .360 NSH.ROOT-SERVERS.NET. -H.ROOT-SERVERS.NET. 360 A 128.63.2.53 -H.ROOT-SERVERS.NET. 360 2001:500:1::803F:235 +H.ROOT-SERVERS.NET. 360 A 198.97.190.53 +H.ROOT-SERVERS.NET. 360 2001:500:1::53 ; ; FORMERLY NIC.NORDU.NET ; .360 NSI.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 360 A 192.36.148.17 -I.ROOT-SERVERS.NET. 360 2001:7FE::53 +I.ROOT-SERVERS.NET. 360 2001:7fe::53 ; ; OPERATED BY VERISIGN, INC. ; .360 NSJ.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 360 A 192.58.128.30 -J.ROOT-SERVERS.NET. 360 2001:503:C27::2:30 +J.ROOT-SERVERS.NET. 360 2001:503:c27::2:30 ; ; OPERATED BY RIPE NCC ; .360 NSK.ROOT-SERVERS.NET. K.ROOT-SERVERS.NET. 360 A 193.0.14.129 -K.ROOT-SERVERS.NET. 360 2001:7FD::1 +K.ROOT-SERVERS.NET. 360 2001:7fd::1 ; ; OPERATED BY ICANN ; @@ -87,5 +87,5 @@ L.ROOT-SERVERS.NET. 360 AA ; .360 NSM.ROOT-SERVERS.NET. M.ROOT-SERVERS.NET. 360 A 202.12.27.33 -M.ROOT-SERVERS.NET. 360 2001:DC3::35 -; End of File +M.ROOT-SERVERS.NET. 360 2001:dc3::35 +; End of file
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: christos
Date: Fri May 6 18:07:17 UTC 2016
Modified Files:
src/sys/dev/ic: rt2860.c
Log Message:
misc cleanups.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ic/rt2860.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/ic/rt2860.c
diff -u src/sys/dev/ic/rt2860.c:1.7 src/sys/dev/ic/rt2860.c:1.8
--- src/sys/dev/ic/rt2860.c:1.7 Mon May 2 20:19:32 2016
+++ src/sys/dev/ic/rt2860.c Fri May 6 14:07:17 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rt2860.c,v 1.7 2016/05/03 00:19:32 christos Exp $ */
+/* $NetBSD: rt2860.c,v 1.8 2016/05/06 18:07:17 christos Exp $ */
/* $OpenBSD: rt2860.c,v 1.90 2016/04/13 10:49:26 mpi Exp $ */
/*-
@@ -23,7 +23,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rt2860.c,v 1.7 2016/05/03 00:19:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rt2860.c,v 1.8 2016/05/06 18:07:17 christos Exp $");
#include
#include
@@ -69,6 +69,7 @@ int rt2860_debug = 0;
#define DPRINTF(x)
#define DPRINTFN(n, x)
#endif
+#define MAXQS 6 /* Tx (4 EDCAs + HCCA + Mgt) and Rx rings */
static void rt2860_attachhook(device_t);
static int rt2860_alloc_tx_ring(struct rt2860_softc *,
@@ -239,7 +240,7 @@ rt2860_attach(void *xsc, int id)
/*
* Allocate Tx (4 EDCAs + HCCA + Mgt) and Rx rings.
*/
- for (qid = 0; qid < 6; qid++) {
+ for (qid = 0; qid < MAXQS; qid++) {
if ((error = rt2860_alloc_tx_ring(sc, >txq[qid])) != 0) {
aprint_error_dev(sc->sc_dev,
"could not allocate Tx ring %d\n", qid);
@@ -418,7 +419,7 @@ rt2860_detach(void *xsc)
ieee80211_ifdetach(>sc_ic); /* free all nodes */
if_detach(ifp);
- for (qid = 0; qid < 6; qid++)
+ for (qid = 0; qid < MAXQS; qid++)
rt2860_free_tx_ring(sc, >txq[qid]);
rt2860_free_rx_ring(sc, >rxq);
rt2860_free_tx_pool(sc);
@@ -689,6 +690,7 @@ rt2860_alloc_rx_ring(struct rt2860_softc
for (i = 0; i < RT2860_RX_RING_COUNT; i++) {
struct rt2860_rx_data *data = >data[i];
struct rt2860_rxd *rxd = >rxd[i];
+ const char *msg;
error = bus_dmamap_create(sc->sc_dmat, MCLBYTES, 1, MCLBYTES,
0, BUS_DMA_NOWAIT, >map);
@@ -700,17 +702,13 @@ rt2860_alloc_rx_ring(struct rt2860_softc
MGET(data->m, M_DONTWAIT, MT_DATA);
if (data->m == NULL) {
- aprint_error_dev(sc->sc_dev,
- "could not allocate Rx mbuf\n");
- error = ENOBUFS;
- goto fail;
+ msg = "allocate Rx mbuf";
+ goto fail1;
}
MCLGET(data->m, M_DONTWAIT);
if ((data->m->m_flags & M_EXT) == 0) {
- aprint_error_dev(sc->sc_dev,
- "could not allocate Rx mbuf cluster\n");
-error = ENOBUFS;
- goto fail;
+ msg = "allocate Rx mbuf cluster";
+ goto fail1;
}
@@ -718,8 +716,12 @@ rt2860_alloc_rx_ring(struct rt2860_softc
mtod(data->m, void *), MCLBYTES, NULL,
BUS_DMA_READ | BUS_DMA_NOWAIT);
if (error != 0) {
- aprint_error_dev(sc->sc_dev,
- "could not load DMA map\n");
+ msg = "load DMA map";
+ fail1:
+ aprint_error_dev(sc->sc_dev, "could not %s\n", msg);
+ m_freem(data->m);
+ data->m = NULL;
+ error = ENOBUFS;
goto fail;
}
@@ -730,7 +732,6 @@ rt2860_alloc_rx_ring(struct rt2860_softc
bus_dmamap_sync(sc->sc_dmat, ring->map, 0, size, BUS_DMASYNC_PREWRITE);
return 0;
-
fail: rt2860_free_rx_ring(sc, ring);
return error;
}
@@ -761,9 +762,12 @@ rt2860_free_rx_ring(struct rt2860_softc
bus_dmamem_unmap(sc->sc_dmat, (void *)ring->rxd,
RT2860_RX_RING_COUNT * sizeof (struct rt2860_rxd));
bus_dmamem_free(sc->sc_dmat, >seg, 1);
+ ring->rxd = NULL;
}
- if (ring->map != NULL)
+ if (ring->map != NULL) {
bus_dmamap_destroy(sc->sc_dmat, ring->map);
+ ring->map = NULL;
+ }
for (i = 0; i < RT2860_RX_RING_COUNT; i++) {
struct rt2860_rx_data *data = >data[i];
@@ -773,9 +777,12 @@ rt2860_free_rx_ring(struct rt2860_softc
data->map->dm_mapsize, BUS_DMASYNC_POSTREAD);
bus_dmamap_unload(sc->sc_dmat, data->map);
m_freem(data->m);
+ data->m = NULL;
}
- if (data->map != NULL)
+ if (data->map != NULL) {
bus_dmamap_destroy(sc->sc_dmat, data->map);
+ data->map = NULL;
+ }
}
}
@@ -1533,6 +1540,7 @@ rt2860_tx(struct rt2860_softc *sc, struc
qid = (type == IEEE80211_FC0_TYPE_MGT) ?
sc->mgtqid : WME_AC_BE;
}
+ KASSERT(qid < MAXQS);
ring = >txq[qid];
/* pickup a rate index */
@@ -3436,7 +3444,7 @@ rt2860_init(struct ifnet *ifp)
RAL_SET_REGION_4(sc, RT2860_SKEY_MODE_0_7, 0, 4);
/* init Tx rings (4 EDCAs + HCCA + Mgt) */
- for (qid = 0; qid < 6; qid++) {
+ for (qid = 0; qid < MAXQS; qid++) {
RAL_WRITE(sc, RT2860_TX_BASE_PTR(qid), sc->txq[qid].paddr);
RAL_WRITE(sc, RT2860_TX_MAX_CNT(qid), RT2860_TX_RING_COUNT);
RAL_WRITE(sc, RT2860_TX_CTX_IDX(qid), 0);
@@ -3599,7 +3607,7 @@ rt2860_stop(struct ifnet *ifp, int disab
/* reset Tx and Rx rings (and reclaim TXWIs) */
sc->qfullmsk = 0;
- for (qid = 0; qid < 6; qid++)
+ for (qid
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Fri May 6 16:30:01 UTC 2016
Modified Files:
src/sys/dev/usb: ehci.c
Log Message:
Fix a KASSERT (ub_usepolling || mutex)
To generate a diff of this commit:
cvs rdiff -u -r1.250 -r1.251 src/sys/dev/usb/ehci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.250 src/sys/dev/usb/ehci.c:1.251
--- src/sys/dev/usb/ehci.c:1.250 Fri May 6 13:03:06 2016
+++ src/sys/dev/usb/ehci.c Fri May 6 16:30:01 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.250 2016/05/06 13:03:06 skrll Exp $ */
+/* $NetBSD: ehci.c,v 1.251 2016/05/06 16:30:01 skrll Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.250 2016/05/06 13:03:06 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.251 2016/05/06 16:30:01 skrll Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -3905,7 +3905,7 @@ ehci_device_bulk_done(struct usbd_xfer *
DPRINTF("xfer=%p, actlen=%d", xfer, xfer->ux_actlen, 0, 0);
- KASSERT(mutex_owned(>sc_lock));
+ KASSERT(sc->sc_bus.ub_usepolling || mutex_owned(>sc_lock));
usb_syncmem(>ux_dmabuf, 0, xfer->ux_length,
rd ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_POSTWRITE);
CVS commit: src/sys
Module Name:src
Committed By: skrll
Date: Fri May 6 13:03:06 UTC 2016
Modified Files:
src/sys/dev/usb: ehci.c motg.c ohci.c uhci.c
src/sys/external/bsd/dwc2: dwc2.c
Log Message:
usb is attached with config_interrupts so we can G/C the code to support
transfers when this wasn't the case.
To generate a diff of this commit:
cvs rdiff -u -r1.249 -r1.250 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/usb/motg.c
cvs rdiff -u -r1.260 -r1.261 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.270 -r1.271 src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.42 -r1.43 src/sys/external/bsd/dwc2/dwc2.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.249 src/sys/dev/usb/ehci.c:1.250
--- src/sys/dev/usb/ehci.c:1.249 Sat Apr 23 10:15:31 2016
+++ src/sys/dev/usb/ehci.c Fri May 6 13:03:06 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.249 2016/04/23 10:15:31 skrll Exp $ */
+/* $NetBSD: ehci.c,v 1.250 2016/05/06 13:03:06 skrll Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.249 2016/04/23 10:15:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.250 2016/05/06 13:03:06 skrll Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -159,7 +159,6 @@ Static usbd_status ehci_open(struct usbd
Static void ehci_poll(struct usbd_bus *);
Static void ehci_softintr(void *);
Static int ehci_intr1(ehci_softc_t *);
-Static void ehci_waitintr(ehci_softc_t *, struct usbd_xfer *);
Static void ehci_check_qh_intr(ehci_softc_t *, struct ehci_xfer *,
ex_completeq_t *);
Static void ehci_check_itd_intr(ehci_softc_t *, struct ehci_xfer *,
@@ -1279,48 +1278,6 @@ ehci_idone(struct ehci_xfer *ex, ex_comp
DPRINTF("ex=%p done", ex, 0, 0, 0);
}
-/*
- * Wait here until controller claims to have an interrupt.
- * Then call ehci_intr and return. Use timeout to avoid waiting
- * too long.
- */
-Static void
-ehci_waitintr(ehci_softc_t *sc, struct usbd_xfer *xfer)
-{
- int timo;
- uint32_t intrs;
-
- EHCIHIST_FUNC(); EHCIHIST_CALLED();
-
- xfer->ux_status = USBD_IN_PROGRESS;
- for (timo = xfer->ux_timeout; timo >= 0; timo--) {
- usb_delay_ms(>sc_bus, 1);
- if (sc->sc_dying)
- break;
- intrs = EHCI_STS_INTRS(EOREAD4(sc, EHCI_USBSTS)) &
- sc->sc_eintrs;
- DPRINTF("0x%04x", intrs, 0, 0, 0);
-#ifdef EHCI_DEBUG
- if (ehcidebug >= 15)
- ehci_dump_regs(sc);
-#endif
- if (intrs) {
- mutex_spin_enter(>sc_intr_lock);
- ehci_intr1(sc);
- mutex_spin_exit(>sc_intr_lock);
- if (xfer->ux_status != USBD_IN_PROGRESS)
-return;
- }
- }
-
- /* Timeout */
- DPRINTF("timeout", 0, 0, 0, 0);
- xfer->ux_status = USBD_TIMEOUT;
- mutex_enter(>sc_lock);
- usb_transfer_complete(xfer);
- mutex_exit(>sc_lock);
-}
-
Static void
ehci_poll(struct usbd_bus *bus)
{
@@ -3704,9 +3661,6 @@ ehci_device_ctrl_start(struct usbd_xfer
#endif
#endif
- if (sc->sc_bus.ub_usepolling)
- ehci_waitintr(sc, xfer);
-
return USBD_IN_PROGRESS;
}
@@ -3909,9 +3863,6 @@ ehci_device_bulk_start(struct usbd_xfer
#endif
#endif
- if (sc->sc_bus.ub_usepolling)
- ehci_waitintr(sc, xfer);
-
return USBD_IN_PROGRESS;
}
@@ -4123,9 +4074,6 @@ ehci_device_intr_start(struct usbd_xfer
#endif
#endif
- if (sc->sc_bus.ub_usepolling)
- ehci_waitintr(sc, xfer);
-
return USBD_IN_PROGRESS;
}
@@ -4509,11 +4457,6 @@ ehci_device_fs_isoc_transfer(struct usbd
mutex_exit(>sc_lock);
- if (sc->sc_bus.ub_usepolling) {
- printf("Starting ehci isoc xfer with polling. Bad idea?\n");
- ehci_waitintr(sc, xfer);
- }
-
return USBD_IN_PROGRESS;
}
@@ -4908,11 +4851,6 @@ ehci_device_isoc_transfer(struct usbd_xf
mutex_exit(>sc_lock);
- if (sc->sc_bus.ub_usepolling) {
- printf("Starting ehci isoc xfer with polling. Bad idea?\n");
- ehci_waitintr(sc, xfer);
- }
-
return USBD_IN_PROGRESS;
}
Index: src/sys/dev/usb/motg.c
diff -u src/sys/dev/usb/motg.c:1.15 src/sys/dev/usb/motg.c:1.16
--- src/sys/dev/usb/motg.c:1.15 Sat Apr 23 18:54:42 2016
+++ src/sys/dev/usb/motg.c Fri May 6 13:03:06 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: motg.c,v 1.15 2016/04/23 18:54:42 skrll Exp $ */
+/* $NetBSD: motg.c,v 1.16 2016/05/06 13:03:06 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.15 2016/04/23 18:54:42 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.16 2016/05/06 13:03:06 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_motg.h"
@@ -179,7 +179,6 @@ static void motg_device_intr_tx(struct
static void motg_device_data_read(struct usbd_xfer *);
static void motg_device_data_write(struct usbd_xfer *);
-static void motg_waitintr(struct motg_softc *, struct usbd_xfer *);
static void motg_device_clear_toggle(struct usbd_pipe *);
static void
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Fri May 6 10:56:04 UTC 2016
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
- Modify wm_smbustopci() to reduce the diff against Linux and FreeBSD.
- wm_gate_hw_phy_config_ich8lan() is for younger than PCH2.
- Add debug code.
To generate a diff of this commit:
cvs rdiff -u -r1.393 -r1.394 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.393 src/sys/dev/pci/if_wm.c:1.394
--- src/sys/dev/pci/if_wm.c:1.393 Fri May 6 08:57:43 2016
+++ src/sys/dev/pci/if_wm.c Fri May 6 10:56:04 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.393 2016/05/06 08:57:43 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.394 2016/05/06 10:56:04 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.393 2016/05/06 08:57:43 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.394 2016/05/06 10:56:04 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -3835,7 +3835,8 @@ wm_reset(struct wm_softc *sc)
reg |= CTRL_PHY_RESET;
phy_reset = 1;
- }
+ } else
+ printf("XXX reset is blocked!!!\n");
wm_get_swfwhw_semaphore(sc);
CSR_WRITE(sc, WMREG_CTRL, reg);
/* Don't insert a completion barrier when reset */
@@ -11416,6 +11417,9 @@ wm_gate_hw_phy_config_ich8lan(struct wm_
{
uint32_t reg;
+ if (sc->sc_type < WM_T_PCH2)
+ return;
+
reg = CSR_READ(sc, WMREG_EXTCNFCTR);
if (gate)
@@ -11429,11 +11433,26 @@ wm_gate_hw_phy_config_ich8lan(struct wm_
static void
wm_smbustopci(struct wm_softc *sc)
{
- uint32_t fwsm;
+ uint32_t fwsm, reg;
+
+ /* Gate automatic PHY configuration by hardware on non-managed 82579 */
+ wm_gate_hw_phy_config_ich8lan(sc, true);
+
+ /* Acquire semaphore */
+ wm_get_swfwhw_semaphore(sc);
fwsm = CSR_READ(sc, WMREG_FWSM);
if (((fwsm & FWSM_FW_VALID) == 0)
&& ((wm_phy_resetisblocked(sc) == false))) {
+ if (sc->sc_type >= WM_T_PCH_LPT) {
+ reg = CSR_READ(sc, WMREG_CTRL_EXT);
+ reg |= CTRL_EXT_FORCE_SMBUS;
+ CSR_WRITE(sc, WMREG_CTRL_EXT, reg);
+ CSR_WRITE_FLUSH(sc);
+ delay(50*1000);
+ }
+
+ /* Toggle LANPHYPC */
sc->sc_ctrl |= CTRL_LANPHYPC_OVERRIDE;
sc->sc_ctrl &= ~CTRL_LANPHYPC_VALUE;
CSR_WRITE(sc, WMREG_CTRL, sc->sc_ctrl);
@@ -11444,13 +11463,21 @@ wm_smbustopci(struct wm_softc *sc)
CSR_WRITE_FLUSH(sc);
delay(50*1000);
- /*
- * Gate automatic PHY configuration by hardware on non-managed
- * 82579
- */
- if (sc->sc_type == WM_T_PCH2)
- wm_gate_hw_phy_config_ich8lan(sc, 1);
+ if (sc->sc_type >= WM_T_PCH_LPT) {
+ reg = CSR_READ(sc, WMREG_CTRL_EXT);
+ reg &= ~CTRL_EXT_FORCE_SMBUS;
+ CSR_WRITE(sc, WMREG_CTRL_EXT, reg);
+ }
}
+
+ /* Release semaphore */
+ wm_put_swfwhw_semaphore(sc);
+
+ /*
+ * Ungate automatic PHY configuration by hardware on non-managed 82579
+ */
+ if ((sc->sc_type == WM_T_PCH2) && ((fwsm & FWSM_FW_VALID) == 0))
+ wm_gate_hw_phy_config_ich8lan(sc, false);
}
static void
CVS commit: src/distrib/notes/common
Module Name:src
Committed By: hiroshi
Date: Fri May 6 10:48:53 UTC 2016
Modified Files:
src/distrib/notes/common: main
Log Message:
Add myself
To generate a diff of this commit:
cvs rdiff -u -r1.527 -r1.528 src/distrib/notes/common/main
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.527 src/distrib/notes/common/main:1.528
--- src/distrib/notes/common/main:1.527 Tue May 3 13:43:11 2016
+++ src/distrib/notes/common/main Fri May 6 10:48:53 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: main,v 1.527 2016/05/03 13:43:11 kre Exp $
+.\" $NetBSD: main,v 1.528 2016/05/06 10:48:53 hiroshi Exp $
.\"
.\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -1406,6 +1406,7 @@ If you're one of them, and would like to
.It Ta Hasso Tepper Ta Mt ha...@netbsd.org
.It Ta Matt Thomas Ta Mt m...@netbsd.org
.It Ta Jason Thorpe Ta Mt thor...@netbsd.org
+.It Ta Hiroshi Tokuda Ta Mt hiro...@netbsd.org
.It Ta Christoph Toshok Ta Mt tos...@netbsd.org
.It Ta Tam\('as T\('oth Ta Mt tt...@netbsd.org
.It Ta Greg Troxel Ta Mt g...@netbsd.org
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Fri May 6 10:27:14 UTC 2016
Modified Files:
src/sys/dev/usb: xhci.c
Log Message:
Print LF in hexdump when datalen % 16 != 0. From t-hash.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/usb/xhci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.43 src/sys/dev/usb/xhci.c:1.44
--- src/sys/dev/usb/xhci.c:1.43 Fri May 6 10:25:56 2016
+++ src/sys/dev/usb/xhci.c Fri May 6 10:27:14 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.43 2016/05/06 10:25:56 skrll Exp $ */
+/* $NetBSD: xhci.c,v 1.44 2016/05/06 10:27:14 skrll Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.43 2016/05/06 10:25:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.44 2016/05/06 10:27:14 skrll Exp $");
#include "opt_usb.h"
@@ -674,6 +674,8 @@ hexdump(const char *msg, const void *bas
if (cnt % 16 == 0)
printf("\n");
}
+ if (cnt % 16 != 0)
+ printf("\n");
#endif
}
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Fri May 6 10:25:56 UTC 2016
Modified Files:
src/sys/dev/usb: xhci.c
Log Message:
G/C some #if 0 code
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/usb/xhci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.42 src/sys/dev/usb/xhci.c:1.43
--- src/sys/dev/usb/xhci.c:1.42 Fri May 6 10:24:06 2016
+++ src/sys/dev/usb/xhci.c Fri May 6 10:25:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.42 2016/05/06 10:24:06 skrll Exp $ */
+/* $NetBSD: xhci.c,v 1.43 2016/05/06 10:25:56 skrll Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.42 2016/05/06 10:24:06 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.43 2016/05/06 10:25:56 skrll Exp $");
#include "opt_usb.h"
@@ -2401,14 +2401,6 @@ xhci_new_device(device_t parent, struct
err = usbd_reload_device_desc(dev);
if (err)
goto bad;
-
-#if 0
- /* Re-establish the default pipe with the new MPS. */
- /* In xhci.c xhci_update_ep0_mps() does it instead. */
- usbd_kill_pipe(dev->ud_pipe0);
- err = usbd_setup_pipe(dev, 0, >ud_ep0,
- USBD_DEFAULT_INTERVAL, >ud_pipe0);
-#endif
}
DPRINTFN(1, "adding unit addr=%d, rev=%02x,",
@@ -3318,17 +3310,6 @@ xhci_device_ctrl_start(struct usbd_xfer
req->bmRequestType | (req->bRequest << 8), UGETW(req->wValue),
UGETW(req->wIndex), UGETW(req->wLength));
-#if 0 /* event handler does this */
- /* XXX */
- if (tr->is_halted) {
- DPRINTFN(1, "ctrl xfer %p halted: slot %u dci %u",
- xfer, xs->xs_idx, dci, 0);
- xhci_reset_endpoint(xfer->ux_pipe);
- tr->is_halted = false;
- xhci_set_dequeue(xfer->ux_pipe);
- }
-#endif
-
/* we rely on the bottom bits for extra info */
KASSERT(((uintptr_t)xfer & 0x3) == 0x0);
@@ -3645,15 +3626,6 @@ xhci_device_intr_done(struct usbd_xfer *
usb_syncmem(>ux_dmabuf, 0, xfer->ux_length,
isread ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_POSTWRITE);
-
-#if 0
- device_printf(sc->sc_dev, "");
- for (size_t i = 0; i < xfer->ux_length; i++) {
- printf(" %02x", ((uint8_t const *)xfer->ux_buffer)[i]);
- }
- printf("\n");
-#endif
-
}
static void
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Fri May 6 10:24:06 UTC 2016
Modified Files:
src/sys/dev/usb: xhci.c xhcireg.h
Log Message:
Remove magic numbers from xhci_hc_reset. From t-hash.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/usb/xhci.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/usb/xhcireg.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/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.41 src/sys/dev/usb/xhci.c:1.42
--- src/sys/dev/usb/xhci.c:1.41 Sat Apr 30 15:03:55 2016
+++ src/sys/dev/usb/xhci.c Fri May 6 10:24:06 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.41 2016/04/30 15:03:55 skrll Exp $ */
+/* $NetBSD: xhci.c,v 1.42 2016/05/06 10:24:06 skrll Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.41 2016/04/30 15:03:55 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.42 2016/05/06 10:24:06 skrll Exp $");
#include "opt_usb.h"
@@ -603,13 +603,13 @@ xhci_hc_reset(struct xhci_softc * const
int i;
/* Check controller not ready */
- for (i = 0; i < 100; i++) {
+ for (i = 0; i < XHCI_WAIT_CNR; i++) {
usbsts = xhci_op_read_4(sc, XHCI_USBSTS);
if ((usbsts & XHCI_STS_CNR) == 0)
break;
usb_delay_ms(>sc_bus, 1);
}
- if (i >= 100) {
+ if (i >= XHCI_WAIT_CNR) {
aprint_error_dev(sc->sc_dev, "controller not ready timeout\n");
return EIO;
}
@@ -622,25 +622,25 @@ xhci_hc_reset(struct xhci_softc * const
/* Reset controller */
usbcmd = XHCI_CMD_HCRST;
xhci_op_write_4(sc, XHCI_USBCMD, usbcmd);
- for (i = 0; i < 100; i++) {
+ for (i = 0; i < XHCI_WAIT_HCRST; i++) {
usbcmd = xhci_op_read_4(sc, XHCI_USBCMD);
if ((usbcmd & XHCI_CMD_HCRST) == 0)
break;
usb_delay_ms(>sc_bus, 1);
}
- if (i >= 100) {
+ if (i >= XHCI_WAIT_HCRST) {
aprint_error_dev(sc->sc_dev, "host controller reset timeout\n");
return EIO;
}
/* Check controller not ready */
- for (i = 0; i < 100; i++) {
+ for (i = 0; i < XHCI_WAIT_CNR; i++) {
usbsts = xhci_op_read_4(sc, XHCI_USBSTS);
if ((usbsts & XHCI_STS_CNR) == 0)
break;
usb_delay_ms(>sc_bus, 1);
}
- if (i >= 100) {
+ if (i >= XHCI_WAIT_CNR) {
aprint_error_dev(sc->sc_dev,
"controller not ready timeout after reset\n");
return EIO;
Index: src/sys/dev/usb/xhcireg.h
diff -u src/sys/dev/usb/xhcireg.h:1.5 src/sys/dev/usb/xhcireg.h:1.6
--- src/sys/dev/usb/xhcireg.h:1.5 Sat Apr 23 10:15:32 2016
+++ src/sys/dev/usb/xhcireg.h Fri May 6 10:24:06 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: xhcireg.h,v 1.5 2016/04/23 10:15:32 skrll Exp $ */
+/* $NetBSD: xhcireg.h,v 1.6 2016/05/06 10:24:06 skrll Exp $ */
/*-
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
@@ -97,6 +97,9 @@
#define XHCI_CMD_EWE 0x0400 /* RW Enable Wrap Event */
#define XHCI_CMD_EU3S 0x0800 /* RW Enable U3 MFINDEX Stop */
+#define XHCI_WAIT_CNR 100 /* in 1ms */
+#define XHCI_WAIT_HCRST 100 /* in 1ms */
+
#define XHCI_USBSTS 0x04 /* XHCI status */
#define XHCI_STS_HCH 0x0001 /* RO - Host Controller Halted */
#define XHCI_STS_HSE 0x0004 /* RW - Host System Error */
CVS commit: src/sys
Module Name:src
Committed By: pooka
Date: Fri May 6 10:19:40 UTC 2016
Modified Files:
src/sys/kern: init_sysent.c syscalls.c syscalls_autoload.c
systrace_args.c
src/sys/rump/include/rump: rump_syscalls.h
src/sys/rump/librump/rumpkern: rump_syscalls.c
src/sys/sys: syscall.h syscallargs.h
Log Message:
regen syscall files
To generate a diff of this commit:
cvs rdiff -u -r1.310 -r1.311 src/sys/kern/init_sysent.c
cvs rdiff -u -r1.300 -r1.301 src/sys/kern/syscalls.c
cvs rdiff -u -r1.19 -r1.20 src/sys/kern/syscalls_autoload.c \
src/sys/kern/systrace_args.c
cvs rdiff -u -r1.100 -r1.101 src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.127 -r1.128 src/sys/rump/librump/rumpkern/rump_syscalls.c
cvs rdiff -u -r1.294 -r1.295 src/sys/sys/syscall.h
cvs rdiff -u -r1.278 -r1.279 src/sys/sys/syscallargs.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/kern/init_sysent.c
diff -u src/sys/kern/init_sysent.c:1.310 src/sys/kern/init_sysent.c:1.311
--- src/sys/kern/init_sysent.c:1.310 Sat Apr 23 23:09:27 2016
+++ src/sys/kern/init_sysent.c Fri May 6 10:19:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: init_sysent.c,v 1.310 2016/04/23 23:09:27 christos Exp $ */
+/* $NetBSD: init_sysent.c,v 1.311 2016/05/06 10:19:40 pooka Exp $ */
/*
* System call switch table.
@@ -8,7 +8,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.310 2016/04/23 23:09:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.311 2016/05/06 10:19:40 pooka Exp $");
#include "opt_modular.h"
#include "opt_ntp.h"
Index: src/sys/kern/syscalls.c
diff -u src/sys/kern/syscalls.c:1.300 src/sys/kern/syscalls.c:1.301
--- src/sys/kern/syscalls.c:1.300 Sat Apr 23 23:09:27 2016
+++ src/sys/kern/syscalls.c Fri May 6 10:19:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: syscalls.c,v 1.300 2016/04/23 23:09:27 christos Exp $ */
+/* $NetBSD: syscalls.c,v 1.301 2016/05/06 10:19:40 pooka Exp $ */
/*
* System call names.
@@ -8,7 +8,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.300 2016/04/23 23:09:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.301 2016/05/06 10:19:40 pooka Exp $");
#if defined(_KERNEL_OPT)
#include "opt_modular.h"
Index: src/sys/kern/syscalls_autoload.c
diff -u src/sys/kern/syscalls_autoload.c:1.19 src/sys/kern/syscalls_autoload.c:1.20
--- src/sys/kern/syscalls_autoload.c:1.19 Sat Apr 23 23:09:27 2016
+++ src/sys/kern/syscalls_autoload.c Fri May 6 10:19:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: syscalls_autoload.c,v 1.19 2016/04/23 23:09:27 christos Exp $ */
+/* $NetBSD: syscalls_autoload.c,v 1.20 2016/05/06 10:19:40 pooka Exp $ */
/*
* System call autoload table.
@@ -8,7 +8,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.19 2016/04/23 23:09:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.20 2016/05/06 10:19:40 pooka Exp $");
#include
static struct sc_autoload netbsd_syscalls_autoload[] = {
Index: src/sys/kern/systrace_args.c
diff -u src/sys/kern/systrace_args.c:1.19 src/sys/kern/systrace_args.c:1.20
--- src/sys/kern/systrace_args.c:1.19 Sat Apr 23 23:09:27 2016
+++ src/sys/kern/systrace_args.c Fri May 6 10:19:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: systrace_args.c,v 1.19 2016/04/23 23:09:27 christos Exp $ */
+/* $NetBSD: systrace_args.c,v 1.20 2016/05/06 10:19:40 pooka Exp $ */
/*
* System call argument to DTrace register array converstion.
Index: src/sys/rump/include/rump/rump_syscalls.h
diff -u src/sys/rump/include/rump/rump_syscalls.h:1.100 src/sys/rump/include/rump/rump_syscalls.h:1.101
--- src/sys/rump/include/rump/rump_syscalls.h:1.100 Sat Apr 23 23:09:27 2016
+++ src/sys/rump/include/rump/rump_syscalls.h Fri May 6 10:19:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_syscalls.h,v 1.100 2016/04/23 23:09:27 christos Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.101 2016/05/06 10:19:40 pooka Exp $ */
/*
* System call protos in rump namespace.
@@ -16,824 +16,824 @@
#include
-#ifndef RUMP_SYS_RENAME_FKTRACE
-#define RUMP_SYS_RENAME_FKTRACE rump___sysimpl_fktrace
-#endif
-
-#ifndef RUMP_SYS_RENAME_GETSID
-#define RUMP_SYS_RENAME_GETSID rump___sysimpl_getsid
+#ifndef RUMP_SYS_RENAME_FGETXATTR
+#define RUMP_SYS_RENAME_FGETXATTR rump___sysimpl_fgetxattr
#endif
-#ifndef RUMP_SYS_RENAME_RECVMMSG
-#define RUMP_SYS_RENAME_RECVMMSG rump___sysimpl_recvmmsg
+#ifndef RUMP_SYS_RENAME_IOCTL
+#define RUMP_SYS_RENAME_IOCTL rump___sysimpl_ioctl
#endif
-#ifndef RUMP_SYS_RENAME_UTIMENSAT
-#define RUMP_SYS_RENAME_UTIMENSAT rump___sysimpl_utimensat
+#ifndef RUMP_SYS_RENAME_GETPPID
+#define RUMP_SYS_RENAME_GETPPID rump___sysimpl_getppid
#endif
-#ifndef RUMP_SYS_RENAME_CHFLAGS
-#define RUMP_SYS_RENAME_CHFLAGS rump___sysimpl_chflags
+#ifndef RUMP_SYS_RENAME___QUOTACTL
+#define RUMP_SYS_RENAME___QUOTACTL rump___sysimpl___quotactl
#endif
-#ifndef
CVS commit: src/sys/kern
Module Name:src Committed By: pooka Date: Fri May 6 10:17:34 UTC 2016 Modified Files: src/sys/kern: syscalls.conf Log Message: Include non-portable inside RUMP_CLIENT protection. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/kern/syscalls.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/syscalls.conf diff -u src/sys/kern/syscalls.conf:1.27 src/sys/kern/syscalls.conf:1.28 --- src/sys/kern/syscalls.conf:1.27 Sun Apr 3 01:22:18 2016 +++ src/sys/kern/syscalls.conf Fri May 6 10:17:34 2016 @@ -1,11 +1,11 @@ -# $NetBSD: syscalls.conf,v 1.27 2016/04/03 01:22:18 christos Exp $ +# $NetBSD: syscalls.conf,v 1.28 2016/05/06 10:17:34 pooka Exp $ sysnames="syscalls.c" sysnumhdr="../sys/syscall.h" syssw="init_sysent.c" systrace="systrace_args.c" sysarghdr="../sys/syscallargs.h" -sysarghdrextra='#ifndef RUMP_CLIENT\n#include \n#include \n#endif\n#include \n#include \n\n' +sysarghdrextra='#ifndef RUMP_CLIENT\n#include \n#include \n#include \n#endif\n\n#include \n\n' sysautoload="syscalls_autoload.c" sysalign=1 rumpcalls="../rump/librump/rumpkern/rump_syscalls.c"
CVS commit: src
Module Name:src
Committed By: snj
Date: Fri May 6 09:30:05 UTC 2016
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: man.inc
src/distrib/sets/lists/comp: mi
Log Message:
hook new man pages into build
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/man.inc
cvs rdiff -u -r1.2033 -r1.2034 src/distrib/sets/lists/comp/mi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/man.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/man.inc:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/man.inc:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/man.inc:1.4 Sun Aug 10 17:07:03 2014
+++ src/crypto/external/bsd/openssl/lib/libcrypto/man.inc Fri May 6 09:30:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: man.inc,v 1.4 2014/08/10 17:07:03 spz Exp $
+# $NetBSD: man.inc,v 1.5 2016/05/06 09:30:05 snj Exp $
.PATH: ${.CURDIR}/man
@@ -67,11 +67,12 @@ MAN+= RSA_padding_add_PKCS1_type_1.3 ope
DH_generate_parameters.3 ERR_print_errors.3 lh_stats.3 \
openssl_ui_compat.3 X509_NAME_ENTRY_get_object.3 SSL_connect.3 \
BIO_s_connect.3 BIO_s_socket.3 BN_set_bit.3 EVP_SealInit.3 \
- EVP_OpenInit.3 EVP_SignInit.3 EVP_EncryptInit.3 EVP_DigestInit.3 \
- EVP_VerifyInit.3 SSL_library_init.3 SSL_get_verify_result.3 \
- SSL_set_verify_result.3 SSL_want.3 RSA_print.3 SSL_accept.3 \
- BIO_s_accept.3 PKCS7_decrypt.3 PKCS7_encrypt.3 RSA_public_encrypt.3 \
- RSA_private_encrypt.3 BN_CTX_start.3 SSL_CTX_add_extra_chain_cert.3 \
+ EVP_OpenInit.3 EVP_SignInit.3 EVP_EncodeInit.3 EVP_EncryptInit.3 \
+ EVP_DigestInit.3 EVP_VerifyInit.3 SSL_library_init.3 \
+ SSL_get_verify_result.3 SSL_set_verify_result.3 SSL_want.3 \
+ RSA_print.3 SSL_accept.3 BIO_s_accept.3 PKCS7_decrypt.3 \
+ PKCS7_encrypt.3 RSA_public_encrypt.3 RSA_private_encrypt.3 \
+ BN_CTX_start.3 SSL_CTX_add_extra_chain_cert.3 \
SSL_get_client_CA_list.3 SSL_CTX_set_client_CA_list.3 \
SSL_CTX_set_cipher_list.3 SSL_CTX_set_max_cert_list.3 \
SSL_CTX_set_timeout.3 SSL_get_default_timeout.3 \
@@ -95,7 +96,8 @@ MAN+= RSA_padding_add_PKCS1_type_1.3 ope
X509_STORE_CTX_new.3 X509_STORE_CTX_set_verify_cb.3 \
X509_STORE_CTX_set_verify_cb.3 X509_STORE_set_verify_cb_func.3 \
X509_VERIFY_PARAM_set_flags.3 X509_verify_cert.3 \
- EVP_PKEY_verify_recover.3 SSL_CTX_set_tlsext_ticket_key_cb.3
+ EVP_PKEY_verify_recover.3 SSL_CTX_set_tlsext_status_cb.3 \
+ SSL_CTX_set_tlsext_ticket_key_cb.3
MAN+= openssl.cnf.5
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2033 src/distrib/sets/lists/comp/mi:1.2034
--- src/distrib/sets/lists/comp/mi:1.2033 Mon May 2 12:59:30 2016
+++ src/distrib/sets/lists/comp/mi Fri May 6 09:30:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2033 2016/05/02 12:59:30 christos Exp $
+# $NetBSD: mi,v 1.2034 2016/05/06 09:30:05 snj Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.compcomp-sys-root
@@ -4397,6 +4397,7 @@
./usr/share/man/cat3/ERR_set_mark.0 comp-c-catman crypto,.cat
./usr/share/man/cat3/EVP_BytesToKey.0 comp-c-catman crypto,.cat
./usr/share/man/cat3/EVP_DigestInit.0 comp-c-catman crypto,.cat
+./usr/share/man/cat3/EVP_EncodeInit.0 comp-c-catman crypto,.cat
./usr/share/man/cat3/EVP_EncryptInit.0 comp-c-catman crypto,.cat
./usr/share/man/cat3/EVP_OpenInit.0 comp-c-catman crypto,.cat
./usr/share/man/cat3/EVP_PKEY_new.0 comp-c-catman crypto,.cat
@@ -4719,6 +4720,7 @@
./usr/share/man/cat3/SSL_CTX_set_session_id_context.0 comp-c-catman crypto,.cat
./usr/share/man/cat3/SSL_CTX_set_ssl_version.0 comp-c-catman crypto,.cat
./usr/share/man/cat3/SSL_CTX_set_timeout.0 comp-c-catman crypto,.cat
+./usr/share/man/cat3/SSL_CTX_set_tlsext_status_cb.0 comp-c-catman crypto,.cat
./usr/share/man/cat3/SSL_CTX_set_tlsext_ticket_key_cb.0 comp-c-catman crypto,.cat
./usr/share/man/cat3/SSL_CTX_set_tmp_dh_callback.0 comp-c-catman crypto,.cat
./usr/share/man/cat3/SSL_CTX_set_tmp_rsa_callback.0 comp-c-catman crypto,.cat
@@ -11665,6 +11667,7 @@
./usr/share/man/html3/ERR_set_mark.html comp-c-htmlman crypto,html
./usr/share/man/html3/EVP_BytesToKey.html comp-c-htmlman crypto,html
./usr/share/man/html3/EVP_DigestInit.html comp-c-htmlman crypto,html
+./usr/share/man/html3/EVP_EncodeInit.html comp-c-htmlman crypto,html
./usr/share/man/html3/EVP_EncryptInit.html comp-c-htmlman crypto,html
./usr/share/man/html3/EVP_OpenInit.html comp-c-htmlman crypto,html
./usr/share/man/html3/EVP_PKEY_new.html comp-c-htmlman crypto,html
@@ -11985,6 +11988,7 @@
./usr/share/man/html3/SSL_CTX_set_session_id_context.html comp-c-htmlman crypto,html
./usr/share/man/html3/SSL_CTX_set_ssl_version.html comp-c-htmlman crypto,html
./usr/share/man/html3/SSL_CTX_set_timeout.html comp-c-htmlman crypto,html
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: snj Date: Fri May 6 09:19:43 UTC 2016 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.6 Log Message: 1379 To generate a diff of this commit: cvs rdiff -u -r1.1.2.61 -r1.1.2.62 src/doc/CHANGES-6.1.6 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-6.1.6 diff -u src/doc/CHANGES-6.1.6:1.1.2.61 src/doc/CHANGES-6.1.6:1.1.2.62 --- src/doc/CHANGES-6.1.6:1.1.2.61 Thu Apr 21 15:24:39 2016 +++ src/doc/CHANGES-6.1.6 Fri May 6 09:19:43 2016 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.6,v 1.1.2.61 2016/04/21 15:24:39 martin Exp $ +# $NetBSD: CHANGES-6.1.6,v 1.1.2.62 2016/05/06 09:19:43 snj Exp $ A complete list of changes from the NetBSD 6.1.5 release to the NetBSD 6.1.6 release: @@ -7516,3 +7516,398 @@ sys/compat/netbsd32/netbsd32_socket.c 1 Memory leak, triggerable from an unprivileged user. [christos, ticket #1378] +crypto/external/bsd/openssl/dist/CHANGES up to 1.11 +crypto/external/bsd/openssl/dist/Makefile up to 1.12 +crypto/external/bsd/openssl/dist/NEWS up to 1.11 +crypto/external/bsd/openssl/dist/README up to 1.11 +crypto/external/bsd/openssl/dist/openssl.spec up to 1.11 +crypto/external/bsd/openssl/dist/apps/pkcs7.c up to 1.1.1.4 +crypto/external/bsd/openssl/dist/crypto/opensslv.h up to 1.20 +crypto/external/bsd/openssl/dist/crypto/asn1/a_bytes.c up to 1.1.1.3 +crypto/external/bsd/openssl/dist/crypto/asn1/a_d2i_fp.c up to 1.4 +crypto/external/bsd/openssl/dist/crypto/asn1/a_type.c up to 1.4 +crypto/external/bsd/openssl/dist/crypto/asn1/asn1_lib.c up to 1.1.1.4 +crypto/external/bsd/openssl/dist/crypto/asn1/asn1_par.c up to 1.1.1.5 +crypto/external/bsd/openssl/dist/crypto/asn1/t_x509.c up to 1.1.1.6 +crypto/external/bsd/openssl/dist/crypto/asn1/tasn_dec.c up to 1.5 +crypto/external/bsd/openssl/dist/crypto/asn1/tasn_enc.c up to 1.5 +crypto/external/bsd/openssl/dist/crypto/asn1/x_name.c up to 1.1.1.5 +crypto/external/bsd/openssl/dist/crypto/asn1/x_x509.c up to 1.1.1.6 +crypto/external/bsd/openssl/dist/crypto/bn/asm/x86-mont.pl up to 1.1.1.3 +crypto/external/bsd/openssl/dist/crypto/bn/asm/x86_64-mont.pl up to 1.1.1.4 +crypto/external/bsd/openssl/dist/crypto/bn/asm/x86_64-mont5.pl up to 1.1.1.5 +crypto/external/bsd/openssl/dist/crypto/comp/comp.h up to 1.1.1.3 +crypto/external/bsd/openssl/dist/crypto/evp/Makefile up to 1.6 +crypto/external/bsd/openssl/dist/crypto/evp/digest.c up to 1.1.1.7 +crypto/external/bsd/openssl/dist/crypto/evp/e_aes_cbc_hmac_sha1.c up to 1.1.1.7 +crypto/external/bsd/openssl/dist/crypto/evp/encode.c up to 1.1.1.7 +crypto/external/bsd/openssl/dist/crypto/evp/evp_enc.c up to 1.5 +crypto/external/bsd/openssl/dist/crypto/pem/pem_lib.c up to 1.1.1.7 +crypto/external/bsd/openssl/dist/crypto/pem/pvkfmt.c up to 1.1.1.7 +crypto/external/bsd/openssl/dist/crypto/x509/x509.h up to 1.1.1.7 +crypto/external/bsd/openssl/dist/crypto/x509/x509_err.c up to 1.1.1.3 +crypto/external/bsd/openssl/dist/crypto/x509/x509_obj.c up to 1.1.1.3 +crypto/external/bsd/openssl/dist/doc/apps/ciphers.pod up to 1.1.1.7 +crypto/external/bsd/openssl/dist/doc/crypto/EVP_EncodeInit.pod up to 1.1.1.1 +crypto/external/bsd/openssl/dist/doc/crypto/evp.pod up to 1.1.1.2 +crypto/external/bsd/openssl/dist/ssl/d1_both.c up to 1.8 +crypto/external/bsd/openssl/dist/ssl/s2_lib.c up to 1.6 +crypto/external/bsd/openssl/dist/ssl/s2_meth.c up to 1.1.1.3 +crypto/external/bsd/openssl/dist/ssl/s3_clnt.c up to 1.18 +crypto/external/bsd/openssl/dist/ssl/s3_lib.c up to 1.18 +crypto/external/bsd/openssl/dist/ssl/ssl.h up to 1.15 +crypto/external/bsd/openssl/dist/ssl/ssl2_stub_syms.c patch +crypto/external/bsd/openssl/dist/ssl/ssl_ciph.c up to 1.11 +crypto/external/bsd/openssl/dist/ssl/ssl_locl.h up to 1.13 +crypto/external/bsd/openssl/dist/ssl/t1_lib.c up to 1.21 +crypto/external/bsd/openssl/dist/test/testfipsssl up to 1.1.1.2 +crypto/external/bsd/openssl/dist/util/libeay.num up to 1.1.1.10 +crypto/external/bsd/openssl/dist/util/mk1mf.pl up to 1.8 +crypto/external/bsd/openssl/dist/util/mkdef.pl up to 1.4 +crypto/external/bsd/openssl/dist/util/ssleay.num up to 1.4 +crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_OBJECT_new.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_length.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_new.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_print_ex.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_generate_nconf.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/BIO_ctrl.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_base64.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_buffer.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_cipher.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_md.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_null.3 up to 1.14
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: snj Date: Fri May 6 09:20:15 UTC 2016 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.7 Log Message: 1379 To generate a diff of this commit: cvs rdiff -u -r1.1.2.63 -r1.1.2.64 src/doc/CHANGES-6.0.7 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-6.0.7 diff -u src/doc/CHANGES-6.0.7:1.1.2.63 src/doc/CHANGES-6.0.7:1.1.2.64 --- src/doc/CHANGES-6.0.7:1.1.2.63 Thu Apr 21 15:27:09 2016 +++ src/doc/CHANGES-6.0.7 Fri May 6 09:20:15 2016 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.7,v 1.1.2.63 2016/04/21 15:27:09 martin Exp $ +# $NetBSD: CHANGES-6.0.7,v 1.1.2.64 2016/05/06 09:20:15 snj Exp $ A complete list of changes from the NetBSD 6.0.6 release to the NetBSD 6.0.7 release: @@ -7796,3 +7796,398 @@ sys/compat/netbsd32/netbsd32_socket.c 1 Memory leak, triggerable from an unprivileged user. [christos, ticket #1378] +crypto/external/bsd/openssl/dist/CHANGES up to 1.11 +crypto/external/bsd/openssl/dist/Makefile up to 1.12 +crypto/external/bsd/openssl/dist/NEWS up to 1.11 +crypto/external/bsd/openssl/dist/README up to 1.11 +crypto/external/bsd/openssl/dist/openssl.spec up to 1.11 +crypto/external/bsd/openssl/dist/apps/pkcs7.c up to 1.1.1.4 +crypto/external/bsd/openssl/dist/crypto/opensslv.h up to 1.20 +crypto/external/bsd/openssl/dist/crypto/asn1/a_bytes.c up to 1.1.1.3 +crypto/external/bsd/openssl/dist/crypto/asn1/a_d2i_fp.c up to 1.4 +crypto/external/bsd/openssl/dist/crypto/asn1/a_type.c up to 1.4 +crypto/external/bsd/openssl/dist/crypto/asn1/asn1_lib.c up to 1.1.1.4 +crypto/external/bsd/openssl/dist/crypto/asn1/asn1_par.c up to 1.1.1.5 +crypto/external/bsd/openssl/dist/crypto/asn1/t_x509.c up to 1.1.1.6 +crypto/external/bsd/openssl/dist/crypto/asn1/tasn_dec.c up to 1.5 +crypto/external/bsd/openssl/dist/crypto/asn1/tasn_enc.c up to 1.5 +crypto/external/bsd/openssl/dist/crypto/asn1/x_name.c up to 1.1.1.5 +crypto/external/bsd/openssl/dist/crypto/asn1/x_x509.c up to 1.1.1.6 +crypto/external/bsd/openssl/dist/crypto/bn/asm/x86-mont.pl up to 1.1.1.3 +crypto/external/bsd/openssl/dist/crypto/bn/asm/x86_64-mont.pl up to 1.1.1.4 +crypto/external/bsd/openssl/dist/crypto/bn/asm/x86_64-mont5.pl up to 1.1.1.5 +crypto/external/bsd/openssl/dist/crypto/comp/comp.h up to 1.1.1.3 +crypto/external/bsd/openssl/dist/crypto/evp/Makefile up to 1.6 +crypto/external/bsd/openssl/dist/crypto/evp/digest.c up to 1.1.1.7 +crypto/external/bsd/openssl/dist/crypto/evp/e_aes_cbc_hmac_sha1.c up to 1.1.1.7 +crypto/external/bsd/openssl/dist/crypto/evp/encode.c up to 1.1.1.7 +crypto/external/bsd/openssl/dist/crypto/evp/evp_enc.c up to 1.5 +crypto/external/bsd/openssl/dist/crypto/pem/pem_lib.c up to 1.1.1.7 +crypto/external/bsd/openssl/dist/crypto/pem/pvkfmt.c up to 1.1.1.7 +crypto/external/bsd/openssl/dist/crypto/x509/x509.h up to 1.1.1.7 +crypto/external/bsd/openssl/dist/crypto/x509/x509_err.c up to 1.1.1.3 +crypto/external/bsd/openssl/dist/crypto/x509/x509_obj.c up to 1.1.1.3 +crypto/external/bsd/openssl/dist/doc/apps/ciphers.pod up to 1.1.1.7 +crypto/external/bsd/openssl/dist/doc/crypto/EVP_EncodeInit.pod up to 1.1.1.1 +crypto/external/bsd/openssl/dist/doc/crypto/evp.pod up to 1.1.1.2 +crypto/external/bsd/openssl/dist/ssl/d1_both.c up to 1.8 +crypto/external/bsd/openssl/dist/ssl/s2_lib.c up to 1.6 +crypto/external/bsd/openssl/dist/ssl/s2_meth.c up to 1.1.1.3 +crypto/external/bsd/openssl/dist/ssl/s3_clnt.c up to 1.18 +crypto/external/bsd/openssl/dist/ssl/s3_lib.c up to 1.18 +crypto/external/bsd/openssl/dist/ssl/ssl.h up to 1.15 +crypto/external/bsd/openssl/dist/ssl/ssl2_stub_syms.c patch +crypto/external/bsd/openssl/dist/ssl/ssl_ciph.c up to 1.11 +crypto/external/bsd/openssl/dist/ssl/ssl_locl.h up to 1.13 +crypto/external/bsd/openssl/dist/ssl/t1_lib.c up to 1.21 +crypto/external/bsd/openssl/dist/test/testfipsssl up to 1.1.1.2 +crypto/external/bsd/openssl/dist/util/libeay.num up to 1.1.1.10 +crypto/external/bsd/openssl/dist/util/mk1mf.pl up to 1.8 +crypto/external/bsd/openssl/dist/util/mkdef.pl up to 1.4 +crypto/external/bsd/openssl/dist/util/ssleay.num up to 1.4 +crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_OBJECT_new.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_length.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_new.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_print_ex.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_generate_nconf.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/BIO_ctrl.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_base64.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_buffer.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_cipher.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_md.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_null.3 up to 1.14
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: snj Date: Fri May 6 09:19:15 UTC 2016 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: 1379 To generate a diff of this commit: cvs rdiff -u -r1.1.2.245 -r1.1.2.246 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.245 src/doc/CHANGES-6.2:1.1.2.246 --- src/doc/CHANGES-6.2:1.1.2.245 Thu Apr 21 15:21:10 2016 +++ src/doc/CHANGES-6.2 Fri May 6 09:19:15 2016 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.245 2016/04/21 15:21:10 martin Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.246 2016/05/06 09:19:15 snj Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -13450,3 +13450,398 @@ sys/compat/netbsd32/netbsd32_socket.c 1 Memory leak, triggerable from an unprivileged user. [christos, ticket #1378] +crypto/external/bsd/openssl/dist/CHANGES up to 1.11 +crypto/external/bsd/openssl/dist/Makefile up to 1.12 +crypto/external/bsd/openssl/dist/NEWS up to 1.11 +crypto/external/bsd/openssl/dist/README up to 1.11 +crypto/external/bsd/openssl/dist/openssl.spec up to 1.11 +crypto/external/bsd/openssl/dist/apps/pkcs7.c up to 1.1.1.4 +crypto/external/bsd/openssl/dist/crypto/opensslv.h up to 1.20 +crypto/external/bsd/openssl/dist/crypto/asn1/a_bytes.c up to 1.1.1.3 +crypto/external/bsd/openssl/dist/crypto/asn1/a_d2i_fp.c up to 1.4 +crypto/external/bsd/openssl/dist/crypto/asn1/a_type.c up to 1.4 +crypto/external/bsd/openssl/dist/crypto/asn1/asn1_lib.c up to 1.1.1.4 +crypto/external/bsd/openssl/dist/crypto/asn1/asn1_par.c up to 1.1.1.5 +crypto/external/bsd/openssl/dist/crypto/asn1/t_x509.c up to 1.1.1.6 +crypto/external/bsd/openssl/dist/crypto/asn1/tasn_dec.c up to 1.5 +crypto/external/bsd/openssl/dist/crypto/asn1/tasn_enc.c up to 1.5 +crypto/external/bsd/openssl/dist/crypto/asn1/x_name.c up to 1.1.1.5 +crypto/external/bsd/openssl/dist/crypto/asn1/x_x509.c up to 1.1.1.6 +crypto/external/bsd/openssl/dist/crypto/bn/asm/x86-mont.pl up to 1.1.1.3 +crypto/external/bsd/openssl/dist/crypto/bn/asm/x86_64-mont.pl up to 1.1.1.4 +crypto/external/bsd/openssl/dist/crypto/bn/asm/x86_64-mont5.pl up to 1.1.1.5 +crypto/external/bsd/openssl/dist/crypto/comp/comp.h up to 1.1.1.3 +crypto/external/bsd/openssl/dist/crypto/evp/Makefile up to 1.6 +crypto/external/bsd/openssl/dist/crypto/evp/digest.c up to 1.1.1.7 +crypto/external/bsd/openssl/dist/crypto/evp/e_aes_cbc_hmac_sha1.c up to 1.1.1.7 +crypto/external/bsd/openssl/dist/crypto/evp/encode.c up to 1.1.1.7 +crypto/external/bsd/openssl/dist/crypto/evp/evp_enc.c up to 1.5 +crypto/external/bsd/openssl/dist/crypto/pem/pem_lib.c up to 1.1.1.7 +crypto/external/bsd/openssl/dist/crypto/pem/pvkfmt.c up to 1.1.1.7 +crypto/external/bsd/openssl/dist/crypto/x509/x509.h up to 1.1.1.7 +crypto/external/bsd/openssl/dist/crypto/x509/x509_err.c up to 1.1.1.3 +crypto/external/bsd/openssl/dist/crypto/x509/x509_obj.c up to 1.1.1.3 +crypto/external/bsd/openssl/dist/doc/apps/ciphers.pod up to 1.1.1.7 +crypto/external/bsd/openssl/dist/doc/crypto/EVP_EncodeInit.pod up to 1.1.1.1 +crypto/external/bsd/openssl/dist/doc/crypto/evp.pod up to 1.1.1.2 +crypto/external/bsd/openssl/dist/ssl/d1_both.c up to 1.8 +crypto/external/bsd/openssl/dist/ssl/s2_lib.c up to 1.6 +crypto/external/bsd/openssl/dist/ssl/s2_meth.c up to 1.1.1.3 +crypto/external/bsd/openssl/dist/ssl/s3_clnt.c up to 1.18 +crypto/external/bsd/openssl/dist/ssl/s3_lib.c up to 1.18 +crypto/external/bsd/openssl/dist/ssl/ssl.h up to 1.15 +crypto/external/bsd/openssl/dist/ssl/ssl2_stub_syms.c patch +crypto/external/bsd/openssl/dist/ssl/ssl_ciph.c up to 1.11 +crypto/external/bsd/openssl/dist/ssl/ssl_locl.h up to 1.13 +crypto/external/bsd/openssl/dist/ssl/t1_lib.c up to 1.21 +crypto/external/bsd/openssl/dist/test/testfipsssl up to 1.1.1.2 +crypto/external/bsd/openssl/dist/util/libeay.num up to 1.1.1.10 +crypto/external/bsd/openssl/dist/util/mk1mf.pl up to 1.8 +crypto/external/bsd/openssl/dist/util/mkdef.pl up to 1.4 +crypto/external/bsd/openssl/dist/util/ssleay.num up to 1.4 +crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_OBJECT_new.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_length.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_new.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_print_ex.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_generate_nconf.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/BIO_ctrl.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_base64.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_buffer.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_cipher.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_md.3 up to 1.14 +crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_null.3 up to 1.14
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Fri May 6 08:57:43 UTC 2016
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Add some workaround code for I219. It still doesn't work.
To generate a diff of this commit:
cvs rdiff -u -r1.392 -r1.393 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.392 src/sys/dev/pci/if_wm.c:1.393
--- src/sys/dev/pci/if_wm.c:1.392 Fri May 6 08:56:20 2016
+++ src/sys/dev/pci/if_wm.c Fri May 6 08:57:43 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.392 2016/05/06 08:56:20 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.393 2016/05/06 08:57:43 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.392 2016/05/06 08:56:20 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.393 2016/05/06 08:57:43 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -3537,8 +3537,10 @@ wm_initialize_hardware_bits(struct wm_so
case WM_T_PCH:
case WM_T_PCH2:
case WM_T_PCH_LPT:
- /* TARC 0 */
- if (sc->sc_type == WM_T_ICH8) {
+ case WM_T_PCH_SPT:
+ /* TARC0 */
+ if ((sc->sc_type == WM_T_ICH8)
+ || (sc->sc_type == WM_T_PCH_SPT)) {
/* Set TARC0 bits 29 and 28 */
tarc0 |= __BITS(29, 28);
}
@@ -3574,6 +3576,12 @@ wm_initialize_hardware_bits(struct wm_so
}
+ /* IOSFPC */
+ if (sc->sc_type == WM_T_PCH_SPT) {
+reg = CSR_READ(sc, WMREG_IOSFPC);
+reg |= RCTL_RDMTS_HEX; /* XXX RTCL bit? */
+CSR_WRITE(sc, WMREG_IOSFPC, reg);
+ }
/*
* Work-around descriptor data corruption issue during
* NFS v2 UDP traffic, just disable the NFS filtering
@@ -5151,6 +5159,45 @@ wm_stop_locked(struct ifnet *ifp, int di
txs->txs_mbuf = NULL;
}
}
+ if (sc->sc_type == WM_T_PCH_SPT) {
+ pcireg_t preg;
+ uint32_t reg;
+ int nexttx;
+
+ /* First, disable MULR fix in FEXTNVM11 */
+ reg = CSR_READ(sc, WMREG_FEXTNVM11);
+ reg |= FEXTNVM11_DIS_MULRFIX;
+ CSR_WRITE(sc, WMREG_FEXTNVM11, reg);
+
+ preg = pci_conf_read(sc->sc_pc, sc->sc_pcitag,
+ WM_PCI_DESCRING_STATUS);
+ if (preg & DESCRING_STATUS_FLUSH_REQ) {
+/* TX */
+printf("XXX need TX flush (reg = %08x)\n",
+preg);
+wm_init_tx_descs(sc, txq);
+wm_init_tx_regs(sc, txq);
+nexttx = txq->txq_next;
+wm_set_dma_addr(
+ >txq_descs[nexttx].wtx_addr,
+ WM_CDTXADDR(txq, nexttx));
+txq->txq_descs[nexttx].wtx_cmdlen
+= htole32(WTX_CMD_IFCS | 512);
+wm_cdtxsync(txq, nexttx, 1,
+BUS_DMASYNC_PREREAD |BUS_DMASYNC_PREWRITE);
+CSR_WRITE(sc, WMREG_TCTL, TCTL_EN);
+CSR_WRITE(sc, WMREG_TDT(0), nexttx);
+CSR_WRITE_FLUSH(sc);
+delay(250);
+CSR_WRITE(sc, WMREG_TCTL, 0);
+ }
+ preg = pci_conf_read(sc->sc_pc, sc->sc_pcitag,
+ WM_PCI_DESCRING_STATUS);
+ if (preg & DESCRING_STATUS_FLUSH_REQ) {
+/* RX */
+printf("XXX need RX flush\n");
+ }
+ }
WM_TX_UNLOCK(txq);
}
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Fri May 6 08:56:20 UTC 2016
Modified Files:
src/sys/dev/pci: if_wm.c if_wmreg.h if_wmvar.h
Log Message:
Basic support for I219. It doesn't work on I219, so it's disabled.
To generate a diff of this commit:
cvs rdiff -u -r1.391 -r1.392 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.88 -r1.89 src/sys/dev/pci/if_wmreg.h
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/pci/if_wmvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.391 src/sys/dev/pci/if_wm.c:1.392
--- src/sys/dev/pci/if_wm.c:1.391 Tue Feb 9 08:32:11 2016
+++ src/sys/dev/pci/if_wm.c Fri May 6 08:56:20 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.391 2016/02/09 08:32:11 ozaki-r Exp $ */
+/* $NetBSD: if_wm.c,v 1.392 2016/05/06 08:56:20 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.391 2016/02/09 08:32:11 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.392 2016/05/06 08:56:20 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -146,8 +146,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.
#define WM_DEBUG_GMII 0x08
#define WM_DEBUG_MANAGE 0x10
#define WM_DEBUG_NVM 0x20
+#define WM_DEBUG_INIT 0x40
int wm_debug = WM_DEBUG_TX | WM_DEBUG_RX | WM_DEBUG_LINK | WM_DEBUG_GMII
-| WM_DEBUG_MANAGE | WM_DEBUG_NVM;
+| WM_DEBUG_MANAGE | WM_DEBUG_NVM | WM_DEBUG_INIT;
#define DPRINTF(x, y) if (wm_debug & (x)) printf y
#else
@@ -334,6 +335,10 @@ struct wm_softc {
bus_space_tag_t sc_flasht; /* flash registers space tag */
bus_space_handle_t sc_flashh; /* flash registers space handle */
bus_size_t sc_flashs; /* flash registers space size */
+ off_t sc_flashreg_offset; /*
+ * offset to flash registers from
+ * start of BAR
+ */
bus_dma_tag_t sc_dmat; /* bus DMA tag */
struct ethercom sc_ethercom; /* ethernet common data */
@@ -490,15 +495,19 @@ do { \
#define CSR_WRITE_FLUSH(sc) \
(void) CSR_READ((sc), WMREG_STATUS)
-#define ICH8_FLASH_READ32(sc, reg) \
- bus_space_read_4((sc)->sc_flasht, (sc)->sc_flashh, (reg))
-#define ICH8_FLASH_WRITE32(sc, reg, data) \
- bus_space_write_4((sc)->sc_flasht, (sc)->sc_flashh, (reg), (data))
-
-#define ICH8_FLASH_READ16(sc, reg) \
- bus_space_read_2((sc)->sc_flasht, (sc)->sc_flashh, (reg))
-#define ICH8_FLASH_WRITE16(sc, reg, data) \
- bus_space_write_2((sc)->sc_flasht, (sc)->sc_flashh, (reg), (data))
+#define ICH8_FLASH_READ32(sc, reg) \
+ bus_space_read_4((sc)->sc_flasht, (sc)->sc_flashh, \
+ (reg) + sc->sc_flashreg_offset)
+#define ICH8_FLASH_WRITE32(sc, reg, data)\
+ bus_space_write_4((sc)->sc_flasht, (sc)->sc_flashh, \
+ (reg) + sc->sc_flashreg_offset, (data))
+
+#define ICH8_FLASH_READ16(sc, reg) \
+ bus_space_read_2((sc)->sc_flasht, (sc)->sc_flashh, \
+ (reg) + sc->sc_flashreg_offset)
+#define ICH8_FLASH_WRITE16(sc, reg, data)\
+ bus_space_write_2((sc)->sc_flasht, (sc)->sc_flashh, \
+ (reg) + sc->sc_flashreg_offset, (data))
#define WM_CDTXADDR(txq, x) ((txq)->txq_desc_dma + WM_CDTXOFF((x)))
#define WM_CDRXADDR(rxq, x) ((rxq)->rxq_desc_dma + WM_CDRXOFF((x)))
@@ -688,10 +697,12 @@ static int wm_nvm_valid_bank_detect_ich8
static int32_t wm_ich8_cycle_init(struct wm_softc *);
static int32_t wm_ich8_flash_cycle(struct wm_softc *, uint32_t);
static int32_t wm_read_ich8_data(struct wm_softc *, uint32_t, uint32_t,
- uint16_t *);
+ uint32_t *);
static int32_t wm_read_ich8_byte(struct wm_softc *, uint32_t, uint8_t *);
static int32_t wm_read_ich8_word(struct wm_softc *, uint32_t, uint16_t *);
+static int32_t wm_read_ich8_dword(struct wm_softc *, uint32_t, uint32_t *);
static int wm_nvm_read_ich8(struct wm_softc *, int, int, uint16_t *);
+static int wm_nvm_read_spt(struct wm_softc *, int, int, uint16_t *);
/* iNVM */
static int wm_nvm_read_word_invm(struct wm_softc *, uint16_t, uint16_t *);
static int wm_nvm_read_invm(struct wm_softc *, int, int, uint16_t *);
@@ -732,7 +743,7 @@ static int wm_enable_mng_pass_thru(struc
static bool wm_phy_resetisblocked(struct wm_softc *);
static void wm_get_hw_control(struct wm_softc *);
static void wm_release_hw_control(struct wm_softc *);
-static void wm_gate_hw_phy_config_ich8lan(struct wm_softc *, int);
+static void wm_gate_hw_phy_config_ich8lan(struct wm_softc *, bool);
static void wm_smbustopci(struct wm_softc *);
static void wm_init_manageability(struct wm_softc *);
static void wm_release_manageability(struct wm_softc *);
@@ -1282,6 +1293,20 @@ static const struct wm_product {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I218_LM3,
"I218 LM Ethernet Connection",
WM_T_PCH_LPT, WMP_F_COPPER },
+#if 0
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V,
+ "I219 V Ethernet Connection",
+ WM_T_PCH_SPT, WMP_F_COPPER },
+ { PCI_VENDOR_INTEL,
CVS commit: src/doc
Module Name:src Committed By: snj Date: Fri May 6 07:45:53 UTC 2016 Modified Files: src/doc: 3RDPARTY Log Message: whitespace To generate a diff of this commit: cvs rdiff -u -r1.1326 -r1.1327 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1326 src/doc/3RDPARTY:1.1327 --- src/doc/3RDPARTY:1.1326 Wed May 4 19:28:32 2016 +++ src/doc/3RDPARTY Fri May 6 07:45:53 2016 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1326 2016/05/04 19:28:32 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1327 2016/05/06 07:45:53 snj Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1055,7 +1055,7 @@ Notes: - Run openssl2netbsd to get rid of the RCSID identifiers - run make in /usr/src/crypto/external/bsd/openssl/lib/libcrypto/man to regen man pages. -- run make in /usr/src/crypto/external/bsd/openssl/lib/libcrypto/arch/* +- run make in /usr/src/crypto/external/bsd/openssl/lib/libcrypto/arch/* to regen assembly files Package: pcc
