CVS commit: [netbsd-7] src/sys/arch/evbmips/loongson
Module Name:src
Committed By: snj
Date: Sat Apr 8 16:15:09 UTC 2017
Modified Files:
src/sys/arch/evbmips/loongson [netbsd-7]: gdium_machdep.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1399):
sys/arch/evbmips/loongson/gdium_machdep.c: 1.8
Adapt to netbsd-7-nhusb.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.12.1 src/sys/arch/evbmips/loongson/gdium_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbmips/loongson/gdium_machdep.c
diff -u src/sys/arch/evbmips/loongson/gdium_machdep.c:1.6 src/sys/arch/evbmips/loongson/gdium_machdep.c:1.6.12.1
--- src/sys/arch/evbmips/loongson/gdium_machdep.c:1.6 Wed Mar 13 21:18:35 2013
+++ src/sys/arch/evbmips/loongson/gdium_machdep.c Sat Apr 8 16:15:09 2017
@@ -284,7 +284,7 @@ gdium_device_register(device_t dev, void
case 5: /* umass at uhub port 3 */
if (device_is_a(dev, "umass")) {
struct usb_attach_arg *uaa = aux;
- if (uaa->port == 3)
+ if (uaa->uaa_port == 3)
goto advance;
}
break;
CVS commit: [netbsd-7] src/sys/arch/evbmips/loongson
Module Name:src Committed By: snj Date: Sat Apr 8 16:15:09 UTC 2017 Modified Files: src/sys/arch/evbmips/loongson [netbsd-7]: gdium_machdep.c Log Message: Pull up following revision(s) (requested by skrll in ticket #1399): sys/arch/evbmips/loongson/gdium_machdep.c: 1.8 Adapt to netbsd-7-nhusb. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.6.12.1 src/sys/arch/evbmips/loongson/gdium_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/arch/evbmips/loongson
Module Name:src
Committed By: martin
Date: Mon Jul 11 10:37:51 UTC 2016
Modified Files:
src/sys/arch/evbmips/loongson [netbsd-7]: yeeloong_machdep.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #1202):
sys/arch/evbmips/loongson/yeeloong_machdep.c: revision 1.8
The version of PMON on my 8089B (LM8089-1.4.9a) configures OHCI but doesn't
enable memory space access. Enable it before the ohci driver attaches to
allow low- and full-speed devices to work.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.4.1 src/sys/arch/evbmips/loongson/yeeloong_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbmips/loongson/yeeloong_machdep.c
diff -u src/sys/arch/evbmips/loongson/yeeloong_machdep.c:1.6 src/sys/arch/evbmips/loongson/yeeloong_machdep.c:1.6.4.1
--- src/sys/arch/evbmips/loongson/yeeloong_machdep.c:1.6 Sat Mar 29 19:28:28 2014
+++ src/sys/arch/evbmips/loongson/yeeloong_machdep.c Mon Jul 11 10:37:51 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: yeeloong_machdep.c,v 1.6 2014/03/29 19:28:28 christos Exp $ */
+/* $NetBSD: yeeloong_machdep.c,v 1.6.4.1 2016/07/11 10:37:51 martin Exp $ */
/* $OpenBSD: yeeloong_machdep.c,v 1.16 2011/04/15 20:40:06 deraadt Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: yeeloong_machdep.c,v 1.6 2014/03/29 19:28:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: yeeloong_machdep.c,v 1.6.4.1 2016/07/11 10:37:51 martin Exp $");
#include
#include
@@ -558,6 +558,18 @@ lemote_device_register(device_t dev, voi
if (device_class(dev) != bootdev_class)
return;
+ /* OHCI memory space access may not be enabled by the BIOS */
+ if (device_is_a(dev, "ohci")) {
+ struct pci_attach_args *pa = aux;
+ pcireg_t csr = pci_conf_read(pa->pa_pc, pa->pa_tag,
+ PCI_COMMAND_STATUS_REG);
+ if ((csr & PCI_COMMAND_MEM_ENABLE) == 0) {
+ csr |= PCI_COMMAND_MEM_ENABLE;
+ pci_conf_write(pa->pa_pc, pa->pa_tag,
+ PCI_COMMAND_STATUS_REG, csr);
+ }
+ }
+
/*
* The device numbering must match. There's no way
* pmon tells us more info. Depending on the usb slot
CVS commit: [netbsd-7] src/sys/arch/evbmips/loongson
Module Name:src Committed By: martin Date: Mon Jul 11 10:37:51 UTC 2016 Modified Files: src/sys/arch/evbmips/loongson [netbsd-7]: yeeloong_machdep.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #1202): sys/arch/evbmips/loongson/yeeloong_machdep.c: revision 1.8 The version of PMON on my 8089B (LM8089-1.4.9a) configures OHCI but doesn't enable memory space access. Enable it before the ohci driver attaches to allow low- and full-speed devices to work. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.6.4.1 src/sys/arch/evbmips/loongson/yeeloong_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/arch/evbmips/loongson
Module Name:src
Committed By: martin
Date: Sat Jan 10 16:46:56 UTC 2015
Modified Files:
src/sys/arch/evbmips/loongson [netbsd-7]: autoconf.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #399):
sys/arch/evbmips/loongson/autoconf.c: revision 1.6
if MEMORY_DISK_IS_ROOT is defined, dont try to guess the root device
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.12.1 src/sys/arch/evbmips/loongson/autoconf.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/evbmips/loongson/autoconf.c
diff -u src/sys/arch/evbmips/loongson/autoconf.c:1.5 src/sys/arch/evbmips/loongson/autoconf.c:1.5.12.1
--- src/sys/arch/evbmips/loongson/autoconf.c:1.5 Wed Mar 13 21:17:43 2013
+++ src/sys/arch/evbmips/loongson/autoconf.c Sat Jan 10 16:46:56 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.5 2013/03/13 21:17:43 macallan Exp $ */
+/* $NetBSD: autoconf.c,v 1.5.12.1 2015/01/10 16:46:56 martin Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -35,8 +35,10 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include opt_md.h
+
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.5 2013/03/13 21:17:43 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.5.12.1 2015/01/10 16:46:56 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -46,7 +48,9 @@ __KERNEL_RCSID(0, $NetBSD: autoconf.c,v
#include sys/cpu.h
#include evbmips/loongson/autoconf.h
+#ifndef MEMORY_DISK_IS_ROOT
static void findroot(void);
+#endif
enum devclass bootdev_class = DV_DULL;
char bootdev[16];
@@ -74,7 +78,9 @@ cpu_configure(void)
void
cpu_rootconf(void)
{
+#ifndef MEMORY_DISK_IS_ROOT
findroot();
+#endif
printf(boot device: %s\n,
booted_device ? device_xname(booted_device) : unknown);
@@ -85,6 +91,7 @@ cpu_rootconf(void)
extern char bootstring[];
extern int netboot;
+#ifndef MEMORY_DISK_IS_ROOT
static void
findroot(void)
{
@@ -111,6 +118,7 @@ findroot(void)
return;
}
+#endif
void
device_register(device_t dev, void *aux)
CVS commit: [netbsd-7] src/sys/arch/evbmips/loongson
Module Name:src Committed By: martin Date: Sat Jan 10 16:46:56 UTC 2015 Modified Files: src/sys/arch/evbmips/loongson [netbsd-7]: autoconf.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #399): sys/arch/evbmips/loongson/autoconf.c: revision 1.6 if MEMORY_DISK_IS_ROOT is defined, dont try to guess the root device To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.12.1 src/sys/arch/evbmips/loongson/autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
