CVS commit: [agc-symver] src/lib/libradius
Module Name:src
Committed By: agc
Date: Thu Mar 28 05:32:45 UTC 2013
Added Files:
src/lib/libradius [agc-symver]: Version.map
Log Message:
Add versioning information for libradius
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.2.1 src/lib/libradius/Version.map
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/lib/libradius/Version.map
diff -u /dev/null src/lib/libradius/Version.map:1.1.2.1
--- /dev/null Thu Mar 28 05:32:45 2013
+++ src/lib/libradius/Version.map Thu Mar 28 05:32:44 2013
@@ -0,0 +1,41 @@
+LIBRADIUS_4.0.0.0 {
+global:
+ rad_acct_open;
+ rad_add_server;
+ rad_auth_open;
+ rad_close;
+ rad_config;
+ rad_continue_send_request;
+ rad_create_request;
+ rad_cvt_addr;
+ rad_cvt_int;
+ rad_cvt_string;
+ rad_demangle;
+ rad_demangle_mppe_key;
+ rad_get_attr;
+ rad_get_vendor_attr;
+ rad_init_send_request;
+ rad_open;
+ rad_put_addr;
+ rad_put_attr;
+ rad_put_int;
+ rad_put_message_authentic;
+ rad_put_string;
+ rad_put_vendor_addr;
+ rad_put_vendor_attr;
+ rad_put_vendor_int;
+ rad_put_vendor_string;
+ rad_request_authenticator;
+ rad_send_request;
+ rad_server_secret;
+ rad_strerror;
+};
+
+NetBSD_6.99.18.0 {
+} LIBRADIUS_4.0.0.0;
+
+LIBRADIUS_private_4.0.0.0 {
+local:
+ *;
+};
+
CVS commit: [agc-symver] src/rescue
Module Name:src
Committed By: agc
Date: Thu Mar 28 05:31:22 UTC 2013
Modified Files:
src/rescue [agc-symver]: Makefile list.pdisk
Log Message:
Pull up fixes from HEAD after pdisk move to external
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.27.18.1 src/rescue/Makefile
cvs rdiff -u -r1.1 -r1.1.68.1 src/rescue/list.pdisk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/rescue/Makefile
diff -u src/rescue/Makefile:1.27 src/rescue/Makefile:1.27.18.1
--- src/rescue/Makefile:1.27 Wed Mar 10 23:13:10 2010
+++ src/rescue/Makefile Thu Mar 28 05:31:22 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2010/03/10 23:13:10 abs Exp $
+# $NetBSD: Makefile,v 1.27.18.1 2013/03/28 05:31:22 agc Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -19,13 +19,20 @@ LISTS= ${.CURDIR}/list
TARGETDIR= ${DESTDIR}/rescue
PARSELISTENV+= TARGETDIR=${TARGETDIR:Q}
-.for f in ldconfig pdisk
+.for f in ldconfig
PROG_${f}!= cd ${NETBSDSRCDIR}/sbin/${f} && ${MAKE} -V PROG
.if (${PROG_${f}} != "")
LISTS+= ${.CURDIR}/list.${f}
.endif
.endfor
+.for f in pdisk
+PROG_${f}!= cd ${NETBSDSRCDIR}/external/bsd/${f}/bin && ${MAKE} -V PROG
+.if (${PROG_${f}} != "")
+LISTS+= ${.CURDIR}/list.${f}
+.endif
+.endfor
+
.if ${USE_INET6} != "no"
LISTS+= ${.CURDIR}/list.inet6
.endif
Index: src/rescue/list.pdisk
diff -u src/rescue/list.pdisk:1.1 src/rescue/list.pdisk:1.1.68.1
--- src/rescue/list.pdisk:1.1 Thu Aug 22 01:23:47 2002
+++ src/rescue/list.pdisk Thu Mar 28 05:31:22 2013
@@ -1,3 +1,4 @@
-# $NetBSD: list.pdisk,v 1.1 2002/08/22 01:23:47 lukem Exp $
+# $NetBSD: list.pdisk,v 1.1.68.1 2013/03/28 05:31:22 agc Exp $
PROG pdisk
+SPECIAL pdisk srcdir external/bsd/pdisk/bin
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: garbled
Date: Thu Mar 28 04:07:55 UTC 2013
Modified Files:
src/sys/dev/usb: usb_quirks.c usbdevs.h usbdevs_data.h
Log Message:
Regen usbdevs.
Modify quirks to allow a product id of ALL
Set all TRIPPWIRE2 vendor devices to ignore hid. Three in a row means they
are all probably like this.
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/usb/usb_quirks.c
cvs rdiff -u -r1.633 -r1.634 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.634 -r1.635 src/sys/dev/usb/usbdevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usb_quirks.c
diff -u src/sys/dev/usb/usb_quirks.c:1.78 src/sys/dev/usb/usb_quirks.c:1.79
--- src/sys/dev/usb/usb_quirks.c:1.78 Wed Mar 20 15:40:29 2013
+++ src/sys/dev/usb/usb_quirks.c Thu Mar 28 04:07:55 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_quirks.c,v 1.78 2013/03/20 15:40:29 garbled Exp $ */
+/* $NetBSD: usb_quirks.c,v 1.79 2013/03/28 04:07:55 garbled Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.78 2013/03/20 15:40:29 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.79 2013/03/28 04:07:55 garbled Exp $");
#include
#include
@@ -60,10 +60,7 @@ Static const struct usbd_quirk_entry {
{ USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS2, ANY, { UQ_HID_IGNORE }},
{ USB_VENDOR_MICROCHIP, USB_PRODUCT_MICROCHIP_PICKIT1,
ANY, { UQ_HID_IGNORE }},
- { USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_UPS,
- ANY, { UQ_HID_IGNORE }},
- { USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_SMARTLCD,
- ANY, { UQ_HID_IGNORE }},
+ { USB_VENDOR_TRIPPLITE2, ANY, ANY, { UQ_HID_IGNORE }},
{ USB_VENDOR_MISC, USB_PRODUCT_MISC_WISPY_24X, ANY, { UQ_HID_IGNORE }},
{ USB_VENDOR_KYE, USB_PRODUCT_KYE_NICHE, 0x100, { UQ_NO_SET_PROTO}},
@@ -160,7 +157,7 @@ usbd_find_quirk(usb_device_descriptor_t
for (t = usb_quirks; t->idVendor != 0; t++) {
if (t->idVendor == vendor &&
- t->idProduct == product &&
+ (t->idProduct == ANY || t->idProduct == product) &&
(t->bcdDevice == ANY || t->bcdDevice == revision))
break;
}
Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.633 src/sys/dev/usb/usbdevs.h:1.634
--- src/sys/dev/usb/usbdevs.h:1.633 Sun Mar 24 23:00:48 2013
+++ src/sys/dev/usb/usbdevs.h Thu Mar 28 04:07:55 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.633 2013/03/24 23:00:48 cheusov Exp $ */
+/* $NetBSD: usbdevs.h,v 1.634 2013/03/28 04:07:55 garbled Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.639 2013/03/20 15:33:24 garbled Exp
+ * NetBSD: usbdevs,v 1.641 2013/03/28 04:05:17 garbled Exp
*/
/*
@@ -3096,6 +3096,7 @@
#define USB_PRODUCT_TRIPPLITE_U209 0x2008 /* U209 Serial adapter */
#define USB_PRODUCT_TRIPPLITE2_UPS 0x1007 /* Tripp Lite UPS */
#define USB_PRODUCT_TRIPPLITE2_SMARTLCD 0x2009 /* SmartLCD UPS */
+#define USB_PRODUCT_TRIPPLITE2_AVR550U 0x2010 /* Tripp Lite AVR550U */
/* Trumpion products */
#define USB_PRODUCT_TRUMPION_T33521 0x1003 /* USB/MP3 decoder */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.634 src/sys/dev/usb/usbdevs_data.h:1.635
--- src/sys/dev/usb/usbdevs_data.h:1.634 Sun Mar 24 23:00:48 2013
+++ src/sys/dev/usb/usbdevs_data.h Thu Mar 28 04:07:55 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.634 2013/03/24 23:00:48 cheusov Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.635 2013/03/28 04:07:55 garbled Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.639 2013/03/20 15:33:24 garbled Exp
+ * NetBSD: usbdevs,v 1.641 2013/03/28 04:05:17 garbled Exp
*/
/*
@@ -9343,6 +9343,10 @@ const struct usb_product usb_products[]
"SmartLCD UPS",
},
{
+ USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_AVR550U,
+ "Tripp Lite AVR550U",
+ },
+ {
USB_VENDOR_TRUMPION, USB_PRODUCT_TRUMPION_T33521,
"USB/MP3 decoder",
},
@@ -9879,4 +9883,4 @@ const struct usb_product usb_products[]
"Prestige",
},
};
-const int usb_nproducts = 1940;
+const int usb_nproducts = 1941;
CVS commit: src/sys/dev/usb
Module Name:src Committed By: garbled Date: Thu Mar 28 04:05:18 UTC 2013 Modified Files: src/sys/dev/usb: usbdevs Log Message: Add entry for a tripplite AVR550U UPS To generate a diff of this commit: cvs rdiff -u -r1.640 -r1.641 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.640 src/sys/dev/usb/usbdevs:1.641 --- src/sys/dev/usb/usbdevs:1.640 Sun Mar 24 23:00:48 2013 +++ src/sys/dev/usb/usbdevs Thu Mar 28 04:05:17 2013 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.640 2013/03/24 23:00:48 cheusov Exp $ +$NetBSD: usbdevs,v 1.641 2013/03/28 04:05:17 garbled Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -3089,6 +3089,7 @@ product TRENDNET RTL8188CU 0x648b RTL818 product TRIPPLITE U209 0x2008 U209 Serial adapter product TRIPPLITE2 UPS 0x1007 Tripp Lite UPS product TRIPPLITE2 SMARTLCD 0x2009 SmartLCD UPS +product TRIPPLITE2 AVR550U 0x2010 Tripp Lite AVR550U /* Trumpion products */ product TRUMPION T33521 0x1003 USB/MP3 decoder
CVS commit: src/sys/arch/powerpc/oea
Module Name:src
Committed By: christos
Date: Thu Mar 28 00:22:22 UTC 2013
Modified Files:
src/sys/arch/powerpc/oea: pmap.c
Log Message:
Fix loop bug (Phileas Fogg)
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/powerpc/oea/pmap.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/powerpc/oea/pmap.c
diff -u src/sys/arch/powerpc/oea/pmap.c:1.87 src/sys/arch/powerpc/oea/pmap.c:1.88
--- src/sys/arch/powerpc/oea/pmap.c:1.87 Sat Oct 20 10:42:15 2012
+++ src/sys/arch/powerpc/oea/pmap.c Wed Mar 27 20:22:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.87 2012/10/20 14:42:15 kiyohara Exp $ */
+/* $NetBSD: pmap.c,v 1.88 2013/03/28 00:22:21 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -63,7 +63,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.87 2012/10/20 14:42:15 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.88 2013/03/28 00:22:21 christos Exp $");
#define PMAP_NOOPNAMES
@@ -3090,7 +3090,7 @@ pmap_boot_find_memory(psize_t size, psiz
int
pmap_setup_segment0_map(int use_large_pages, ...)
{
-vaddr_t va;
+vaddr_t va, va_end;
register_t pte_lo = 0x0;
int ptegidx = 0, i = 0;
@@ -3123,7 +3123,7 @@ pmap_setup_segment0_map(int use_large_pa
pa = va_arg(ap, paddr_t);
size = va_arg(ap, size_t);
-for (; va < (va + size); va += 0x1000, pa += 0x1000) {
+for (va_end = va + size; va < va_end; va += 0x1000, pa += 0x1000) {
#if 0
printf("%s: Inserting: va: %#" _PRIxva ", pa: %#" _PRIxpa "\n", __func__, va, pa);
#endif
CVS commit: src/distrib/utils/embedded
Module Name:src
Committed By: jmcneill
Date: Thu Mar 28 00:20:02 UTC 2013
Modified Files:
src/distrib/utils/embedded: mkimage
Log Message:
For ffs, set bytes per inode to 4K. Otherwise we get a density based on
the contents of the image, which aren't very useful after the file-system
has been resized -- for rpi.img, this was 22K per inode!
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/distrib/utils/embedded/mkimage
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/mkimage
diff -u src/distrib/utils/embedded/mkimage:1.36 src/distrib/utils/embedded/mkimage:1.37
--- src/distrib/utils/embedded/mkimage:1.36 Tue Mar 19 22:16:53 2013
+++ src/distrib/utils/embedded/mkimage Thu Mar 28 00:20:02 2013
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mkimage,v 1.36 2013/03/19 22:16:53 garbled Exp $
+# $NetBSD: mkimage,v 1.37 2013/03/28 00:20:02 jmcneill Exp $
#
# Copyright (c) 2013 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -157,6 +157,7 @@ if [ -z "$bootonly" ]; then
${MAKEFS} -N ${release}/etc -t ffs -rx \
-O $(((${init} + ${boot} + ${swap}) / 2))m \
-b $((${extra} / 2))m \
+ -o d=4096 \
-F "$tmp/selected_sets" ${image} "${release}" "${mnt}"
fi
CVS commit: src/sys/external/bsd/ipf/netinet
Module Name:src Committed By: christos Date: Wed Mar 27 23:49:03 UTC 2013 Modified Files: src/sys/external/bsd/ipf/netinet: ip_log.c Log Message: call mutex destroy in fini, so that we don't end up with a lockdebug panic when we re-attach. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/ipf/netinet/ip_log.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/external/bsd/ipf/netinet/ip_log.c diff -u src/sys/external/bsd/ipf/netinet/ip_log.c:1.4 src/sys/external/bsd/ipf/netinet/ip_log.c:1.5 --- src/sys/external/bsd/ipf/netinet/ip_log.c:1.4 Sat Sep 15 12:56:45 2012 +++ src/sys/external/bsd/ipf/netinet/ip_log.c Wed Mar 27 19:49:02 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_log.c,v 1.4 2012/09/15 16:56:45 plunky Exp $ */ +/* $NetBSD: ip_log.c,v 1.5 2013/03/27 23:49:02 christos Exp $ */ /* * Copyright (C) 2012 by Darren Reed. @@ -9,7 +9,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ip_log.c,v 1.4 2012/09/15 16:56:45 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_log.c,v 1.5 2013/03/27 23:49:02 christos Exp $"); #include #if defined(KERNEL) || defined(_KERNEL) @@ -327,6 +327,7 @@ ipf_log_soft_fini(ipf_main_softc_t *soft MUTEX_ENTER(&softl->ipl_mutex[i]); } MUTEX_EXIT(&softl->ipl_mutex[i]); + MUTEX_DESTROY(&softl->ipl_mutex[i]); } return 0;
CVS commit: src/external/gpl2/xcvs/dist/src
Module Name:src Committed By: christos Date: Wed Mar 27 19:23:28 UTC 2013 Modified Files: src/external/gpl2/xcvs/dist/src: lock.c Log Message: delete the assert as we'll never get there anyway. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/xcvs/dist/src/lock.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl2/xcvs/dist/src/lock.c diff -u src/external/gpl2/xcvs/dist/src/lock.c:1.3 src/external/gpl2/xcvs/dist/src/lock.c:1.4 --- src/external/gpl2/xcvs/dist/src/lock.c:1.3 Wed Mar 27 14:15:13 2013 +++ src/external/gpl2/xcvs/dist/src/lock.c Wed Mar 27 15:23:28 2013 @@ -233,7 +233,6 @@ lock_name (const char *repository, const if (len == -1) error (1, 0, "%s not found in %s", repository, current_parsed_root->directory); - assert(len != -1); short_repos = repository + len + 1; if (strcmp (repository, current_parsed_root->directory) == 0)
CVS commit: src/external/gpl2/xcvs/dist/src
Module Name:src Committed By: christos Date: Wed Mar 27 18:15:13 UTC 2013 Modified Files: src/external/gpl2/xcvs/dist/src: lock.c Log Message: Don't abort with an assertion when a directory cannot be found in a repository. This could happen when someone copies from one directory to another CVS files or when things get corrupted. Provide an explanatory error message instead. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/xcvs/dist/src/lock.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl2/xcvs/dist/src/lock.c diff -u src/external/gpl2/xcvs/dist/src/lock.c:1.2 src/external/gpl2/xcvs/dist/src/lock.c:1.3 --- src/external/gpl2/xcvs/dist/src/lock.c:1.2 Wed Apr 8 12:27:51 2009 +++ src/external/gpl2/xcvs/dist/src/lock.c Wed Mar 27 14:15:13 2013 @@ -230,6 +230,9 @@ lock_name (const char *repository, const * might have symlinks present */ len = find_root(repository, current_parsed_root->directory); + if (len == -1) + error (1, 0, "%s not found in %s", + repository, current_parsed_root->directory); assert(len != -1); short_repos = repository + len + 1;
CVS commit: [agc-symver] src/lib/libresolv
Module Name:src
Committed By: agc
Date: Wed Mar 27 14:57:50 UTC 2013
Added Files:
src/lib/libresolv [agc-symver]: Version.map
Log Message:
Add versioning info for libresolv
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.2.1 src/lib/libresolv/Version.map
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/lib/libresolv/Version.map
diff -u /dev/null src/lib/libresolv/Version.map:1.1.2.1
--- /dev/null Wed Mar 27 14:57:50 2013
+++ src/lib/libresolv/Version.map Wed Mar 27 14:57:50 2013
@@ -0,0 +1,66 @@
+LIBRESOLV_3.0.0.0 {
+global:
+ __res_nupdate;
+ __res_nsendsigned;
+ __res_buildprotolist;
+ __res_destroyprotolist;
+ __res_destroyservicelist;
+ __res_freeupdrec;
+ __res_mkupdrec;
+ __res_nmkupdate;
+ __res_protocolname;
+ __res_protocolnumber;
+ __res_servicename;
+ __res_servicenumber;
+ __res_findzonecut;
+ __res_findzonecut2;
+ __ns_find_tsig;
+ __ns_verify50;
+ __ns_verify_tcp;
+ __ns_verify_tcp_init;
+ __ns_sign250;
+ __ns_sign50;
+ __ns_sign_tcp;
+ __ns_sign_tcp2;
+ __ns_sign_tcp_init;
+ __ns_samedomain;
+ __ns_subdomain;
+ __ns_datetosecs;
+ __dst_hmac_md5_init;
+ __dst_s_build_filename;
+ __dst_s_calculate_bits;
+ __dst_s_dns_key_id;
+ __dst_s_dump;
+ __dst_s_filename_length;
+ __dst_s_fopen;
+ __dst_s_get_int16;
+ __dst_s_get_int32;
+ __dst_s_id_calc;
+ __dst_s_put_int16;
+ __dst_s_put_int32;
+ __dst_s_verify_str;
+ __dst_buffer_to_key;
+ __dst_check_algorithm;
+ __dst_compare_keys;
+ __dst_dnskey_to_key;
+ __dst_free_key;
+ __dst_generate_key;
+ __dst_init;
+ __dst_key_to_buffer;
+ __dst_key_to_dnskey;
+ __dst_read_key;
+ __dst_sig_size;
+ __dst_sign_data;
+ __dst_verify_data;
+ __dst_write_key;
+ dst_t_func;
+};
+
+NetBSD_6.99.18.0 {
+} LIBRESOLV_3.0.0.0;
+
+LIBRESOLV_private_3.0.0.0 {
+local:
+ *;
+};
+
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Wed Mar 27 12:11:57 UTC 2013
Modified Files:
src/sys/dev/pci: if_bgereg.h
Log Message:
Add BGE_SRAM_FW_MB_RESET_MAGIC again.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/pci/if_bgereg.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_bgereg.h
diff -u src/sys/dev/pci/if_bgereg.h:1.70 src/sys/dev/pci/if_bgereg.h:1.71
--- src/sys/dev/pci/if_bgereg.h:1.70 Wed Mar 27 10:27:58 2013
+++ src/sys/dev/pci/if_bgereg.h Wed Mar 27 12:11:57 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bgereg.h,v 1.70 2013/03/27 10:27:58 msaitoh Exp $ */
+/* $NetBSD: if_bgereg.h,v 1.71 2013/03/27 12:11:57 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2001
@@ -2178,6 +2178,7 @@
* code from running.
*/
#define BGE_SRAM_FW_MB_MAGIC 0x4B657654
+#define BGE_SRAM_FW_MB_RESET_MAGIC 0xB49A89AB
typedef struct {
volatile u_int32_t bge_addr_hi;
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Wed Mar 27 12:03:52 UTC 2013
Modified Files:
src/sys/dev/pci: if_bge.c
Log Message:
Revert 1.228 except BGE_NO_EEPROM flag for BCM5906. Sorry.
To generate a diff of this commit:
cvs rdiff -u -r1.228 -r1.229 src/sys/dev/pci/if_bge.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_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.228 src/sys/dev/pci/if_bge.c:1.229
--- src/sys/dev/pci/if_bge.c:1.228 Wed Mar 27 10:26:05 2013
+++ src/sys/dev/pci/if_bge.c Wed Mar 27 12:03:51 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.228 2013/03/27 10:26:05 msaitoh Exp $ */
+/* $NetBSD: if_bge.c,v 1.229 2013/03/27 12:03:51 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.228 2013/03/27 10:26:05 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.229 2013/03/27 12:03:51 msaitoh Exp $");
#include "vlan.h"
@@ -1130,15 +1130,11 @@ bge_ape_send_event(struct bge_softc *sc,
if ((sc->bge_mfw_flags & BGE_MFW_ON_APE) == 0)
return;
- printf("%s: APE event 0x%08x send\n", device_xname(sc->bge_dev), event);
-
/* Wait up to 1ms for APE to service previous event. */
for (i = 10; i > 0; i--) {
if (bge_ape_lock(sc, BGE_APE_LOCK_MEM) != 0)
break;
apedata = APE_READ_4(sc, BGE_APE_EVENT_STATUS);
- printf("%s: APE data 0x%08x -> 0x%08x\n",
- device_xname(sc->bge_dev), apedata, event);
if ((apedata & BGE_APE_EVENT_STATUS_EVENT_PENDING) == 0) {
APE_WRITE_4(sc, BGE_APE_EVENT_STATUS, event |
BGE_APE_EVENT_STATUS_EVENT_PENDING);
@@ -3482,15 +3478,6 @@ bge_attach(device_t parent, device_t sel
sc->bge_chipid != BGE_CHIPID_BCM5705_A1)))
sc->bge_flags |= BGE_PHY_NO_WIRESPEED;
- if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5719 ||
- BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5720 ||
- BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM57766 ||
- (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROADCOM_BCM5718 &&
- sc->bge_chipid != BGE_CHIPID_BCM5717_A0) ||
- (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM57765 &&
- sc->bge_chipid != BGE_CHIPID_BCM57765_A0))
- sc->bge_flags |= BGE_PHY_EEE;
-
/* Set various PHY bug flags. */
if (sc->bge_chipid == BGE_CHIPID_BCM5701_A0 ||
sc->bge_chipid == BGE_CHIPID_BCM5701_B0)
@@ -4132,13 +4119,6 @@ bge_reset(struct bge_softc *sc)
BGE_CLRBIT(sc, BGE_CPMU_CLCK_ORIDE,
CPMU_CLCK_ORIDE_MAC_ORIDE_EN);
- if ((sc->bge_flags & BGE_PHY_EEE) != 0) {
- uint32_t eeemode;
-
- eeemode = CSR_READ_4(sc, BGE_CPMU_EEE_MODE);
- printf("EEEMODE = %x\n", eeemode);
- CSR_WRITE_4(sc, BGE_CPMU_EEE_MODE, 0);
- }
return 0;
}
@@ -5693,13 +5673,6 @@ bge_link_upd(struct bge_softc *sc)
IFM_SUBTYPE(mii->mii_media_active) == IFM_NONE))
BGE_STS_CLRBIT(sc, BGE_STS_LINK);
}
- } else {
- /*
- * For controllers that call mii_tick, we have to poll
- * link status.
- */
- mii_pollstat(mii);
- bge_miibus_statchg(ifp);
}
/* Clear the attention */
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Wed Mar 27 10:27:58 UTC 2013
Modified Files:
src/sys/dev/pci: if_bgereg.h
Log Message:
Revert rev. 1.68.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/dev/pci/if_bgereg.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_bgereg.h
diff -u src/sys/dev/pci/if_bgereg.h:1.69 src/sys/dev/pci/if_bgereg.h:1.70
--- src/sys/dev/pci/if_bgereg.h:1.69 Wed Mar 27 10:26:06 2013
+++ src/sys/dev/pci/if_bgereg.h Wed Mar 27 10:27:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bgereg.h,v 1.69 2013/03/27 10:26:06 msaitoh Exp $ */
+/* $NetBSD: if_bgereg.h,v 1.70 2013/03/27 10:27:58 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2001
@@ -1222,7 +1222,6 @@
#define BGE_CPMU_MUTEX_GNT 0x3660
#define BGE_CPMU_PHY_STRAP 0x3664
#define BGE_CPMU_PADRNG_CTL 0x3668
-#define BGE_CPMU_EEE_MODE 0x36b0
/* CPMU Control register */
#define BGE_CPMU_CTRL_LINK_IDLE_MODE 0x0200
@@ -1265,9 +1264,6 @@
/* CPMU Padring Control register */
#define BGE_CPMU_PADRNG_CTL_RDIV2 0x0004
-/* CPMU EEE_MODE register */
-#define BGE_CPMU_EEEMODE_LPIENABLE 0x0080
-
/*
* Mbuf Cluster Free registers (has nothing to do with BSD mbufs)
*/
@@ -2182,7 +2178,6 @@
* code from running.
*/
#define BGE_SRAM_FW_MB_MAGIC 0x4B657654
-#define BGE_SRAM_FW_MB_RESET_MAGIC 0xB49A89AB
typedef struct {
volatile u_int32_t bge_addr_hi;
@@ -2632,5 +2627,4 @@ struct vpd_key {
#define BGE_57765_PLUS 0x0800
#define BGE_APE 0x1000
#define BGE_CPMU_PRESENT 0x2000
-#define BGE_PHY_EEE 0x4000
#define BGE_TSO 0x8000
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Wed Mar 27 10:26:06 UTC 2013
Modified Files:
src/sys/dev/pci: if_bge.c if_bgereg.h
Log Message:
Fix a bug that chips which have BCM5906 ASIC touch GPIO wrongly.
To generate a diff of this commit:
cvs rdiff -u -r1.227 -r1.228 src/sys/dev/pci/if_bge.c
cvs rdiff -u -r1.68 -r1.69 src/sys/dev/pci/if_bgereg.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_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.227 src/sys/dev/pci/if_bge.c:1.228
--- src/sys/dev/pci/if_bge.c:1.227 Sun Mar 24 22:33:59 2013
+++ src/sys/dev/pci/if_bge.c Wed Mar 27 10:26:05 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.227 2013/03/24 22:33:59 msaitoh Exp $ */
+/* $NetBSD: if_bge.c,v 1.228 2013/03/27 10:26:05 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.227 2013/03/24 22:33:59 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.228 2013/03/27 10:26:05 msaitoh Exp $");
#include "vlan.h"
@@ -1130,11 +1130,15 @@ bge_ape_send_event(struct bge_softc *sc,
if ((sc->bge_mfw_flags & BGE_MFW_ON_APE) == 0)
return;
+ printf("%s: APE event 0x%08x send\n", device_xname(sc->bge_dev), event);
+
/* Wait up to 1ms for APE to service previous event. */
for (i = 10; i > 0; i--) {
if (bge_ape_lock(sc, BGE_APE_LOCK_MEM) != 0)
break;
apedata = APE_READ_4(sc, BGE_APE_EVENT_STATUS);
+ printf("%s: APE data 0x%08x -> 0x%08x\n",
+ device_xname(sc->bge_dev), apedata, event);
if ((apedata & BGE_APE_EVENT_STATUS_EVENT_PENDING) == 0) {
APE_WRITE_4(sc, BGE_APE_EVENT_STATUS, event |
BGE_APE_EVENT_STATUS_EVENT_PENDING);
@@ -3478,6 +3482,15 @@ bge_attach(device_t parent, device_t sel
sc->bge_chipid != BGE_CHIPID_BCM5705_A1)))
sc->bge_flags |= BGE_PHY_NO_WIRESPEED;
+ if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5719 ||
+ BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5720 ||
+ BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM57766 ||
+ (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROADCOM_BCM5718 &&
+ sc->bge_chipid != BGE_CHIPID_BCM5717_A0) ||
+ (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM57765 &&
+ sc->bge_chipid != BGE_CHIPID_BCM57765_A0))
+ sc->bge_flags |= BGE_PHY_EEE;
+
/* Set various PHY bug flags. */
if (sc->bge_chipid == BGE_CHIPID_BCM5701_A0 ||
sc->bge_chipid == BGE_CHIPID_BCM5701_B0)
@@ -3517,6 +3530,9 @@ bge_attach(device_t parent, device_t sel
"without-seeprom", &no_seeprom) && no_seeprom)
sc->bge_flags |= BGE_NO_EEPROM;
+ else if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5906)
+ sc->bge_flags |= BGE_NO_EEPROM;
+
/* Now check the 'ROM failed' bit on the RX CPU */
else if (CSR_READ_4(sc, BGE_RXCPU_MODE) & BGE_RXCPUMODE_ROMFAIL)
sc->bge_flags |= BGE_NO_EEPROM;
@@ -4116,6 +4132,13 @@ bge_reset(struct bge_softc *sc)
BGE_CLRBIT(sc, BGE_CPMU_CLCK_ORIDE,
CPMU_CLCK_ORIDE_MAC_ORIDE_EN);
+ if ((sc->bge_flags & BGE_PHY_EEE) != 0) {
+ uint32_t eeemode;
+
+ eeemode = CSR_READ_4(sc, BGE_CPMU_EEE_MODE);
+ printf("EEEMODE = %x\n", eeemode);
+ CSR_WRITE_4(sc, BGE_CPMU_EEE_MODE, 0);
+ }
return 0;
}
@@ -5670,6 +5693,13 @@ bge_link_upd(struct bge_softc *sc)
IFM_SUBTYPE(mii->mii_media_active) == IFM_NONE))
BGE_STS_CLRBIT(sc, BGE_STS_LINK);
}
+ } else {
+ /*
+ * For controllers that call mii_tick, we have to poll
+ * link status.
+ */
+ mii_pollstat(mii);
+ bge_miibus_statchg(ifp);
}
/* Clear the attention */
Index: src/sys/dev/pci/if_bgereg.h
diff -u src/sys/dev/pci/if_bgereg.h:1.68 src/sys/dev/pci/if_bgereg.h:1.69
--- src/sys/dev/pci/if_bgereg.h:1.68 Thu Mar 21 12:56:03 2013
+++ src/sys/dev/pci/if_bgereg.h Wed Mar 27 10:26:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bgereg.h,v 1.68 2013/03/21 12:56:03 msaitoh Exp $ */
+/* $NetBSD: if_bgereg.h,v 1.69 2013/03/27 10:26:06 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2001
@@ -1222,6 +1222,7 @@
#define BGE_CPMU_MUTEX_GNT 0x3660
#define BGE_CPMU_PHY_STRAP 0x3664
#define BGE_CPMU_PADRNG_CTL 0x3668
+#define BGE_CPMU_EEE_MODE 0x36b0
/* CPMU Control register */
#define BGE_CPMU_CTRL_LINK_IDLE_MODE 0x0200
@@ -1264,6 +1265,9 @@
/* CPMU Padring Control register */
#define BGE_CPMU_PADRNG_CTL_RDIV2 0x0004
+/* CPMU EEE_MODE register */
+#define BGE_CPMU_EEEMODE_LPIENABLE 0x0080
+
/*
* Mbuf Cluster Free registers (has nothing to do with BSD mbufs)
*/
@@ -2628,4 +2632,5 @@ struct vpd_key {
#define BGE_57765_PLUS 0x0800
#define BGE_APE 0x1000
#define BGE_CPMU_PRESENT 0x2000
+#define BGE_PHY_EEE 0x4000
#define BGE_TSO 0x8000
