CVS commit: src/sbin/atactl
Module Name:src Committed By: mlelstv Date: Fri May 31 05:47:22 UTC 2019 Modified Files: src/sbin/atactl: atactl.8 Log Message: Mention SATL support. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sbin/atactl/atactl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/atactl
Module Name:src Committed By: mlelstv Date: Fri May 31 05:47:22 UTC 2019 Modified Files: src/sbin/atactl: atactl.8 Log Message: Mention SATL support. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sbin/atactl/atactl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/atactl/atactl.8 diff -u src/sbin/atactl/atactl.8:1.29 src/sbin/atactl/atactl.8:1.30 --- src/sbin/atactl/atactl.8:1.29 Sun Mar 3 04:51:57 2019 +++ src/sbin/atactl/atactl.8 Fri May 31 05:47:22 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: atactl.8,v 1.29 2019/03/03 04:51:57 mrg Exp $ +.\" $NetBSD: atactl.8,v 1.30 2019/05/31 05:47:22 mlelstv Exp $ .\" .\" Copyright (c) 1998, 2019 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -48,6 +48,10 @@ control devices which reside on standard the ATA bus itself. It is used by specifying a device or bus to manipulate, the command to perform, and any arguments the command may require. +.Pp +You may also control devices which are inside a SCSI enclosure, this +includes many USB disks. In this case ATA commands are passed through +the SCSI layer using SATL commands. .Sh DEVICE COMMANDS The following commands may be used on IDE and ATA devices. Note that not all devices support all commands. @@ -279,6 +283,8 @@ command written by significantly enhanced the .Cm smart status support. +.An Michael van Elst +added support for SATL. .Sh BUGS The output from the .Cm identify @@ -295,3 +301,5 @@ The .Cm smart status command currently guesses the vendor attribute name table to use, and may be wrong or miss supported devices. +.Pp +SATL bus commands don't work yet.
CVS commit: src/sys/dev/hyperv
Module Name:src Committed By: nonaka Date: Fri May 31 04:23:19 UTC 2019 Modified Files: src/sys/dev/hyperv: hyperv_common.c Log Message: Avoid undefined reference to `hyperv_is_gen1' without hyperv(4). To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/hyperv/hyperv_common.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/hyperv/hyperv_common.c diff -u src/sys/dev/hyperv/hyperv_common.c:1.1 src/sys/dev/hyperv/hyperv_common.c:1.2 --- src/sys/dev/hyperv/hyperv_common.c:1.1 Fri Feb 15 08:54:01 2019 +++ src/sys/dev/hyperv/hyperv_common.c Fri May 31 04:23:19 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: hyperv_common.c,v 1.1 2019/02/15 08:54:01 nonaka Exp $ */ +/* $NetBSD: hyperv_common.c,v 1.2 2019/05/31 04:23:19 nonaka Exp $ */ /*- * Copyright (c) 2009-2012,2016-2017 Microsoft Corp. @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: hyperv_common.c,v 1.1 2019/02/15 08:54:01 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hyperv_common.c,v 1.2 2019/05/31 04:23:19 nonaka Exp $"); #include "hyperv.h" @@ -51,6 +51,7 @@ uint64_t hyperv_hypercall_error(uint64_t __weak_alias(hyperv_hypercall, hyperv_hypercall_error); __weak_alias(hyperv_hypercall_enabled, hyperv_nullop); __weak_alias(hyperv_synic_supported, hyperv_nullop); +__weak_alias(hyperv_is_gen1, hyperv_nullop); __weak_alias(hyperv_set_event_proc, hyperv_voidop); __weak_alias(hyperv_set_message_proc, hyperv_voidop); __weak_alias(hyperv_send_eom, hyperv_voidop);
CVS commit: src/sys/dev/hyperv
Module Name:src Committed By: nonaka Date: Fri May 31 04:23:19 UTC 2019 Modified Files: src/sys/dev/hyperv: hyperv_common.c Log Message: Avoid undefined reference to `hyperv_is_gen1' without hyperv(4). To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/hyperv/hyperv_common.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/radeon
Module Name:src Committed By: maya Date: Fri May 31 03:41:32 UTC 2019 Modified Files: src/sys/external/bsd/drm2/radeon: radeondrmkmsfb.c Log Message: Restore previous KASSERT but with the same condition as in nouveaufb.c, which is the code I was trying to mimic. Thanks riastradh for the heads up and fix. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.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/drm2/radeon/radeondrmkmsfb.c diff -u src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.11 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.12 --- src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.11 Fri May 31 03:28:48 2019 +++ src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c Fri May 31 03:41:32 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: radeondrmkmsfb.c,v 1.11 2019/05/31 03:28:48 maya Exp $ */ +/* $NetBSD: radeondrmkmsfb.c,v 1.12 2019/05/31 03:41:32 maya Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: radeondrmkmsfb.c,v 1.11 2019/05/31 03:28:48 maya Exp $"); +__KERNEL_RCSID(0, "$NetBSD: radeondrmkmsfb.c,v 1.12 2019/05/31 03:41:32 maya Exp $"); #include #include @@ -192,6 +192,9 @@ radeonfb_drmfb_mmapfb(struct drmfb_softc if (offset < 0) return -1; + const unsigned num_pages __diagused = rbo->tbo.num_pages; + + KASSERT(offset < (num_pages << PAGE_SHIFT)); KASSERT(rbo->tbo.mem.bus.is_iomem); if (ISSET(rbo->tbo.mem.placement, TTM_PL_FLAG_WC))
CVS commit: src/sys/external/bsd/drm2/radeon
Module Name:src Committed By: maya Date: Fri May 31 03:41:32 UTC 2019 Modified Files: src/sys/external/bsd/drm2/radeon: radeondrmkmsfb.c Log Message: Restore previous KASSERT but with the same condition as in nouveaufb.c, which is the code I was trying to mimic. Thanks riastradh for the heads up and fix. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/radeon
Module Name:src Committed By: maya Date: Fri May 31 03:28:49 UTC 2019 Modified Files: src/sys/external/bsd/drm2/radeon: radeondrmkmsfb.c Log Message: Quickly hide a KASSERT that fires, hopefully before people trip over it. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/radeon
Module Name:src Committed By: maya Date: Fri May 31 03:28:49 UTC 2019 Modified Files: src/sys/external/bsd/drm2/radeon: radeondrmkmsfb.c Log Message: Quickly hide a KASSERT that fires, hopefully before people trip over it. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.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/drm2/radeon/radeondrmkmsfb.c diff -u src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.10 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.11 --- src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.10 Fri May 31 02:35:08 2019 +++ src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c Fri May 31 03:28:48 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: radeondrmkmsfb.c,v 1.10 2019/05/31 02:35:08 maya Exp $ */ +/* $NetBSD: radeondrmkmsfb.c,v 1.11 2019/05/31 03:28:48 maya Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: radeondrmkmsfb.c,v 1.10 2019/05/31 02:35:08 maya Exp $"); +__KERNEL_RCSID(0, "$NetBSD: radeondrmkmsfb.c,v 1.11 2019/05/31 03:28:48 maya Exp $"); #include #include @@ -192,9 +192,6 @@ radeonfb_drmfb_mmapfb(struct drmfb_softc if (offset < 0) return -1; - const unsigned num_pages __diagused = rbo->tbo.num_pages; - - KASSERT(offset == (num_pages << PAGE_SHIFT)); KASSERT(rbo->tbo.mem.bus.is_iomem); if (ISSET(rbo->tbo.mem.placement, TTM_PL_FLAG_WC))
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: nonaka Date: Fri May 31 03:10:31 UTC 2019 Modified Files: src/sys/arch/x86/x86: consinit.c Log Message: Back out r1.30 change. > tuck in include inside ifdef, from Ryosuke Moro It was caused by the reporter's local change. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/x86/x86/consinit.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: nonaka Date: Fri May 31 03:10:31 UTC 2019 Modified Files: src/sys/arch/x86/x86: consinit.c Log Message: Back out r1.30 change. > tuck in include inside ifdef, from Ryosuke Moro It was caused by the reporter's local change. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/x86/x86/consinit.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/x86/consinit.c diff -u src/sys/arch/x86/x86/consinit.c:1.30 src/sys/arch/x86/x86/consinit.c:1.31 --- src/sys/arch/x86/x86/consinit.c:1.30 Sun May 26 00:30:35 2019 +++ src/sys/arch/x86/x86/consinit.c Fri May 31 03:10:31 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: consinit.c,v 1.30 2019/05/26 00:30:35 christos Exp $ */ +/* $NetBSD: consinit.c,v 1.31 2019/05/31 03:10:31 nonaka Exp $ */ /* * Copyright (c) 1998 @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.30 2019/05/26 00:30:35 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.31 2019/05/31 03:10:31 nonaka Exp $"); #include "opt_kgdb.h" #include "opt_puc.h" @@ -92,8 +92,8 @@ __KERNEL_RCSID(0, "$NetBSD: consinit.c,v #endif #ifndef XEN -#if NHVKBD > 0 #include "hvkbd.h" +#if NHVKBD > 0 #include #endif #endif
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: msaitoh Date: Fri May 31 02:49:45 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.1 Log Message: Ticket #1274. To generate a diff of this commit: cvs rdiff -u -r1.1.2.148 -r1.1.2.149 src/doc/CHANGES-8.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: msaitoh Date: Fri May 31 02:49:45 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.1 Log Message: Ticket #1274. To generate a diff of this commit: cvs rdiff -u -r1.1.2.148 -r1.1.2.149 src/doc/CHANGES-8.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.1 diff -u src/doc/CHANGES-8.1:1.1.2.148 src/doc/CHANGES-8.1:1.1.2.149 --- src/doc/CHANGES-8.1:1.1.2.148 Wed May 29 16:03:30 2019 +++ src/doc/CHANGES-8.1 Fri May 31 02:49:45 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.1,v 1.1.2.148 2019/05/29 16:03:30 martin Exp $ +# $NetBSD: CHANGES-8.1,v 1.1.2.149 2019/05/31 02:49:45 msaitoh Exp $ A complete list of changes from the NetBSD 8.0 release to the NetBSD 8.1 release: @@ -3222,3 +3222,7 @@ sys/net/rtsock.c1.250 Don't take softnet_lock in sysctl_rtable. [ozaki-r, ticket #1276] +sys/arch/sparc64/sparc64/db_trace.c 1.51-1.53 + + Fix kernel debugger stack trace on sparc64. + [martin, ticket #1274]
CVS commit: [netbsd-8] src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: msaitoh
Date: Fri May 31 02:48:41 UTC 2019
Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-8]: db_trace.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #1274):
sys/arch/sparc64/sparc64/db_trace.c: revision 1.51
sys/arch/sparc64/sparc64/db_trace.c: revision 1.52
sys/arch/sparc64/sparc64/db_trace.c: revision 1.53
Relax test for valid stack frame address (now that we have multiple kernel
stacks since ... a long time). Just test for a valid kernel VA, using
the same test as for "pc".
Very close to a patch suggested by Tobias Ulmer in PR port-sparc64/54221.
Fix previous and use the original patch from PR port-sparc64/54221
instead (XXX should fix comments in param.h)
Add missing include to fix the crash(8) build, from Tobias Ulmer, PR
port-sparc64/54221
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.50.30.1 src/sys/arch/sparc64/sparc64/db_trace.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/sparc64/db_trace.c
diff -u src/sys/arch/sparc64/sparc64/db_trace.c:1.50 src/sys/arch/sparc64/sparc64/db_trace.c:1.50.30.1
--- src/sys/arch/sparc64/sparc64/db_trace.c:1.50 Mon Mar 4 20:17:46 2013
+++ src/sys/arch/sparc64/sparc64/db_trace.c Fri May 31 02:48:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.50 2013/03/04 20:17:46 christos Exp $ */
+/* $NetBSD: db_trace.c,v 1.50.30.1 2019/05/31 02:48:41 msaitoh Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.50 2013/03/04 20:17:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.50.30.1 2019/05/31 02:48:41 msaitoh Exp $");
#include
#include
@@ -36,6 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: db_trace.c,v
#include
#include
#include
+#include
#include
#include
@@ -163,7 +164,7 @@ db_stack_trace_print(db_expr_t addr, boo
if (kernel_only) {
if (pc < KERNBASE || pc >= KERNEND)
break;
- if (frame < KERNBASE || frame >= EINTSTACK)
+ if (frame < KERNBASE || frame >= VM_MAX_KERNEL_ADDRESS)
break;
} else {
if (frame == 0 || frame == (vaddr_t)-1)
CVS commit: [netbsd-8] src/sys/arch/sparc64/sparc64
Module Name:src Committed By: msaitoh Date: Fri May 31 02:48:41 UTC 2019 Modified Files: src/sys/arch/sparc64/sparc64 [netbsd-8]: db_trace.c Log Message: Pull up following revision(s) (requested by martin in ticket #1274): sys/arch/sparc64/sparc64/db_trace.c: revision 1.51 sys/arch/sparc64/sparc64/db_trace.c: revision 1.52 sys/arch/sparc64/sparc64/db_trace.c: revision 1.53 Relax test for valid stack frame address (now that we have multiple kernel stacks since ... a long time). Just test for a valid kernel VA, using the same test as for "pc". Very close to a patch suggested by Tobias Ulmer in PR port-sparc64/54221. Fix previous and use the original patch from PR port-sparc64/54221 instead (XXX should fix comments in param.h) Add missing include to fix the crash(8) build, from Tobias Ulmer, PR port-sparc64/54221 To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.50.30.1 src/sys/arch/sparc64/sparc64/db_trace.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/radeon
Module Name:src
Committed By: maya
Date: Fri May 31 02:35:08 UTC 2019
Modified Files:
src/sys/external/bsd/drm2/radeon: radeondrmkmsfb.c
Log Message:
Teach radeondrmkmsfb to use drmfb instead of its own, duplicated logic.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.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/drm2/radeon/radeondrmkmsfb.c
diff -u src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.9 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.10
--- src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.9 Fri May 31 01:58:07 2019
+++ src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c Fri May 31 02:35:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: radeondrmkmsfb.c,v 1.9 2019/05/31 01:58:07 jmcneill Exp $ */
+/* $NetBSD: radeondrmkmsfb.c,v 1.10 2019/05/31 02:35:08 maya Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,36 +31,15 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: radeondrmkmsfb.c,v 1.9 2019/05/31 01:58:07 jmcneill Exp $");
-
-#ifdef _KERNEL_OPT
-#include "vga.h"
-#endif
+__KERNEL_RCSID(0, "$NetBSD: radeondrmkmsfb.c,v 1.10 2019/05/31 02:35:08 maya Exp $");
#include
#include
-#include
-#include
-#include
-
-#include
-#include
-
-#if NVGA > 0
-/*
- * XXX All we really need is vga_is_console from vgavar.h, but the
- * header files are missing their own dependencies, so we need to
- * explicitly drag in the other crap.
- */
-#include
-#include
-#include
-#include
-#endif
-
#include
#include
+#include
+#include
#include
#include "radeon_drv.h"
@@ -68,11 +47,10 @@ __KERNEL_RCSID(0, "$NetBSD: radeondrmkms
#include "radeondrmkmsfb.h"
struct radeonfb_softc {
- /* XXX genfb requires the genfb_softc to be first. */
- struct genfb_softc sc_genfb;
+ struct drmfb_softc sc_drmfb; /* XXX Must be first. */
device_t sc_dev;
struct radeonfb_attach_args sc_rfa;
- struct radeon_task sc_setconfig_task;
+ struct radeon_task sc_attach_task;
boolsc_scheduled:1;
boolsc_attached:1;
};
@@ -81,23 +59,21 @@ static int radeonfb_match(device_t, cfda
static void radeonfb_attach(device_t, device_t, void *);
static int radeonfb_detach(device_t, int);
-static void radeonfb_setconfig_task(struct radeon_task *);
+static void radeonfb_attach_task(struct radeon_task *);
-static int radeonfb_genfb_ioctl(void *, void *, unsigned long, void *,
- int, struct lwp *);
-static paddr_t radeonfb_genfb_mmap(void *, void *, off_t, int);
-static int radeonfb_genfb_enable_polling(void *);
-static int radeonfb_genfb_disable_polling(void *);
-static bool radeonfb_genfb_shutdown(device_t, int);
-static bool radeonfb_genfb_setmode(struct genfb_softc *, int);
-
-static const struct genfb_mode_callback radeonfb_genfb_mode_callback = {
- .gmc_setmode = radeonfb_genfb_setmode,
-};
+static paddr_t radeonfb_drmfb_mmapfb(struct drmfb_softc *, off_t, int);
+static bool radeonfb_shutdown(device_t, int);
CFATTACH_DECL_NEW(radeondrmkmsfb, sizeof(struct radeonfb_softc),
radeonfb_match, radeonfb_attach, radeonfb_detach, NULL);
+static const struct drmfb_params radeonfb_drmfb_params = {
+ .dp_mmapfb = radeonfb_drmfb_mmapfb,
+ .dp_mmap = drmfb_pci_mmap,
+ .dp_ioctl = drmfb_pci_ioctl,
+ .dp_is_vga_console = drmfb_pci_is_vga_console,
+};
+
static int
radeonfb_match(device_t parent, cfdata_t match, void *aux)
{
@@ -120,8 +96,8 @@ radeonfb_attach(device_t parent, device_
aprint_naive("\n");
aprint_normal("\n");
- radeon_task_init(>sc_setconfig_task, _setconfig_task);
- error = radeon_task_schedule(parent, >sc_setconfig_task);
+ radeon_task_init(>sc_attach_task, _attach_task);
+ error = radeon_task_schedule(parent, >sc_attach_task);
if (error) {
aprint_error_dev(self, "failed to schedule mode set: %d\n",
error);
@@ -139,12 +115,21 @@ static int
radeonfb_detach(device_t self, int flags)
{
struct radeonfb_softc *const sc = device_private(self);
+ int error;
if (sc->sc_scheduled)
return EBUSY;
+;
if (sc->sc_attached) {
- /* XXX genfb detach? Help? */
+ pmf_device_deregister(self);
+ error = drmfb_detach(>sc_drmfb, flags);
+ if (error) {
+ /* XXX Ugh. */
+ (void)pmf_device_register1(self, NULL, NULL,
+ _shutdown);
+ return error;
+ }
sc->sc_attached = false;
}
@@ -152,238 +137,70 @@ radeonfb_detach(device_t self, int flags
}
static void
-radeonfb_setconfig_task(struct radeon_task *task)
+radeonfb_attach_task(struct radeon_task *task)
{
struct radeonfb_softc *const sc = container_of(task,
- struct radeonfb_softc, sc_setconfig_task);
- const prop_dictionary_t dict = device_properties(sc->sc_dev);
+ struct radeonfb_softc, sc_attach_task);
const struct radeonfb_attach_args *const rfa = >sc_rfa;
- const struct drm_fb_helper_surface_size *const sizes =
- >rfa_fb_sizes;
- enum { CONS_VGA, CONS_GENFB,
CVS commit: src/sys/external/bsd/drm2/radeon
Module Name:src Committed By: maya Date: Fri May 31 02:35:08 UTC 2019 Modified Files: src/sys/external/bsd/drm2/radeon: radeondrmkmsfb.c Log Message: Teach radeondrmkmsfb to use drmfb instead of its own, duplicated logic. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/radeon
Module Name:src
Committed By: jmcneill
Date: Fri May 31 01:58:07 UTC 2019
Modified Files:
src/sys/external/bsd/drm2/radeon: radeondrmkmsfb.c
Log Message:
Make the first EDID we find available to genfb
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.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/drm2/radeon/radeondrmkmsfb.c
diff -u src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.8 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.9
--- src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.8 Mon Aug 27 13:36:14 2018
+++ src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c Fri May 31 01:58:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: radeondrmkmsfb.c,v 1.8 2018/08/27 13:36:14 riastradh Exp $ */
+/* $NetBSD: radeondrmkmsfb.c,v 1.9 2019/05/31 01:58:07 jmcneill Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: radeondrmkmsfb.c,v 1.8 2018/08/27 13:36:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeondrmkmsfb.c,v 1.9 2019/05/31 01:58:07 jmcneill Exp $");
#ifdef _KERNEL_OPT
#include "vga.h"
@@ -163,7 +163,7 @@ radeonfb_setconfig_task(struct radeon_ta
enum { CONS_VGA, CONS_GENFB, CONS_NONE } what_was_cons;
static const struct genfb_ops zero_genfb_ops;
struct genfb_ops genfb_ops = zero_genfb_ops;
- int error;
+ int error, n;
KASSERT(sc->sc_scheduled);
@@ -196,6 +196,19 @@ radeonfb_setconfig_task(struct radeon_ta
prop_dictionary_set_bool(dict, "is_console", false);
}
+ /* Make the first EDID we find available to wsfb */
+ for (n = 0; n < rfa->rfa_fb_helper->connector_count; n++) {
+ struct drm_connector *connector =
+ rfa->rfa_fb_helper->connector_info[n]->connector;
+ struct drm_property_blob *edid = connector->edid_blob_ptr;
+ if (edid && edid->data) {
+ prop_data_t edid_data =
+ prop_data_create_data(edid->data, edid->length);
+ prop_dictionary_set(dict, "EDID", edid_data);
+ break;
+ }
+ }
+
sc->sc_genfb.sc_dev = sc->sc_dev;
genfb_init(>sc_genfb);
genfb_ops.genfb_ioctl = radeonfb_genfb_ioctl;
CVS commit: src/sys/external/bsd/drm2/radeon
Module Name:src Committed By: jmcneill Date: Fri May 31 01:58:07 UTC 2019 Modified Files: src/sys/external/bsd/drm2/radeon: radeondrmkmsfb.c Log Message: Make the first EDID we find available to genfb To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/wsfb
Module Name:src
Committed By: jmcneill
Date: Fri May 31 01:35:56 UTC 2019
Modified Files:
src/sys/dev/wsfb: files.wsfb genfb.c
Log Message:
If an EDID is available, attempt to use the screen size to influence font
selection by passing a "wantcols" value to rasops_init that is satisfied
by a font that is at least 3mm wide.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/wsfb/files.wsfb
cvs rdiff -u -r1.64 -r1.65 src/sys/dev/wsfb/genfb.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/wsfb/files.wsfb
diff -u src/sys/dev/wsfb/files.wsfb:1.9 src/sys/dev/wsfb/files.wsfb:1.10
--- src/sys/dev/wsfb/files.wsfb:1.9 Fri May 1 02:00:41 2015
+++ src/sys/dev/wsfb/files.wsfb Fri May 31 01:35:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.wsfb,v 1.9 2015/05/01 02:00:41 nat Exp $
+# $NetBSD: files.wsfb,v 1.10 2019/05/31 01:35:56 jmcneill Exp $
#
# wsdisplay framebuffer drivers
@@ -9,7 +9,7 @@ defflag opt_wsfb.h WSFB_FAKE_VGA_FB # al
defflag opt_wsfb.h WSFB_ALLOW_OTHERS # allow to mmap() foreign ranges
# a generic framebuffer console
-define genfb: rasops1, rasops2, rasops8, rasops15, rasops16, rasops24, rasops32, vcons
+define genfb: rasops1, rasops2, rasops8, rasops15, rasops16, rasops24, rasops32, vcons, edid
device genfb: genfb, wsemuldisplaydev, drm, splash
file dev/wsfb/genfb.c genfb needs-flag
defflag opt_genfb.h GENFB_DEBUG GENFB_SHADOWFB
Index: src/sys/dev/wsfb/genfb.c
diff -u src/sys/dev/wsfb/genfb.c:1.64 src/sys/dev/wsfb/genfb.c:1.65
--- src/sys/dev/wsfb/genfb.c:1.64 Mon Sep 3 16:29:34 2018
+++ src/sys/dev/wsfb/genfb.c Fri May 31 01:35:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb.c,v 1.64 2018/09/03 16:29:34 riastradh Exp $ */
+/* $NetBSD: genfb.c,v 1.65 2019/05/31 01:35:56 jmcneill Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.64 2018/09/03 16:29:34 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.65 2019/05/31 01:35:56 jmcneill Exp $");
#include
#include
@@ -49,6 +49,9 @@ __KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.
#include
+#include
+#include
+
#ifdef GENFB_DISABLE_TEXT
#include
#define DISABLESPLASH (boothowto & (RB_SINGLE | RB_USERCONF | RB_ASKNAME | \
@@ -58,6 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.
#ifdef _KERNEL_OPT
#include "opt_genfb.h"
#include "opt_wsfb.h"
+#include "opt_rasops.h"
#endif
#ifdef GENFB_DEBUG
@@ -67,12 +71,15 @@ __KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.
#endif
#define GENFB_BRIGHTNESS_STEP 15
+#define GENFB_CHAR_WIDTH_MM 3
static int genfb_ioctl(void *, void *, u_long, void *, int, struct lwp *);
static paddr_t genfb_mmap(void *, void *, off_t, int);
static void genfb_pollc(void *, int);
static void genfb_init_screen(void *, struct vcons_screen *, int, long *);
+static int genfb_calc_hsize(struct genfb_softc *);
+static int genfb_calc_cols(struct genfb_softc *);
static int genfb_putcmap(struct genfb_softc *, struct wsdisplay_cmap *);
static int genfb_getcmap(struct genfb_softc *, struct wsdisplay_cmap *);
@@ -530,6 +537,7 @@ genfb_init_screen(void *cookie, struct v
{
struct genfb_softc *sc = cookie;
struct rasops_info *ri = >scr_ri;
+ int wantcols;
ri->ri_depth = sc->sc_depth;
ri->ri_width = sc->sc_width;
@@ -583,8 +591,9 @@ genfb_init_screen(void *cookie, struct v
if (ri->ri_depth == 8 && sc->sc_cmcb != NULL)
ri->ri_flg |= RI_ENABLE_ALPHA | RI_8BIT_IS_RGB;
+ wantcols = genfb_calc_cols(sc);
- rasops_init(ri, 0, 0);
+ rasops_init(ri, 0, wantcols);
ri->ri_caps = WSSCREEN_WSCOLORS | WSSCREEN_HILIT | WSSCREEN_UNDERLINE |
WSSCREEN_RESIZE;
rasops_reconfig(ri, sc->sc_height / ri->ri_font->fontheight,
@@ -599,6 +608,36 @@ genfb_init_screen(void *cookie, struct v
#endif
}
+/* Returns the width of the display in millimeters, or 0 if not known. */
+static int
+genfb_calc_hsize(struct genfb_softc *sc)
+{
+ device_t dev = sc->sc_dev;
+ prop_dictionary_t dict = device_properties(dev);
+ prop_data_t edid_data;
+ struct edid_info edid;
+ const char *edid_ptr;
+
+ edid_data = prop_dictionary_get(dict, "EDID");
+ if (edid_data == NULL || prop_data_size(edid_data) < 128)
+ return 0;
+
+ edid_ptr = prop_data_data_nocopy(edid_data);
+ if (edid_parse(__UNCONST(edid_ptr), ) != 0)
+ return 0;
+
+ return (int)edid.edid_max_hsize * 10;
+}
+
+/* Return the minimum number of character columns based on DPI */
+static int
+genfb_calc_cols(struct genfb_softc *sc)
+{
+ const int hsize = genfb_calc_hsize(sc);
+
+ return MAX(RASOPS_DEFAULT_WIDTH, hsize / GENFB_CHAR_WIDTH_MM);
+}
+
static int
genfb_putcmap(struct genfb_softc *sc, struct wsdisplay_cmap *cm)
{
CVS commit: src/sys/dev/wsfb
Module Name:src Committed By: jmcneill Date: Fri May 31 01:35:56 UTC 2019 Modified Files: src/sys/dev/wsfb: files.wsfb genfb.c Log Message: If an EDID is available, attempt to use the screen size to influence font selection by passing a "wantcols" value to rasops_init that is satisfied by a font that is at least 3mm wide. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/dev/wsfb/files.wsfb cvs rdiff -u -r1.64 -r1.65 src/sys/dev/wsfb/genfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src
Committed By: jmcneill
Date: Fri May 31 01:30:08 UTC 2019
Modified Files:
src/sys/external/bsd/drm2/drm: drmfb.c
Log Message:
Make the first EDID we find available to genfb
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/drm/drmfb.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/drm2/drm/drmfb.c
diff -u src/sys/external/bsd/drm2/drm/drmfb.c:1.4 src/sys/external/bsd/drm2/drm/drmfb.c:1.5
--- src/sys/external/bsd/drm2/drm/drmfb.c:1.4 Mon Aug 27 13:36:14 2018
+++ src/sys/external/bsd/drm2/drm/drmfb.c Fri May 31 01:30:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: drmfb.c,v 1.4 2018/08/27 13:36:14 riastradh Exp $ */
+/* $NetBSD: drmfb.c,v 1.5 2019/05/31 01:30:08 jmcneill Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.4 2018/08/27 13:36:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.5 2019/05/31 01:30:08 jmcneill Exp $");
#ifdef _KERNEL_OPT
#include "vga.h"
@@ -92,7 +92,7 @@ drmfb_attach(struct drmfb_softc *sc, con
struct genfb_ops genfb_ops = zero_genfb_ops;
enum { CONS_VGA, CONS_GENFB, CONS_NONE } what_was_cons;
bool is_console;
- int error;
+ int error, n;
/* genfb requires this. */
KASSERTMSG((void *)>sc_genfb == device_private(da->da_dev),
@@ -135,6 +135,19 @@ drmfb_attach(struct drmfb_softc *sc, con
what_was_cons = CONS_NONE;
}
+ /* Make the first EDID we find available to wsfb */
+ for (n = 0; n < da->da_fb_helper->connector_count; n++) {
+ struct drm_connector *connector =
+ da->da_fb_helper->connector_info[n]->connector;
+ struct drm_property_blob *edid = connector->edid_blob_ptr;
+ if (edid && edid->data) {
+ prop_data_t edid_data =
+ prop_data_create_data(edid->data, edid->length);
+ prop_dictionary_set(dict, "EDID", edid_data);
+ break;
+ }
+ }
+
sc->sc_genfb.sc_dev = sc->sc_da.da_dev;
genfb_init(>sc_genfb);
genfb_ops.genfb_ioctl = drmfb_genfb_ioctl;
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: jmcneill Date: Fri May 31 01:30:08 UTC 2019 Modified Files: src/sys/external/bsd/drm2/drm: drmfb.c Log Message: Make the first EDID we find available to genfb To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/drm/drmfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: maya
Date: Thu May 30 23:15:46 UTC 2019
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Add libraries to resolve missing xcb symbols
Fixes executing 'emulators/nestopia' on r600, reported by nia, thanks!
XXX we might want to get rid of the references instead.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/external/mit/xorg/lib/gallium/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.27 src/external/mit/xorg/lib/gallium/Makefile:1.28
--- src/external/mit/xorg/lib/gallium/Makefile:1.27 Thu May 16 01:22:35 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Thu May 30 23:15:46 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2019/05/16 01:22:35 christos Exp $
+# $NetBSD: Makefile,v 1.28 2019/05/30 23:15:46 maya Exp $
# Link the gallium mega driver.
@@ -959,6 +959,8 @@ LIBDPLIBS+= expat ${.CURDIR}/../../../.
LIBDPLIBS+= terminfo ${.CURDIR}/../../../../../lib/libterminfo
LIBDPLIBS+= z ${.CURDIR}/../../../../../lib/libz
LIBDPLIBS+= execinfo ${.CURDIR}/../../../../../lib/libexecinfo
+LIBDPLIBS+= X11-xcb ${.CURDIR}/../libX11/libX11-xcb
+LIBDPLIBS+= xcb-dri2${.CURDIR}/../libxcb/dri2
# gallium drivers requiring LLVM
.if ${BUILD_LLVMPIPE} == 1 || ${BUILD_RADEON} == 1
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: maya Date: Thu May 30 23:15:46 UTC 2019 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Add libraries to resolve missing xcb symbols Fixes executing 'emulators/nestopia' on r600, reported by nia, thanks! XXX we might want to get rid of the references instead. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: mlelstv
Date: Thu May 30 21:44:50 UTC 2019
Modified Files:
src/sys/dev/usb: umass_scsipi.c
Log Message:
ATA passthrough commands, supported by many SPC-2 disks, require more
sense data.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/usb/umass_scsipi.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/umass_scsipi.c
diff -u src/sys/dev/usb/umass_scsipi.c:1.61 src/sys/dev/usb/umass_scsipi.c:1.62
--- src/sys/dev/usb/umass_scsipi.c:1.61 Thu Mar 28 10:44:29 2019
+++ src/sys/dev/usb/umass_scsipi.c Thu May 30 21:44:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_scsipi.c,v 1.61 2019/03/28 10:44:29 kardel Exp $ */
+/* $NetBSD: umass_scsipi.c,v 1.62 2019/05/30 21:44:49 mlelstv Exp $ */
/*
* Copyright (c) 2001, 2003, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.61 2019/03/28 10:44:29 kardel Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.62 2019/05/30 21:44:49 mlelstv Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -458,7 +458,7 @@ umass_scsipi_cb(struct umass_softc *sc,
cmdlen = UFI_COMMAND_LENGTH; /* XXX */
else
cmdlen = sizeof(scbus->sc_sense_cmd);
- if (periph->periph_version < 0x05) /* SPC-3 */
+ if (periph->periph_version < 0x04) /* SPC-2 */
senselen = 18;
else
senselen = sizeof(xs->sense);
@@ -498,6 +498,7 @@ umass_scsipi_sense_cb(struct umass_softc
{
UMASSHIST_FUNC(); UMASSHIST_CALLED();
struct scsipi_xfer *xs = priv;
+ size_t extra;
DPRINTFM(UDMASS_CMD, "sc %#jx: xs=%#jx residue=%jd status=%jd",
(uintptr_t)sc, (uintptr_t)xs, residue, status);
@@ -507,7 +508,9 @@ umass_scsipi_sense_cb(struct umass_softc
case STATUS_CMD_OK:
case STATUS_CMD_UNKNOWN:
/* getting sense data succeeded */
- if (residue == 0 || residue == 14)/* XXX */
+ extra = sizeof(xs->sense.scsi_sense)
+ - sizeof(xs->sense.scsi_sense.extra_bytes);
+ if (residue <= extra)
xs->error = XS_SENSE;
else
xs->error = XS_SHORTSENSE;
CVS commit: src/sys/dev/usb
Module Name:src Committed By: mlelstv Date: Thu May 30 21:44:50 UTC 2019 Modified Files: src/sys/dev/usb: umass_scsipi.c Log Message: ATA passthrough commands, supported by many SPC-2 disks, require more sense data. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/sys/dev/usb/umass_scsipi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: christos Date: Thu May 30 21:43:23 UTC 2019 Modified Files: src/external/gpl3/gdb/dist/gdb: bsd-kvm.c Log Message: remove unused variable To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/gdb/dist/gdb/bsd-kvm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Thu May 30 21:33:57 UTC 2019 Modified Files: src/share/mk: bsd.own.mk Log Message: Everyone is on gdb-8.3 now. To generate a diff of this commit: cvs rdiff -u -r1.1142 -r1.1143 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/atactl
Module Name:src Committed By: mlelstv Date: Thu May 30 21:32:08 UTC 2019 Modified Files: src/sbin/atactl: atactl.c Log Message: Add support for ATA command pass-through to SCSI devices. To generate a diff of this commit: cvs rdiff -u -r1.82 -r1.83 src/sbin/atactl/atactl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: christos Date: Thu May 30 21:43:23 UTC 2019 Modified Files: src/external/gpl3/gdb/dist/gdb: bsd-kvm.c Log Message: remove unused variable To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/gdb/dist/gdb/bsd-kvm.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/gpl3/gdb/dist/gdb/bsd-kvm.c diff -u src/external/gpl3/gdb/dist/gdb/bsd-kvm.c:1.15 src/external/gpl3/gdb/dist/gdb/bsd-kvm.c:1.16 --- src/external/gpl3/gdb/dist/gdb/bsd-kvm.c:1.15 Thu May 30 17:23:52 2019 +++ src/external/gpl3/gdb/dist/gdb/bsd-kvm.c Thu May 30 17:43:23 2019 @@ -111,7 +111,6 @@ bsd_kvm_target_open (const char *arg, in kvm_t *temp_kd; struct inferior *inf; char *filename = NULL; - struct gdbarch_info info; target_preopen (from_tty);
CVS commit: src/sbin/atactl
Module Name:src
Committed By: mlelstv
Date: Thu May 30 21:32:08 UTC 2019
Modified Files:
src/sbin/atactl: atactl.c
Log Message:
Add support for ATA command pass-through to SCSI devices.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sbin/atactl/atactl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/atactl/atactl.c
diff -u src/sbin/atactl/atactl.c:1.82 src/sbin/atactl/atactl.c:1.83
--- src/sbin/atactl/atactl.c:1.82 Sun Mar 3 04:51:57 2019
+++ src/sbin/atactl/atactl.c Thu May 30 21:32:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: atactl.c,v 1.82 2019/03/03 04:51:57 mrg Exp $ */
+/* $NetBSD: atactl.c,v 1.83 2019/05/30 21:32:08 mlelstv Exp $ */
/*-
* Copyright (c) 1998, 2019 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: atactl.c,v 1.82 2019/03/03 04:51:57 mrg Exp $");
+__RCSID("$NetBSD: atactl.c,v 1.83 2019/05/30 21:32:08 mlelstv Exp $");
#endif
@@ -54,6 +54,9 @@ __RCSID("$NetBSD: atactl.c,v 1.82 2019/0
#include
#include
+#include
+#include
+
struct ata_smart_error {
struct {
uint8_t device_control;
@@ -90,6 +93,53 @@ struct ata_smart_errorlog {
uint8_t checksum;
} __packed;
+#define SCSI_ATA_PASS_THROUGH_16 0x85
+struct scsi_ata_pass_through_16 {
+ uint8_t opcode;
+ uint8_t byte2;
+#define SATL_NODATA 0x06
+#define SATL_PIO_IN 0x08
+#define SATL_PIO_OUT 0x0a
+#define SATL_EXTEND 0x01
+ uint8_t byte3;
+#define SATL_CKCOND 0x20
+#define SATL_READ 0x08
+#define SATL_BLOCKS 0x04
+#define SATL_LEN(x) ((x) & 0x03)
+ uint8_t features[2];
+ uint8_t sector_count[2];
+ uint8_t lba[6];
+ uint8_t device;
+ uint8_t ata_cmd;
+ uint8_t control;
+} __packed;
+
+#define SCSI_ATA_PASS_THROUGH_12 0xa1
+struct scsi_ata_pass_through_12 {
+ uint8_t opcode;
+ uint8_t byte2;
+ uint8_t byte3;
+ uint8_t features[1];
+ uint8_t sector_count[1];
+ uint8_t lba[3];
+ uint8_t device;
+ uint8_t ata_cmd;
+ uint8_t reserved;
+ uint8_t control;
+} __packed;
+
+struct scsi_ata_return_descriptor {
+ uint8_t descr;
+#define SCSI_ATA_RETURN_DESCRIPTOR 9
+ uint8_t additional_length;
+ uint8_t extend;
+ uint8_t error;
+ uint8_t sector_count[2];
+ uint8_t lba[6];
+ uint8_t device;
+ uint8_t status;
+} __packed;
+
struct command {
const char *cmd_name;
const char *arg_names;
@@ -103,6 +153,8 @@ struct bitinfo {
__dead static void usage(void);
static void ata_command(struct atareq *);
+static int satl_command(struct atareq *, int);
+static const uint8_t *satl_return_desc(const uint8_t *, size_t, uint8_t);
static void print_bitinfo(const char *, const char *, u_int,
const struct bitinfo *);
static void print_bitinfo2(const char *, const char *, u_int, u_int,
@@ -119,6 +171,7 @@ static void fillataparams(void);
static int is_smart(void);
static int fd;/* file descriptor for device */
+static int use_satl; /* tunnel through SATL */
static const char *dvname; /* device name */
static char dvname_store[MAXPATHLEN]; /* for opendisk(3) */
static const char *cmdname; /* command user issued */
@@ -531,10 +584,25 @@ ata_command(struct atareq *req)
{
int error;
- error = ioctl(fd, ATAIOCCOMMAND, req);
-
- if (error == -1)
- err(1, "ATAIOCCOMMAND failed");
+ switch (use_satl) {
+ case 0:
+ error = ioctl(fd, ATAIOCCOMMAND, req);
+ if (error == 0)
+ break;
+ if (errno != ENOTTY)
+ err(1, "ATAIOCCOMMAND failed");
+ use_satl = 1;
+ /* FALLTHROUGH */
+ case 1:
+ error = satl_command(req, 16);
+ if (error == 0)
+ return;
+ use_satl = 2;
+ /* FALLTHROUGH */
+ case 2:
+ (void) satl_command(req, 12);
+ return;
+ }
switch (req->retsts) {
@@ -562,6 +630,191 @@ ata_command(struct atareq *req)
}
/*
+ * Wrapper that calls SCIOCCOMMAND for a tunneled ATA command
+ */
+static int
+satl_command(struct atareq *req, int cmdlen)
+{
+ scsireq_t sreq;
+ int error;
+ union {
+ struct scsi_ata_pass_through_12 cmd12;
+ struct scsi_ata_pass_through_16 cmd16;
+ } c;
+ uint8_t b2, b3;
+ const uint8_t *desc;
+
+ b2 = SATL_NODATA;
+ if (req->datalen > 0) {
+ if (req->flags & ATACMD_READ)
+ b2 = SATL_PIO_IN;
+ else
+ b2 = SATL_PIO_OUT;
+ }
+
+ b3 = SATL_BLOCKS;
+ if (req->datalen > 0) {
+ b3 |= 2; /* sector count holds count */
+ } else {
+ b3 |= SATL_CKCOND;
+ }
+ if (req->datalen == 0 || req->flags & ATACMD_READ)
+ b3 |= SATL_READ;
+
+ switch (cmdlen) {
+ case 16:
+ c.cmd16.opcode = SCSI_ATA_PASS_THROUGH_16;
+ c.cmd16.byte2 = b2;
+ c.cmd16.byte3 = b3;
+ c.cmd16.features[0] = 0;
+ c.cmd16.features[1] = req->features;
+ c.cmd16.sector_count[0] = 0;
+ c.cmd16.sector_count[1] = req->sec_count;
+ c.cmd16.lba[0] = 0;
+ c.cmd16.lba[1] = req->sec_num;
+ c.cmd16.lba[2] = 0;
+ c.cmd16.lba[3] = req->cylinder;
+ c.cmd16.lba[4] = 0;
+ c.cmd16.lba[5] = req->cylinder >> 8;
+ c.cmd16.device = 0;
+ c.cmd16.ata_cmd = req->command;
+ c.cmd16.control = 0;
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Thu May 30 21:33:57 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Everyone is on gdb-8.3 now.
To generate a diff of this commit:
cvs rdiff -u -r1.1142 -r1.1143 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1142 src/share/mk/bsd.own.mk:1.1143
--- src/share/mk/bsd.own.mk:1.1142 Wed May 29 21:20:41 2019
+++ src/share/mk/bsd.own.mk Thu May 30 17:33:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1142 2019/05/30 01:20:41 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1143 2019/05/30 21:33:57 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -138,15 +138,7 @@ USE_SSP?= yes
#
# What GDB is used?
#
-.if ${MACHINE} == "amd64" || \
-${MACHINE} == "i386" || \
-${MACHINE} == "sparc" || \
-${MACHINE} == "sparc64" || \
-${MACHINE} == "vax"
HAVE_GDB?= 830
-.else
-HAVE_GDB?= 801
-.endif
.if ${HAVE_GDB} == 830
EXTERNAL_GDB_SUBDIR= gdb
CVS commit: src/sys/arch/x86/include
Module Name:src
Committed By: christos
Date: Thu May 30 21:40:40 UTC 2019
Modified Files:
src/sys/arch/x86/include: cpufunc.h
Log Message:
use __asm
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/x86/include/cpufunc.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/cpufunc.h
diff -u src/sys/arch/x86/include/cpufunc.h:1.31 src/sys/arch/x86/include/cpufunc.h:1.32
--- src/sys/arch/x86/include/cpufunc.h:1.31 Wed May 29 12:54:41 2019
+++ src/sys/arch/x86/include/cpufunc.h Thu May 30 17:40:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.h,v 1.31 2019/05/29 16:54:41 maxv Exp $ */
+/* $NetBSD: cpufunc.h,v 1.32 2019/05/30 21:40:40 christos Exp $ */
/*
* Copyright (c) 1998, 2007, 2019 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
static inline void
x86_pause(void)
{
- asm volatile ("pause");
+ __asm volatile ("pause");
}
void x86_lfence(void);
@@ -81,7 +81,7 @@ invpcid(register_t op, uint64_t pcid, va
.addr = va
};
- asm volatile (
+ __asm volatile (
"invpcid %[desc],%[op]"
:
: [desc] "m" (desc), [op] "r" (op)
@@ -94,7 +94,7 @@ rdtsc(void)
{
uint32_t low, high;
- asm volatile (
+ __asm volatile (
"rdtsc"
: "=a" (low), "=d" (high)
:
@@ -127,7 +127,7 @@ x86_getss(void)
{
uint16_t val;
- asm volatile (
+ __asm volatile (
"mov %%ss,%[val]"
: [val] "=r" (val)
:
@@ -138,7 +138,7 @@ x86_getss(void)
static inline void
setds(uint16_t val)
{
- asm volatile (
+ __asm volatile (
"mov %[val],%%ds"
:
: [val] "r" (val)
@@ -148,7 +148,7 @@ setds(uint16_t val)
static inline void
setes(uint16_t val)
{
- asm volatile (
+ __asm volatile (
"mov %[val],%%es"
:
: [val] "r" (val)
@@ -158,7 +158,7 @@ setes(uint16_t val)
static inline void
setfs(uint16_t val)
{
- asm volatile (
+ __asm volatile (
"mov %[val],%%fs"
:
: [val] "r" (val)
@@ -172,7 +172,7 @@ void setusergs(int);
#define FUNC_CR(crnum) \
static inline void lcr##crnum(register_t val) \
{ \
- asm volatile (\
+ __asm volatile (\
"mov %[val],%%cr" #crnum \
:\
: [val] "r" (val) \
@@ -181,7 +181,7 @@ void setusergs(int);
static inline register_t rcr##crnum(void) \
{ \
register_t val;\
- asm volatile (\
+ __asm volatile (\
"mov %%cr" #crnum ",%[val]" \
: [val] "=r" (val) \
:\
@@ -211,7 +211,7 @@ FUNC_CR(8)
#define FUNC_DR(drnum) \
static inline void ldr##drnum(register_t val) \
{ \
- asm volatile (\
+ __asm volatile (\
"mov %[val],%%dr" #drnum \
:\
: [val] "r" (val) \
@@ -220,7 +220,7 @@ FUNC_CR(8)
static inline register_t rdr##drnum(void) \
{ \
register_t val;\
- asm volatile (\
+ __asm volatile (\
"mov %%dr" #drnum ",%[val]" \
: [val] "=r" (val) \
:\
@@ -255,13 +255,13 @@ union savefpu;
static inline void
fninit(void)
{
- asm volatile ("fninit");
+ __asm volatile ("fninit");
}
static inline void
fnclex(void)
{
- asm volatile ("fnclex");
+ __asm volatile ("fnclex");
}
void fnsave(union savefpu *);
@@ -273,7 +273,7 @@ void frstor(const union savefpu *);
static inline void
clts(void)
{
- asm volatile ("clts");
+ __asm volatile ("clts");
}
void stts(void);
@@ -289,7 +289,7 @@ rdxcr(uint32_t xcr)
{
uint32_t low, high;
- asm volatile (
+ __asm volatile (
"xgetbv"
: "=a" (low), "=d" (high)
: "c" (xcr)
@@ -305,7 +305,7 @@ wrxcr(uint32_t xcr, uint64_t val)
low = val;
high = val >> 32;
- asm volatile (
+ __asm volatile (
"xsetbv"
:
: "a" (low), "d" (high), "c" (xcr)
@@ -325,13 +325,13 @@ void x86_enable_intr(void);
static inline void
x86_disable_intr(void)
{
- asm volatile ("cli");
+ __asm volatile ("cli");
}
static inline void
x86_enable_intr(void)
{
- asm volatile ("sti");
+ __asm volatile ("sti");
}
#endif /* XENPV */
@@ -358,7 +358,7 @@ rdmsr(u_int msr)
{
uint32_t low, high;
- asm volatile (
+ __asm volatile (
"rdmsr"
: "=a" (low), "=d" (high)
: "c" (msr)
@@ -377,7 +377,7 @@ wrmsr(u_int msr, uint64_t val)
low = val;
high = val >> 32;
- asm volatile (
+ __asm volatile (
"wrmsr"
:
: "a" (low), "d" (high), "c" (msr)
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: christos Date: Thu May 30 21:40:40 UTC 2019 Modified Files: src/sys/arch/x86/include: cpufunc.h Log Message: use __asm To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/x86/include/cpufunc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb
Module Name:src Committed By: christos Date: Thu May 30 21:28:01 UTC 2019 Modified Files: src/external/gpl3/gdb/dist/gdb: ppc-nbsd-nat.c src/external/gpl3/gdb/dist/sim/ppc: emul_netbsd.c src/external/gpl3/gdb/lib/libbfd/arch/powerpc: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb/lib/libbfd/arch/powerpc64: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb/lib/libbfd/arch/sh3el: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb/lib/libdecnumber/arch/powerpc: config.h gstdint.h src/external/gpl3/gdb/lib/libdecnumber/arch/powerpc64: config.h gstdint.h src/external/gpl3/gdb/lib/libdecnumber/arch/sh3el: config.h gstdint.h src/external/gpl3/gdb/lib/libgdb/arch/powerpc: config.h defs.mk init.c jit-reader.h version.c xml-builtin.c src/external/gpl3/gdb/lib/libgdb/arch/powerpc/build-gnulib: config.h src/external/gpl3/gdb/lib/libgdb/arch/powerpc64: config.h defs.mk init.c jit-reader.h version.c xml-builtin.c src/external/gpl3/gdb/lib/libgdb/arch/powerpc64/build-gnulib: config.h src/external/gpl3/gdb/lib/libgdb/arch/sh3el: config.h defs.mk init.c jit-reader.h version.c xml-builtin.c src/external/gpl3/gdb/lib/libgdb/arch/sh3el/build-gnulib: config.h src/external/gpl3/gdb/lib/libiberty/arch/powerpc: config.h src/external/gpl3/gdb/lib/libiberty/arch/powerpc64: config.h src/external/gpl3/gdb/lib/libiberty/arch/sh3el: config.h src/external/gpl3/gdb/lib/libopcodes/arch/powerpc: config.h src/external/gpl3/gdb/lib/libopcodes/arch/powerpc64: config.h src/external/gpl3/gdb/lib/libopcodes/arch/sh3el: config.h src/external/gpl3/gdb/lib/libreadline/arch/powerpc: config.h src/external/gpl3/gdb/lib/libreadline/arch/powerpc64: config.h src/external/gpl3/gdb/lib/libreadline/arch/sh3el: config.h src/external/gpl3/gdb/lib/libsim/arch/powerpc: build-config.h config.h src/external/gpl3/gdb/lib/libsim/arch/powerpc64: build-config.h config.h Log Message: fix ppc To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/dist/gdb/ppc-nbsd-nat.c cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gdb/dist/sim/ppc/emul_netbsd.c cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libbfd/arch/powerpc/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/powerpc/bfd.h \ src/external/gpl3/gdb/lib/libbfd/arch/powerpc/bfd_stdint.h \ src/external/gpl3/gdb/lib/libbfd/arch/powerpc/bfdver.h cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/gdb/lib/libbfd/arch/powerpc/config.h \ src/external/gpl3/gdb/lib/libbfd/arch/powerpc/targmatch.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gdb/lib/libbfd/arch/powerpc/defs.mk cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libbfd/arch/powerpc64/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/powerpc64/bfd.h \ src/external/gpl3/gdb/lib/libbfd/arch/powerpc64/bfdver.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libbfd/arch/powerpc64/bfd_stdint.h cvs rdiff -u -r1.8 -r1.9 \ src/external/gpl3/gdb/lib/libbfd/arch/powerpc64/config.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gdb/lib/libbfd/arch/powerpc64/defs.mk cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/gdb/lib/libbfd/arch/powerpc64/targmatch.h cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libbfd/arch/sh3el/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/sh3el/bfd.h \ src/external/gpl3/gdb/lib/libbfd/arch/sh3el/bfd_stdint.h \ src/external/gpl3/gdb/lib/libbfd/arch/sh3el/bfdver.h cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gdb/lib/libbfd/arch/sh3el/config.h cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/lib/libbfd/arch/sh3el/defs.mk cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/gdb/lib/libbfd/arch/sh3el/targmatch.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gdb/lib/libdecnumber/arch/powerpc/config.h cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libdecnumber/arch/powerpc/gstdint.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gdb/lib/libdecnumber/arch/powerpc64/config.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libdecnumber/arch/powerpc64/gstdint.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gdb/lib/libdecnumber/arch/sh3el/config.h cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libdecnumber/arch/sh3el/gstdint.h cvs rdiff -u -r1.8 -r1.9 \ src/external/gpl3/gdb/lib/libgdb/arch/powerpc/config.h cvs rdiff -u -r1.10 -r1.11 \ src/external/gpl3/gdb/lib/libgdb/arch/powerpc/defs.mk cvs rdiff -u -r1.12 -r1.13 \ src/external/gpl3/gdb/lib/libgdb/arch/powerpc/init.c cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gdb/lib/libgdb/arch/powerpc/jit-reader.h cvs rdiff -u -r1.7 -r1.8 \
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: christos Date: Thu May 30 21:23:52 UTC 2019 Modified Files: src/external/gpl3/gdb/dist/gdb: bsd-kvm.c Log Message: need arch-utils.h To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gdb/dist/gdb/bsd-kvm.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/gpl3/gdb/dist/gdb/bsd-kvm.c diff -u src/external/gpl3/gdb/dist/gdb/bsd-kvm.c:1.14 src/external/gpl3/gdb/dist/gdb/bsd-kvm.c:1.15 --- src/external/gpl3/gdb/dist/gdb/bsd-kvm.c:1.14 Thu May 30 17:15:47 2019 +++ src/external/gpl3/gdb/dist/gdb/bsd-kvm.c Thu May 30 17:23:52 2019 @@ -29,6 +29,7 @@ #include "gdbcore.h" #include "inferior.h" /* for get_exec_file */ #include "gdbthread.h" +#include "arch-utils.h" #include #include
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: christos Date: Thu May 30 21:23:52 UTC 2019 Modified Files: src/external/gpl3/gdb/dist/gdb: bsd-kvm.c Log Message: need arch-utils.h To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gdb/dist/gdb/bsd-kvm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: christos Date: Thu May 30 21:15:47 UTC 2019 Modified Files: src/external/gpl3/gdb/dist/gdb: bsd-kvm.c Log Message: set the architecture of the inferior. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gdb/dist/gdb/bsd-kvm.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/gpl3/gdb/dist/gdb/bsd-kvm.c diff -u src/external/gpl3/gdb/dist/gdb/bsd-kvm.c:1.13 src/external/gpl3/gdb/dist/gdb/bsd-kvm.c:1.14 --- src/external/gpl3/gdb/dist/gdb/bsd-kvm.c:1.13 Wed May 29 13:52:09 2019 +++ src/external/gpl3/gdb/dist/gdb/bsd-kvm.c Thu May 30 17:15:47 2019 @@ -110,6 +110,7 @@ bsd_kvm_target_open (const char *arg, in kvm_t *temp_kd; struct inferior *inf; char *filename = NULL; + struct gdbarch_info info; target_preopen (from_tty); @@ -141,6 +142,8 @@ bsd_kvm_target_open (const char *arg, in inf->aspace = maybe_new_address_space (); inf->pspace = new program_space (inf->aspace); + inf->gdbarch = get_current_arch (); + add_thread_silent (bsd_kvm_ptid); inferior_ptid = bsd_kvm_ptid;
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: christos Date: Thu May 30 21:16:03 UTC 2019 Modified Files: src/external/gpl3/gdb/dist/gdb: amd64-nbsd-nat.c Log Message: let's do things in the order everyone else does (I don't think it matters) To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/dist/gdb/amd64-nbsd-nat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: christos Date: Thu May 30 21:16:03 UTC 2019 Modified Files: src/external/gpl3/gdb/dist/gdb: amd64-nbsd-nat.c Log Message: let's do things in the order everyone else does (I don't think it matters) To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/dist/gdb/amd64-nbsd-nat.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/gpl3/gdb/dist/gdb/amd64-nbsd-nat.c diff -u src/external/gpl3/gdb/dist/gdb/amd64-nbsd-nat.c:1.7 src/external/gpl3/gdb/dist/gdb/amd64-nbsd-nat.c:1.8 --- src/external/gpl3/gdb/dist/gdb/amd64-nbsd-nat.c:1.7 Thu May 30 16:41:14 2019 +++ src/external/gpl3/gdb/dist/gdb/amd64-nbsd-nat.c Thu May 30 17:16:03 2019 @@ -131,7 +131,7 @@ _initialize_amd64nbsd_nat (void) amd64_native_gregset32_num_regs = ARRAY_SIZE (amd64nbsd32_r_reg_offset); amd64_native_gregset64_reg_offset = amd64nbsd_r_reg_offset; - bsd_kvm_add_target (amd64nbsd_supply_pcb); - add_inf_child_target (_amd64_nbsd_nat_target); + + bsd_kvm_add_target (amd64nbsd_supply_pcb); }
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: christos Date: Thu May 30 21:15:47 UTC 2019 Modified Files: src/external/gpl3/gdb/dist/gdb: bsd-kvm.c Log Message: set the architecture of the inferior. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gdb/dist/gdb/bsd-kvm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
re: CVS commit: src/sys/dev/ic
> Committed By: tnn > Date: Thu May 30 07:37:17 UTC 2019 > > Modified Files: > src/sys/dev/ic: ssdfb.c > > Log Message: > - include uvm.h before uvm_device.h > - don't need IPL_SCHED here the IPL_SCHED change seems backwards to me. IPL_VM is the "this driver is not updated to MPSAFE yet" level, but IPL_SCHED is the MPSAFE level. ie, we should be striving to remove any uses of IPL_VM, not moving (back) to them. thanks. .mrg.
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: christos
Date: Thu May 30 20:41:14 UTC 2019
Modified Files:
src/external/gpl3/gdb/dist/gdb: amd64-nbsd-nat.c
Log Message:
put back the kvm pcb code.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gdb/dist/gdb/amd64-nbsd-nat.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/gpl3/gdb/dist/gdb/amd64-nbsd-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/amd64-nbsd-nat.c:1.6 src/external/gpl3/gdb/dist/gdb/amd64-nbsd-nat.c:1.7
--- src/external/gpl3/gdb/dist/gdb/amd64-nbsd-nat.c:1.6 Sun May 26 17:40:01 2019
+++ src/external/gpl3/gdb/dist/gdb/amd64-nbsd-nat.c Thu May 30 16:41:14 2019
@@ -71,6 +71,57 @@ static int amd64nbsd32_r_reg_offset[] =
15 * 8 /* %gs */
};
+static int
+amd64nbsd_supply_pcb (struct regcache *regcache, struct pcb *pcb)
+{
+ struct switchframe sf;
+ int regnum;
+ long zero = 0;
+
+ /* The following is true for NetBSD/amd64:
+
+ The pcb contains the stack pointer at the point of the context
+ switch in cpu_switchto(). At that point we have a stack frame as
+ described by `struct switchframe', which for NetBSD/amd64 has the
+ following layout:
+
+ interrupt level
+ %r15
+ %r14
+ %r13
+ %r12
+ %rbx
+ return address
+
+ Together with %rsp in the pcb, this accounts for all callee-saved
+ registers specified by the psABI. From this information we
+ reconstruct the register state as it would look when we just
+ returned from cpu_switchto().
+
+ For kernel core dumps, dumpsys() builds a fake switchframe for us. */
+
+ /* The stack pointer shouldn't be zero. */
+ if (pcb->pcb_rsp == 0)
+return 0;
+
+ /* Read the stack frame, and check its validity. */
+ read_memory (pcb->pcb_rsp, (gdb_byte *) , sizeof sf);
+ pcb->pcb_rsp += sizeof (struct switchframe);
+ regcache->raw_supply (12, _r12);
+ regcache->raw_supply (13, _r13);
+ regcache->raw_supply (14, _r14);
+ regcache->raw_supply (15, _r15);
+ regcache->raw_supply (AMD64_RBX_REGNUM, _rbx);
+ regcache->raw_supply (AMD64_RIP_REGNUM, _rip);
+
+ regcache->raw_supply (AMD64_RSP_REGNUM, >pcb_rsp);
+ regcache->raw_supply (AMD64_RBP_REGNUM, >pcb_rbp);
+ regcache->raw_supply (AMD64_FS_REGNUM, >pcb_fs);
+ regcache->raw_supply (AMD64_GS_REGNUM, >pcb_gs);
+
+ return 1;
+}
+
static amd64_bsd_nat_target the_amd64_nbsd_nat_target;
void
@@ -80,5 +131,7 @@ _initialize_amd64nbsd_nat (void)
amd64_native_gregset32_num_regs = ARRAY_SIZE (amd64nbsd32_r_reg_offset);
amd64_native_gregset64_reg_offset = amd64nbsd_r_reg_offset;
+ bsd_kvm_add_target (amd64nbsd_supply_pcb);
+
add_inf_child_target (_amd64_nbsd_nat_target);
}
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: christos Date: Thu May 30 20:41:14 UTC 2019 Modified Files: src/external/gpl3/gdb/dist/gdb: amd64-nbsd-nat.c Log Message: put back the kvm pcb code. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gdb/dist/gdb/amd64-nbsd-nat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb
Module Name:src Committed By: christos Date: Thu May 30 19:34:28 UTC 2019 Modified Files: src/external/gpl3/gdb/dist/gdb: sh-nbsd-nat.c sh-nbsd-tdep.c src/external/gpl3/gdb/lib/libbfd/arch/sh3eb: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb/lib/libdecnumber/arch/sh3eb: config.h gstdint.h src/external/gpl3/gdb/lib/libgdb/arch/sh3eb: config.h defs.mk init.c jit-reader.h version.c xml-builtin.c src/external/gpl3/gdb/lib/libgdb/arch/sh3eb/build-gnulib: config.h src/external/gpl3/gdb/lib/libiberty/arch/sh3eb: config.h src/external/gpl3/gdb/lib/libopcodes/arch/sh3eb: config.h src/external/gpl3/gdb/lib/libreadline/arch/sh3eb: config.h Log Message: fix sh3eb To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/dist/gdb/sh-nbsd-nat.c cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/dist/gdb/sh-nbsd-tdep.c cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libbfd/arch/sh3eb/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/sh3eb/bfd.h \ src/external/gpl3/gdb/lib/libbfd/arch/sh3eb/bfd_stdint.h \ src/external/gpl3/gdb/lib/libbfd/arch/sh3eb/bfdver.h cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gdb/lib/libbfd/arch/sh3eb/config.h cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/lib/libbfd/arch/sh3eb/defs.mk cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/gdb/lib/libbfd/arch/sh3eb/targmatch.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gdb/lib/libdecnumber/arch/sh3eb/config.h cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libdecnumber/arch/sh3eb/gstdint.h cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gdb/lib/libgdb/arch/sh3eb/config.h cvs rdiff -u -r1.11 -r1.12 \ src/external/gpl3/gdb/lib/libgdb/arch/sh3eb/defs.mk \ src/external/gpl3/gdb/lib/libgdb/arch/sh3eb/init.c cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gdb/lib/libgdb/arch/sh3eb/jit-reader.h cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libgdb/arch/sh3eb/version.c \ src/external/gpl3/gdb/lib/libgdb/arch/sh3eb/xml-builtin.c cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libgdb/arch/sh3eb/build-gnulib/config.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libiberty/arch/sh3eb/config.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libopcodes/arch/sh3eb/config.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gdb/lib/libreadline/arch/sh3eb/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/lib
Module Name:src Committed By: christos Date: Thu May 30 19:22:03 UTC 2019 Modified Files: src/external/gpl3/gdb/lib/libbfd/arch/mipseb: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb/lib/libdecnumber/arch/mipseb: config.h gstdint.h src/external/gpl3/gdb/lib/libgdb/arch/mipseb: config.h defs.mk init.c jit-reader.h version.c xml-builtin.c src/external/gpl3/gdb/lib/libgdb/arch/mipseb/build-gnulib: config.h src/external/gpl3/gdb/lib/libiberty/arch/mipseb: config.h src/external/gpl3/gdb/lib/libopcodes/arch/mipseb: config.h src/external/gpl3/gdb/lib/libreadline/arch/mipseb: config.h Log Message: add mipseb To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libbfd/arch/mipseb/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/mipseb/bfd.h \ src/external/gpl3/gdb/lib/libbfd/arch/mipseb/bfdver.h \ src/external/gpl3/gdb/lib/libbfd/arch/mipseb/defs.mk cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gdb/lib/libbfd/arch/mipseb/bfd_stdint.h cvs rdiff -u -r1.8 -r1.9 \ src/external/gpl3/gdb/lib/libbfd/arch/mipseb/config.h cvs rdiff -u -r1.10 -r1.11 \ src/external/gpl3/gdb/lib/libbfd/arch/mipseb/targmatch.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gdb/lib/libdecnumber/arch/mipseb/config.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gdb/lib/libdecnumber/arch/mipseb/gstdint.h cvs rdiff -u -r1.11 -r1.12 \ src/external/gpl3/gdb/lib/libgdb/arch/mipseb/config.h cvs rdiff -u -r1.13 -r1.14 \ src/external/gpl3/gdb/lib/libgdb/arch/mipseb/defs.mk cvs rdiff -u -r1.12 -r1.13 \ src/external/gpl3/gdb/lib/libgdb/arch/mipseb/init.c cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gdb/lib/libgdb/arch/mipseb/jit-reader.h cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libgdb/arch/mipseb/version.c \ src/external/gpl3/gdb/lib/libgdb/arch/mipseb/xml-builtin.c cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libgdb/arch/mipseb/build-gnulib/config.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libiberty/arch/mipseb/config.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libopcodes/arch/mipseb/config.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gdb/lib/libreadline/arch/mipseb/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/lib
Module Name:src Committed By: christos Date: Thu May 30 18:58:33 UTC 2019 Modified Files: src/external/gpl3/gdb/lib/libbfd/arch/mipsel: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb/lib/libdecnumber/arch/mipsel: config.h gstdint.h src/external/gpl3/gdb/lib/libgdb/arch/mipsel: config.h defs.mk init.c jit-reader.h version.c xml-builtin.c src/external/gpl3/gdb/lib/libgdb/arch/mipsel/build-gnulib: config.h src/external/gpl3/gdb/lib/libiberty/arch/mipsel: config.h src/external/gpl3/gdb/lib/libopcodes/arch/mipsel: config.h src/external/gpl3/gdb/lib/libreadline/arch/mipsel: config.h Log Message: fix mipsel To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libbfd/arch/mipsel/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/mipsel/bfd.h \ src/external/gpl3/gdb/lib/libbfd/arch/mipsel/bfd_stdint.h \ src/external/gpl3/gdb/lib/libbfd/arch/mipsel/bfdver.h \ src/external/gpl3/gdb/lib/libbfd/arch/mipsel/defs.mk cvs rdiff -u -r1.8 -r1.9 \ src/external/gpl3/gdb/lib/libbfd/arch/mipsel/config.h cvs rdiff -u -r1.10 -r1.11 \ src/external/gpl3/gdb/lib/libbfd/arch/mipsel/targmatch.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gdb/lib/libdecnumber/arch/mipsel/config.h cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libdecnumber/arch/mipsel/gstdint.h cvs rdiff -u -r1.11 -r1.12 \ src/external/gpl3/gdb/lib/libgdb/arch/mipsel/config.h cvs rdiff -u -r1.13 -r1.14 \ src/external/gpl3/gdb/lib/libgdb/arch/mipsel/defs.mk cvs rdiff -u -r1.12 -r1.13 \ src/external/gpl3/gdb/lib/libgdb/arch/mipsel/init.c cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gdb/lib/libgdb/arch/mipsel/jit-reader.h cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libgdb/arch/mipsel/version.c \ src/external/gpl3/gdb/lib/libgdb/arch/mipsel/xml-builtin.c cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libgdb/arch/mipsel/build-gnulib/config.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libiberty/arch/mipsel/config.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libopcodes/arch/mipsel/config.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gdb/lib/libreadline/arch/mipsel/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/lib
Module Name:src Committed By: christos Date: Thu May 30 18:34:25 UTC 2019 Modified Files: src/external/gpl3/gdb/lib/libbfd/arch/mips64el: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb/lib/libdecnumber/arch/mips64el: config.h gstdint.h src/external/gpl3/gdb/lib/libgdb/arch/mips64el: config.h defs.mk init.c jit-reader.h version.c xml-builtin.c src/external/gpl3/gdb/lib/libgdb/arch/mips64el/build-gnulib: config.h src/external/gpl3/gdb/lib/libiberty/arch/mips64el: config.h src/external/gpl3/gdb/lib/libopcodes/arch/mips64el: config.h src/external/gpl3/gdb/lib/libreadline/arch/mips64el: config.h Log Message: add mips64el To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/gdb/lib/libbfd/arch/mips64el/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/mips64el/bfd.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libbfd/arch/mips64el/bfd_stdint.h cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libbfd/arch/mips64el/bfdver.h cvs rdiff -u -r1.8 -r1.9 \ src/external/gpl3/gdb/lib/libbfd/arch/mips64el/config.h cvs rdiff -u -r1.10 -r1.11 \ src/external/gpl3/gdb/lib/libbfd/arch/mips64el/defs.mk cvs rdiff -u -r1.11 -r1.12 \ src/external/gpl3/gdb/lib/libbfd/arch/mips64el/targmatch.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gdb/lib/libdecnumber/arch/mips64el/config.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libdecnumber/arch/mips64el/gstdint.h cvs rdiff -u -r1.13 -r1.14 \ src/external/gpl3/gdb/lib/libgdb/arch/mips64el/config.h \ src/external/gpl3/gdb/lib/libgdb/arch/mips64el/defs.mk \ src/external/gpl3/gdb/lib/libgdb/arch/mips64el/init.c cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gdb/lib/libgdb/arch/mips64el/jit-reader.h cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libgdb/arch/mips64el/version.c \ src/external/gpl3/gdb/lib/libgdb/arch/mips64el/xml-builtin.c cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libgdb/arch/mips64el/build-gnulib/config.h cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libiberty/arch/mips64el/config.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libopcodes/arch/mips64el/config.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gdb/lib/libreadline/arch/mips64el/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/sunxi
Module Name:src
Committed By: tnn
Date: Thu May 30 18:19:36 UTC 2019
Modified Files:
src/sys/arch/arm/sunxi: sunxi_gpio.c
Log Message:
sunxi_gpio: implement the interrupt API in gpio_chipset_tag
- advertise GPIO pins as interrupt capable via pin_intrcaps
- split establish/disestablish code into fdt attach specific,
gpio attach specific and shared parts, similar to the BCM2835 GPIO driver
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/sunxi/sunxi_gpio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/sunxi/sunxi_gpio.c
diff -u src/sys/arch/arm/sunxi/sunxi_gpio.c:1.24 src/sys/arch/arm/sunxi/sunxi_gpio.c:1.25
--- src/sys/arch/arm/sunxi/sunxi_gpio.c:1.24 Mon May 27 23:26:20 2019
+++ src/sys/arch/arm/sunxi/sunxi_gpio.c Thu May 30 18:19:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_gpio.c,v 1.24 2019/05/27 23:26:20 jmcneill Exp $ */
+/* $NetBSD: sunxi_gpio.c,v 1.25 2019/05/30 18:19:36 tnn Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -29,7 +29,7 @@
#include "opt_soc.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: sunxi_gpio.c,v 1.24 2019/05/27 23:26:20 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_gpio.c,v 1.25 2019/05/30 18:19:36 tnn Exp $");
#include
#include
@@ -120,7 +120,7 @@ static const struct of_compat_data compa
struct sunxi_gpio_eint {
int (*eint_func)(void *);
void *eint_arg;
- int eint_flags;
+ bool eint_mpsafe;
int eint_bank;
int eint_num;
};
@@ -429,11 +429,10 @@ sunxi_gpio_intr(void *priv)
eint = >sc_eint[bank][bit - 1];
if (eint->eint_func == NULL)
continue;
- const bool mpsafe = (eint->eint_flags & FDT_INTR_MPSAFE) != 0;
- if (!mpsafe)
+ if (!eint->eint_mpsafe)
KERNEL_LOCK(1, curlwp);
ret |= eint->eint_func(eint->eint_arg);
- if (!mpsafe)
+ if (!eint->eint_mpsafe)
KERNEL_UNLOCK_ONE(curlwp);
}
}
@@ -442,53 +441,13 @@ sunxi_gpio_intr(void *priv)
}
static void *
-sunxi_gpio_establish(device_t dev, u_int *specifier, int ipl, int flags,
+sunxi_intr_enable(struct sunxi_gpio_softc *sc,
+const struct sunxi_gpio_pins *pin_def, u_int mode, bool mpsafe,
int (*func)(void *), void *arg)
{
- struct sunxi_gpio_softc * const sc = device_private(dev);
- const struct sunxi_gpio_pins *pin_def;
- struct sunxi_gpio_eint *eint;
uint32_t val;
- u_int mode;
-
- if (ipl != IPL_VM) {
- aprint_error_dev(dev, "%s: wrong IPL %d (expected %d)\n",
- __func__, ipl, IPL_VM);
- return NULL;
- }
-
- /* 1st cell is the bank */
- /* 2nd cell is the pin */
- /* 3rd cell is flags */
- const u_int port = be32toh(specifier[0]);
- const u_int pin = be32toh(specifier[1]);
- const u_int type = be32toh(specifier[2]) & 0xf;
-
- switch (type) {
- case FDT_INTR_TYPE_POS_EDGE:
- mode = SUNXI_GPIO_INT_MODE_POS_EDGE;
- break;
- case FDT_INTR_TYPE_NEG_EDGE:
- mode = SUNXI_GPIO_INT_MODE_NEG_EDGE;
- break;
- case FDT_INTR_TYPE_DOUBLE_EDGE:
- mode = SUNXI_GPIO_INT_MODE_DOUBLE_EDGE;
- break;
- case FDT_INTR_TYPE_HIGH_LEVEL:
- mode = SUNXI_GPIO_INT_MODE_HIGH_LEVEL;
- break;
- case FDT_INTR_TYPE_LOW_LEVEL:
- mode = SUNXI_GPIO_INT_MODE_LOW_LEVEL;
- break;
- default:
- aprint_error_dev(dev, "%s: unsupported irq type 0x%x\n",
- __func__, type);
- return NULL;
- }
-
- pin_def = sunxi_gpio_lookup(sc, port, pin);
- if (pin_def == NULL)
- return NULL;
+ struct sunxi_gpio_eint *eint;
+
if (pin_def->functions[pin_def->eint_func] == NULL ||
strcmp(pin_def->functions[pin_def->eint_func], "irq") != 0)
return NULL;
@@ -511,7 +470,7 @@ sunxi_gpio_establish(device_t dev, u_int
eint->eint_func = func;
eint->eint_arg = arg;
- eint->eint_flags = flags;
+ eint->eint_mpsafe = mpsafe;
eint->eint_bank = pin_def->eint_bank;
eint->eint_num = pin_def->eint_num;
@@ -532,10 +491,8 @@ sunxi_gpio_establish(device_t dev, u_int
}
static void
-sunxi_gpio_disestablish(device_t dev, void *ih)
+sunxi_intr_disable(struct sunxi_gpio_softc *sc, struct sunxi_gpio_eint *eint)
{
- struct sunxi_gpio_softc * const sc = device_private(dev);
- struct sunxi_gpio_eint * const eint = ih;
uint32_t val;
KASSERT(eint->eint_func != NULL);
@@ -550,13 +507,73 @@ sunxi_gpio_disestablish(device_t dev, vo
eint->eint_func = NULL;
eint->eint_arg = NULL;
- eint->eint_flags = 0;
+ eint->eint_mpsafe = false;
mutex_exit(>sc_lock);
}
+static void *
+sunxi_fdt_intr_establish(device_t dev, u_int *specifier, int ipl, int flags,
+int (*func)(void *), void *arg)
+{
+ struct sunxi_gpio_softc * const sc = device_private(dev);
+ bool mpsafe = (flags & FDT_INTR_MPSAFE) != 0;
+ const struct sunxi_gpio_pins *pin_def;
+ u_int mode;
+
+ if (ipl != IPL_VM) {
+ aprint_error_dev(dev, "%s: wrong IPL %d (expected %d)\n",
+ __func__, ipl, IPL_VM);
+ return NULL;
+ }
+
+ /* 1st cell is the bank */
+ /* 2nd cell is the pin */
+ /* 3rd cell is flags */
+ const u_int port = be32toh(specifier[0]);
+
CVS commit: src/sys/arch/arm/sunxi
Module Name:src Committed By: tnn Date: Thu May 30 18:19:36 UTC 2019 Modified Files: src/sys/arch/arm/sunxi: sunxi_gpio.c Log Message: sunxi_gpio: implement the interrupt API in gpio_chipset_tag - advertise GPIO pins as interrupt capable via pin_intrcaps - split establish/disestablish code into fdt attach specific, gpio attach specific and shared parts, similar to the BCM2835 GPIO driver To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/sunxi/sunxi_gpio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb
Module Name:src Committed By: christos Date: Thu May 30 18:17:59 UTC 2019 Modified Files: src/external/gpl3/gdb/dist/gdb: mips-nbsd-tdep.c src/external/gpl3/gdb/lib/libbfd/arch/mips64eb: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb/lib/libdecnumber/arch/mips64eb: config.h gstdint.h src/external/gpl3/gdb/lib/libgdb/arch/mips64eb: config.h defs.mk init.c jit-reader.h version.c xml-builtin.c src/external/gpl3/gdb/lib/libgdb/arch/mips64eb/build-gnulib: config.h src/external/gpl3/gdb/lib/libiberty/arch/mips64eb: config.h src/external/gpl3/gdb/lib/libopcodes/arch/mips64eb: config.h src/external/gpl3/gdb/lib/libreadline/arch/mips64eb: config.h Log Message: add mips64eb To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/dist/gdb/mips-nbsd-tdep.c cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/gdb/lib/libbfd/arch/mips64eb/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/mips64eb/bfd.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libbfd/arch/mips64eb/bfd_stdint.h cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libbfd/arch/mips64eb/bfdver.h cvs rdiff -u -r1.8 -r1.9 \ src/external/gpl3/gdb/lib/libbfd/arch/mips64eb/config.h cvs rdiff -u -r1.10 -r1.11 \ src/external/gpl3/gdb/lib/libbfd/arch/mips64eb/defs.mk cvs rdiff -u -r1.11 -r1.12 \ src/external/gpl3/gdb/lib/libbfd/arch/mips64eb/targmatch.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gdb/lib/libdecnumber/arch/mips64eb/config.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libdecnumber/arch/mips64eb/gstdint.h cvs rdiff -u -r1.13 -r1.14 \ src/external/gpl3/gdb/lib/libgdb/arch/mips64eb/config.h \ src/external/gpl3/gdb/lib/libgdb/arch/mips64eb/defs.mk \ src/external/gpl3/gdb/lib/libgdb/arch/mips64eb/init.c cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gdb/lib/libgdb/arch/mips64eb/jit-reader.h cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libgdb/arch/mips64eb/version.c \ src/external/gpl3/gdb/lib/libgdb/arch/mips64eb/xml-builtin.c cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libgdb/arch/mips64eb/build-gnulib/config.h cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libiberty/arch/mips64eb/config.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libopcodes/arch/mips64eb/config.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gdb/lib/libreadline/arch/mips64eb/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/lib
Module Name:src Committed By: christos Date: Thu May 30 18:06:06 UTC 2019 Modified Files: src/external/gpl3/gdb/lib/libbfd/arch/m68k: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb/lib/libdecnumber/arch/m68k: config.h gstdint.h src/external/gpl3/gdb/lib/libgdb/arch/m68k: config.h defs.mk init.c jit-reader.h version.c xml-builtin.c src/external/gpl3/gdb/lib/libgdb/arch/m68k/build-gnulib: config.h src/external/gpl3/gdb/lib/libiberty/arch/m68k: config.h src/external/gpl3/gdb/lib/libopcodes/arch/m68k: config.h src/external/gpl3/gdb/lib/libreadline/arch/m68k: config.h Log Message: add m68k To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/lib/libbfd/arch/m68k/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/m68k/bfd.h \ src/external/gpl3/gdb/lib/libbfd/arch/m68k/bfdver.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libbfd/arch/m68k/bfd_stdint.h cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gdb/lib/libbfd/arch/m68k/config.h cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/lib/libbfd/arch/m68k/defs.mk cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/gdb/lib/libbfd/arch/m68k/targmatch.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gdb/lib/libdecnumber/arch/m68k/config.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libdecnumber/arch/m68k/gstdint.h cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gdb/lib/libgdb/arch/m68k/config.h cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gdb/lib/libgdb/arch/m68k/defs.mk cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gdb/lib/libgdb/arch/m68k/init.c cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gdb/lib/libgdb/arch/m68k/jit-reader.h cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/lib/libgdb/arch/m68k/version.c \ src/external/gpl3/gdb/lib/libgdb/arch/m68k/xml-builtin.c cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libgdb/arch/m68k/build-gnulib/config.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libiberty/arch/m68k/config.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libopcodes/arch/m68k/config.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gdb/lib/libreadline/arch/m68k/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb
Module Name:src Committed By: christos Date: Thu May 30 17:46:39 UTC 2019 Modified Files: src/external/gpl3/gdb/dist/gdb: m68k-bsd-nat.c src/external/gpl3/gdb/lib/libbfd/arch/m68000: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb/lib/libdecnumber/arch/m68000: config.h gstdint.h src/external/gpl3/gdb/lib/libgdb/arch/m68000: config.h defs.mk init.c jit-reader.h version.c xml-builtin.c src/external/gpl3/gdb/lib/libgdb/arch/m68000/build-gnulib: config.h src/external/gpl3/gdb/lib/libiberty/arch/m68000: config.h src/external/gpl3/gdb/lib/libopcodes/arch/m68000: config.h src/external/gpl3/gdb/lib/libreadline/arch/m68000: config.h Log Message: hello sun2! To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gdb/dist/gdb/m68k-bsd-nat.c cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libbfd/arch/m68000/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/m68000/bfd.h \ src/external/gpl3/gdb/lib/libbfd/arch/m68000/bfdver.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libbfd/arch/m68000/bfd_stdint.h cvs rdiff -u -r1.8 -r1.9 \ src/external/gpl3/gdb/lib/libbfd/arch/m68000/config.h cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/lib/libbfd/arch/m68000/defs.mk cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/gdb/lib/libbfd/arch/m68000/targmatch.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gdb/lib/libdecnumber/arch/m68000/config.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libdecnumber/arch/m68000/gstdint.h cvs rdiff -u -r1.8 -r1.9 \ src/external/gpl3/gdb/lib/libgdb/arch/m68000/config.h cvs rdiff -u -r1.10 -r1.11 \ src/external/gpl3/gdb/lib/libgdb/arch/m68000/defs.mk cvs rdiff -u -r1.11 -r1.12 \ src/external/gpl3/gdb/lib/libgdb/arch/m68000/init.c cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gdb/lib/libgdb/arch/m68000/jit-reader.h cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libgdb/arch/m68000/version.c \ src/external/gpl3/gdb/lib/libgdb/arch/m68000/xml-builtin.c cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libgdb/arch/m68000/build-gnulib/config.h cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libiberty/arch/m68000/config.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libopcodes/arch/m68000/config.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gdb/lib/libreadline/arch/m68000/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/lib
Module Name:src Committed By: christos Date: Thu May 30 17:16:34 UTC 2019 Modified Files: src/external/gpl3/gdb/lib/libbfd/arch/armeb: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb/lib/libdecnumber/arch/armeb: config.h gstdint.h src/external/gpl3/gdb/lib/libgdb/arch/armeb: config.h defs.mk init.c jit-reader.h version.c xml-builtin.c src/external/gpl3/gdb/lib/libgdb/arch/armeb/build-gnulib: config.h src/external/gpl3/gdb/lib/libiberty/arch/armeb: config.h src/external/gpl3/gdb/lib/libopcodes/arch/armeb: config.h src/external/gpl3/gdb/lib/libreadline/arch/armeb: config.h Log Message: add armeb To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libbfd/arch/armeb/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/armeb/bfd.h \ src/external/gpl3/gdb/lib/libbfd/arch/armeb/bfdver.h cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/gdb/lib/libbfd/arch/armeb/bfd_stdint.h \ src/external/gpl3/gdb/lib/libbfd/arch/armeb/targmatch.h cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gdb/lib/libbfd/arch/armeb/config.h cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gdb/lib/libbfd/arch/armeb/defs.mk cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gdb/lib/libdecnumber/arch/armeb/config.h cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/gdb/lib/libdecnumber/arch/armeb/gstdint.h cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/gdb/lib/libgdb/arch/armeb/config.h cvs rdiff -u -r1.13 -r1.14 \ src/external/gpl3/gdb/lib/libgdb/arch/armeb/defs.mk \ src/external/gpl3/gdb/lib/libgdb/arch/armeb/init.c cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gdb/lib/libgdb/arch/armeb/jit-reader.h cvs rdiff -u -r1.8 -r1.9 \ src/external/gpl3/gdb/lib/libgdb/arch/armeb/version.c cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libgdb/arch/armeb/xml-builtin.c cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libgdb/arch/armeb/build-gnulib/config.h cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libiberty/arch/armeb/config.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libopcodes/arch/armeb/config.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gdb/lib/libreadline/arch/armeb/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/scsipi
Module Name:src Committed By: mlelstv Date: Thu May 30 16:57:39 UTC 2019 Modified Files: src/sys/dev/scsipi: scsipi_ioctl.c Log Message: use correct size when copying outgoing sense data. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 src/sys/dev/scsipi/scsipi_ioctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/scsipi
Module Name:src
Committed By: mlelstv
Date: Thu May 30 16:57:39 UTC 2019
Modified Files:
src/sys/dev/scsipi: scsipi_ioctl.c
Log Message:
use correct size when copying outgoing sense data.
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sys/dev/scsipi/scsipi_ioctl.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/scsipi/scsipi_ioctl.c
diff -u src/sys/dev/scsipi/scsipi_ioctl.c:1.71 src/sys/dev/scsipi/scsipi_ioctl.c:1.72
--- src/sys/dev/scsipi/scsipi_ioctl.c:1.71 Sun May 26 08:12:41 2019
+++ src/sys/dev/scsipi/scsipi_ioctl.c Thu May 30 16:57:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipi_ioctl.c,v 1.71 2019/05/26 08:12:41 mlelstv Exp $ */
+/* $NetBSD: scsipi_ioctl.c,v 1.72 2019/05/30 16:57:39 mlelstv Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: scsipi_ioctl.c,v 1.71 2019/05/26 08:12:41 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_ioctl.c,v 1.72 2019/05/30 16:57:39 mlelstv Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_freebsd.h"
@@ -168,14 +168,16 @@ scsipi_user_done(struct scsipi_xfer *xs)
SC_DEBUG(periph, SCSIPI_DB3, ("have sense\n"));
screq->senselen_used = uimin(sizeof(xs->sense.scsi_sense),
SENSEBUFLEN);
- memcpy(screq->sense, >sense.scsi_sense, screq->senselen);
+ memcpy(screq->sense, >sense.scsi_sense,
+ screq->senselen_used);
screq->retsts = SCCMD_SENSE;
break;
case XS_SHORTSENSE:
SC_DEBUG(periph, SCSIPI_DB3, ("have short sense\n"));
screq->senselen_used = uimin(sizeof(xs->sense.atapi_sense),
SENSEBUFLEN);
- memcpy(screq->sense, >sense.scsi_sense, screq->senselen);
+ memcpy(screq->sense, >sense.atapi_sense,
+ screq->senselen_used);
screq->retsts = SCCMD_UNKNOWN; /* XXX need a shortsense here */
break;
case XS_DRIVER_STUFFUP:
CVS commit: src/external/gpl3/gdb/lib
Module Name:src Committed By: christos Date: Thu May 30 16:54:02 UTC 2019 Modified Files: src/external/gpl3/gdb/lib/libbfd/arch/hppa: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb/lib/libdecnumber/arch/hppa: config.h gstdint.h src/external/gpl3/gdb/lib/libgdb/arch/hppa: config.h defs.mk init.c jit-reader.h version.c xml-builtin.c src/external/gpl3/gdb/lib/libgdb/arch/hppa/build-gnulib: config.h src/external/gpl3/gdb/lib/libiberty/arch/hppa: config.h src/external/gpl3/gdb/lib/libopcodes/arch/hppa: config.h src/external/gpl3/gdb/lib/libreadline/arch/hppa: config.h Log Message: fix hppa... To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/lib/libbfd/arch/hppa/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/hppa/bfd.h \ src/external/gpl3/gdb/lib/libbfd/arch/hppa/bfdver.h cvs rdiff -u -r1.8 -r1.9 \ src/external/gpl3/gdb/lib/libbfd/arch/hppa/bfd_stdint.h \ src/external/gpl3/gdb/lib/libbfd/arch/hppa/config.h cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/lib/libbfd/arch/hppa/defs.mk cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/gdb/lib/libbfd/arch/hppa/targmatch.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gdb/lib/libdecnumber/arch/hppa/config.h cvs rdiff -u -r1.8 -r1.9 \ src/external/gpl3/gdb/lib/libdecnumber/arch/hppa/gstdint.h cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gdb/lib/libgdb/arch/hppa/config.h cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gdb/lib/libgdb/arch/hppa/defs.mk cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gdb/lib/libgdb/arch/hppa/init.c cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gdb/lib/libgdb/arch/hppa/jit-reader.h cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/lib/libgdb/arch/hppa/version.c \ src/external/gpl3/gdb/lib/libgdb/arch/hppa/xml-builtin.c cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libgdb/arch/hppa/build-gnulib/config.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libiberty/arch/hppa/config.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libopcodes/arch/hppa/config.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gdb/lib/libreadline/arch/hppa/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: mlelstv Date: Thu May 30 16:04:04 UTC 2019 Modified Files: src/sys/dev/pci: pcidevs Log Message: add IDs for SATA controllers VT8237S and VX855 To generate a diff of this commit: cvs rdiff -u -r1.1372 -r1.1373 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.1372 src/sys/dev/pci/pcidevs:1.1373 --- src/sys/dev/pci/pcidevs:1.1372 Mon Apr 15 09:01:28 2019 +++ src/sys/dev/pci/pcidevs Thu May 30 16:04:04 2019 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1372 2019/04/15 09:01:28 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1373 2019/05/30 16:04:04 mlelstv Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -7692,6 +7692,7 @@ product VIATECH VT8237A_SATA_2 0x5337 VT product VIATECH VT3351_IOAPIC 0x5351 VT3351 I/O APIC Interrupt Controller product VIATECH P4M900_IOAPIC 0x5364 CN896/P4M900 IOAPIC product VIATECH VT8237S_SATA 0x5372 VT8237S Integrated SATA Controller +product VIATECH VT8237S_SATA_2 0x7372 VT8237S Integrated SATA Controller product VIATECH VT86C100A 0x6100 VT86C100A (Rhine-II) 10/100 Ethernet product VIATECH VT8251_SATA 0x6287 VT8251 Integrated SATA Controller product VIATECH P4M900_6 0x6364 CN896/P4M900 Security Device @@ -7702,6 +7703,7 @@ product VIATECH P4M900_7 0x7364 CN896/P4 product VIATECH VT8231 0x8231 VT8231 PCI-ISA Bridge product VIATECH VT8231_PWR 0x8235 VT8231 Power Management Controller product VIATECH VT8363_PPB 0x8305 VT8363 (Apollo KT133) PCI to AGP Bridge +product VIATECH VX855 0x8409 VX855 PCI-LPC Bridge product VIATECH CX700 0x8324 CX700 PCI-LPC Bridge product VIATECH VX800 0x8353 VX800/VX820 PCI-LPC Bridge product VIATECH VT8371_PPB 0x8391 VT8371 (Apollo KX133) PCI-PCI Bridge
CVS commit: src/sys/dev/pci
Module Name:src Committed By: mlelstv Date: Thu May 30 16:04:29 UTC 2019 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.1360 -r1.1361 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1359 -r1.1360 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: mlelstv
Date: Thu May 30 16:04:29 UTC 2019
Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.1360 -r1.1361 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1359 -r1.1360 src/sys/dev/pci/pcidevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.1360 src/sys/dev/pci/pcidevs.h:1.1361
--- src/sys/dev/pci/pcidevs.h:1.1360 Mon Apr 15 09:01:49 2019
+++ src/sys/dev/pci/pcidevs.h Thu May 30 16:04:28 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs.h,v 1.1360 2019/04/15 09:01:49 msaitoh Exp $ */
+/* $NetBSD: pcidevs.h,v 1.1361 2019/05/30 16:04:28 mlelstv Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1372 2019/04/15 09:01:28 msaitoh Exp
+ * NetBSD: pcidevs,v 1.1373 2019/05/30 16:04:04 mlelstv Exp
*/
/*
@@ -7699,6 +7699,7 @@
#define PCI_PRODUCT_VIATECH_VT3351_IOAPIC 0x5351 /* VT3351 I/O APIC Interrupt Controller */
#define PCI_PRODUCT_VIATECH_P4M900_IOAPIC 0x5364 /* CN896/P4M900 IOAPIC */
#define PCI_PRODUCT_VIATECH_VT8237S_SATA 0x5372 /* VT8237S Integrated SATA Controller */
+#define PCI_PRODUCT_VIATECH_VT8237S_SATA_2 0x7372 /* VT8237S Integrated SATA Controller */
#define PCI_PRODUCT_VIATECH_VT86C100A 0x6100 /* VT86C100A (Rhine-II) 10/100 Ethernet */
#define PCI_PRODUCT_VIATECH_VT8251_SATA 0x6287 /* VT8251 Integrated SATA Controller */
#define PCI_PRODUCT_VIATECH_P4M900_6 0x6364 /* CN896/P4M900 Security Device */
@@ -7709,6 +7710,7 @@
#define PCI_PRODUCT_VIATECH_VT8231 0x8231 /* VT8231 PCI-ISA Bridge */
#define PCI_PRODUCT_VIATECH_VT8231_PWR 0x8235 /* VT8231 Power Management Controller */
#define PCI_PRODUCT_VIATECH_VT8363_PPB 0x8305 /* VT8363 (Apollo KT133) PCI to AGP Bridge */
+#define PCI_PRODUCT_VIATECH_VX855 0x8409 /* VX855 PCI-LPC Bridge */
#define PCI_PRODUCT_VIATECH_CX700 0x8324 /* CX700 PCI-LPC Bridge */
#define PCI_PRODUCT_VIATECH_VX800 0x8353 /* VX800/VX820 PCI-LPC Bridge */
#define PCI_PRODUCT_VIATECH_VT8371_PPB 0x8391 /* VT8371 (Apollo KX133) PCI-PCI Bridge */
Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.1359 src/sys/dev/pci/pcidevs_data.h:1.1360
--- src/sys/dev/pci/pcidevs_data.h:1.1359 Mon Apr 15 09:01:49 2019
+++ src/sys/dev/pci/pcidevs_data.h Thu May 30 16:04:28 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs_data.h,v 1.1359 2019/04/15 09:01:49 msaitoh Exp $ */
+/* $NetBSD: pcidevs_data.h,v 1.1360 2019/05/30 16:04:28 mlelstv Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1372 2019/04/15 09:01:28 msaitoh Exp
+ * NetBSD: pcidevs,v 1.1373 2019/05/30 16:04:04 mlelstv Exp
*/
/*
@@ -13521,6 +13521,8 @@ static const uint16_t pci_products[] = {
35741, 8536, 0,
PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8237S_SATA,
36368, 692, 8584, 6384, 0,
+ PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8237S_SATA_2,
+ 36368, 692, 8584, 6384, 0,
PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT86C100A,
36402, 36412, 5748, 5646, 0,
PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8251_SATA,
@@ -13541,18 +13543,20 @@ static const uint16_t pci_products[] = {
36423, 3749, 7007, 6384, 0,
PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8363_PPB,
35712, 35719, 35727, 615, 6938, 8410, 6492, 0,
+ PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VX855,
+ 36430, 29886, 6492, 0,
PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_CX700,
35835, 29886, 6492, 0,
PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VX800,
- 36430, 29886, 6492, 0,
+ 36436, 29886, 6492, 0,
PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8371_PPB,
35754, 35719, 35761, 8397, 6492, 0,
PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8501AGP,
- 35774, 35719, 35781, 36442, 6492, 0,
+ 35774, 35719, 35781, 36448, 6492, 0,
PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C597AGP,
- 35895, 35719, 35904, 36442, 6492, 0,
+ 35895, 35719, 35904, 36448, 6492, 0,
PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C598AGP,
- 35909, 35719, 35918, 36442, 6492, 0,
+ 35909, 35719, 35918, 36448, 6492, 0,
PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8605AGP,
35924, 35719, 35931, 35940, 23598, 6492, 0,
PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VX900_IDE,
@@ -13562,15 +13566,15 @@ static const uint16_t pci_products[] = {
PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_P4M900_PPB_1,
35741, 8397, 6492, 0,
PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8633AGP,
- 36450, 35719, 7182, 36457, 36442, 6492, 0,
+ 36456, 35719, 7182, 36463, 36448, 6492, 0,
PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8366AGP,
- 36149, 35719, 36156, 36442, 6492, 0,
+ 36149, 35719, 36156, 36448, 6492, 0,
CVS commit: src/sys/dev/pci
Module Name:src Committed By: mlelstv Date: Thu May 30 16:04:04 UTC 2019 Modified Files: src/sys/dev/pci: pcidevs Log Message: add IDs for SATA controllers VT8237S and VX855 To generate a diff of this commit: cvs rdiff -u -r1.1372 -r1.1373 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb
Module Name:src Committed By: christos Date: Thu May 30 16:02:24 UTC 2019 Modified Files: src/external/gpl3/gdb/dist/gdb: arm-nbsd-nat.c configure.tgt src/external/gpl3/gdb/lib/libbfd/arch/arm: bfd-in3.h bfd.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb/lib/libdecnumber/arch/arm: config.h src/external/gpl3/gdb/lib/libgdb/arch/arm: config.h defs.mk init.c jit-reader.h version.c xml-builtin.c src/external/gpl3/gdb/lib/libgdb/arch/arm/build-gnulib: config.h src/external/gpl3/gdb/lib/libiberty/arch/arm: config.h src/external/gpl3/gdb/lib/libopcodes/arch/arm: config.h src/external/gpl3/gdb/lib/libreadline/arch/arm: config.h Log Message: fix arm To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gdb/dist/gdb/arm-nbsd-nat.c cvs rdiff -u -r1.21 -r1.22 src/external/gpl3/gdb/dist/gdb/configure.tgt cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/lib/libbfd/arch/arm/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/arm/bfd.h \ src/external/gpl3/gdb/lib/libbfd/arch/arm/bfdver.h cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gdb/lib/libbfd/arch/arm/config.h cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gdb/lib/libbfd/arch/arm/defs.mk cvs rdiff -u -r1.10 -r1.11 \ src/external/gpl3/gdb/lib/libbfd/arch/arm/targmatch.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gdb/lib/libdecnumber/arch/arm/config.h cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gdb/lib/libgdb/arch/arm/config.h \ src/external/gpl3/gdb/lib/libgdb/arch/arm/version.c cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/gdb/lib/libgdb/arch/arm/defs.mk cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gdb/lib/libgdb/arch/arm/init.c cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gdb/lib/libgdb/arch/arm/jit-reader.h cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libgdb/arch/arm/xml-builtin.c cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gdb/lib/libgdb/arch/arm/build-gnulib/config.h cvs rdiff -u -r1.8 -r1.9 \ src/external/gpl3/gdb/lib/libiberty/arch/arm/config.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gdb/lib/libopcodes/arch/arm/config.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gdb/lib/libreadline/arch/arm/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/wsfontload
Module Name:src Committed By: pgoyette Date: Thu May 30 14:58:52 UTC 2019 Modified Files: src/usr.sbin/wsfontload: wsfontload.8 Log Message: Note lack of a method to determine which fonts have been loaded. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/wsfontload/wsfontload.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: nonaka Date: Thu May 30 11:15:29 UTC 2019 Modified Files: src/sys/arch/x86/x86: hyperv.c Log Message: Avoid undefined reference to `hyperv_guid_video' without vmbus(4). To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/x86/hyperv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: nonaka
Date: Thu May 30 11:15:29 UTC 2019
Modified Files:
src/sys/arch/x86/x86: hyperv.c
Log Message:
Avoid undefined reference to `hyperv_guid_video' without vmbus(4).
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/x86/hyperv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/hyperv.c
diff -u src/sys/arch/x86/x86/hyperv.c:1.2 src/sys/arch/x86/x86/hyperv.c:1.3
--- src/sys/arch/x86/x86/hyperv.c:1.2 Fri May 24 14:28:48 2019
+++ src/sys/arch/x86/x86/hyperv.c Thu May 30 11:15:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: hyperv.c,v 1.2 2019/05/24 14:28:48 nonaka Exp $ */
+/* $NetBSD: hyperv.c,v 1.3 2019/05/30 11:15:29 nonaka Exp $ */
/*-
* Copyright (c) 2009-2012,2016-2017 Microsoft Corp.
@@ -33,7 +33,7 @@
*/
#include
#ifdef __KERNEL_RCSID
-__KERNEL_RCSID(0, "$NetBSD: hyperv.c,v 1.2 2019/05/24 14:28:48 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hyperv.c,v 1.3 2019/05/30 11:15:29 nonaka Exp $");
#endif
#ifdef __FBSDID
__FBSDID("$FreeBSD: head/sys/dev/hyperv/vmbus/hyperv.c 331757 2018-03-30 02:25:12Z emaste $");
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD: head/sys/dev/hyperv/
#include "lapic.h"
#include "genfb.h"
#include "opt_ddb.h"
+#include "vmbus.h"
#include "wsdisplay.h"
#endif
@@ -988,6 +989,7 @@ hyperv_modcmd(modcmd_t cmd, void *aux)
return rv;
}
+#if NVMBUS > 0
/*
* genfb at vmbus
*/
@@ -1086,10 +1088,12 @@ populate_fbinfo(device_t dev, prop_dicti
}
#endif
}
+#endif
device_t
device_hyperv_register(device_t dev, void *aux)
{
+#if NVMBUS > 0
device_t parent = device_parent(dev);
if (parent && device_is_a(parent, "vmbus") && !x86_found_console) {
@@ -1128,5 +1132,6 @@ device_hyperv_register(device_t dev, voi
return NULL;
}
}
+#endif
return NULL;
}
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: tnn
Date: Thu May 30 07:37:17 UTC 2019
Modified Files:
src/sys/dev/ic: ssdfb.c
Log Message:
- include uvm.h before uvm_device.h
- don't need IPL_SCHED here
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/ic/ssdfb.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/ssdfb.c
diff -u src/sys/dev/ic/ssdfb.c:1.3 src/sys/dev/ic/ssdfb.c:1.4
--- src/sys/dev/ic/ssdfb.c:1.3 Sun Mar 17 04:03:17 2019
+++ src/sys/dev/ic/ssdfb.c Thu May 30 07:37:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ssdfb.c,v 1.3 2019/03/17 04:03:17 tnn Exp $ */
+/* $NetBSD: ssdfb.c,v 1.4 2019/05/30 07:37:17 tnn Exp $ */
/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -30,13 +30,14 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ssdfb.c,v 1.3 2019/03/17 04:03:17 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ssdfb.c,v 1.4 2019/05/30 07:37:17 tnn Exp $");
#include "opt_ddb.h"
#include
#include
#include
+#include
#include
#include
#include
@@ -300,7 +301,7 @@ ssdfb_attach(struct ssdfb_softc *sc, int
if (sc->sc_is_console)
ssdfb_set_usepoll(sc, true);
- mutex_init(>sc_cond_mtx, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(>sc_cond_mtx, MUTEX_DEFAULT, IPL_VM);
cv_init(>sc_cond, "ssdfb");
error = kthread_create(PRI_SOFTCLOCK, KTHREAD_MPSAFE | KTHREAD_MUSTJOIN,
NULL, ssdfb_thread, sc, >sc_thread, "%s",
@@ -989,7 +990,7 @@ ssdfb_pick_font(int *cookiep, struct wsd
uint8_t d[4][2] = {{5, 8}, {8, 8}, {8, 10} ,{8, 16}};
/*
- * Try to find fonts in order of inreasing size.
+ * Try to find fonts in order of increasing size.
*/
wsfont_init();
for(i = 0; i < __arraycount(d); i++) {
CVS commit: src/sys/dev/ic
Module Name:src Committed By: tnn Date: Thu May 30 07:37:17 UTC 2019 Modified Files: src/sys/dev/ic: ssdfb.c Log Message: - include uvm.h before uvm_device.h - don't need IPL_SCHED here To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/ic/ssdfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/gdbscripts
Module Name:src Committed By: mrg Date: Thu May 30 07:17:35 UTC 2019 Modified Files: src/sys/gdbscripts: lwps Log Message: fix some minor issues in these user functions, and add more to investigate lwps/processes: - fix header formatting - separate proc and thread info - add per-thread and per-proc functions, use them as building blocks for the existing functions; - 'threadinfo' to display just one thread, - 'procthreadsaddr' to display one process by struct proc * - 'procthreadspid' to find process by pid - add 'procs' as a ps(1) a-like To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/gdbscripts/lwps Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/gdbscripts/lwps diff -u src/sys/gdbscripts/lwps:1.4 src/sys/gdbscripts/lwps:1.5 --- src/sys/gdbscripts/lwps:1.4 Sat Feb 5 14:12:05 2011 +++ src/sys/gdbscripts/lwps Thu May 30 07:17:35 2019 @@ -1,4 +1,4 @@ -# $NetBSD: lwps,v 1.4 2011/02/05 14:12:05 yamt Exp $ +# $NetBSD: lwps,v 1.5 2019/05/30 07:17:35 mrg Exp $ define lwps set $i = 0 @@ -8,7 +8,7 @@ define lwps set $p = allproc.lh_first end if ($p) - printf "\t lwp pid lid flagwchan\n" + printf "\t lwp pid lid flag wchan\n" end while ($p) set $l = $p->p_lwps.lh_first @@ -34,35 +34,89 @@ document lwps ps for lwps end -define threadlist - set $i = 0 +define procs + set $p = allproc.lh_first - while ($i < 2) - if ($i == 0) - set $p = allproc.lh_first - end - while ($p) - set $l = $p->p_lwps.lh_first - set $j = 0 - while ($j < $p->p_nlwps) - printf "\n" - printf "proc: %16lx %5d %8x %4x %5d %16lx %s", \ -$p, $p->p_pid, \ -$p->p_flag, $p->p_stat, $p->p_nlwps, $p->p_lwps.lh_first, \ -(char *) $p->p_comm - printf "\n" -printf "Thread: %16lx %5d %5d %8x %16lx\n", \ - $l, $p->p_pid, $l->l_lid, $l->l_flag, $l->l_wchan - kvm proc $l -where - printf "\n" - printf "\n" -set $l = $l->l_sibling.le_next -set $j++ - end - set $p = $p->p_list.le_next + printf " paddr pid flag statn firstlwp command\n" + while ($p) + printf "%16lx %5d %8x %4x %5d %16lx %16s\n", \ + $p, $p->p_pid, $p->p_flag, $p->p_stat, \ + $nlwps, $p->p_lwps.lh_first, \ + (char *) $p->p_comm + set $p = $p->p_list.le_next + end +end +document procs +Show one line summary of all processes (ps) +end + +define threadinfo + set $l = (struct lwp *)$arg0 + set $pid = $arg1 + + set $j = 0 + set $n = $l->l_name + #if ($n == 0) + # set $n = (char *)"" + #end + printf " laddr pid lid flag wchan\n" + printf "%16lx %5d %5d %8x %16lx", \ + $l, $pid, $l->l_lid, $l->l_flag, $l->l_wchan + if ($n != 0) + printf " %16s", $n + end +printf "\n\n" +kvm proc $l + where +printf "\n" +end +document threadinfo +Print out the stack and other data of a single thread. +end + +define procthreadsaddr + set $p = (struct proc *)$arg0 + set $l = $p->p_lwps.lh_first + set $nlwps = $p->p_nlwps + set $pid = $p->p_pid + + printf " paddr pid flag statn firstlwp command\n" + printf "%16lx %5d %8x %4x %5d %16lx %16s\n\n", \ + $p, $pid, $p->p_flag, $p->p_stat, \ + $nlwps, $p->p_lwps.lh_first, \ + (char *) $p->p_comm + while ($l) + threadinfo $l $pid + set $l = $l->l_sibling.le_next + set $j++ + end +end +document procthreadsaddr +Print out the stack of all threads in a particular process, +found via struct proc * address. +end + +define procthreadspid + set $pid = (unsigned)$arg0 + set $p = allproc.lh_first + while ($p) + if ($pid == $p->p_pid) + procthreadsaddr $p + loop_break end - set $i++ + set $p = $p->p_list.le_next + end +end +document procthreadspid +Print out the stack of all threads in a particular process, +found via PID. +end + +define threadlist + set $p = allproc.lh_first + while ($p) + procthreadsaddr $p + set $p = $p->p_list.le_next end end document threadlist
CVS commit: src/sys/gdbscripts
Module Name:src Committed By: mrg Date: Thu May 30 07:17:35 UTC 2019 Modified Files: src/sys/gdbscripts: lwps Log Message: fix some minor issues in these user functions, and add more to investigate lwps/processes: - fix header formatting - separate proc and thread info - add per-thread and per-proc functions, use them as building blocks for the existing functions; - 'threadinfo' to display just one thread, - 'procthreadsaddr' to display one process by struct proc * - 'procthreadspid' to find process by pid - add 'procs' as a ps(1) a-like To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/gdbscripts/lwps Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
