CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Mon Apr 2 07:30:34 UTC 2018 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add Intel X299 and Z370 LPC. To generate a diff of this commit: cvs rdiff -u -r1.1323 -r1.1324 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.1323 src/sys/dev/pci/pcidevs:1.1324 --- src/sys/dev/pci/pcidevs:1.1323 Sat Mar 31 14:39:47 2018 +++ src/sys/dev/pci/pcidevs Mon Apr 2 07:30:34 2018 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1323 2018/03/31 14:39:47 sevan Exp $ +$NetBSD: pcidevs,v 1.1324 2018/04/02 07:30:34 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -5178,6 +5178,8 @@ product INTEL 2HS_LPC_Z27 0xa2c5 Z270 LP product INTEL 2HS_LPC_Q27 0xa2c6 Q270 LPC product INTEL 2HS_LPC_Q25 0xa2c7 Q250 LPC product INTEL 2HS_LPC_B25 0xa2c8 B250 LPC +product INTEL 2HS_LPC_Z37 0xa2c9 Z370 LPC +product INTEL 2HS_LPC_X29 0xa2d2 X299 LPC product INTEL 2HS_I2C_0 0xa2e0 200 Series I2C 0 product INTEL 2HS_I2C_1 0xa2e1 200 Series I2C 1 product INTEL 2HS_I2C_2 0xa2e2 200 Series I2C 2
CVS commit: [netbsd-8] src/sys/arch/x86/x86
Module Name:src
Committed By: martin
Date: Mon Apr 2 08:43:58 UTC 2018
Modified Files:
src/sys/arch/x86/x86 [netbsd-8]: svs.c
Log Message:
Pull up the following revisions, requested by maxv in ticket #683:
sys/arch/x86/x86/svs.c 1.15-1.17
Fix sysctl type, should be bool.
Use EOPNOTSUPP instead of EINVAL.
Improve the detection. Future generations of Intel CPUs will have a bit to
say they are not affected by Meltdown.
To generate a diff of this commit:
cvs rdiff -u -r1.14.2.2 -r1.14.2.3 src/sys/arch/x86/x86/svs.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/svs.c
diff -u src/sys/arch/x86/x86/svs.c:1.14.2.2 src/sys/arch/x86/x86/svs.c:1.14.2.3
--- src/sys/arch/x86/x86/svs.c:1.14.2.2 Thu Mar 22 16:59:04 2018
+++ src/sys/arch/x86/x86/svs.c Mon Apr 2 08:43:58 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: svs.c,v 1.14.2.2 2018/03/22 16:59:04 martin Exp $ */
+/* $NetBSD: svs.c,v 1.14.2.3 2018/04/02 08:43:58 martin Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: svs.c,v 1.14.2.2 2018/03/22 16:59:04 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svs.c,v 1.14.2.3 2018/04/02 08:43:58 martin Exp $");
#include "opt_svs.h"
@@ -720,9 +720,10 @@ int
sysctl_machdep_svs_enabled(SYSCTLFN_ARGS)
{
struct sysctlnode node;
- int error, val;
+ int error;
+ bool val;
- val = *(int *)rnode->sysctl_data;
+ val = *(bool *)rnode->sysctl_data;
node = *rnode;
node.sysctl_data = &val;
@@ -732,7 +733,10 @@ sysctl_machdep_svs_enabled(SYSCTLFN_ARGS
return error;
if (val == 1) {
- error = EINVAL;
+ if (svs_enabled)
+ error = 0;
+ else
+ error = EOPNOTSUPP;
} else {
if (svs_enabled)
error = svs_disable();
@@ -746,8 +750,21 @@ sysctl_machdep_svs_enabled(SYSCTLFN_ARGS
void
svs_init(void)
{
+ uint64_t msr;
+
if (cpu_vendor != CPUVENDOR_INTEL) {
return;
}
+ if (cpu_info_primary.ci_feat_val[7] & CPUID_SEF_ARCH_CAP) {
+ msr = rdmsr(MSR_IA32_ARCH_CAPABILITIES);
+ if (msr & IA32_ARCH_RDCL_NO) {
+ /*
+ * The processor indicates it is not vulnerable to the
+ * Rogue Data Cache Load (Meltdown) flaw.
+ */
+ return;
+ }
+ }
+
svs_enable();
}
CVS commit: [netbsd-8] src/sys/arch/i386/stand/efiboot
Module Name:src
Committed By: martin
Date: Mon Apr 2 08:50:33 UTC 2018
Modified Files:
src/sys/arch/i386/stand/efiboot [netbsd-8]: Makefile.efiboot boot.c
efiboot.c efiboot.h eficons.c efidelay.c efidisk.c efimemory.c
src/sys/arch/i386/stand/efiboot/bootia32 [netbsd-8]: efibootia32.c
src/sys/arch/i386/stand/efiboot/bootx64 [netbsd-8]: efibootx64.c
Added Files:
src/sys/arch/i386/stand/efiboot [netbsd-8]: efichar.c
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #685):
sys/arch/i386/stand/efiboot/efidisk.c: revision 1.4
sys/arch/i386/stand/efiboot/bootx64/efibootx64.c: revision 1.4
sys/arch/i386/stand/efiboot/eficons.c: revision 1.5
sys/arch/i386/stand/efiboot/efichar.c: revision 1.1
sys/arch/i386/stand/efiboot/bootia32/efibootia32.c: revision 1.4
sys/arch/i386/stand/efiboot/boot.c: revision 1.8
sys/arch/i386/stand/efiboot/efimemory.c: revision 1.5
sys/arch/i386/stand/efiboot/efiboot.c: revision 1.6
sys/arch/i386/stand/efiboot/efidelay.c: revision 1.2
sys/arch/i386/stand/efiboot/efiboot.h: revision 1.7
sys/arch/i386/stand/efiboot/Makefile.efiboot: revision 1.11
efiboot: Added serial console support.
To generate a diff of this commit:
cvs rdiff -u -r1.9.2.1 -r1.9.2.2 \
src/sys/arch/i386/stand/efiboot/Makefile.efiboot
cvs rdiff -u -r1.5.2.2 -r1.5.2.3 src/sys/arch/i386/stand/efiboot/boot.c
cvs rdiff -u -r1.4.10.1 -r1.4.10.2 src/sys/arch/i386/stand/efiboot/efiboot.c
cvs rdiff -u -r1.5.2.1 -r1.5.2.2 src/sys/arch/i386/stand/efiboot/efiboot.h
cvs rdiff -u -r0 -r1.1.4.2 src/sys/arch/i386/stand/efiboot/efichar.c
cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/arch/i386/stand/efiboot/eficons.c
cvs rdiff -u -r1.1 -r1.1.12.1 src/sys/arch/i386/stand/efiboot/efidelay.c
cvs rdiff -u -r1.1.12.2 -r1.1.12.3 src/sys/arch/i386/stand/efiboot/efidisk.c
cvs rdiff -u -r1.4 -r1.4.10.1 src/sys/arch/i386/stand/efiboot/efimemory.c
cvs rdiff -u -r1.3 -r1.3.2.1 \
src/sys/arch/i386/stand/efiboot/bootia32/efibootia32.c
cvs rdiff -u -r1.3 -r1.3.2.1 \
src/sys/arch/i386/stand/efiboot/bootx64/efibootx64.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/i386/stand/efiboot/Makefile.efiboot
diff -u src/sys/arch/i386/stand/efiboot/Makefile.efiboot:1.9.2.1 src/sys/arch/i386/stand/efiboot/Makefile.efiboot:1.9.2.2
--- src/sys/arch/i386/stand/efiboot/Makefile.efiboot:1.9.2.1 Tue Mar 13 14:54:52 2018
+++ src/sys/arch/i386/stand/efiboot/Makefile.efiboot Mon Apr 2 08:50:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.efiboot,v 1.9.2.1 2018/03/13 14:54:52 martin Exp $
+# $NetBSD: Makefile.efiboot,v 1.9.2.2 2018/04/02 08:50:33 martin Exp $
S= ${.CURDIR}/../../../../..
@@ -12,7 +12,7 @@ SOURCES?= start.S conf.c devopen.c efibo
LIBI386SRCS= boot.c biosdisk.c bootinfo.c bootinfo_biosgeom.c
LIBI386SRCS+= bootmenu.c diskbuf.c exec.c menuutils.c
LIBI386SRCS+= panic.c parseutils.c pread.c
-LIBI386SRCS+= eficons.c efidelay.c efidev.c efidisk.c efidisk_ll.c
+LIBI386SRCS+= efichar.c eficons.c efidelay.c efidev.c efidisk.c efidisk_ll.c
LIBI386SRCS+= efigetsecs.c efimemory.c
SRCS= ${SOURCES} ${EXTRA_SOURCES} ${LIBI386SRCS}
Index: src/sys/arch/i386/stand/efiboot/boot.c
diff -u src/sys/arch/i386/stand/efiboot/boot.c:1.5.2.2 src/sys/arch/i386/stand/efiboot/boot.c:1.5.2.3
--- src/sys/arch/i386/stand/efiboot/boot.c:1.5.2.2 Wed Mar 21 10:50:49 2018
+++ src/sys/arch/i386/stand/efiboot/boot.c Mon Apr 2 08:50:33 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.5.2.2 2018/03/21 10:50:49 martin Exp $ */
+/* $NetBSD: boot.c,v 1.5.2.3 2018/04/02 08:50:33 martin Exp $ */
/*-
* Copyright (c) 2016 Kimihiro Nonaka
@@ -463,11 +463,16 @@ command_consdev(char *arg)
char *sep, *sep2 = NULL;
int ioport, speed = 0;
+ if (*arg == '\0') {
+ efi_cons_show();
+ return;
+ }
+
sep = strchr(arg, ',');
if (sep != NULL) {
*sep++ = '\0';
sep2 = strchr(sep, ',');
- if (sep != NULL)
+ if (sep2 != NULL)
*sep2++ = '\0';
}
@@ -555,6 +560,8 @@ void
command_version(char *arg)
{
CHAR16 *path;
+ char *upath, *ufirmware;
+ int rv;
if (strcmp(arg, "full") == 0) {
printf("ImageBase: 0x%" PRIxPTR "\n",
@@ -562,12 +569,24 @@ command_version(char *arg)
printf("Stack: 0x%" PRIxPTR "\n", efi_main_sp);
printf("EFI version: %d.%02d\n",
ST->Hdr.Revision >> 16, ST->Hdr.Revision & 0x);
- Print(L"EFI Firmware: %s (rev %d.%02d)\n", ST->FirmwareVendor,
- ST->FirmwareRevision >> 16, ST->FirmwareRevision & 0x);
+ ufirmware = NULL;
+ rv = ucs2_to_utf8(ST->FirmwareVendor, &ufirmware);
+ if (rv == 0) {
+ printf("EFI Firmware: %s (rev %d.%02d)\n", ufirmware,
+ ST->FirmwareRevision >> 16,
+ ST->FirmwareRevision & 0x);
+ FreePool(ufirmware);
+ }
path = DevicePathToStr(efi_bootdp);
- Print(L"Boot DevicePath: %d:%d:%s\n", DevicePathType(efi_bootdp),
CVS commit: [netbsd-8] src/sys
Module Name:src
Committed By: martin
Date: Mon Apr 2 08:54:35 UTC 2018
Modified Files:
src/sys/netinet [netbsd-8]: if_arp.c
src/sys/netinet6 [netbsd-8]: nd6_nbr.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #686):
sys/netinet/if_arp.c: revision 1.271
sys/netinet6/nd6_nbr.c: revision 1.151,1.152
Avoid passing NULL to nd6_dad_duplicated
Fix PR kern/53075
Fix a race condition on DAD destructions (again)
The previous fix to DAD timers was wrong; it avoided a use-after-free but
instead introduced a memory leak. The destruction method had delegated
a destruction of a DAD timer to the timer itself and told that by setting NULL
to dp->dad_ifa. However, the previous fix made DAD timers do nothing on
the sign.
Fixing the issue with using callout_stop isn't easy. One approach is to have
a refcount on dp but it introduces extra complexity that we want to avoid.
The new fix falls back to using callout_halt, which was abandoned because of
softnet_lock. Fortunately now the network stack is protected by KERNEL_LOCK
so we can remove softnet_lock from DAD timers (callout) and use callout_halt
safely.
To generate a diff of this commit:
cvs rdiff -u -r1.250.2.7 -r1.250.2.8 src/sys/netinet/if_arp.c
cvs rdiff -u -r1.138.6.5 -r1.138.6.6 src/sys/netinet6/nd6_nbr.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/netinet/if_arp.c
diff -u src/sys/netinet/if_arp.c:1.250.2.7 src/sys/netinet/if_arp.c:1.250.2.8
--- src/sys/netinet/if_arp.c:1.250.2.7 Tue Mar 13 13:27:10 2018
+++ src/sys/netinet/if_arp.c Mon Apr 2 08:54:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arp.c,v 1.250.2.7 2018/03/13 13:27:10 martin Exp $ */
+/* $NetBSD: if_arp.c,v 1.250.2.8 2018/04/02 08:54:35 martin Exp $ */
/*-
* Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.250.2.7 2018/03/13 13:27:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.250.2.8 2018/04/02 08:54:35 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -1539,14 +1539,24 @@ arp_dad_starttimer(struct dadq *dp, int
}
static void
-arp_dad_destroytimer(struct dadq *dp)
+arp_dad_stoptimer(struct dadq *dp)
{
+ KASSERT(mutex_owned(&arp_dad_lock));
+
TAILQ_REMOVE(&dadq, dp, dad_list);
- /* Request the timer to destroy dp. */
+ /* Tell the timer that dp is being destroyed. */
dp->dad_ifa = NULL;
- callout_reset(&dp->dad_timer_ch, 0,
- (void (*)(void *))arp_dad_timer, dp);
+ callout_halt(&dp->dad_timer_ch, &arp_dad_lock);
+}
+
+static void
+arp_dad_destroytimer(struct dadq *dp)
+{
+
+ callout_destroy(&dp->dad_timer_ch);
+ KASSERT(dp->dad_ifa == NULL);
+ kmem_intr_free(dp, sizeof(*dp));
}
static void
@@ -1665,11 +1675,11 @@ arp_dad_stop(struct ifaddr *ifa)
return;
}
- /* Prevent the timer from running anymore. */
- arp_dad_destroytimer(dp);
+ arp_dad_stoptimer(dp);
mutex_exit(&arp_dad_lock);
+ arp_dad_destroytimer(dp);
ifafree(ifa);
}
@@ -1681,15 +1691,12 @@ arp_dad_timer(struct dadq *dp)
char ipbuf[INET_ADDRSTRLEN];
bool need_free = false;
- SOFTNET_KERNEL_LOCK_UNLESS_NET_MPSAFE();
+ KERNEL_LOCK_UNLESS_NET_MPSAFE();
mutex_enter(&arp_dad_lock);
ifa = dp->dad_ifa;
if (ifa == NULL) {
- /*
- * ifa is being deleted and the callout is already scheduled
- * again, so we cannot destroy dp in this run.
- */
+ /* dp is being destroyed by someone. Do nothing. */
goto done;
}
@@ -1713,7 +1720,7 @@ arp_dad_timer(struct dadq *dp)
ARPLOG(LOG_INFO, "%s: could not run DAD, driver problem?\n",
if_name(ifa->ifa_ifp));
- TAILQ_REMOVE(&dadq, dp, dad_list);
+ arp_dad_stoptimer(dp);
need_free = true;
goto done;
}
@@ -1762,19 +1769,18 @@ announce:
if_name(ifa->ifa_ifp), ARPLOGADDR(&ia->ia_addr.sin_addr));
}
- TAILQ_REMOVE(&dadq, dp, dad_list);
+ arp_dad_stoptimer(dp);
need_free = true;
done:
mutex_exit(&arp_dad_lock);
if (need_free) {
- callout_destroy(&dp->dad_timer_ch);
- kmem_intr_free(dp, sizeof(*dp));
- if (ifa != NULL)
- ifafree(ifa);
+ arp_dad_destroytimer(dp);
+ KASSERT(ifa != NULL);
+ ifafree(ifa);
}
- SOFTNET_KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
+ KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
}
static void
Index: src/sys/netinet6/nd6_nbr.c
diff -u src/sys/netinet6/nd6_nbr.c:1.138.6.5 src/sys/netinet6/nd6_nbr.c:1.138.6.6
--- src/sys/netinet6/nd6_nbr.c:1.138.6.5 Tue Mar 20 09:13:15 2018
+++ src/sys/netinet6/nd6_nbr.c Mon Apr 2 08:54:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6_nbr.c,v 1.138.6.5 2018/03/20 09:13:15 bouyer Exp $ */
+/* $NetBSD: nd6_nbr.c,v 1.138.6.6 2018/04/02 08:54:35 martin Exp $ */
/* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.138.6.5 2018/03/20 09:13:15 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_
CVS commit: [netbsd-8] src
Module Name:src Committed By: martin Date: Mon Apr 2 09:07:53 UTC 2018 Modified Files: src/share/man/man4 [netbsd-8]: ddb.4 src/sys/arch/x86/x86 [netbsd-8]: db_memrw.c src/sys/ddb [netbsd-8]: db_command.c src/sys/kern [netbsd-8]: kern_mutex.c kern_mutex_obj.c kern_rwlock.c kern_rwlock_obj.c subr_lockdebug.c subr_xcall.c src/sys/rump/librump/rumpkern [netbsd-8]: locks.c src/sys/sys [netbsd-8]: lockdebug.h Log Message: Pull up following revision(s) (requested by ozaki-r in ticket #687): sys/kern/kern_rwlock_obj.c: revision 1.4 sys/rump/librump/rumpkern/locks.c: revision 1.80 sys/kern/kern_rwlock.c: revision 1.50 sys/arch/x86/x86/db_memrw.c: revision 1.5,1.6 sys/ddb/db_command.c: revision 1.150-1.153 share/man/man4/ddb.4: revision 1.175 (via patch),1.176-1.178 sys/kern/kern_mutex_obj.c: revision 1.6 sys/kern/subr_lockdebug.c: revision 1.61-1.64 sys/sys/lockdebug.h: revision 1.17 sys/kern/kern_mutex.c: revision 1.71 sys/sys/lockdebug.h: revision 1.18,1.19 sys/kern/subr_xcall.c: revision 1.26 Obtain proper initialized addresses of locks allocated by mutex_obj_alloc or rw_obj_alloc Initialized addresses of locks allocated by mutex_obj_alloc or rw_obj_alloc were not useful because the addresses were mutex_obj_alloc or rw_obj_alloc itself. What we want to know are callers of them. Spinkle ASSERT_SLEEPABLE to xcall functions Use db_printf instead of printf in ddb Add a new command, show lockstat, which shows statistics of locks Currently the command shows the number of allocated locks. The command is useful only if LOCKDEBUG is enabled. Add a new command, show all locks, which shows information of active locks The command shows information of all active (i.e., being held) locks that are tracked through either of LWPs or CPUs by the LOCKDEBUG facility. The /t modifier additionally shows a backtrace for each LWP additionally. This feature is useful for debugging especially to analyze deadlocks. The command is useful only if LOCKDEBUG is enabled. Don't pass a unset address to lockdebug_lock_print x86: avoid accessing invalid addresses in ddb like arm32 This avoids that a command stops in the middle of an execution if a fault occurs due to an access to an invalid address. Get rid of a redundant output Improve wording. Fix a Cm argument. ddb: rename "show lockstat" to "show lockstats" to avoid conflicting with lockstat(8) Requested by mrg@ To generate a diff of this commit: cvs rdiff -u -r1.166 -r1.166.6.1 src/share/man/man4/ddb.4 cvs rdiff -u -r1.2 -r1.2.10.1 src/sys/arch/x86/x86/db_memrw.c cvs rdiff -u -r1.148 -r1.148.8.1 src/sys/ddb/db_command.c cvs rdiff -u -r1.65.2.1 -r1.65.2.2 src/sys/kern/kern_mutex.c cvs rdiff -u -r1.5 -r1.5.46.1 src/sys/kern/kern_mutex_obj.c cvs rdiff -u -r1.46.6.1 -r1.46.6.2 src/sys/kern/kern_rwlock.c cvs rdiff -u -r1.3 -r1.3.48.1 src/sys/kern/kern_rwlock_obj.c cvs rdiff -u -r1.57 -r1.57.2.1 src/sys/kern/subr_lockdebug.c cvs rdiff -u -r1.19.8.1 -r1.19.8.2 src/sys/kern/subr_xcall.c cvs rdiff -u -r1.74.2.1 -r1.74.2.2 src/sys/rump/librump/rumpkern/locks.c cvs rdiff -u -r1.15 -r1.15.6.1 src/sys/sys/lockdebug.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/ddb.4 diff -u src/share/man/man4/ddb.4:1.166 src/share/man/man4/ddb.4:1.166.6.1 --- src/share/man/man4/ddb.4:1.166 Thu Jan 12 13:14:41 2017 +++ src/share/man/man4/ddb.4 Mon Apr 2 09:07:52 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: ddb.4,v 1.166 2017/01/12 13:14:41 wiz Exp $ +.\" $NetBSD: ddb.4,v 1.166.6.1 2018/04/02 09:07:52 martin Exp $ .\" .\" Copyright (c) 1997 - 2009 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -56,7 +56,7 @@ .\" any improvements or extensions that they make and grant Carnegie Mellon .\" the rights to redistribute these changes. .\" -.Dd January 12, 2017 +.Dd March 19, 2018 .Dt DDB 4 .Os .Sh NAME @@ -258,7 +258,7 @@ is taken to be 1 for printing commands, .Pp The syntax: .Bd -ragged -offset indent -.Cm , Ns Ar count +.Cm \&, Ns Ar count .Ed .Pp repeats the previous command, just as a blank line does, but with @@ -564,6 +564,13 @@ Display information about callouts in th See .Xr callout 9 for more information on callouts. +.It Ic show all locks Ns Op Cm /t +Display details information about all active locks. +If +.Cm /t +is specified, stack traces of LWPs holding locks are also printed. +This command is only useful if a kernel is compiled with +.Cd options LOCKDEBUG . .It Ic show all pages Display basic information about all physical pages managed by the VM system. For more detailed information about a single page, use @@ -656,7 +663,11 @@ be displayed. .It Ic show lock Ar address Display information about a lock at .Ar address . -This command is useful only if a kernel is compiled with +This command
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Apr 2 09:11:54 UTC 2018 Modified Files: src/doc [netbsd-8]: CHANGES-8.0 Log Message: Tickets #683, #685, #686, #687 To generate a diff of this commit: cvs rdiff -u -r1.1.2.159 -r1.1.2.160 src/doc/CHANGES-8.0 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.0 diff -u src/doc/CHANGES-8.0:1.1.2.159 src/doc/CHANGES-8.0:1.1.2.160 --- src/doc/CHANGES-8.0:1.1.2.159 Sun Apr 1 09:02:51 2018 +++ src/doc/CHANGES-8.0 Mon Apr 2 09:11:54 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.0,v 1.1.2.159 2018/04/01 09:02:51 martin Exp $ +# $NetBSD: CHANGES-8.0,v 1.1.2.160 2018/04/02 09:11:54 martin Exp $ A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04 until the 8.0 release: @@ -10779,3 +10779,53 @@ tools/gcc/gcc-version.mk 1.10 (patch) -mindirect-branch-register [mrg, ticket #682] +sys/arch/x86/x86/svs.c 1.15-1.17 + + Change the type of sysctl machdep.svs.enabled to bool. + If machdep.svs.enabled can not be set to 1, return EOPNOTSUPP. + Improve feature detection. Future generations of Intel CPUs will + have a bit to say they are not affected by Meltdown. + [maxv, #683] + +sys/arch/i386/stand/efiboot/Makefile.efiboot 1.11 +sys/arch/i386/stand/efiboot/boot.c 1.8 +sys/arch/i386/stand/efiboot/bootia32/efibootia32.c 1.4 +sys/arch/i386/stand/efiboot/bootx64/efibootx64.c 1.4 +sys/arch/i386/stand/efiboot/efiboot.c 1.6 +sys/arch/i386/stand/efiboot/efiboot.h 1.7 +sys/arch/i386/stand/efiboot/efichar.c 1.1 +sys/arch/i386/stand/efiboot/eficons.c 1.5 +sys/arch/i386/stand/efiboot/efidelay.c 1.2 +sys/arch/i386/stand/efiboot/efidisk.c 1.4 +sys/arch/i386/stand/efiboot/efimemory.c 1.5 + + efiboot: Add serial console support. + [nonaka, ticket #685] + +sys/netinet/if_arp.c1.271 (patch) +sys/netinet6/nd6_nbr.c1.151,1.152 (patch) + + Avoid passing NULL to nd6_dad_duplicated. + Fix a race condition on DAD destructions. + [ozaki-r, ticket #686] + +share/man/man4/ddb.41.175 (patch)-1.178 +sys/arch/x86/x86/db_memrw.c 1.5,1.6 +sys/ddb/db_command.c1.150-1.153 +sys/kern/kern_mutex.c1.71 +sys/kern/kern_mutex_obj.c 1.6 +sys/kern/kern_rwlock.c1.50 +sys/kern/kern_rwlock_obj.c 1.4 +sys/kern/subr_lockdebug.c 1.61-1.64 +sys/kern/subr_xcall.c1.26 +sys/rump/librump/rumpkern/locks.c 1.80 +sys/sys/lockdebug.h1.17-1.19 + + - Provide proper initialization addresses of + mutex and rwlock that are initialized by + *_obj_alloc APIs + - Add ASSERT_SLEEPABLEs to xcall functions + - Add new commands to ddb, which show statistics + of lock objects and details of active locks + [ozaki-r, ticket #687] +
CVS commit: src/sys
Module Name:src
Committed By: nonaka
Date: Mon Apr 2 09:44:19 UTC 2018
Modified Files:
src/sys/arch/i386/stand/efiboot: TODO.efiboot boot.c devopen.c
devopen.h efidisk.c efidisk.h
src/sys/arch/i386/stand/lib: biosdisk.c biosdisk.h bootmenu.c
bootmenu.h
src/sys/lib/libsa: bootcfg.c bootcfg.h
Log Message:
efiboot: try to read boot.cfg from /EFI/NetBSD on ESP of the booted disk.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/i386/stand/efiboot/TODO.efiboot \
src/sys/arch/i386/stand/efiboot/efidisk.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/i386/stand/efiboot/boot.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/stand/efiboot/devopen.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/i386/stand/efiboot/devopen.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/i386/stand/efiboot/efidisk.h
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/i386/stand/lib/biosdisk.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/i386/stand/lib/biosdisk.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/i386/stand/lib/bootmenu.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/i386/stand/lib/bootmenu.h
cvs rdiff -u -r1.2 -r1.3 src/sys/lib/libsa/bootcfg.c
cvs rdiff -u -r1.1 -r1.2 src/sys/lib/libsa/bootcfg.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/i386/stand/efiboot/TODO.efiboot
diff -u src/sys/arch/i386/stand/efiboot/TODO.efiboot:1.4 src/sys/arch/i386/stand/efiboot/TODO.efiboot:1.5
--- src/sys/arch/i386/stand/efiboot/TODO.efiboot:1.4 Thu Mar 8 10:34:33 2018
+++ src/sys/arch/i386/stand/efiboot/TODO.efiboot Mon Apr 2 09:44:18 2018
@@ -1,6 +1,5 @@
- efiboot
* handle UEFI variables
- * load boot.cfg from EFI system partition (FAT32)
- kernel
* handle UEFI variables (/dev/efivar)
Index: src/sys/arch/i386/stand/efiboot/efidisk.c
diff -u src/sys/arch/i386/stand/efiboot/efidisk.c:1.4 src/sys/arch/i386/stand/efiboot/efidisk.c:1.5
--- src/sys/arch/i386/stand/efiboot/efidisk.c:1.4 Tue Mar 27 14:15:05 2018
+++ src/sys/arch/i386/stand/efiboot/efidisk.c Mon Apr 2 09:44:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: efidisk.c,v 1.4 2018/03/27 14:15:05 nonaka Exp $ */
+/* $NetBSD: efidisk.c,v 1.5 2018/04/02 09:44:18 nonaka Exp $ */
/*-
* Copyright (c) 2016 Kimihiro Nonaka
@@ -213,3 +213,37 @@ get_harddrives(void)
{
return nefidisks;
}
+
+int
+efidisk_get_efi_system_partition(int dev, int *partition)
+{
+ extern const struct uuid GET_efi;
+ const struct efidiskinfo *edi;
+ struct biosdisk_partition *part;
+ int i, nparts;
+
+ edi = efidisk_getinfo(dev);
+ if (edi == NULL)
+ return ENXIO;
+
+ if (edi->type != BIOSDISK_TYPE_HD)
+ return ENOTSUP;
+
+ if (biosdisk_readpartition(edi->dev, &part, &nparts))
+ return EIO;
+
+ for (i = 0; i < nparts; i++) {
+ if (part[i].size == 0)
+ continue;
+ if (part[i].fstype == FS_UNUSED)
+ continue;
+ if (guid_is_equal(part[i].guid->guid, &GET_efi))
+ break;
+ }
+ dealloc(part, sizeof(*part) * nparts);
+ if (i == nparts)
+ return ENOENT;
+
+ *partition = i;
+ return 0;
+}
Index: src/sys/arch/i386/stand/efiboot/boot.c
diff -u src/sys/arch/i386/stand/efiboot/boot.c:1.8 src/sys/arch/i386/stand/efiboot/boot.c:1.9
--- src/sys/arch/i386/stand/efiboot/boot.c:1.8 Tue Mar 27 14:15:05 2018
+++ src/sys/arch/i386/stand/efiboot/boot.c Mon Apr 2 09:44:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.8 2018/03/27 14:15:05 nonaka Exp $ */
+/* $NetBSD: boot.c,v 1.9 2018/04/02 09:44:18 nonaka Exp $ */
/*-
* Copyright (c) 2016 Kimihiro Nonaka
@@ -55,7 +55,9 @@ static const char * const names[][2] = {
#define NUMNAMES __arraycount(names)
#define DEFFILENAME names[0][0]
-#define MAXDEVNAME 16
+#ifndef EFIBOOTCFG_FILENAME
+#define EFIBOOTCFG_FILENAME "esp:/EFI/NetBSD/boot.cfg"
+#endif
void command_help(char *);
void command_quit(char *);
@@ -273,6 +275,10 @@ boot(void)
default_filename = DEFFILENAME;
if (!(boot_params.bp_flags & X86_BP_FLAGS_NOBOOTCONF)) {
+#ifdef EFIBOOTCFG_FILENAME
+ int rv = parsebootconf(EFIBOOTCFG_FILENAME);
+ if (rv)
+#endif
parsebootconf(BOOTCFG_FILENAME);
} else {
bootcfg_info.timeout = boot_params.bp_timeout;
Index: src/sys/arch/i386/stand/efiboot/devopen.c
diff -u src/sys/arch/i386/stand/efiboot/devopen.c:1.3 src/sys/arch/i386/stand/efiboot/devopen.c:1.4
--- src/sys/arch/i386/stand/efiboot/devopen.c:1.3 Tue Mar 20 10:16:17 2018
+++ src/sys/arch/i386/stand/efiboot/devopen.c Mon Apr 2 09:44:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: devopen.c,v 1.3 2018/03/20 10:16:17 nonaka Exp $ */
+/* $NetBSD: devopen.c,v 1.4 2018/04/02 09:44:18 nonaka Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -59,6 +59,7 @@
#include
#include "devopen.h"
#include
+#include "efidisk.h"
static int
dev2bios(char *devname, int unit, int *biosdev)
@@ -103,9 +104,20 @@ devopen(struct open_file *f, const char
int biosdev;
int error;
- if ((error = parsebootfile(fname, &fsname, &devname,
- &unit, &partition, (co
CVS commit: [netbsd-8] src/tests/net
Module Name:src
Committed By: martin
Date: Mon Apr 2 09:51:58 UTC 2018
Modified Files:
src/tests/net/if_tap [netbsd-8]: t_tap.sh
src/tests/net/ndp [netbsd-8]: t_ndp.sh
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #688):
tests/net/ndp/t_ndp.sh: revision 1.31
tests/net/if_tap/t_tap.sh: revision 1.8
Avoid setting IP addresses of the same subnet on different interface
If we do so, there will remain one route that is of a preceding address, but
that behavior is not documented and may be changed in the future. Tests
shouldn't rely on such a unstable behavior.
To generate a diff of this commit:
cvs rdiff -u -r1.6.6.1 -r1.6.6.2 src/tests/net/if_tap/t_tap.sh
cvs rdiff -u -r1.19.2.1 -r1.19.2.2 src/tests/net/ndp/t_ndp.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/if_tap/t_tap.sh
diff -u src/tests/net/if_tap/t_tap.sh:1.6.6.1 src/tests/net/if_tap/t_tap.sh:1.6.6.2
--- src/tests/net/if_tap/t_tap.sh:1.6.6.1 Mon Feb 26 00:41:14 2018
+++ src/tests/net/if_tap/t_tap.sh Mon Apr 2 09:51:58 2018
@@ -1,4 +1,4 @@
-# $NetBSD: t_tap.sh,v 1.6.6.1 2018/02/26 00:41:14 snj Exp $
+# $NetBSD: t_tap.sh,v 1.6.6.2 2018/04/02 09:51:58 martin Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -82,10 +82,6 @@ tap_stand_alone_body()
atf_check -s exit:0 rump.ifconfig shmif0 $IP4_LOCAL
atf_check -s exit:0 rump.ifconfig shmif0 inet6 $IP6_LOCAL
atf_check -s exit:0 rump.ifconfig shmif0 up
- atf_check -s exit:0 rump.ifconfig tap0 create
- atf_check -s exit:0 rump.ifconfig tap0 $IP4_TAP
- atf_check -s exit:0 rump.ifconfig tap0 inet6 $IP6_TAP
- atf_check -s exit:0 rump.ifconfig tap0 up
atf_check -s exit:0 rump.ifconfig -w 10
export RUMP_SERVER=${SOCK_REMOTE}
@@ -96,14 +92,23 @@ tap_stand_alone_body()
atf_check -s exit:0 rump.ifconfig -w 10
atf_check -s exit:0 -o ignore rump.ping -n -w $TIMEOUT -c 1 $IP4_LOCAL
- # Cannot reach to an alone tap
- atf_check -s not-exit:0 -o ignore -e ignore \
- rump.ping -n -w $TIMEOUT -c 1 $IP4_TAP
-
atf_check -s exit:0 -o ignore rump.ping6 -n -X $TIMEOUT -c 1 $IP6_LOCAL
+
+ export RUMP_SERVER=${SOCK_LOCAL}
+ atf_check -s exit:0 rump.ifconfig shmif0 $IP4_LOCAL delete
+ atf_check -s exit:0 rump.ifconfig shmif0 inet6 $IP6_LOCAL delete
+ atf_check -s exit:0 rump.ifconfig tap0 create
+ atf_check -s exit:0 rump.ifconfig tap0 $IP4_TAP
+ atf_check -s exit:0 rump.ifconfig tap0 inet6 $IP6_TAP
+ atf_check -s exit:0 rump.ifconfig tap0 up
+ atf_check -s exit:0 rump.ifconfig -w 10
+
+ export RUMP_SERVER=${SOCK_REMOTE}
# Cannot reach to an alone tap
atf_check -s not-exit:0 -o ignore -e ignore \
rump.ping6 -n -X $TIMEOUT -c 1 $IP6_TAP
+ atf_check -s not-exit:0 -o ignore -e ignore \
+ rump.ping -n -w $TIMEOUT -c 1 $IP4_TAP
rump_server_destroy_ifaces
}
Index: src/tests/net/ndp/t_ndp.sh
diff -u src/tests/net/ndp/t_ndp.sh:1.19.2.1 src/tests/net/ndp/t_ndp.sh:1.19.2.2
--- src/tests/net/ndp/t_ndp.sh:1.19.2.1 Fri Jul 7 13:57:26 2017
+++ src/tests/net/ndp/t_ndp.sh Mon Apr 2 09:51:58 2018
@@ -1,4 +1,4 @@
-# $NetBSD: t_ndp.sh,v 1.19.2.1 2017/07/07 13:57:26 martin Exp $
+# $NetBSD: t_ndp.sh,v 1.19.2.2 2018/04/02 09:51:58 martin Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -490,7 +490,7 @@ ndp_purge_on_route_change_body()
rump_server_add_iface $SOCKSRC shmif1 bus1
export RUMP_SERVER=$SOCKSRC
- atf_check -s exit:0 rump.ifconfig shmif1 inet6 $IP6SRC2
+ atf_check -s exit:0 rump.ifconfig shmif1 inet6 fc00:1::1
atf_check -s exit:0 rump.ifconfig -w 10
$DEBUG && rump.netstat -nr -f inet6
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Apr 2 09:53:08 UTC 2018 Modified Files: src/doc [netbsd-8]: CHANGES-8.0 Log Message: Ticket #688 To generate a diff of this commit: cvs rdiff -u -r1.1.2.160 -r1.1.2.161 src/doc/CHANGES-8.0 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.0 diff -u src/doc/CHANGES-8.0:1.1.2.160 src/doc/CHANGES-8.0:1.1.2.161 --- src/doc/CHANGES-8.0:1.1.2.160 Mon Apr 2 09:11:54 2018 +++ src/doc/CHANGES-8.0 Mon Apr 2 09:53:08 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.0,v 1.1.2.160 2018/04/02 09:11:54 martin Exp $ +# $NetBSD: CHANGES-8.0,v 1.1.2.161 2018/04/02 09:53:08 martin Exp $ A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04 until the 8.0 release: @@ -10829,3 +10829,9 @@ sys/sys/lockdebug.h1.17-1.19 of lock objects and details of active locks [ozaki-r, ticket #687] +tests/net/if_tap/t_tap.sh 1.8 +tests/net/ndp/t_ndp.sh1.31 + + Avoid setting IP addresses of the same subnet on different interface. + [ozaki-r, ticket #688] +
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src Committed By: sevan Date: Mon Apr 2 10:30:07 UTC 2018 Modified Files: src/crypto/external/bsd/netpgp/dist/src/lib: libnetpgp.3 Log Message: Revert previous change as the typedef should now work as intended. Thanks christos, martin To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 \ src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3 diff -u src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.17 src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.18 --- src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.17 Sun Apr 1 23:25:27 2018 +++ src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3 Mon Apr 2 10:30:06 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: libnetpgp.3,v 1.17 2018/04/01 23:25:27 sevan Exp $ +.\" $NetBSD: libnetpgp.3,v 1.18 2018/04/02 10:30:06 sevan Exp $ .\" .\" Copyright (c) 2009,2010 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd April 02, 2018 +.Dd February 16, 2014 .Dt LIBNETPGP 3 .Os .Sh NAME @@ -41,11 +41,11 @@ The following functions relate to initialisations and finalisations: .Ft int .Fo netpgp_init -.Fa "struct netpgp_t *netpgp" +.Fa "netpgp_t *netpgp" .Fc .Ft int .Fo netpgp_end -.Fa "struct netpgp_t *netpgp" +.Fa "netpgp_t *netpgp" .Fc .Pp The following functions are for debugging, reflection and information: @@ -63,99 +63,99 @@ The following functions are for debuggin .Fc .Ft int .Fo netpgp_list_packets -.Fa "struct netpgp_t *netpgp" "char *filename" "int armour" "char *pubringname" +.Fa "netpgp_t *netpgp" "char *filename" "int armour" "char *pubringname" .Fc .Pp The following functions are for variable management: .Ft int .Fo netpgp_setvar -.Fa "struct netpgp_t *netpgp" "const char *name" "const char *value" +.Fa "netpgp_t *netpgp" "const char *name" "const char *value" .Fc .Ft char * .Fo netpgp_getvar -.Fa "struct netpgp_t *netpgp" "const char *name" +.Fa "netpgp_t *netpgp" "const char *name" .Fc .Ft int .Fo netpgp_incvar -.Fa "struct netpgp_t *netpgp" "const char *name" "const int delta" +.Fa "netpgp_t *netpgp" "const char *name" "const int delta" .Fc .Pp The following function sets the home directory: .Ft int .Fo netpgp_set_homedir -.Fa "struct netpgp_t *netpgp" "char *homedir" "char *subdir" "const int quiet" +.Fa "netpgp_t *netpgp" "char *homedir" "char *subdir" "const int quiet" .Fc .Pp The following functions are used for key management: .Ft int .Fo netpgp_list_keys -.Fa "struct netpgp_t *netpgp" "const int printsigs" +.Fa "netpgp_t *netpgp" "const int printsigs" .Fc .Ft int .Fo netpgp_match_list_keys -.Fa "struct netpgp_t *netpgp" "char *pattern" +.Fa "netpgp_t *netpgp" "char *pattern" .Fc .Ft int .Fo netpgp_find_key -.Fa "struct netpgp_t *netpgp" "char *userid" +.Fa "netpgp_t *netpgp" "char *userid" .Fc .Ft char * .Fo netpgp_get_key -.Fa "struct netpgp_t *netpgp" "const char *id" +.Fa "netpgp_t *netpgp" "const char *id" .Fc .Ft int .Fo netpgp_export_key -.Fa "struct netpgp_t *netpgp" "char *userid" +.Fa "netpgp_t *netpgp" "char *userid" .Fc .Ft int .Fo netpgp_import_key -.Fa "struct netpgp_t *netpgp" "char *file" +.Fa "netpgp_t *netpgp" "char *file" .Fc .Ft int .Fo netpgp_generate_key -.Fa "struct netpgp_t *netpgp" "char *userid" "int numbits" +.Fa "netpgp_t *netpgp" "char *userid" "int numbits" .Fc .Pp The following functions are used for file management: .Ft int .Fo netpgp_encrypt_file -.Fa "struct netpgp_t *netpgp" "char *userid" "char *filename" "char *out" +.Fa "netpgp_t *netpgp" "char *userid" "char *filename" "char *out" .Fa "int armored" .Fc .Ft int .Fo netpgp_decrypt_file -.Fa "struct netpgp_t *netpgp" "char *filename" "char *out" "int armored" +.Fa "netpgp_t *netpgp" "char *filename" "char *out" "int armored" .Fc .Ft int .Fo netpgp_sign_file -.Fa "struct netpgp_t *netpgp" "char *userid" "char *filename" "char *out" +.Fa "netpgp_t *netpgp" "char *userid" "char *filename" "char *out" .Fa "int armored" "int cleartext" "int detached" .Fc .Ft int .Fo netpgp_verify_file -.Fa "struct netpgp_t *netpgp" "char *f" "int armored" +.Fa "netpgp_t *netpgp" "char *f" "int armored" .Fc .Pp The following functions are used for memory signing and encryption: .Ft int .Fo netpgp_encrypt_memory -.Fa "struct netpgp_t *netpgp" "char *userid" "void *in" "const size_t insize" +.Fa "netpgp_t *netpgp" "char *userid" "void *in" "const size_t insize" .Fa "char *out" "size_t outsize" "int armored" .Fc .Ft int .Fo netpgp_decrypt_memory -.Fa "struct netpgp_t *netpgp" "const void *input" "const size_t insize" +.Fa "netpgp_t *netpgp" "const void *input" "const size_t insize" .Fa "char *out" "size_t outsize" "c
CVS commit: src/sys/dev/ic
Module Name:src Committed By: rin Date: Mon Apr 2 10:32:47 UTC 2018 Modified Files: src/sys/dev/ic: aic7xxx.c Log Message: Initialize ahc->shared_data_size appropriately. Fix panic when detach. To generate a diff of this commit: cvs rdiff -u -r1.132 -r1.133 src/sys/dev/ic/aic7xxx.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/aic7xxx.c diff -u src/sys/dev/ic/aic7xxx.c:1.132 src/sys/dev/ic/aic7xxx.c:1.133 --- src/sys/dev/ic/aic7xxx.c:1.132 Sat Feb 7 04:27:54 2015 +++ src/sys/dev/ic/aic7xxx.c Mon Apr 2 10:32:47 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: aic7xxx.c,v 1.132 2015/02/07 04:27:54 christos Exp $ */ +/* $NetBSD: aic7xxx.c,v 1.133 2018/04/02 10:32:47 rin Exp $ */ /* * Core routines and tables shareable across OS platforms. @@ -39,7 +39,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: aic7xxx.c,v 1.132 2015/02/07 04:27:54 christos Exp $ + * $Id: aic7xxx.c,v 1.133 2018/04/02 10:32:47 rin Exp $ * * //depot/aic7xxx/aic7xxx/aic7xxx.c#112 $ * @@ -50,7 +50,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: aic7xxx.c,v 1.132 2015/02/07 04:27:54 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aic7xxx.c,v 1.133 2018/04/02 10:32:47 rin Exp $"); #include #include @@ -4511,8 +4511,9 @@ ahc_init(struct ahc_softc *ahc) if ((ahc->features & AHC_TARGETMODE) != 0) driver_data_size += AHC_TMODE_CMDS * sizeof(struct target_cmd) + /*DMA WideOdd Bug Buffer*/1; + ahc->shared_data_size = driver_data_size; - if (ahc_createdmamem(ahc->parent_dmat, driver_data_size, + if (ahc_createdmamem(ahc->parent_dmat, ahc->shared_data_size, ahc->sc_dmaflags, &ahc->shared_data_dmamap, (void **)&ahc->qoutfifo, &ahc->shared_data_busaddr, &ahc->shared_data_seg, @@ -4526,7 +4527,7 @@ ahc_init(struct ahc_softc *ahc) ahc->targetcmds = (struct target_cmd *)ahc->qoutfifo; ahc->qoutfifo = (uint8_t *)&ahc->targetcmds[AHC_TMODE_CMDS]; ahc->dma_bug_buf = ahc->shared_data_busaddr - + driver_data_size - 1; + + ahc->shared_data_size - 1; /* All target command blocks start out invalid. */ for (i = 0; i < AHC_TMODE_CMDS; i++) ahc->targetcmds[i].cmd_valid = 0;
CVS commit: src/sys/dev/ic
Module Name:src Committed By: rin Date: Mon Apr 2 10:44:06 UTC 2018 Modified Files: src/sys/dev/ic: aic7xxx.c Log Message: Use ahc_freedmamem() for consistency. No functional change intended. To generate a diff of this commit: cvs rdiff -u -r1.133 -r1.134 src/sys/dev/ic/aic7xxx.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/aic7xxx.c diff -u src/sys/dev/ic/aic7xxx.c:1.133 src/sys/dev/ic/aic7xxx.c:1.134 --- src/sys/dev/ic/aic7xxx.c:1.133 Mon Apr 2 10:32:47 2018 +++ src/sys/dev/ic/aic7xxx.c Mon Apr 2 10:44:06 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: aic7xxx.c,v 1.133 2018/04/02 10:32:47 rin Exp $ */ +/* $NetBSD: aic7xxx.c,v 1.134 2018/04/02 10:44:06 rin Exp $ */ /* * Core routines and tables shareable across OS platforms. @@ -39,7 +39,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: aic7xxx.c,v 1.133 2018/04/02 10:32:47 rin Exp $ + * $Id: aic7xxx.c,v 1.134 2018/04/02 10:44:06 rin Exp $ * * //depot/aic7xxx/aic7xxx/aic7xxx.c#112 $ * @@ -50,7 +50,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: aic7xxx.c,v 1.133 2018/04/02 10:32:47 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aic7xxx.c,v 1.134 2018/04/02 10:44:06 rin Exp $"); #include #include @@ -3922,12 +3922,9 @@ ahc_free(struct ahc_softc *ahc) /* TAILQ_REMOVE(&ahc_tailq, ahc, links); XXX */ /* FALLTHROUGH */ case 1: - bus_dmamap_unload(ahc->parent_dmat, ahc->shared_data_dmamap); - bus_dmamap_destroy(ahc->parent_dmat, ahc->shared_data_dmamap); - bus_dmamem_unmap(ahc->parent_dmat, (void *)ahc->qoutfifo, - ahc->shared_data_size); - bus_dmamem_free(ahc->parent_dmat, &ahc->shared_data_seg, - ahc->shared_data_nseg); + ahc_freedmamem(ahc->parent_dmat, ahc->shared_data_size, + ahc->shared_data_dmamap, (void *)ahc->qoutfifo, + &ahc->shared_data_seg, ahc->shared_data_nseg); break; case 0: break;
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Mon Apr 2 10:51:35 UTC 2018
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c
Log Message:
Fix long standing bug that 82598 SFP+ panics in ixgbe_handle_mod() because
hw->mac.ops.setup_sfp is NULL. This change is a part of FreeBSD r327031.
To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 src/sys/dev/pci/ixgbe/ixgbe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.141 src/sys/dev/pci/ixgbe/ixgbe.c:1.142
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.141 Mon Apr 2 05:02:55 2018
+++ src/sys/dev/pci/ixgbe/ixgbe.c Mon Apr 2 10:51:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.141 2018/04/02 05:02:55 knakahara Exp $ */
+/* $NetBSD: ixgbe.c,v 1.142 2018/04/02 10:51:35 msaitoh Exp $ */
/**
@@ -4405,7 +4405,11 @@ ixgbe_handle_mod(void *context)
return;
}
- err = hw->mac.ops.setup_sfp(hw);
+ if (hw->mac.type == ixgbe_mac_82598EB)
+ err = hw->phy.ops.reset(hw);
+ else
+ err = hw->mac.ops.setup_sfp(hw);
+
if (err == IXGBE_ERR_SFP_NOT_SUPPORTED) {
device_printf(dev,
"Setup failure - unsupported SFP+ module type.\n");
CVS commit: src/sys/dev/cardbus
Module Name:src
Committed By: rin
Date: Mon Apr 2 11:02:53 UTC 2018
Modified Files:
src/sys/dev/cardbus: ahc_cardbus.c
Log Message:
Remove extra printf duplicate with MI codes.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/cardbus/ahc_cardbus.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/cardbus/ahc_cardbus.c
diff -u src/sys/dev/cardbus/ahc_cardbus.c:1.36 src/sys/dev/cardbus/ahc_cardbus.c:1.37
--- src/sys/dev/cardbus/ahc_cardbus.c:1.36 Thu Jul 14 04:00:45 2016
+++ src/sys/dev/cardbus/ahc_cardbus.c Mon Apr 2 11:02:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ahc_cardbus.c,v 1.36 2016/07/14 04:00:45 msaitoh Exp $ */
+/* $NetBSD: ahc_cardbus.c,v 1.37 2018/04/02 11:02:52 rin Exp $ */
/*-
* Copyright (c) 2000, 2005 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ahc_cardbus.c,v 1.36 2016/07/14 04:00:45 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahc_cardbus.c,v 1.37 2018/04/02 11:02:52 rin Exp $");
#include "opt_ahc_cardbus.h"
@@ -229,8 +229,6 @@ ahc_cardbus_attach(device_t parent, devi
ahc->our_id = our_id;
}
- printf("%s: aic7860", ahc_name(ahc));
-
/*
* Record our termination setting for the
* generic initialization routine.
CVS commit: src/external/gpl3/gcc/dist/gcc/config/vax
Module Name:src Committed By: maya Date: Mon Apr 2 17:45:23 UTC 2018 Modified Files: src/external/gpl3/gcc/dist/gcc/config/vax: builtins.md predicates.md Log Message: Add new predicate volatile_mem_operand and use it for jbbssi Fixes PR port-vax/53039: GCC/VAX hits ICE building libstdc++ GCC wants to change the label and then doesn't recognise the new insn, it believes it doesn't satisfy the memory_operand predicate. It appears the memory_operand predicate doesn't accept volatile memory accesses during the RTL generation phase. The predicate is from rs6000 code. from krister To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gcc/dist/gcc/config/vax/builtins.md cvs rdiff -u -r1.1.1.4 -r1.2 \ src/external/gpl3/gcc/dist/gcc/config/vax/predicates.md 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/gcc/dist/gcc/config/vax/builtins.md diff -u src/external/gpl3/gcc/dist/gcc/config/vax/builtins.md:1.7 src/external/gpl3/gcc/dist/gcc/config/vax/builtins.md:1.8 --- src/external/gpl3/gcc/dist/gcc/config/vax/builtins.md:1.7 Fri Feb 2 03:41:05 2018 +++ src/external/gpl3/gcc/dist/gcc/config/vax/builtins.md Mon Apr 2 17:45:23 2018 @@ -77,13 +77,13 @@ [(parallel [(set (pc) (if_then_else - (ne (zero_extract:SI (match_operand:QI 0 "memory_operand" "g") + (ne (zero_extract:SI (match_operand:QI 0 "volatile_mem_operand" "g") (const_int 1) (match_operand:SI 1 "general_operand" "nrm")) (const_int 0)) (label_ref (match_operand 2 "" "")) (pc))) - (set (zero_extract:SI (match_operand:QI 3 "memory_operand" "+0") + (set (zero_extract:SI (match_operand:QI 3 "volatile_mem_operand" "+0") (const_int 1) (match_dup 1)) (const_int 1))])] @@ -94,13 +94,13 @@ [(parallel [(set (pc) (if_then_else - (ne (zero_extract:SI (match_operand:HI 0 "memory_operand" "Q") + (ne (zero_extract:SI (match_operand:HI 0 "volatile_mem_operand" "Q") (const_int 1) (match_operand:SI 1 "general_operand" "nrm")) (const_int 0)) (label_ref (match_operand 2 "" "")) (pc))) - (set (zero_extract:SI (match_operand:HI 3 "memory_operand" "+0") + (set (zero_extract:SI (match_operand:HI 3 "volatile_mem_operand" "+0") (const_int 1) (match_dup 1)) (const_int 1))])] @@ -111,13 +111,13 @@ [(parallel [(set (pc) (if_then_else - (ne (zero_extract:SI (match_operand:SI 0 "memory_operand" "Q") + (ne (zero_extract:SI (match_operand:SI 0 "volatile_mem_operand" "Q") (const_int 1) (match_operand:SI 1 "general_operand" "nrm")) (const_int 0)) (label_ref (match_operand 2 "" "")) (pc))) - (set (zero_extract:SI (match_operand:SI 3 "memory_operand" "+0") + (set (zero_extract:SI (match_operand:SI 3 "volatile_mem_operand" "+0") (const_int 1) (match_dup 1)) (const_int 1))])] Index: src/external/gpl3/gcc/dist/gcc/config/vax/predicates.md diff -u src/external/gpl3/gcc/dist/gcc/config/vax/predicates.md:1.1.1.4 src/external/gpl3/gcc/dist/gcc/config/vax/predicates.md:1.2 --- src/external/gpl3/gcc/dist/gcc/config/vax/predicates.md:1.1.1.4 Fri Feb 2 01:59:55 2018 +++ src/external/gpl3/gcc/dist/gcc/config/vax/predicates.md Mon Apr 2 17:45:23 2018 @@ -109,3 +109,16 @@ (and (match_code "const_int,const_double,subreg,reg,mem") (and (match_operand:DI 0 "general_operand" "") (not (match_operand:DI 0 "illegal_addsub_di_memory_operand") + +;; Return 1 if the operand is in volatile memory. Note that during the +;; RTL generation phase, memory_operand does not return TRUE for volatile +;; memory references. So this function allows us to recognize volatile +;; references where it's safe. +(define_predicate "volatile_mem_operand" + (and (and (match_code "mem") + (match_test "MEM_VOLATILE_P (op)")) + (if_then_else (match_test "reload_completed") + (match_operand 0 "memory_operand") + (if_then_else (match_test "reload_in_progress") + (match_test "strict_memory_address_p (mode, XEXP (op, 0))") + (match_test "memory_address_p (mode, XEXP (op, 0))")
CVS commit: src/sys/uvm
Module Name:src Committed By: jdolecek Date: Mon Apr 2 18:25:42 UTC 2018 Modified Files: src/sys/uvm: uvm_emap.c Log Message: fix typo in comment To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/uvm/uvm_emap.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/uvm/uvm_emap.c diff -u src/sys/uvm/uvm_emap.c:1.11 src/sys/uvm/uvm_emap.c:1.12 --- src/sys/uvm/uvm_emap.c:1.11 Thu Nov 27 14:25:01 2014 +++ src/sys/uvm/uvm_emap.c Mon Apr 2 18:25:41 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_emap.c,v 1.11 2014/11/27 14:25:01 uebayasi Exp $ */ +/* $NetBSD: uvm_emap.c,v 1.12 2018/04/02 18:25:41 jdolecek Exp $ */ /*- * Copyright (c) 2009, 2010 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ * Notes for pmap developers: * * Generic (more expensive) stubs are implemented for architectures which - * do not support pmap. + * do not support emap. * * Note that uvm_emap_update() is called from lower pmap(9) layer, while * other functions call to pmap(9). Typical pattern of update in pmap: @@ -80,7 +80,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uvm_emap.c,v 1.11 2014/11/27 14:25:01 uebayasi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uvm_emap.c,v 1.12 2018/04/02 18:25:41 jdolecek Exp $"); #include #include
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: christos Date: Mon Apr 2 20:54:47 UTC 2018 Modified Files: src/sys/arch/amd64/amd64: spl.S Log Message: use the right end macro: IDTVEC_END(name) instead of END(Xname) To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/amd64/amd64/spl.S 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/amd64/amd64/spl.S diff -u src/sys/arch/amd64/amd64/spl.S:1.31 src/sys/arch/amd64/amd64/spl.S:1.32 --- src/sys/arch/amd64/amd64/spl.S:1.31 Tue Nov 28 03:43:49 2017 +++ src/sys/arch/amd64/amd64/spl.S Mon Apr 2 16:54:47 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: spl.S,v 1.31 2017/11/28 08:43:49 maxv Exp $ */ +/* $NetBSD: spl.S,v 1.32 2018/04/02 20:54:47 christos Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -127,7 +127,7 @@ IDTVEC(softintr) popq %r15 /* unwind switchframe */ addq $(5 * 8),%rsp jmp *%r13 /* back to Xspllower/Xdoreti */ -END(Xsoftintr) +IDTVEC_END(softintr) /* * softintr_ret() @@ -167,7 +167,7 @@ IDTVEC(preemptrecurse) call _C_LABEL(kpreempt) cli jmp *%r13 /* back to Xspllower */ -END(Xpreemptrecurse) +IDTVEC_END(preemptrecurse) /* * Xpreemptresume() @@ -187,7 +187,7 @@ IDTVEC(preemptresume) call _C_LABEL(preempt) /* from user */ cli jmp *%r13 /* back to Xdoreti */ -END(Xpreemptresume) +IDTVEC_END(preemptresume) /* * int splraise(int s); @@ -311,7 +311,7 @@ IDTVEC(spllower) popq %r13 popq %rbx ret -END(Xspllower) +ITDVEC_END(spllower) /* * void Xdoreti(void); @@ -365,4 +365,4 @@ LABEL(doreti_checkast) CLI(si) jmp doreti_checkast /* recheck ASTs */ END(doreti_checkast) -END(Xdoreti) +IDTVEC_END(doreti)
CVS commit: src/sys/arch/arm/sunxi
Module Name:src
Committed By: bouyer
Date: Mon Apr 2 20:55:49 UTC 2018
Modified Files:
src/sys/arch/arm/sunxi: sunxi_ccu_display.c
Log Message:
- sunxi_ccu_lcdxch1_set_rate(): enable parent before calling
sunxi_ccu_div_set_rate(). If it's not enabled get_rate() will return 0 and
sunxi_ccu_div_set_rate() will fail.
- rework sunxi_ccu_lcdxch0_set_rate() to actually really select the best
parent.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/sunxi/sunxi_ccu_display.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_ccu_display.c
diff -u src/sys/arch/arm/sunxi/sunxi_ccu_display.c:1.1 src/sys/arch/arm/sunxi/sunxi_ccu_display.c:1.2
--- src/sys/arch/arm/sunxi/sunxi_ccu_display.c:1.1 Sun Apr 1 21:19:17 2018
+++ src/sys/arch/arm/sunxi/sunxi_ccu_display.c Mon Apr 2 20:55:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_ccu_display.c,v 1.1 2018/04/01 21:19:17 bouyer Exp $ */
+/* $NetBSD: sunxi_ccu_display.c,v 1.2 2018/04/02 20:55:49 bouyer Exp $ */
/*-
* Copyright (c) 2018 Manuel Bouyer
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sunxi_ccu_display.c,v 1.1 2018/04/01 21:19:17 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_ccu_display.c,v 1.2 2018/04/02 20:55:49 bouyer Exp $");
#include
#include
@@ -46,18 +46,32 @@ sunxi_ccu_lcdxch0_set_rate(struct sunxi_
{
struct clk *clkp;
int error;
+ int diff, diff_x2;
+ int rate, rate_x2;
clkp = &pllclk->base;
- error = clk_set_rate(clkp, new_rate);
- if (error) {
+ rate = clk_round_rate(clkp, new_rate);
+ diff = abs(new_rate - rate);
+
+ rate_x2 = (clk_round_rate(clkp, new_rate / 2) * 2);
+ diff_x2 = abs(new_rate - rate_x2);
+
+ if (rate == 0 && rate_x2 == 0)
+ return ERANGE;
+
+ if (diff_x2 < diff) {
error = clk_set_rate(clkp, new_rate / 2);
- if (error != 0)
- return error;
- clkp = &pllclk_x2->base;
+ KASSERT(error == 0);
+ error = clk_set_parent(&clk->base, &pllclk_x2->base);
+ KASSERT(error == 0);
+ } else {
+ error = clk_set_rate(clkp, new_rate);
+ KASSERT(error == 0);
+ error = clk_set_parent(&clk->base, clkp);
+ KASSERT(error == 0);
}
- error = clk_set_parent(&clk->base, clkp);
- KASSERT(error == 0);
- return error;
+ (void)error;
+ return 0;
}
u_int
@@ -122,6 +136,8 @@ sunxi_ccu_lcdxch1_set_rate(struct sunxi_
KASSERT(error == 0);
error = clk_set_parent(&clk->base, clkp);
KASSERT(error == 0);
+ error = clk_enable(clkp);
+ KASSERT(error == 0);
error = sunxi_ccu_div_set_rate(sc, clk, new_rate);
KASSERT(error == 0);
return error;
CVS commit: src/sys/arch/arm/sunxi
Module Name:src
Committed By: bouyer
Date: Mon Apr 2 20:57:18 UTC 2018
Modified Files:
src/sys/arch/arm/sunxi: sun4i_a10_ccu.c
Log Message:
Add missing A10_RST_LVDS entry
fix sun4i_a10_ac_dig_table[] with values from arm/allwinner/,
audio plays at the right rate again on my lime2
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/sunxi/sun4i_a10_ccu.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/sun4i_a10_ccu.c
diff -u src/sys/arch/arm/sunxi/sun4i_a10_ccu.c:1.8 src/sys/arch/arm/sunxi/sun4i_a10_ccu.c:1.9
--- src/sys/arch/arm/sunxi/sun4i_a10_ccu.c:1.8 Sun Apr 1 21:19:17 2018
+++ src/sys/arch/arm/sunxi/sun4i_a10_ccu.c Mon Apr 2 20:57:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sun4i_a10_ccu.c,v 1.8 2018/04/01 21:19:17 bouyer Exp $ */
+/* $NetBSD: sun4i_a10_ccu.c,v 1.9 2018/04/02 20:57:18 bouyer Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -28,7 +28,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: sun4i_a10_ccu.c,v 1.8 2018/04/01 21:19:17 bouyer Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sun4i_a10_ccu.c,v 1.9 2018/04/02 20:57:18 bouyer Exp $");
#include
#include
@@ -74,6 +74,7 @@ __KERNEL_RCSID(1, "$NetBSD: sun4i_a10_cc
#define CSI_CFG_REG 0x134
#define VE_CFG_REG 0x13c
#define AUDIO_CODEC_SCLK_CFG_REG 0x140
+#define LVDS_CFG_REG 0x14c
#define HDMI_CLOCK_CFG_REG 0x150
#define MALI_CLOCK_CFG_REG 0x154
#define IEP_SCLK_CFG_REG 0x160
@@ -106,6 +107,7 @@ static struct sunxi_ccu_reset sun4i_a10_
SUNXI_CCU_RESET(A10_RST_DE_MP, MP_CFG_REG, 30),
SUNXI_CCU_RESET(A10_RST_TCON0, LCD0CH0_CFG_REG, 30),
SUNXI_CCU_RESET(A10_RST_TCON1, LCD1CH0_CFG_REG, 30),
+ SUNXI_CCU_RESET(A10_RST_LVDS, LVDS_CFG_REG, 0),
};
static const char *cpu_parents[] = { "losc", "osc24m", "pll_core", "pll_periph" };
@@ -132,7 +134,7 @@ static const struct sunxi_ccu_nkmp_tbl s
};
static const struct sunxi_ccu_nkmp_tbl sun4i_a10_ac_dig_table[] = {
- { 24576000, 86, 0, 21, 3 },
+ { 24576000, 86, 0, 21, 4 },
{ 0 }
};
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: mlelstv Date: Mon Apr 2 22:29:33 UTC 2018 Modified Files: src/sys/arch/amd64/amd64: spl.S Log Message: typo To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/arch/amd64/amd64/spl.S 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/amd64/amd64/spl.S diff -u src/sys/arch/amd64/amd64/spl.S:1.32 src/sys/arch/amd64/amd64/spl.S:1.33 --- src/sys/arch/amd64/amd64/spl.S:1.32 Mon Apr 2 20:54:47 2018 +++ src/sys/arch/amd64/amd64/spl.S Mon Apr 2 22:29:33 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: spl.S,v 1.32 2018/04/02 20:54:47 christos Exp $ */ +/* $NetBSD: spl.S,v 1.33 2018/04/02 22:29:33 mlelstv Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -311,7 +311,7 @@ IDTVEC(spllower) popq %r13 popq %rbx ret -ITDVEC_END(spllower) +IDTVEC_END(spllower) /* * void Xdoreti(void);
CVS commit: src/external/gpl3/gcc/usr.bin/backend
Module Name:src
Committed By: mrg
Date: Mon Apr 2 22:34:22 UTC 2018
Modified Files:
src/external/gpl3/gcc/usr.bin/backend: Makefile
Log Message:
handle programs that have 3 outputs in a saner fashion.
hopefully fixes PR 53137.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/external/gpl3/gcc/usr.bin/backend/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/gpl3/gcc/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.43 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.44
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.43 Sun Feb 11 02:12:28 2018
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile Mon Apr 2 22:34:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2018/02/11 02:12:28 christos Exp $
+# $NetBSD: Makefile,v 1.44 2018/04/02 22:34:22 mrg Exp $
LIBISPRIVATE= yes
@@ -398,16 +398,23 @@ CLEANFILES+= tree-check.h
BUILDSYMLINKS+= insn-check.h tree-check.h
# genattrtab has three output files
-# XXX fix me
-insn-attrtab.c insn-dfatab.c insn-latencytab.c: genattrtab ${G_md_file} insn-conditions.md
- ${_MKTARGET_CREATE}
- ./genattrtab ${G_md_file} insn-conditions.md -Ainsn-attrtab.c -Dinsn-dfatab.c -Linsn-latencytab.c
+insn-dfatab.c insn-latencytab.c: insn-attrtab.c
+ cp -p ${.TARGET}.tmp ${.TARGET}
+insn-attrtab.c: genattrtab ${G_md_file} insn-conditions.md
+ ${_MKTARGET_CREATE}
+ ./genattrtab ${G_md_file} insn-conditions.md \
+ -A${.TARGET}.tmp -Dinsn-dfatab.c.tmp -Linsn-latencytab.c.tmp && \
+ mv ${.TARGET}.tmp ${.TARGET}
CLEANFILES+= insn-attrtab.c insn-dfatab.c insn-latencytab.c
# genopinit has two output files
-insn-opinit.c insn-opinit.h: genopinit ${G_md_file} insn-conditions.md
- ${_MKTARGET_CREATE}
- ./genopinit ${G_md_file} insn-conditions.md -hinsn-opinit.h -cinsn-opinit.c
+insn-opinit.h: insn-opinit.c
+ cp -p ${.TARGET}.tmp ${.TARGET}
+insn-opinit.c: genopinit ${G_md_file} insn-conditions.md
+ ${_MKTARGET_CREATE}
+ ./genopinit ${G_md_file} insn-conditions.md \
+ -hinsn-opinit.h.tmp -c${.TARGET}.tmp && \
+ mv ${.TARGET}.tmp ${.TARGET}
CLEANFILES+= insn-opinit.h insn-opinit.c
LDFLAGS.genautomata+= -lm
CVS commit: src/external/gpl3/gcc
Module Name:src
Committed By: mrg
Date: Mon Apr 2 22:35:26 UTC 2018
Modified Files:
src/external/gpl3/gcc/lib/libasan: Makefile
src/external/gpl3/gcc/usr.bin/backend: Makefile
Log Message:
apply some more vax -O0/-O1. this now builds.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/external/gpl3/gcc/lib/libasan/Makefile
cvs rdiff -u -r1.44 -r1.45 src/external/gpl3/gcc/usr.bin/backend/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/gpl3/gcc/lib/libasan/Makefile
diff -u src/external/gpl3/gcc/lib/libasan/Makefile:1.21 src/external/gpl3/gcc/lib/libasan/Makefile:1.22
--- src/external/gpl3/gcc/lib/libasan/Makefile:1.21 Wed Feb 14 02:12:35 2018
+++ src/external/gpl3/gcc/lib/libasan/Makefile Mon Apr 2 22:35:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2018/02/14 02:12:35 christos Exp $
+# $NetBSD: Makefile,v 1.22 2018/04/02 22:35:26 mrg Exp $
UNSUPPORTED_COMPILER.clang= # defined
@@ -45,6 +45,8 @@ COPTS.asan_report.cc += -O1
COPTS.sanitizer_common.cc += -O1
COPTS.sanitizer_common_libcdep.cc += -O1
COPTS.sanitizer_posix.cc += -O1
+COPTS.ubsan_diag.cc += -O1
+COPTS.ubsan_init.cc += -O1
.endif
.include
Index: src/external/gpl3/gcc/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.44 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.45
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.44 Mon Apr 2 22:34:22 2018
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile Mon Apr 2 22:35:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2018/04/02 22:34:22 mrg Exp $
+# $NetBSD: Makefile,v 1.45 2018/04/02 22:35:26 mrg Exp $
LIBISPRIVATE= yes
@@ -516,7 +516,7 @@ COPTS.convert.c+=-O0
COPTS.dwarf2out.c+=-O0
COPTS.dse.c+=-O0 # XXX port-vax/51967
COPTS.expmed.c+=-O0
-COPTS.expr.c+=-O0
+COPTS.expr.c+=-O0 -Wno-error=tautological-compare
COPTS.fixed-value.c+=-O0
COPTS.fold-const.c+=-O0
COPTS.gimple-fold.c+=-O0
@@ -535,6 +535,7 @@ COPTS.tree-affine.c+=-O0
COPTS.tree-cfg.c+=-O0
COPTS.tree-eh.c+=-O0
COPTS.tree-object-size.c+=-O0
+COPTS.tree-parloops.c+=-O0
COPTS.tree-predcom.c+=-O0
COPTS.tree-pretty-print.c+=-O0
COPTS.tree-ssa-alias.c+=-O0
@@ -556,7 +557,7 @@ COPTS.tree-vrp.c+=-O0
COPTS.tree.c+=-O0
COPTS.ubsan.c+=-O0
COPTS.varasm.c+=-O0
-COPTS.wide-int.c+=-O0
+COPTS.wide-int.cc+=-O0
.else
COPTS.tree.c= ${${ACTIVE_CC} == "clang" :? -O0 :}
.endif
CVS commit: src/sys/arch/vax/vax
Module Name:src
Committed By: mrg
Date: Mon Apr 2 22:49:48 UTC 2018
Modified Files:
src/sys/arch/vax/vax: ctu.c
Log Message:
convert some spaces into new lines and tabs to make the gcc 6
indent checker happy.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/vax/vax/ctu.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/vax/vax/ctu.c
diff -u src/sys/arch/vax/vax/ctu.c:1.36 src/sys/arch/vax/vax/ctu.c:1.37
--- src/sys/arch/vax/vax/ctu.c:1.36 Mon May 22 16:39:41 2017
+++ src/sys/arch/vax/vax/ctu.c Mon Apr 2 22:49:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ctu.c,v 1.36 2017/05/22 16:39:41 ragge Exp $ */
+/* $NetBSD: ctu.c,v 1.37 2018/04/02 22:49:48 mrg Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ctu.c,v 1.36 2017/05/22 16:39:41 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ctu.c,v 1.37 2018/04/02 22:49:48 mrg Exp $");
#include
#include
@@ -376,16 +376,20 @@ cturintr(void *arg)
#ifdef TUDEBUG
printf("Writing byte %d\n", tu_sc.sc_xbytes);
#endif
- WAIT; mtpr(RSP_TYP_DATA, PR_CSTD);
- WAIT; mtpr(128, PR_CSTD);
+ WAIT;
+ mtpr(RSP_TYP_DATA, PR_CSTD);
+ WAIT;
+ mtpr(128, PR_CSTD);
for (i = 0; i < 128; i++) {
WAIT;
mtpr(buf[tu_sc.sc_xbytes++], PR_CSTD);
}
tck = ctu_cksum((void *)&buf[tu_sc.sc_xbytes-128], 64);
tck += 0x8001; if (tck > 0x) tck -= 0x;
- WAIT; mtpr(tck & 0xff, PR_CSTD);
- WAIT; mtpr((tck >> 8) & 0xff, PR_CSTD);
+ WAIT;
+ mtpr(tck & 0xff, PR_CSTD);
+ WAIT;
+ mtpr((tck >> 8) & 0xff, PR_CSTD);
bp->b_resid = 0;
if (tu_sc.sc_xbytes == bp->b_bcount)
tu_sc.sc_state = TU_ENDPACKET;
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Tue Apr 3 06:11:14 UTC 2018 Modified Files: src/doc: 3RDPARTY Log Message: openssh-7.7 out To generate a diff of this commit: cvs rdiff -u -r1.1507 -r1.1508 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1507 src/doc/3RDPARTY:1.1508 --- src/doc/3RDPARTY:1.1507 Tue Mar 27 06:34:25 2018 +++ src/doc/3RDPARTY Tue Apr 3 06:11:14 2018 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1507 2018/03/27 06:34:25 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1508 2018/04/03 06:11:14 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1031,7 +1031,7 @@ Patch applied after OpenSSH import. Package: OpenSSH Version: 7.6 -Current Vers: 7.6 / portable 7.6p1 +Current Vers: 7.7 / portable 7.7p1 Maintainer: OpenSSH Archive Site: http://www.openssh.com/ftp.html Home Page: http://www.openssh.com/portable.html
