CVS commit: src/sys/arch/sparc64/dev
Module Name:src
Committed By: nakayama
Date: Fri Aug 14 10:59:27 UTC 2015
Modified Files:
src/sys/arch/sparc64/dev: pckbc_ebus.c
Log Message:
pckbc@ebus: match kb_ps2 device to make keyboard and mouse work
on qemu-sparc64.
XXX OpenBIOS doesn't provide interrupts for pckbc currently, so use
the interrupt numbers described in QEMU's hw/sparc64/sun4u.c::isa_irq_handler.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/dev/pckbc_ebus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/dev/pckbc_ebus.c
diff -u src/sys/arch/sparc64/dev/pckbc_ebus.c:1.1 src/sys/arch/sparc64/dev/pckbc_ebus.c:1.2
--- src/sys/arch/sparc64/dev/pckbc_ebus.c:1.1 Tue Oct 9 20:55:04 2012
+++ src/sys/arch/sparc64/dev/pckbc_ebus.c Fri Aug 14 10:59:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_ebus.c,v 1.1 2012/10/09 20:55:04 jdc Exp $ */
+/* $NetBSD: pckbc_ebus.c,v 1.2 2015/08/14 10:59:27 nakayama Exp $ */
/*
* Copyright (c) 2002 Valeriy E. Ushakov
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pckbc_ebus.c,v 1.1 2012/10/09 20:55:04 jdc Exp $);
+__KERNEL_RCSID(0, $NetBSD: pckbc_ebus.c,v 1.2 2015/08/14 10:59:27 nakayama Exp $);
#include sys/param.h
#include sys/systm.h
@@ -58,6 +58,7 @@ static void pckbc_ebus_attach(device_t,
static void pckbc_ebus_intr_establish(struct pckbc_softc *, pckbport_slot_t);
#define PCKBC_PROM_DEVICE_NAME 8042
+#define PCKBC_PROM_DEVICE_NAME2 kb_ps2
CFATTACH_DECL_NEW(pckbc_ebus, sizeof(struct pckbc_ebus_softc),
pckbc_ebus_match, pckbc_ebus_attach, NULL, NULL);
@@ -68,7 +69,10 @@ pckbc_ebus_match(device_t parent, cfdata
{
struct ebus_attach_args *ea = aux;
- return (strcmp(ea-ea_name, PCKBC_PROM_DEVICE_NAME) == 0);
+ if (strcmp(ea-ea_name, PCKBC_PROM_DEVICE_NAME) == 0 ||
+ strcmp(ea-ea_name, PCKBC_PROM_DEVICE_NAME2) == 0)
+ return 1;
+ return 0;
}
static void
@@ -98,8 +102,25 @@ pckbc_ebus_attach(device_t parent, devic
psc-intr_establish = pckbc_ebus_intr_establish;
- for (i = 0; i PCKBC_NSLOTS; i++)
- sc-psc_intr[i] = ea-ea_intr[i];
+ if (ea-ea_nintr PCKBC_NSLOTS) {
+ aprint_error(: no intr %d, ea-ea_nintr);
+
+ /*
+ * XXX OpenBIOS doesn't provide interrupts for pckbc
+ * currently, so use the interrupt numbers described in
+ * QEMU's hw/sparc64/sun4u.c::isa_irq_handler.
+ */
+ if (strcmp(machine_model, OpenBiosTeam,OpenBIOS) == 0) {
+ sc-psc_intr[PCKBC_KBD_SLOT] = 0x29;
+ sc-psc_intr[PCKBC_AUX_SLOT] = 0x2a;
+ } else {
+ aprint_error(\n);
+ return;
+ }
+ } else {
+ for (i = 0; i PCKBC_NSLOTS; i++)
+ sc-psc_intr[i] = ea-ea_intr[i];
+ }
if (isconsole) {
int status;
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Fri Aug 14 06:05:40 UTC 2015 Modified Files: src/sys/dev/pci/ixgbe: ixv.c Log Message: - Fix uninitialized data. - include vlan.h and check NVLAN. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/ixgbe/ixv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/ixgbe/ixv.c diff -u src/sys/dev/pci/ixgbe/ixv.c:1.12 src/sys/dev/pci/ixgbe/ixv.c:1.13 --- src/sys/dev/pci/ixgbe/ixv.c:1.12 Thu Aug 13 10:03:38 2015 +++ src/sys/dev/pci/ixgbe/ixv.c Fri Aug 14 06:05:40 2015 @@ -31,12 +31,13 @@ **/ /*$FreeBSD: head/sys/dev/ixgbe/ixv.c 275358 2014-12-01 11:45:24Z hselasky $*/ -/*$NetBSD: ixv.c,v 1.12 2015/08/13 10:03:38 msaitoh Exp $*/ +/*$NetBSD: ixv.c,v 1.13 2015/08/14 06:05:40 msaitoh Exp $*/ #include opt_inet.h #include opt_inet6.h #include ixv.h +#include vlan.h /* * Driver version @@ -366,6 +367,10 @@ ixv_attach(device_t parent, device_t dev adapter = device_private(dev); adapter-dev = adapter-osdep.dev = dev; hw = adapter-hw; + adapter-osdep.pc = pa-pa_pc; + adapter-osdep.tag = pa-pa_tag; + adapter-osdep.dmat = pa-pa_dmat; + adapter-osdep.attached = false; ent = ixv_lookup(pa); @@ -469,6 +474,7 @@ ixv_attach(device_t parent, device_t dev #endif INIT_DEBUGOUT(ixv_attach: end); + adapter-osdep.attached = true; return; err_late: @@ -497,7 +503,10 @@ ixv_detach(device_t dev, int flags) struct ix_queue *que = adapter-queues; INIT_DEBUGOUT(ixv_detach: begin); + if (adapter-osdep.attached == false) + return 0; +#if NVLAN 0 /* Make sure VLANS are not using driver */ if (!VLAN_ATTACHED(adapter-osdep.ec)) ; /* nothing to do: no VLANs */ @@ -507,6 +516,7 @@ ixv_detach(device_t dev, int flags) aprint_error_dev(dev, VLANs in use\n); return EBUSY; } +#endif IXV_CORE_LOCK(adapter); ixv_stop(adapter); @@ -1784,7 +1794,6 @@ ixv_setup_msix(struct adapter *adapter) device_t dev = adapter-dev; int want, msgs; - /* ** Want two vectors: one for a queue, ** plus an additional for mailbox. @@ -1794,6 +1803,7 @@ ixv_setup_msix(struct adapter *adapter) aprint_error_dev(dev,MSIX config error\n); return (ENXIO); } + want = MIN(msgs, IXG_MSIX_NINTR); adapter-msix_mem = (void *)1; /* XXX */ aprint_normal_dev(dev,
CVS commit: [netbsd-5-1] src/crypto/dist/openssl
Module Name:src Committed By: msaitoh Date: Fri Aug 14 05:59:39 UTC 2015 Modified Files: src/crypto/dist/openssl [netbsd-5-1]: e_os2.h src/crypto/dist/openssl/crypto/asn1 [netbsd-5-1]: a_int.c tasn_new.c src/crypto/dist/openssl/crypto/bn [netbsd-5-1]: bn.h bn_err.c bn_print.c bn_rand.c bn_shift.c src/crypto/dist/openssl/crypto/cms [netbsd-5-1]: cms_smime.c src/crypto/dist/openssl/crypto/ec [netbsd-5-1]: ec2_smpl.c ec_check.c ec_key.c ec_lib.c ecp_smpl.c ectest.c src/crypto/dist/openssl/crypto/ecdsa [netbsd-5-1]: ecdsatest.c ecs_ossl.c src/crypto/dist/openssl/crypto/objects [netbsd-5-1]: obj_dat.c src/crypto/dist/openssl/crypto/ocsp [netbsd-5-1]: ocsp_vfy.c src/crypto/dist/openssl/crypto/pem [netbsd-5-1]: pem_pk8.c src/crypto/dist/openssl/crypto/pkcs7 [netbsd-5-1]: pk7_doit.c src/crypto/dist/openssl/crypto/x509 [netbsd-5-1]: x509_lu.c x509_vfy.c src/crypto/dist/openssl/doc/crypto [netbsd-5-1]: BN_rand.pod BN_set_bit.pod pem.pod src/crypto/dist/openssl/ssl [netbsd-5-1]: d1_lib.c s3_clnt.c s3_srvr.c ssl.h ssl_err.c ssl_lib.c ssl_locl.h ssl_sess.c src/crypto/dist/openssl/util [netbsd-5-1]: mkerr.pl Log Message: Pull up following revision(s) (requested by spz in ticket #1976): crypto/dist/openssl/e_os2.h patch crypto/dist/openssl/crypto/asn1/a_int.c patch crypto/dist/openssl/crypto/asn1/tasn_new.c patch crypto/dist/openssl/crypto/bn/bn.h patch crypto/dist/openssl/crypto/bn/bn_err.c patch crypto/dist/openssl/crypto/bn/bn_print.cpatch crypto/dist/openssl/crypto/bn/bn_rand.c patch crypto/dist/openssl/crypto/bn/bn_shift.cpatch crypto/dist/openssl/crypto/cms/cms_smime.c patch crypto/dist/openssl/crypto/ec/ec2_smpl.cpatch crypto/dist/openssl/crypto/ec/ec_check.cpatch crypto/dist/openssl/crypto/ec/ec_key.c patch crypto/dist/openssl/crypto/ec/ec_lib.c patch crypto/dist/openssl/crypto/ec/ecp_smpl.cpatch crypto/dist/openssl/crypto/ec/ectest.c patch crypto/dist/openssl/crypto/ecdsa/ecdsatest.cpatch crypto/dist/openssl/crypto/ecdsa/ecs_ossl.c patch crypto/dist/openssl/crypto/objects/obj_dat.cpatch crypto/dist/openssl/crypto/ocsp/ocsp_vfy.c patch crypto/dist/openssl/crypto/pem/pem_pk8.cpatch crypto/dist/openssl/crypto/pkcs7/pk7_doit.c patch crypto/dist/openssl/crypto/x509/x509_lu.c patch crypto/dist/openssl/crypto/x509/x509_vfy.c patch crypto/dist/openssl/doc/crypto/BN_rand.pod patch crypto/dist/openssl/doc/crypto/BN_set_bit.pod patch crypto/dist/openssl/doc/crypto/pem.pod patch crypto/dist/openssl/ssl/d1_lib.cpatch crypto/dist/openssl/ssl/s3_clnt.c patch crypto/dist/openssl/ssl/s3_srvr.c patch crypto/dist/openssl/ssl/ssl.h patch crypto/dist/openssl/ssl/ssl_err.c patch crypto/dist/openssl/ssl/ssl_lib.c patch crypto/dist/openssl/ssl/ssl_locl.h patch crypto/dist/openssl/ssl/ssl_sess.c patch crypto/dist/openssl/util/mkerr.pl patch This change covers the vulnerabilities relevant to netbsd-5 from the June OpenSSL advisory, and also fixes a regression introduced with the POODLE fix in October last year that caused the SSL server side to fail to handshake. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.12.1 src/crypto/dist/openssl/e_os2.h cvs rdiff -u -r1.1.1.8 -r1.1.1.8.12.1 \ src/crypto/dist/openssl/crypto/asn1/a_int.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.12.1 \ src/crypto/dist/openssl/crypto/asn1/tasn_new.c cvs rdiff -u -r1.12.12.1 -r1.12.12.2 src/crypto/dist/openssl/crypto/bn/bn.h cvs rdiff -u -r1.1.1.7 -r1.1.1.7.12.1 \ src/crypto/dist/openssl/crypto/bn/bn_err.c cvs rdiff -u -r1.9 -r1.9.12.1 src/crypto/dist/openssl/crypto/bn/bn_print.c cvs rdiff -u -r1.1.1.6 -r1.1.1.6.34.1 \ src/crypto/dist/openssl/crypto/bn/bn_rand.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.34.1 \ src/crypto/dist/openssl/crypto/bn/bn_shift.c cvs rdiff -u -r1.1.1.1.8.1 -r1.1.1.1.8.1.6.1 \ src/crypto/dist/openssl/crypto/cms/cms_smime.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.12.1 \ src/crypto/dist/openssl/crypto/ec/ec2_smpl.c \ src/crypto/dist/openssl/crypto/ec/ectest.c cvs rdiff -u -r1.1.1.2 -r1.1.1.2.34.1 \ src/crypto/dist/openssl/crypto/ec/ec_check.c cvs rdiff -u -r1.1.1.1.34.1 -r1.1.1.1.34.2 \ src/crypto/dist/openssl/crypto/ec/ec_key.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.12.1 \ src/crypto/dist/openssl/crypto/ec/ec_lib.c cvs rdiff -u -r1.1.1.4.34.1 -r1.1.1.4.34.2 \ src/crypto/dist/openssl/crypto/ec/ecp_smpl.c cvs rdiff -u -r1.1.1.2 -r1.1.1.2.12.1 \ src/crypto/dist/openssl/crypto/ecdsa/ecdsatest.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.12.1 \
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: msaitoh Date: Fri Aug 14 06:00:19 UTC 2015 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Ticket 1976. To generate a diff of this commit: cvs rdiff -u -r1.1.2.123 -r1.1.2.124 src/doc/CHANGES-5.3 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-5.3 diff -u src/doc/CHANGES-5.3:1.1.2.123 src/doc/CHANGES-5.3:1.1.2.124 --- src/doc/CHANGES-5.3:1.1.2.123 Tue Aug 4 20:09:02 2015 +++ src/doc/CHANGES-5.3 Fri Aug 14 06:00:19 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.123 2015/08/04 20:09:02 snj Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.124 2015/08/14 06:00:19 msaitoh Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -3949,3 +3949,44 @@ sys/netinet/tcp_output.c 1.184 Make sure that snd_win doesn't go negative. [matt, ticket #1973] +crypto/dist/openssl/e_os2.h patch +crypto/dist/openssl/crypto/asn1/a_int.c patch +crypto/dist/openssl/crypto/asn1/tasn_new.c patch +crypto/dist/openssl/crypto/bn/bn.h patch +crypto/dist/openssl/crypto/bn/bn_err.c patch +crypto/dist/openssl/crypto/bn/bn_print.c patch +crypto/dist/openssl/crypto/bn/bn_rand.c patch +crypto/dist/openssl/crypto/bn/bn_shift.c patch +crypto/dist/openssl/crypto/cms/cms_smime.c patch +crypto/dist/openssl/crypto/ec/ec2_smpl.c patch +crypto/dist/openssl/crypto/ec/ec_check.c patch +crypto/dist/openssl/crypto/ec/ec_key.c patch +crypto/dist/openssl/crypto/ec/ec_lib.c patch +crypto/dist/openssl/crypto/ec/ecp_smpl.c patch +crypto/dist/openssl/crypto/ec/ectest.c patch +crypto/dist/openssl/crypto/ecdsa/ecdsatest.c patch +crypto/dist/openssl/crypto/ecdsa/ecs_ossl.c patch +crypto/dist/openssl/crypto/objects/obj_dat.c patch +crypto/dist/openssl/crypto/ocsp/ocsp_vfy.c patch +crypto/dist/openssl/crypto/pem/pem_pk8.c patch +crypto/dist/openssl/crypto/pkcs7/pk7_doit.c patch +crypto/dist/openssl/crypto/x509/x509_lu.c patch +crypto/dist/openssl/crypto/x509/x509_vfy.c patch +crypto/dist/openssl/doc/crypto/BN_rand.pod patch +crypto/dist/openssl/doc/crypto/BN_set_bit.pod patch +crypto/dist/openssl/doc/crypto/pem.pod patch +crypto/dist/openssl/ssl/d1_lib.c patch +crypto/dist/openssl/ssl/s3_clnt.c patch +crypto/dist/openssl/ssl/s3_srvr.c patch +crypto/dist/openssl/ssl/ssl.h patch +crypto/dist/openssl/ssl/ssl_err.c patch +crypto/dist/openssl/ssl/ssl_lib.c patch +crypto/dist/openssl/ssl/ssl_locl.h patch +crypto/dist/openssl/ssl/ssl_sess.c patch +crypto/dist/openssl/util/mkerr.pl patch + + This change covers the vulnerabilities relevant to netbsd-5 from the + June OpenSSL advisory, and also fixes a regression introduced with the + POODLE fix in October last year that caused the SSL server side to + fail to handshake. + [spz, ticket#1976]
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: msaitoh Date: Fri Aug 14 06:00:50 UTC 2015 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.6 Log Message: Ticket 1976. To generate a diff of this commit: cvs rdiff -u -r1.1.2.33 -r1.1.2.34 src/doc/CHANGES-5.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-5.1.6 diff -u src/doc/CHANGES-5.1.6:1.1.2.33 src/doc/CHANGES-5.1.6:1.1.2.34 --- src/doc/CHANGES-5.1.6:1.1.2.33 Fri Jul 24 07:47:34 2015 +++ src/doc/CHANGES-5.1.6 Fri Aug 14 06:00:50 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.6,v 1.1.2.33 2015/07/24 07:47:34 martin Exp $ +# $NetBSD: CHANGES-5.1.6,v 1.1.2.34 2015/08/14 06:00:50 msaitoh Exp $ A complete list of changes from the NetBSD 5.1.5 release to the NetBSD 5.1.6 release: @@ -2655,3 +2655,44 @@ sys/netinet/tcp_output.c 1.184 Make sure that snd_win doesn't go negative. [matt, ticket #1973] +crypto/dist/openssl/e_os2.h patch +crypto/dist/openssl/crypto/asn1/a_int.c patch +crypto/dist/openssl/crypto/asn1/tasn_new.c patch +crypto/dist/openssl/crypto/bn/bn.h patch +crypto/dist/openssl/crypto/bn/bn_err.c patch +crypto/dist/openssl/crypto/bn/bn_print.c patch +crypto/dist/openssl/crypto/bn/bn_rand.c patch +crypto/dist/openssl/crypto/bn/bn_shift.c patch +crypto/dist/openssl/crypto/cms/cms_smime.c patch +crypto/dist/openssl/crypto/ec/ec2_smpl.c patch +crypto/dist/openssl/crypto/ec/ec_check.c patch +crypto/dist/openssl/crypto/ec/ec_key.c patch +crypto/dist/openssl/crypto/ec/ec_lib.c patch +crypto/dist/openssl/crypto/ec/ecp_smpl.c patch +crypto/dist/openssl/crypto/ec/ectest.c patch +crypto/dist/openssl/crypto/ecdsa/ecdsatest.c patch +crypto/dist/openssl/crypto/ecdsa/ecs_ossl.c patch +crypto/dist/openssl/crypto/objects/obj_dat.c patch +crypto/dist/openssl/crypto/ocsp/ocsp_vfy.c patch +crypto/dist/openssl/crypto/pem/pem_pk8.c patch +crypto/dist/openssl/crypto/pkcs7/pk7_doit.c patch +crypto/dist/openssl/crypto/x509/x509_lu.c patch +crypto/dist/openssl/crypto/x509/x509_vfy.c patch +crypto/dist/openssl/doc/crypto/BN_rand.pod patch +crypto/dist/openssl/doc/crypto/BN_set_bit.pod patch +crypto/dist/openssl/doc/crypto/pem.pod patch +crypto/dist/openssl/ssl/d1_lib.c patch +crypto/dist/openssl/ssl/s3_clnt.c patch +crypto/dist/openssl/ssl/s3_srvr.c patch +crypto/dist/openssl/ssl/ssl.h patch +crypto/dist/openssl/ssl/ssl_err.c patch +crypto/dist/openssl/ssl/ssl_lib.c patch +crypto/dist/openssl/ssl/ssl_locl.h patch +crypto/dist/openssl/ssl/ssl_sess.c patch +crypto/dist/openssl/util/mkerr.pl patch + + This change covers the vulnerabilities relevant to netbsd-5 from the + June OpenSSL advisory, and also fixes a regression introduced with the + POODLE fix in October last year that caused the SSL server side to + fail to handshake. + [spz, ticket#1976]
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Fri Aug 14 06:54:22 UTC 2015 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: - Add Hardware-Controlled Performance States (HWP) bits. - Use __BIT() To generate a diff of this commit: cvs rdiff -u -r1.82 -r1.83 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.82 src/sys/arch/x86/include/specialreg.h:1.83 --- src/sys/arch/x86/include/specialreg.h:1.82 Fri May 8 07:23:56 2015 +++ src/sys/arch/x86/include/specialreg.h Fri Aug 14 06:54:22 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.82 2015/05/08 07:23:56 msaitoh Exp $ */ +/* $NetBSD: specialreg.h,v 1.83 2015/08/14 06:54:22 msaitoh Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -279,16 +279,24 @@ * Intel Digital Thermal Sensor and * Power Management, Fn_0006 - %eax. */ -#define CPUID_DSPM_DTS 0x0001 /* Digital Thermal Sensor */ -#define CPUID_DSPM_IDA 0x0002 /* Intel Dynamic Acceleration */ -#define CPUID_DSPM_ARAT 0x0004 /* Always Running APIC Timer */ -#define CPUID_DSPM_PLN 0x0010 /* Power Limit Notification */ -#define CPUID_DSPM_CME 0x0020 /* Clock Modulation Extension */ -#define CPUID_DSPM_PLTM 0x0040 /* Package Level Thermal Management */ +#define CPUID_DSPM_DTS __BIT(0) /* Digital Thermal Sensor */ +#define CPUID_DSPM_IDA __BIT(1) /* Intel Dynamic Acceleration */ +#define CPUID_DSPM_ARAT __BIT(2) /* Always Running APIC Timer */ +#define CPUID_DSPM_PLN __BIT(4) /* Power Limit Notification */ +#define CPUID_DSPM_ECMD __BIT(5) /* Clock Modulation Extension */ +#define CPUID_DSPM_PTM __BIT(6) /* Package Level Thermal Management */ +#define CPUID_DSPM_HWP __BIT(7) /* HWP */ +#define CPUID_DSPM_HWP_NOTIFY __BIT(8) /* HWP Notification */ +#define CPUID_DSPM_HWP_ACTWIN __BIT(9) /* HWP Activity Window */ +#define CPUID_DSPM_HWP_EPP __BIT(10) /* HWP Energy Performance Preference */ +#define CPUID_DSPM_HWP_PLR __BIT(11) /* HWP Package Level Request */ +#define CPUID_DSPM_HDC __BIT(13) /* HDC */ #define CPUID_DSPM_FLAGS \20 \ - \1 DTS \2 IDA \3 ARAT \ - \5 PLN \6 CME \7 PLTM + \1 DTS \2 IDA \3 ARAT \ + \5 PLN \6 ECMD \7 PTM \10 HWP \ + \11 HWP_NOTIFY \12 HWP_ACTWIN \13 HWP_EPP \14 HWP_PLR \ + \16 HDC /* * Intel Digital Thermal Sensor and
CVS commit: src/share/man/man9
Module Name:src Committed By: knakahara Date: Fri Aug 14 06:48:11 UTC 2015 Modified Files: src/share/man/man9: pci.9 Log Message: fix pci_get_ht_capability(9). To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/share/man/man9/pci.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/pci.9 diff -u src/share/man/man9/pci.9:1.39 src/share/man/man9/pci.9:1.40 --- src/share/man/man9/pci.9:1.39 Fri Aug 14 02:04:16 2015 +++ src/share/man/man9/pci.9 Fri Aug 14 06:48:11 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: pci.9,v 1.39 2015/08/14 02:04:16 knakahara Exp $ +.\ $NetBSD: pci.9,v 1.40 2015/08/14 06:48:11 knakahara Exp $ .\ .\ Copyright (c) 2001, 2003 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -102,7 +102,7 @@ int capid int *offsetp pcireg_t *valuep .Ft int .Fn pci_get_ht_capability pci_chipset_tag_t pc pcitag_t tag \ -int *offsetp pcireg_t *valuep +int capid int *offsetp pcireg_t *valuep .Ft pcireg_t .Fn pci_mapreg_type pci_chipset_tag_t pc pcitag_t tag int reg .Ft int @@ -466,10 +466,28 @@ If the capability was not found, it retu and .Fa valuep remain unchanged. -.It Fn pci_get_ht_capability pc tag offsetp valuep -This function is about the same as -.Fn pci_get_capability . -This function specializes in HyperTransport capability. +.It Fn pci_get_ht_capability pc tag capid offsetp valuep +Parse the device capability list in HyperTransport configuration +space looking for capability +.Fa capid . +If +.Fa offsetp +is not NULL, the register offset in configuration space is returned in +.Fa offsetp . +If +.Fa valuep +is not NULL, the value of the capability is returned in +.Fa valuep . +The argument +.Fa tag +is the PCI tag for the current device attached to PCI chipset +.Fa pc . +This function returns 1 if the capability was found. +If the capability was not found, it returns zero, and +.Fa offsetp +and +.Fa valuep +remain unchanged. .It Fn pci_mapreg_type pc tag reg Interrogates the Base Address Register (BAR) in configuration space specified by
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: msaitoh Date: Fri Aug 14 06:00:34 UTC 2015 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.4 Log Message: Ticket 1976. To generate a diff of this commit: cvs rdiff -u -r1.1.2.34 -r1.1.2.35 src/doc/CHANGES-5.2.4 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-5.2.4 diff -u src/doc/CHANGES-5.2.4:1.1.2.34 src/doc/CHANGES-5.2.4:1.1.2.35 --- src/doc/CHANGES-5.2.4:1.1.2.34 Fri Jul 24 07:46:03 2015 +++ src/doc/CHANGES-5.2.4 Fri Aug 14 06:00:34 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.4,v 1.1.2.34 2015/07/24 07:46:03 martin Exp $ +# $NetBSD: CHANGES-5.2.4,v 1.1.2.35 2015/08/14 06:00:34 msaitoh Exp $ A complete list of changes from the NetBSD 5.2.3 release to the NetBSD 5.2.4 release: @@ -2655,3 +2655,44 @@ sys/netinet/tcp_output.c 1.184 Make sure that snd_win doesn't go negative. [matt, ticket #1973] +crypto/dist/openssl/e_os2.h patch +crypto/dist/openssl/crypto/asn1/a_int.c patch +crypto/dist/openssl/crypto/asn1/tasn_new.c patch +crypto/dist/openssl/crypto/bn/bn.h patch +crypto/dist/openssl/crypto/bn/bn_err.c patch +crypto/dist/openssl/crypto/bn/bn_print.c patch +crypto/dist/openssl/crypto/bn/bn_rand.c patch +crypto/dist/openssl/crypto/bn/bn_shift.c patch +crypto/dist/openssl/crypto/cms/cms_smime.c patch +crypto/dist/openssl/crypto/ec/ec2_smpl.c patch +crypto/dist/openssl/crypto/ec/ec_check.c patch +crypto/dist/openssl/crypto/ec/ec_key.c patch +crypto/dist/openssl/crypto/ec/ec_lib.c patch +crypto/dist/openssl/crypto/ec/ecp_smpl.c patch +crypto/dist/openssl/crypto/ec/ectest.c patch +crypto/dist/openssl/crypto/ecdsa/ecdsatest.c patch +crypto/dist/openssl/crypto/ecdsa/ecs_ossl.c patch +crypto/dist/openssl/crypto/objects/obj_dat.c patch +crypto/dist/openssl/crypto/ocsp/ocsp_vfy.c patch +crypto/dist/openssl/crypto/pem/pem_pk8.c patch +crypto/dist/openssl/crypto/pkcs7/pk7_doit.c patch +crypto/dist/openssl/crypto/x509/x509_lu.c patch +crypto/dist/openssl/crypto/x509/x509_vfy.c patch +crypto/dist/openssl/doc/crypto/BN_rand.pod patch +crypto/dist/openssl/doc/crypto/BN_set_bit.pod patch +crypto/dist/openssl/doc/crypto/pem.pod patch +crypto/dist/openssl/ssl/d1_lib.c patch +crypto/dist/openssl/ssl/s3_clnt.c patch +crypto/dist/openssl/ssl/s3_srvr.c patch +crypto/dist/openssl/ssl/ssl.h patch +crypto/dist/openssl/ssl/ssl_err.c patch +crypto/dist/openssl/ssl/ssl_lib.c patch +crypto/dist/openssl/ssl/ssl_locl.h patch +crypto/dist/openssl/ssl/ssl_sess.c patch +crypto/dist/openssl/util/mkerr.pl patch + + This change covers the vulnerabilities relevant to netbsd-5 from the + June OpenSSL advisory, and also fixes a regression introduced with the + POODLE fix in October last year that caused the SSL server side to + fail to handshake. + [spz, ticket#1976]
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: martin Date: Fri Aug 14 15:27:28 UTC 2015 Modified Files: src/sys/dev/pci/ixgbe: ixv.c Log Message: Make it compilable without DIAGNOSTIC To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pci/ixgbe/ixv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/ixgbe/ixv.c diff -u src/sys/dev/pci/ixgbe/ixv.c:1.13 src/sys/dev/pci/ixgbe/ixv.c:1.14 --- src/sys/dev/pci/ixgbe/ixv.c:1.13 Fri Aug 14 06:05:40 2015 +++ src/sys/dev/pci/ixgbe/ixv.c Fri Aug 14 15:27:28 2015 @@ -31,7 +31,7 @@ **/ /*$FreeBSD: head/sys/dev/ixgbe/ixv.c 275358 2014-12-01 11:45:24Z hselasky $*/ -/*$NetBSD: ixv.c,v 1.13 2015/08/14 06:05:40 msaitoh Exp $*/ +/*$NetBSD: ixv.c,v 1.14 2015/08/14 15:27:28 martin Exp $*/ #include opt_inet.h #include opt_inet6.h @@ -2497,7 +2497,7 @@ ixv_tx_ctx_setup(struct tx_ring *txr, st struct ip6_hdr ip6; int ehdrlen, ip_hlen = 0; u16 etype; - u8 ipproto = 0; + u8 ipproto __diagused = 0; bool offload; int ctxd = txr-next_avail_desc; u16 vtag = 0;
CVS commit: src/sys/dev/pci
Module Name:src Committed By: nonaka Date: Fri Aug 14 16:49:43 UTC 2015 Modified Files: src/sys/dev/pci: pcidevs Log Message: Added ASMedia ASM1042A USB 3.0 Host Controller. To generate a diff of this commit: cvs rdiff -u -r1.1230 -r1.1231 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.1230 src/sys/dev/pci/pcidevs:1.1231 --- src/sys/dev/pci/pcidevs:1.1230 Fri Aug 14 01:11:49 2015 +++ src/sys/dev/pci/pcidevs Fri Aug 14 16:49:43 2015 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1230 2015/08/14 01:11:49 knakahara Exp $ +$NetBSD: pcidevs,v 1.1231 2015/08/14 16:49:43 nonaka Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1165,7 +1165,8 @@ product ASMEDIA ASM1061_01 0x0601 ASM106 product ASMEDIA ASM1061_02 0x0602 ASM1061 AHCI SATA III Controller product ASMEDIA ASM1061_11 0x0611 ASM1061 AHCI SATA III Controller product ASMEDIA ASM1061_12 0x0612 ASM1061 AHCI SATA III Controller -product ASMEDIA ASM1042 0x1042 ASM1042 xHCI USB 3.0 +product ASMEDIA ASM1042 0x1042 ASM1042 USB 3.0 Host Controller +product ASMEDIA ASM1042A 0x1142 ASM1042A USB 3.0 Host Controller /* Asustek products */ product ASUSTEK HFCPCI 0x0675 ISDN
