CVS commit: src/sys/sys
Module Name:src Committed By: ozaki-r Date: Thu Jul 4 02:49:30 UTC 2019 Modified Files: src/sys/sys: param.h Log Message: Bump the version for if_description Welcome to 8.99.50 To generate a diff of this commit: cvs rdiff -u -r1.597 -r1.598 src/sys/sys/param.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/sys/param.h diff -u src/sys/sys/param.h:1.597 src/sys/sys/param.h:1.598 --- src/sys/sys/param.h:1.597 Fri Jun 28 15:10:32 2019 +++ src/sys/sys/param.h Thu Jul 4 02:49:30 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.597 2019/06/28 15:10:32 jmcneill Exp $ */ +/* $NetBSD: param.h,v 1.598 2019/07/04 02:49:30 ozaki-r Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -67,7 +67,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 899004900 /* NetBSD 8.99.49 */ +#define __NetBSD_Version__ 899005000 /* NetBSD 8.99.50 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: src/sys/sys
Module Name:src Committed By: ozaki-r Date: Thu Jul 4 02:49:30 UTC 2019 Modified Files: src/sys/sys: param.h Log Message: Bump the version for if_description Welcome to 8.99.50 To generate a diff of this commit: cvs rdiff -u -r1.597 -r1.598 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/net/if
Module Name:src Committed By: ozaki-r Date: Thu Jul 4 02:46:40 UTC 2019 Modified Files: src/tests/net/if: t_ifconfig.sh Log Message: Add ATF test for a description. >From t-kusaba@IIJ To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/tests/net/if/t_ifconfig.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/ifconfig
Module Name:src
Committed By: ozaki-r
Date: Thu Jul 4 02:45:46 UTC 2019
Modified Files:
src/sbin/ifconfig: ifconfig.8 ifconfig.c
Log Message:
Add descr,description/-descr,-description commands to ifconfig(8) to handle a
description.
>From t-kusaba@IIJ
To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/sbin/ifconfig/ifconfig.8
cvs rdiff -u -r1.238 -r1.239 src/sbin/ifconfig/ifconfig.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/ifconfig/ifconfig.8
diff -u src/sbin/ifconfig/ifconfig.8:1.116 src/sbin/ifconfig/ifconfig.8:1.117
--- src/sbin/ifconfig/ifconfig.8:1.116 Thu Nov 15 04:37:20 2018
+++ src/sbin/ifconfig/ifconfig.8 Thu Jul 4 02:45:45 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: ifconfig.8,v 1.116 2018/11/15 04:37:20 ozaki-r Exp $
+.\" $NetBSD: ifconfig.8,v 1.117 2019/07/04 02:45:45 ozaki-r Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)ifconfig.8 8.4 (Berkeley) 6/1/94
.\"
-.Dd November 15, 2018
+.Dd June 18, 2019
.Dt IFCONFIG 8
.Os
.Sh NAME
@@ -186,6 +186,10 @@ pseudo-device, attach it to
.Ar iface .
If not specified, the kernel will attempt to select an interface with
a subnet matching that of the carp interface.
+.It Cm description Ar description , Cm descr Ar description
+Set a description of the interface. (0-63 characters)
+.It Cm -description , Cm -descr
+Clear the description of the interface.
.It Cm debug
Enable driver dependent debugging code; usually, this turns on
extra console error logging.
Index: src/sbin/ifconfig/ifconfig.c
diff -u src/sbin/ifconfig/ifconfig.c:1.238 src/sbin/ifconfig/ifconfig.c:1.239
--- src/sbin/ifconfig/ifconfig.c:1.238 Fri Dec 21 08:58:08 2018
+++ src/sbin/ifconfig/ifconfig.c Thu Jul 4 02:45:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ifconfig.c,v 1.238 2018/12/21 08:58:08 msaitoh Exp $ */
+/* $NetBSD: ifconfig.c,v 1.239 2019/07/04 02:45:45 ozaki-r Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1983, 1993\
The Regents of the University of California. All rights reserved.");
-__RCSID("$NetBSD: ifconfig.c,v 1.238 2018/12/21 08:58:08 msaitoh Exp $");
+__RCSID("$NetBSD: ifconfig.c,v 1.239 2019/07/04 02:45:45 ozaki-r Exp $");
#endif /* not lint */
#include
@@ -133,6 +133,8 @@ static int setifnetmask(prop_dictionary_
static int setifprefixlen(prop_dictionary_t, prop_dictionary_t);
static int setlinkstr(prop_dictionary_t, prop_dictionary_t);
static int unsetlinkstr(prop_dictionary_t, prop_dictionary_t);
+static int setifdescr(prop_dictionary_t, prop_dictionary_t);
+static int unsetifdescr(prop_dictionary_t, prop_dictionary_t);
static void status(const struct sockaddr *, prop_dictionary_t,
prop_dictionary_t);
__dead static void usage(void);
@@ -193,6 +195,9 @@ struct paddr parse_broadcast = PADDR_INI
"broadcast address",
setifbroadaddr, "broadcast", NULL, NULL, NULL, _root.pb_parser);
+struct pstr parse_descr = PSTR_INITIALIZER1(_descr, "descr",
+setifdescr, "descr", false, _root.pb_parser);
+
static const struct kwinst misckw[] = {
{.k_word = "alias", .k_key = "alias", .k_deact = "alias",
.k_type = KW_T_BOOL, .k_neg = true,
@@ -213,6 +218,12 @@ static const struct kwinst misckw[] = {
, {.k_word = "linkstr", .k_nextparser = _linkstr.ps_parser }
, {.k_word = "-linkstr", .k_exec = unsetlinkstr,
.k_nextparser = _root.pb_parser }
+ , {.k_word = "descr", .k_nextparser = _descr.ps_parser}
+ , {.k_word = "description", .k_nextparser = _descr.ps_parser}
+ , {.k_word = "-descr", .k_exec = unsetifdescr,
+ .k_nextparser = _root.pb_parser}
+ , {.k_word = "-description", .k_exec = unsetifdescr,
+ .k_nextparser = _root.pb_parser}
};
/* key: clonecmd */
@@ -1270,6 +1281,7 @@ status(const struct sockaddr *sdl, prop_
struct ifcapreq ifcr;
unsigned short flags;
const struct afswtch *afp;
+ char ifdescr[IFDESCRSIZE];
if ((af = getaf(env)) == -1) {
afp = NULL;
@@ -1321,6 +1333,12 @@ status(const struct sockaddr *sdl, prop_
SIMPLEQ_FOREACH(status_f, _funcs, f_next)
(*status_f->f_func)(env, oenv);
+ estrlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+ ifr.ifr_buf =
+ ifr.ifr_buflen = sizeof(ifdescr);
+ if (prog_ioctl(s, SIOCGIFDESCR, ) == 0)
+ printf("\tdescription: \"%s\"\n", (char *)ifr.ifr_buf);
+
print_link_addresses(env, true);
estrlcpy(ifdrv.ifd_name, ifname, sizeof(ifdrv.ifd_name));
@@ -1461,6 +1479,55 @@ unsetlinkstr(prop_dictionary_t env, prop
return 0;
}
+static int
+setifdescr(prop_dictionary_t env, prop_dictionary_t oenv)
+{
+ struct ifreq ifr;
+ size_t len;
+ prop_data_t data;
+ char *descr;
+
+ data = (prop_data_t)prop_dictionary_get(env, "descr");
+ if (data == NULL) {
+ errno = ENOENT;
+ return -1;
+ }
+ len = prop_data_size(data) + 1;
+
CVS commit: src/sys
Module Name:src Committed By: ozaki-r Date: Thu Jul 4 02:44:25 UTC 2019 Modified Files: src/sys/net: if.c if.h src/sys/sys: sockio.h Log Message: Add support for a network interface description. ioctl(2): - Add SIOCGIFDESCR/SIOCSIFDESCR commands to get/set the description. This enables to make a memo for interface, like "Home network" or "Remote VPN". >From t-kusaba@IIJ To generate a diff of this commit: cvs rdiff -u -r1.455 -r1.456 src/sys/net/if.c cvs rdiff -u -r1.273 -r1.274 src/sys/net/if.h cvs rdiff -u -r1.37 -r1.38 src/sys/sys/sockio.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: ozaki-r
Date: Thu Jul 4 02:44:25 UTC 2019
Modified Files:
src/sys/net: if.c if.h
src/sys/sys: sockio.h
Log Message:
Add support for a network interface description.
ioctl(2):
- Add SIOCGIFDESCR/SIOCSIFDESCR commands to get/set the description.
This enables to make a memo for interface, like "Home network" or "Remote VPN".
>From t-kusaba@IIJ
To generate a diff of this commit:
cvs rdiff -u -r1.455 -r1.456 src/sys/net/if.c
cvs rdiff -u -r1.273 -r1.274 src/sys/net/if.h
cvs rdiff -u -r1.37 -r1.38 src/sys/sys/sockio.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/net/if.c
diff -u src/sys/net/if.c:1.455 src/sys/net/if.c:1.456
--- src/sys/net/if.c:1.455 Tue May 21 09:18:37 2019
+++ src/sys/net/if.c Thu Jul 4 02:44:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.455 2019/05/21 09:18:37 msaitoh Exp $ */
+/* $NetBSD: if.c,v 1.456 2019/07/04 02:44:25 ozaki-r Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.455 2019/05/21 09:18:37 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.456 2019/07/04 02:44:25 ozaki-r Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -3050,6 +3050,58 @@ ifioctl_common(struct ifnet *ifp, u_long
KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
#endif
return ENETRESET;
+ case SIOCSIFDESCR:
+ {
+ char *descrbuf;
+
+ ifr = data;
+
+ if (ifr->ifr_buflen > IFDESCRSIZE)
+return ENAMETOOLONG;
+
+ if (ifr->ifr_buf == NULL || ifr->ifr_buflen == 0) {
+/* unset description */
+descrbuf = NULL;
+ } else {
+int error;
+
+ descrbuf = kmem_zalloc(IFDESCRSIZE, KM_SLEEP);
+/* copy (IFDESCRSIZE - 1) bytes to ensure terminating nul */
+error = copyin(ifr->ifr_buf, descrbuf, IFDESCRSIZE - 1);
+if (error) {
+ kmem_free(descrbuf, IFDESCRSIZE);
+ return error;
+}
+ }
+
+ if (ifp->if_description != NULL)
+kmem_free(ifp->if_description, IFDESCRSIZE);
+
+ ifp->if_description = descrbuf;
+ }
+ break;
+
+ case SIOCGIFDESCR:
+ {
+ char *descr;
+
+ ifr = data;
+ descr = ifp->if_description;
+
+ if (descr == NULL)
+return ENOMSG;
+
+ if (ifr->ifr_buflen < IFDESCRSIZE)
+return EINVAL;
+ else {
+int error;
+error = copyout(descr, ifr->ifr_buf, IFDESCRSIZE);
+if (error)
+ return error;
+ }
+ }
+ break;
+
default:
return ENOTTY;
}
Index: src/sys/net/if.h
diff -u src/sys/net/if.h:1.273 src/sys/net/if.h:1.274
--- src/sys/net/if.h:1.273 Mon Jun 24 06:24:33 2019
+++ src/sys/net/if.h Thu Jul 4 02:44:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if.h,v 1.273 2019/06/24 06:24:33 skrll Exp $ */
+/* $NetBSD: if.h,v 1.274 2019/07/04 02:44:25 ozaki-r Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -75,6 +75,11 @@
*/
#define IF_NAMESIZE 16
+/*
+ * Length of interface description, including terminating '\0'.
+ */
+#define IFDESCRSIZE 64
+
#if defined(_NETBSD_SOURCE)
#include
@@ -365,6 +370,7 @@ typedef struct ifnet {
int (*if_setflags) /* :: */
(struct ifnet *, const short);
kmutex_t *if_ioctl_lock; /* :: */
+ char *if_description; /* i: interface description */
#ifdef _KERNEL /* XXX kvm(3) */
struct callout *if_slowtimo_ch;/* :: */
struct krwlock *if_afdata_lock;/* :: */
Index: src/sys/sys/sockio.h
diff -u src/sys/sys/sockio.h:1.37 src/sys/sys/sockio.h:1.38
--- src/sys/sys/sockio.h:1.37 Fri May 17 07:37:12 2019
+++ src/sys/sys/sockio.h Thu Jul 4 02:44:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sockio.h,v 1.37 2019/05/17 07:37:12 msaitoh Exp $ */
+/* $NetBSD: sockio.h,v 1.38 2019/07/04 02:44:25 ozaki-r Exp $ */
/*-
* Copyright (c) 1982, 1986, 1990, 1993, 1994
@@ -143,6 +143,9 @@
#define SIOCGIFINDEX _IOWR('i', 140, struct ifreq) /* get ifnet index */
#define SIOCSETHERCAP_IOW('i', 141, struct eccapreq) /* set ethercap */
+#define SIOCSIFDESCR _IOW('i', 142, struct ifreq) /* set interface description */
+#define SIOCGIFDESCR _IOWR('i', 143, struct ifreq) /* get interface description */
+
#define SIOCGUMBINFO _IOWR('i', 190, struct ifreq) /* get MBIM info */
#define SIOCSUMBPARAM _IOW('i', 191, struct ifreq) /* set MBIM param */
#define SIOCGUMBPARAM _IOWR('i', 192, struct ifreq) /* get MBIM param */
CVS commit: src/sys/dev/sdmmc
Module Name:src
Committed By: jmcneill
Date: Wed Jul 3 23:10:08 UTC 2019
Modified Files:
src/sys/dev/sdmmc: sdhc.c
Log Message:
If switching to fixed sampling clock, do not return an error to the sdmmc layer.
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/sys/dev/sdmmc/sdhc.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/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.102 src/sys/dev/sdmmc/sdhc.c:1.103
--- src/sys/dev/sdmmc/sdhc.c:1.102 Wed Mar 13 12:16:49 2019
+++ src/sys/dev/sdmmc/sdhc.c Wed Jul 3 23:10:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.102 2019/03/13 12:16:49 jmcneill Exp $ */
+/* $NetBSD: sdhc.c,v 1.103 2019/07/03 23:10:08 jmcneill Exp $ */
/* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.102 2019/03/13 12:16:49 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.103 2019/07/03 23:10:08 jmcneill Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -1460,7 +1460,7 @@ sdhc_execute_tuning1(struct sdhc_host *h
sdhc_soft_reset(hp, SDHC_RESET_DAT|SDHC_RESET_CMD);
aprint_error_dev(hp->sc->sc_dev,
"tuning did not complete, using fixed sampling clock\n");
- return EIO; /* tuning did not complete */
+ return 0; /* tuning did not complete */
}
if ((HREAD2(hp, SDHC_HOST_CTL2) & SDHC_SAMPLING_CLOCK_SEL) == 0) {
@@ -1469,7 +1469,7 @@ sdhc_execute_tuning1(struct sdhc_host *h
sdhc_soft_reset(hp, SDHC_RESET_DAT|SDHC_RESET_CMD);
aprint_error_dev(hp->sc->sc_dev,
"tuning failed, using fixed sampling clock\n");
- return EIO; /* tuning failed */
+ return 0; /* tuning failed */
}
if (hp->tuning_timer_count) {
CVS commit: src/sys/dev/fdt
Module Name:src Committed By: jmcneill Date: Wed Jul 3 23:10:43 UTC 2019 Modified Files: src/sys/dev/fdt: arasan_sdhc_fdt.c Log Message: Add SDHC_FLAG_SINGLE_POWER_WRITE and SDHC_FLAG_32BIT_ACCESS flags To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/fdt/arasan_sdhc_fdt.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/fdt
Module Name:src Committed By: jmcneill Date: Wed Jul 3 23:10:43 UTC 2019 Modified Files: src/sys/dev/fdt: arasan_sdhc_fdt.c Log Message: Add SDHC_FLAG_SINGLE_POWER_WRITE and SDHC_FLAG_32BIT_ACCESS flags To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/fdt/arasan_sdhc_fdt.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/fdt/arasan_sdhc_fdt.c diff -u src/sys/dev/fdt/arasan_sdhc_fdt.c:1.2 src/sys/dev/fdt/arasan_sdhc_fdt.c:1.3 --- src/sys/dev/fdt/arasan_sdhc_fdt.c:1.2 Wed Jul 3 19:46:02 2019 +++ src/sys/dev/fdt/arasan_sdhc_fdt.c Wed Jul 3 23:10:43 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: arasan_sdhc_fdt.c,v 1.2 2019/07/03 19:46:02 jmcneill Exp $ */ +/* $NetBSD: arasan_sdhc_fdt.c,v 1.3 2019/07/03 23:10:43 jmcneill Exp $ */ /*- * Copyright (c) 2019 Jared McNeill @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: arasan_sdhc_fdt.c,v 1.2 2019/07/03 19:46:02 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: arasan_sdhc_fdt.c,v 1.3 2019/07/03 23:10:43 jmcneill Exp $"); #include #include @@ -279,6 +279,8 @@ arasan_sdhc_attach(device_t parent, devi sc->sc_base.sc_dev = self; sc->sc_base.sc_host = sc->sc_host; sc->sc_base.sc_flags = SDHC_FLAG_NO_CLKBASE | + SDHC_FLAG_SINGLE_POWER_WRITE | + SDHC_FLAG_32BIT_ACCESS | SDHC_FLAG_USE_DMA | SDHC_FLAG_USE_ADMA2 | SDHC_FLAG_STOP_WITH_TC;
CVS commit: src/sys/dev/sdmmc
Module Name:src Committed By: jmcneill Date: Wed Jul 3 23:10:08 UTC 2019 Modified Files: src/sys/dev/sdmmc: sdhc.c Log Message: If switching to fixed sampling clock, do not return an error to the sdmmc layer. To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 src/sys/dev/sdmmc/sdhc.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/external/bsd/drm2/nouveau
On Wed, Jul 03, 2019 at 08:47:22PM +, Thomas Klausner wrote: > Module Name: src > Committed By: wiz > Date: Wed Jul 3 20:47:22 UTC 2019 > > Modified Files: > src/sys/external/bsd/drm2/nouveau: nouveau_pci.c > > Log Message: > Improve nouveau pci attachment code so it waits for the availability of / > before trying to load firmware. > Which firmware is it loading? we should probably ship it...
CVS commit: src/sys/arch/arm/rockchip
Module Name:src Committed By: jmcneill Date: Wed Jul 3 20:55:22 UTC 2019 Modified Files: src/sys/arch/arm/rockchip: rk_tsadc.c Log Message: Set correct bits when enabling gpio tshut mode To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/rockchip/rk_tsadc.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/nouveau
Module Name:src Committed By: wiz Date: Wed Jul 3 20:47:22 UTC 2019 Modified Files: src/sys/external/bsd/drm2/nouveau: nouveau_pci.c Log Message: Improve nouveau pci attachment code so it waits for the availability of / before trying to load firmware. Fixes my PR 54274. LGTM mrg To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/external/bsd/drm2/nouveau/nouveau_pci.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/nouveau
Module Name:src
Committed By: wiz
Date: Wed Jul 3 20:47:22 UTC 2019
Modified Files:
src/sys/external/bsd/drm2/nouveau: nouveau_pci.c
Log Message:
Improve nouveau pci attachment code so it waits for the availability of /
before trying to load firmware.
Fixes my PR 54274.
LGTM mrg
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/external/bsd/drm2/nouveau/nouveau_pci.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/nouveau/nouveau_pci.c
diff -u src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.23 src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.24
--- src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.23 Mon Dec 24 08:40:33 2018
+++ src/sys/external/bsd/drm2/nouveau/nouveau_pci.c Wed Jul 3 20:47:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_pci.c,v 1.23 2018/12/24 08:40:33 mrg Exp $ */
+/* $NetBSD: nouveau_pci.c,v 1.24 2019/07/03 20:47:22 wiz Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.23 2018/12/24 08:40:33 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.24 2019/07/03 20:47:22 wiz Exp $");
#include
#include
@@ -52,6 +52,7 @@ SIMPLEQ_HEAD(nouveau_pci_task_head, nouv
struct nouveau_pci_softc {
device_t sc_dev;
+ struct pci_attach_args sc_pa;
enum {
NOUVEAU_TASK_ATTACH,
NOUVEAU_TASK_WORKQUEUE,
@@ -67,6 +68,7 @@ struct nouveau_pci_softc {
static int nouveau_pci_match(device_t, cfdata_t, void *);
static void nouveau_pci_attach(device_t, device_t, void *);
+static void nouveau_pci_attach_real(device_t);
static int nouveau_pci_detach(device_t, int);
static bool nouveau_pci_suspend(device_t, const pmf_qual_t *);
@@ -110,7 +112,7 @@ nouveau_pci_match(device_t parent, cfdat
* 0x1e80-0x1eff TU104
* 0x1f00-0x1f7f TU106
*/
-
+
if (IS_BETWEEN(0x1580, 0x15ff) ||
IS_BETWEEN(0x1b00, 0x1b7f) ||
IS_BETWEEN(0x1b80, 0x1bff) ||
@@ -144,22 +146,37 @@ nouveau_pci_attach(device_t parent, devi
{
struct nouveau_pci_softc *const sc = device_private(self);
const struct pci_attach_args *const pa = aux;
- int error;
pci_aprint_devinfo(pa, NULL);
- sc->sc_dev = self;
+ if (!pmf_device_register(self, _pci_suspend, _pci_resume))
+ aprint_error_dev(self, "unable to establish power handler\n");
- /* Initialize the Linux PCI device descriptor. */
- linux_pci_dev_init(>sc_pci_dev, self, device_parent(self), pa, 0);
+ /*
+ * Trivial initialization first; the rest will come after we
+ * have mounted the root file system and can load firmware
+ * images.
+ */
+ sc->sc_dev = NULL;
+ sc->sc_pa = *pa;
- if (!pmf_device_register(self, _pci_suspend,
- _pci_resume))
- aprint_error_dev(self, "unable to establish power handler\n");
+ config_mountroot(self, _pci_attach_real);
+}
+static void
+nouveau_pci_attach_real(device_t self)
+{
+ struct nouveau_pci_softc *const sc = device_private(self);
+ const struct pci_attach_args *const pa = >sc_pa;
+ int error;
+
+ sc->sc_dev = self;
sc->sc_task_state = NOUVEAU_TASK_ATTACH;
SIMPLEQ_INIT(>sc_task_u.attach);
+ /* Initialize the Linux PCI device descriptor. */
+ linux_pci_dev_init(>sc_pci_dev, self, device_parent(self), pa, 0);
+
/* XXX errno Linux->NetBSD */
error = -nvkm_device_pci_new(>sc_pci_dev,
nouveau_config, nouveau_debug,
@@ -204,6 +221,10 @@ nouveau_pci_detach(device_t self, int fl
struct nouveau_pci_softc *const sc = device_private(self);
int error;
+ if (sc->sc_dev == NULL)
+ /* Not done attaching. */
+ return EBUSY;
+
/* XXX Check for in-use before tearing it all down... */
error = config_detach_children(self, flags);
if (error)
CVS commit: src/share/misc
Module Name:src Committed By: sevan Date: Wed Jul 3 20:26:16 UTC 2019 Modified Files: src/share/misc: acronyms.comp Log Message: HEVC IDCT VDPAU VLD To generate a diff of this commit: cvs rdiff -u -r1.276 -r1.277 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms.comp diff -u src/share/misc/acronyms.comp:1.276 src/share/misc/acronyms.comp:1.277 --- src/share/misc/acronyms.comp:1.276 Tue Jul 2 16:10:15 2019 +++ src/share/misc/acronyms.comp Wed Jul 3 20:26:16 2019 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.276 2019/07/02 16:10:15 sevan Exp $ +$NetBSD: acronyms.comp,v 1.277 2019/07/03 20:26:16 sevan Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -641,6 +641,7 @@ HDMI High-Definition Multimedia Interfac HDTV high-definition television HECI host embedded controller interface HEST hardware error source table +HEVC high efficiency video coding HF high frequency HFM highest frequency mode HFS hierarchical file system @@ -685,6 +686,7 @@ ICT information and communications techn ICW initialization command word IDA Intel dynamic acceleration IDCMP Intuition direct communication message port +IDCT inverse discrete cosine transform IDE integrated development environment IDE integrated drive electronics IDPS intrusion detection [and] prevention system @@ -1650,6 +1652,7 @@ VCM virtual channel memory VCO voltage-controlled oscillator VCP virtual chassis port VCS version control system +VDPAU Video Decode and Presentation API for Unix VES virtual execution system VESA Video Electronics Standards Association VFO variable-frequency oscillator @@ -1662,6 +1665,7 @@ VIM Vi IMproved VIPT virtually indexed, physically tagged VIVT virtually indexed, virtually tagged VLAN virtual local area network +VLD variable-length decoding VLIW very long instruction word VLSI very large scale integration VLSM variable length subnet mask
CVS commit: src/share/misc
Module Name:src Committed By: sevan Date: Wed Jul 3 20:26:16 UTC 2019 Modified Files: src/share/misc: acronyms.comp Log Message: HEVC IDCT VDPAU VLD To generate a diff of this commit: cvs rdiff -u -r1.276 -r1.277 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/fdt
Module Name:src
Committed By: jmcneill
Date: Wed Jul 3 19:46:02 UTC 2019
Modified Files:
src/sys/dev/fdt: arasan_sdhc_fdt.c
Log Message:
Enforce 32-bit limits on ADMA2 capable controllers that do not support 64-bit
descriptors
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/fdt/arasan_sdhc_fdt.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/fdt/arasan_sdhc_fdt.c
diff -u src/sys/dev/fdt/arasan_sdhc_fdt.c:1.1 src/sys/dev/fdt/arasan_sdhc_fdt.c:1.2
--- src/sys/dev/fdt/arasan_sdhc_fdt.c:1.1 Wed Mar 13 12:17:45 2019
+++ src/sys/dev/fdt/arasan_sdhc_fdt.c Wed Jul 3 19:46:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: arasan_sdhc_fdt.c,v 1.1 2019/03/13 12:17:45 jmcneill Exp $ */
+/* $NetBSD: arasan_sdhc_fdt.c,v 1.2 2019/07/03 19:46:02 jmcneill Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: arasan_sdhc_fdt.c,v 1.1 2019/03/13 12:17:45 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arasan_sdhc_fdt.c,v 1.2 2019/07/03 19:46:02 jmcneill Exp $");
#include
#include
@@ -224,6 +224,7 @@ arasan_sdhc_attach(device_t parent, devi
bus_addr_t addr;
bus_size_t size;
u_int bus_width;
+ int error;
void *ih;
fdtbus_clock_assign(phandle);
@@ -263,8 +264,19 @@ arasan_sdhc_attach(device_t parent, devi
sc->sc_bsz = size;
sc->sc_type = of_search_compatible(phandle, compat_data)->data;
+ const uint32_t caps = bus_space_read_4(sc->sc_bst, sc->sc_bsh, SDHC_CAPABILITIES);
+ if ((caps & (SDHC_ADMA2_SUPP|SDHC_64BIT_SYS_BUS)) == SDHC_ADMA2_SUPP) {
+ error = bus_dmatag_subregion(faa->faa_dmat, 0, 0x,
+ >sc_base.sc_dmat, BUS_DMA_WAITOK);
+ if (error != 0) {
+ aprint_error(": couldn't create DMA tag: %d\n", error);
+ return;
+ }
+ } else {
+ sc->sc_base.sc_dmat = faa->faa_dmat;
+ }
+
sc->sc_base.sc_dev = self;
- sc->sc_base.sc_dmat = faa->faa_dmat;
sc->sc_base.sc_host = sc->sc_host;
sc->sc_base.sc_flags = SDHC_FLAG_NO_CLKBASE |
SDHC_FLAG_USE_DMA |
CVS commit: src/sys/dev/fdt
Module Name:src Committed By: jmcneill Date: Wed Jul 3 19:46:02 UTC 2019 Modified Files: src/sys/dev/fdt: arasan_sdhc_fdt.c Log Message: Enforce 32-bit limits on ADMA2 capable controllers that do not support 64-bit descriptors To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/fdt/arasan_sdhc_fdt.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/evbarm/conf
Module Name:src Committed By: jmcneill Date: Wed Jul 3 19:45:14 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: std.generic64 Log Message: Define _ARM32_NEED_BUS_DMA_BOUNCE for aarch64 so we can use bus_dmamap_subregion To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/std.generic64 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/evbarm/conf/std.generic64 diff -u src/sys/arch/evbarm/conf/std.generic64:1.9 src/sys/arch/evbarm/conf/std.generic64:1.10 --- src/sys/arch/evbarm/conf/std.generic64:1.9 Tue Nov 13 06:06:29 2018 +++ src/sys/arch/evbarm/conf/std.generic64 Wed Jul 3 19:45:14 2019 @@ -1,4 +1,4 @@ -# $NetBSD: std.generic64,v 1.9 2018/11/13 06:06:29 ryo Exp $ +# $NetBSD: std.generic64,v 1.10 2019/07/03 19:45:14 jmcneill Exp $ # # generic NetBSD/evbarm64 with FDT support @@ -19,6 +19,7 @@ options FPU_VFP options MODULAR options MODULAR_DEFAULT_AUTOLOAD options PCI_NETBSD_CONFIGURE +options _ARM32_NEED_BUS_DMA_BOUNCE options __HAVE_PCI_CONF_HOOK options __HAVE_PCI_MSI_MSIX
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Wed Jul 3 19:45:14 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: std.generic64 Log Message: Define _ARM32_NEED_BUS_DMA_BOUNCE for aarch64 so we can use bus_dmamap_subregion To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/std.generic64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libisns
Module Name:src
Committed By: dholland
Date: Wed Jul 3 18:40:33 UTC 2019
Modified Files:
src/lib/libisns: isns_thread.c
Log Message:
Fix up mangled logic, hopefully. PR 54323 from David Binderman.
XXX: This code is pretty dodgy in general and would benefit from a
XXX: workover by someone who knows what it's supposed to be doing.
XXX: E.g. it appears that a read error will cause an infinite loop...
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/lib/libisns/isns_thread.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libisns/isns_thread.c
diff -u src/lib/libisns/isns_thread.c:1.1.1.1 src/lib/libisns/isns_thread.c:1.2
--- src/lib/libisns/isns_thread.c:1.1.1.1 Sun Jan 16 01:22:50 2011
+++ src/lib/libisns/isns_thread.c Wed Jul 3 18:40:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: isns_thread.c,v 1.1.1.1 2011/01/16 01:22:50 agc Exp $ */
+/* $NetBSD: isns_thread.c,v 1.2 2019/07/03 18:40:33 dholland Exp $ */
/*-
* Copyright (c) 2004,2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: isns_thread.c,v 1.1.1.1 2011/01/16 01:22:50 agc Exp $");
+__RCSID("$NetBSD: isns_thread.c,v 1.2 2019/07/03 18:40:33 dholland Exp $");
/*
@@ -152,12 +152,16 @@ isns_kevent_pipe(struct kevent* evt_p, s
DBG("isns_kevent_pipe: ISNS_CMD_ABORT_TRANS\n");
rbytes = read(cfg_p->pipe_fds[0], _id,
sizeof(trans_id));
- if ((rbytes < 0) && (rbytes == sizeof(trans_id)))
-isns_abort_trans(cfg_p, trans_id);
- else
+ if (rbytes < 0)
DBG("isns_kevent_pipe: "
"error reading trans id\n");
- pipe_nbytes -= (int)rbytes;
+ else if (rbytes != sizeof(trans_id))
+DBG("isns_kevent_pipe: "
+"short read reading trans id\n");
+ else {
+isns_abort_trans(cfg_p, trans_id);
+pipe_nbytes -= (int)rbytes;
+ }
break;
case ISNS_CMD_STOP:
CVS commit: src/lib/libisns
Module Name:src Committed By: dholland Date: Wed Jul 3 18:40:33 UTC 2019 Modified Files: src/lib/libisns: isns_thread.c Log Message: Fix up mangled logic, hopefully. PR 54323 from David Binderman. XXX: This code is pretty dodgy in general and would benefit from a XXX: workover by someone who knows what it's supposed to be doing. XXX: E.g. it appears that a read error will cause an infinite loop... To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/lib/libisns/isns_thread.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/sunos
Module Name:src
Committed By: dholland
Date: Wed Jul 3 18:24:50 UTC 2019
Modified Files:
src/sys/compat/sunos: sunos_misc.c
Log Message:
Stack buffers mustn't escape their scope. PR 54326 from David Binderman
To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 src/sys/compat/sunos/sunos_misc.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/compat/sunos/sunos_misc.c
diff -u src/sys/compat/sunos/sunos_misc.c:1.172 src/sys/compat/sunos/sunos_misc.c:1.173
--- src/sys/compat/sunos/sunos_misc.c:1.172 Mon Sep 3 16:29:30 2018
+++ src/sys/compat/sunos/sunos_misc.c Wed Jul 3 18:24:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos_misc.c,v 1.172 2018/09/03 16:29:30 riastradh Exp $ */
+/* $NetBSD: sunos_misc.c,v 1.173 2019/07/03 18:24:50 dholland Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -50,7 +50,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sunos_misc.c,v 1.172 2018/09/03 16:29:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_misc.c,v 1.173 2019/07/03 18:24:50 dholland Exp $");
#include
#include
@@ -1013,6 +1013,7 @@ sunos_sys_reboot(struct lwp *l, const st
struct sunos_howto_conv *convp;
int error, bsd_howto, sun_howto;
char *bootstr;
+ char bs[128];
if ((error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_REBOOT,
0, NULL, NULL, NULL)) != 0)
@@ -1036,8 +1037,6 @@ sunos_sys_reboot(struct lwp *l, const st
* next booted kernel.
*/
if (sun_howto & SUNOS_RB_STRING) {
- char bs[128];
-
error = copyinstr(SCARG(uap, bootstr), bs, sizeof(bs), 0);
if (error)
CVS commit: src/sys/compat/sunos
Module Name:src Committed By: dholland Date: Wed Jul 3 18:24:50 UTC 2019 Modified Files: src/sys/compat/sunos: sunos_misc.c Log Message: Stack buffers mustn't escape their scope. PR 54326 from David Binderman To generate a diff of this commit: cvs rdiff -u -r1.172 -r1.173 src/sys/compat/sunos/sunos_misc.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/mii
Module Name:src
Committed By: maxv
Date: Wed Jul 3 17:40:30 UTC 2019
Modified Files:
src/sys/dev/mii: makphy.c
Log Message:
Check the return value of PHY_READ(). Because, if it fails, 'reg' is not
initialized. On Qemu, this read systematically fails.
Print an error in this case, and act as if there was no fiber. Maybe there
is a smarter way to fix this kind of things.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/mii/makphy.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/mii/makphy.c
diff -u src/sys/dev/mii/makphy.c:1.59 src/sys/dev/mii/makphy.c:1.60
--- src/sys/dev/mii/makphy.c:1.59 Mon Mar 25 07:34:13 2019
+++ src/sys/dev/mii/makphy.c Wed Jul 3 17:40:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: makphy.c,v 1.59 2019/03/25 07:34:13 msaitoh Exp $ */
+/* $NetBSD: makphy.c,v 1.60 2019/07/03 17:40:29 maxv Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.59 2019/03/25 07:34:13 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.60 2019/07/03 17:40:29 maxv Exp $");
#include
#include
@@ -204,7 +204,11 @@ page0:
switch (model) {
case MII_MODEL_xxMARVELL_E1011:
case MII_MODEL_xxMARVELL_E1112:
- PHY_READ(sc, MAKPHY_ESSR, );
+ if (PHY_READ(sc, MAKPHY_ESSR, ) != 0) {
+ aprint_verbose_dev(self,
+ "Failed to read MAKPHY_ESSR\n");
+ break;
+ }
if (reg & ESSR_FIBER_LINK)
sc->mii_flags |= MIIF_HAVEFIBER;
break;
CVS commit: src/sys/dev/mii
Module Name:src Committed By: maxv Date: Wed Jul 3 17:40:30 UTC 2019 Modified Files: src/sys/dev/mii: makphy.c Log Message: Check the return value of PHY_READ(). Because, if it fails, 'reg' is not initialized. On Qemu, this read systematically fails. Print an error in this case, and act as if there was no fiber. Maybe there is a smarter way to fix this kind of things. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/dev/mii/makphy.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: maxv Date: Wed Jul 3 17:31:32 UTC 2019 Modified Files: src/sys/kern: kern_sysctl.c Log Message: Invert two conditions, to fix uninitialized memory access. If the node is an immediate, then the 64 bits of nnode.sysctl_data may not all be initialized, since this is an union. Obviously, this is harmless; but still a bug, so fix it. To generate a diff of this commit: cvs rdiff -u -r1.263 -r1.264 src/sys/kern/kern_sysctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: maxv
Date: Wed Jul 3 17:31:32 UTC 2019
Modified Files:
src/sys/kern: kern_sysctl.c
Log Message:
Invert two conditions, to fix uninitialized memory access. If the node is
an immediate, then the 64 bits of nnode.sysctl_data may not all be
initialized, since this is an union.
Obviously, this is harmless; but still a bug, so fix it.
To generate a diff of this commit:
cvs rdiff -u -r1.263 -r1.264 src/sys/kern/kern_sysctl.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/kern/kern_sysctl.c
diff -u src/sys/kern/kern_sysctl.c:1.263 src/sys/kern/kern_sysctl.c:1.264
--- src/sys/kern/kern_sysctl.c:1.263 Mon Jan 28 15:56:12 2019
+++ src/sys/kern/kern_sysctl.c Wed Jul 3 17:31:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sysctl.c,v 1.263 2019/01/28 15:56:12 christos Exp $ */
+/* $NetBSD: kern_sysctl.c,v 1.264 2019/07/03 17:31:32 maxv Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.263 2019/01/28 15:56:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.264 2019/07/03 17:31:32 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_defcorename.h"
@@ -1077,8 +1077,8 @@ sysctl_create(SYSCTLFN_ARGS)
*/
if (l != NULL || nnode.sysctl_func == NULL) {
if (type != CTLTYPE_NODE &&
- nnode.sysctl_data == NULL &&
!(flags & CTLFLAG_IMMEDIATE) &&
+ nnode.sysctl_data == NULL &&
own == NULL)
return (EINVAL);
}
CVS commit: src/sys/arch
Module Name:src Committed By: maxv Date: Wed Jul 3 17:24:37 UTC 2019 Modified Files: src/sys/arch/amd64/amd64: cpufunc.S src/sys/arch/i386/i386: cpufunc.S src/sys/arch/x86/include: cpufunc.h Log Message: Inline x86_cpuid2(), prerequisite for future changes. Also, add "memory" on certain other inlines, to make sure GCC does not reorder. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/arch/amd64/amd64/cpufunc.S cvs rdiff -u -r1.32 -r1.33 src/sys/arch/i386/i386/cpufunc.S cvs rdiff -u -r1.32 -r1.33 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/sys/arch
Module Name:src
Committed By: maxv
Date: Wed Jul 3 17:24:37 UTC 2019
Modified Files:
src/sys/arch/amd64/amd64: cpufunc.S
src/sys/arch/i386/i386: cpufunc.S
src/sys/arch/x86/include: cpufunc.h
Log Message:
Inline x86_cpuid2(), prerequisite for future changes. Also, add "memory"
on certain other inlines, to make sure GCC does not reorder.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/amd64/amd64/cpufunc.S
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/i386/i386/cpufunc.S
cvs rdiff -u -r1.32 -r1.33 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/amd64/amd64/cpufunc.S
diff -u src/sys/arch/amd64/amd64/cpufunc.S:1.41 src/sys/arch/amd64/amd64/cpufunc.S:1.42
--- src/sys/arch/amd64/amd64/cpufunc.S:1.41 Wed May 29 16:54:41 2019
+++ src/sys/arch/amd64/amd64/cpufunc.S Wed Jul 3 17:24:37 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.S,v 1.41 2019/05/29 16:54:41 maxv Exp $ */
+/* $NetBSD: cpufunc.S,v 1.42 2019/07/03 17:24:37 maxv Exp $ */
/*
* Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc.
@@ -358,20 +358,6 @@ ENTRY(x86_mwait)
ret
END(x86_mwait)
-ENTRY(x86_cpuid2)
- movq %rbx, %r8
- movq %rdi, %rax
- movq %rsi, %rcx
- movq %rdx, %rsi
- cpuid
- movl %eax, 0(%rsi)
- movl %ebx, 4(%rsi)
- movl %ecx, 8(%rsi)
- movl %edx, 12(%rsi)
- movq %r8, %rbx
- ret
-END(x86_cpuid2)
-
ENTRY(fnsave)
fnsave (%rdi)
ret
Index: src/sys/arch/i386/i386/cpufunc.S
diff -u src/sys/arch/i386/i386/cpufunc.S:1.32 src/sys/arch/i386/i386/cpufunc.S:1.33
--- src/sys/arch/i386/i386/cpufunc.S:1.32 Sun May 19 08:17:02 2019
+++ src/sys/arch/i386/i386/cpufunc.S Wed Jul 3 17:24:37 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.S,v 1.32 2019/05/19 08:17:02 maxv Exp $ */
+/* $NetBSD: cpufunc.S,v 1.33 2019/07/03 17:24:37 maxv Exp $ */
/*-
* Copyright (c) 1998, 2007 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include
#include
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.S,v 1.32 2019/05/19 08:17:02 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.S,v 1.33 2019/07/03 17:24:37 maxv Exp $");
#include "opt_xen.h"
@@ -244,22 +244,6 @@ ENTRY(x86_mwait)
ret
END(x86_mwait)
-ENTRY(x86_cpuid2)
- pushl %ebx
- pushl %edi
- movl 12(%esp), %eax
- movl 16(%esp), %ecx
- movl 20(%esp), %edi
- cpuid
- movl %eax, 0(%edi)
- movl %ebx, 4(%edi)
- movl %ecx, 8(%edi)
- movl %edx, 12(%edi)
- popl %edi
- popl %ebx
- ret
-END(x86_cpuid2)
-
ENTRY(fnsave)
movl 4(%esp), %eax
fnsave (%eax)
Index: src/sys/arch/x86/include/cpufunc.h
diff -u src/sys/arch/x86/include/cpufunc.h:1.32 src/sys/arch/x86/include/cpufunc.h:1.33
--- src/sys/arch/x86/include/cpufunc.h:1.32 Thu May 30 21:40:40 2019
+++ src/sys/arch/x86/include/cpufunc.h Wed Jul 3 17:24:37 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.h,v 1.32 2019/05/30 21:40:40 christos Exp $ */
+/* $NetBSD: cpufunc.h,v 1.33 2019/07/03 17:24:37 maxv Exp $ */
/*
* Copyright (c) 1998, 2007, 2019 The NetBSD Foundation, Inc.
@@ -112,9 +112,24 @@ void x86_patch(bool);
void x86_monitor(const void *, uint32_t, uint32_t);
void x86_mwait(uint32_t, uint32_t);
-/* x86_cpuid2() writes four 32bit values, %eax, %ebx, %ecx and %edx */
-#define x86_cpuid(a,b) x86_cpuid2((a),0,(b))
-void x86_cpuid2(uint32_t, uint32_t, uint32_t *);
+
+static inline void
+x86_cpuid2(uint32_t eax, uint32_t ecx, uint32_t *regs)
+{
+ uint32_t ebx, edx;
+
+ __asm volatile (
+ "cpuid"
+ : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
+ : "a" (eax), "c" (ecx)
+ );
+
+ regs[0] = eax;
+ regs[1] = ebx;
+ regs[2] = ecx;
+ regs[3] = edx;
+}
+#define x86_cpuid(a,b) x86_cpuid2((a), 0, (b))
/* -- */
@@ -176,6 +191,7 @@ void setusergs(int);
"mov %[val],%%cr" #crnum \
:\
: [val] "r" (val) \
+ : "memory" \
); \
} \
static inline register_t rcr##crnum(void) \
@@ -325,13 +341,13 @@ void x86_enable_intr(void);
static inline void
x86_disable_intr(void)
{
- __asm volatile ("cli");
+ __asm volatile ("cli" ::: "memory");
}
static inline void
x86_enable_intr(void)
{
- __asm volatile ("sti");
+ __asm volatile ("sti" ::: "memory");
}
#endif /* XENPV */
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed Jul 3 15:52:35 UTC 2019 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new tzcode To generate a diff of this commit: cvs rdiff -u -r1.1633 -r1.1634 src/doc/3RDPARTY cvs rdiff -u -r1.2550 -r1.2551 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed Jul 3 15:52:35 UTC 2019 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new tzcode To generate a diff of this commit: cvs rdiff -u -r1.1633 -r1.1634 src/doc/3RDPARTY cvs rdiff -u -r1.2550 -r1.2551 src/doc/CHANGES 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.1633 src/doc/3RDPARTY:1.1634 --- src/doc/3RDPARTY:1.1633 Wed Jul 3 08:38:28 2019 +++ src/doc/3RDPARTY Wed Jul 3 11:52:35 2019 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1633 2019/07/03 12:38:28 sevan Exp $ +# $NetBSD: 3RDPARTY,v 1.1634 2019/07/03 15:52:35 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1398,13 +1398,14 @@ Notes: Added changes from a5 -> a12 manually. Package: tz -Version: tzcode2019a / tzdata2019a -Current Vers: tzcode2019a / tzdata2019a +Version: tzcode2019b / tzdata2019a +Current Vers: tzcode2019b / tzdata2019b Maintainer: Paul Eggert Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Old Archive Site: ftp://elsie.nci.nih.gov/pub/ Home Page: http://www.iana.org/time-zones +Date: 2019-07-03 Mailing List: t...@iana.org Responsible: kleink, christos, kre License: Public domain Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2550 src/doc/CHANGES:1.2551 --- src/doc/CHANGES:1.2550 Wed Jun 26 13:50:22 2019 +++ src/doc/CHANGES Wed Jul 3 11:52:35 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2550 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2551 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -396,3 +396,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0: gpt(8): added uuid subcommand to generate new UUIDS. [jnemeth 20190624] dhcpcd(8): Import dhcpcd-7.2.3 [roy 20190626] + tzcode: Updated to 2019b. [christos 20190703]
CVS commit: src/usr.sbin/zic
Module Name:src
Committed By: christos
Date: Wed Jul 3 15:50:40 UTC 2019
Modified Files:
src/usr.sbin/zic: Makefile
Log Message:
Change the default to be slim
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/zic/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/zic/Makefile
diff -u src/usr.sbin/zic/Makefile:1.20 src/usr.sbin/zic/Makefile:1.21
--- src/usr.sbin/zic/Makefile:1.20 Fri Jan 6 12:25:32 2017
+++ src/usr.sbin/zic/Makefile Wed Jul 3 11:50:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2017/01/06 17:25:32 christos Exp $
+# $NetBSD: Makefile,v 1.21 2019/07/03 15:50:40 christos Exp $
.include "Makefile.inc"
.include
@@ -14,6 +14,7 @@ TZVERSION=0
TZVERSION!= ${TOOL_CAT} ${NETBSDSRCDIR}/lib/libc/time/version
.endif
CPPFLAGS+=-DPKGVERSION='"(tzcode) "' -DTZVERSION='"${TZVERSION}"'
+CPPFLAGS+=-DZIC_BLOAT_DEFAULT='"slim"'
.PATH: ${NETBSDSRCDIR}/lib/libc/time
CVS commit: src/lib/libc/time
Module Name:src Committed By: christos Date: Wed Jul 3 15:50:16 UTC 2019 Modified Files: src/lib/libc/time: Makefile NEWS localtime.c theory.html tz-art.html tz-how-to.html tz-link.html tzfile.5 tzset.3 version zic.8 zic.c Log Message: Sync with 2019b: zic's new -b option supports a way to control data bloat and to test for year-2038 bugs in software that reads TZif files. 'zic -b fat' and 'zic -b slim' generate larger and smaller output; for example, changing from fat to slim shrinks the Europe/London file from 3648 to 1599 bytes, saving about 56%. Fat and slim files represent the same set of timestamps and use the same TZif format as documented in tzfile(5) and in Internet RFC 8536. Fat format attempts to work around bugs or incompatibilities in older software, notably software that mishandles 64-bit TZif data or uses obsolete TZ strings like "EET-2EEST" that lack DST rules. Slim format is more efficient and does not work around 64-bit bugs or obsolete TZ strings. Currently zic defaults to fat format unless you compile with -DZIC_BLOAT_DEFAULT=\"slim\"; this out-of-the-box default is intended to change in future releases as the buggy software often mishandles timestamps anyway. zic no longer treats a set of rules ending in 2037 specially. Previously, zic assumed that such a ruleset meant that future timestamps could not be predicted, and therefore omitted a POSIX-like TZ string in the TZif output. The old behavior is no longer needed for current tzdata, and caused problems with newlib when used with older tzdata (reported by David Gauchard). zic no longer generates some artifact transitions. For example, Europe/London no longer has a no-op transition in January 1996. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/lib/libc/time/Makefile cvs rdiff -u -r1.28 -r1.29 src/lib/libc/time/NEWS src/lib/libc/time/tzfile.5 cvs rdiff -u -r1.121 -r1.122 src/lib/libc/time/localtime.c cvs rdiff -u -r1.7 -r1.8 src/lib/libc/time/theory.html cvs rdiff -u -r1.4 -r1.5 src/lib/libc/time/tz-art.html cvs rdiff -u -r1.6 -r1.7 src/lib/libc/time/tz-how-to.html cvs rdiff -u -r1.5 -r1.6 src/lib/libc/time/tz-link.html cvs rdiff -u -r1.41 -r1.42 src/lib/libc/time/tzset.3 cvs rdiff -u -r1.11 -r1.12 src/lib/libc/time/version cvs rdiff -u -r1.32 -r1.33 src/lib/libc/time/zic.8 cvs rdiff -u -r1.74 -r1.75 src/lib/libc/time/zic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/time/Makefile diff -u src/lib/libc/time/Makefile:1.43 src/lib/libc/time/Makefile:1.44 --- src/lib/libc/time/Makefile:1.43 Thu Apr 4 14:18:31 2019 +++ src/lib/libc/time/Makefile Wed Jul 3 11:50:16 2019 @@ -35,11 +35,13 @@ DATAFORM= main LOCALTIME= GMT -# If you want something other than Eastern United States time as a template -# for handling ruleless POSIX-style timezone environment variables, +# The POSIXRULES macro controls interpretation of nonstandard and obsolete +# POSIX-like TZ settings like TZ='EET-2EEST' that lack DST transition rules. +# In the reference implementation, if you want something other than Eastern +# United States time as a template for handling these settings, you can # change the line below (after finding the timezone you want in the # one of the $(TDATA) source files, or adding it to a source file). -# A ruleless environment setting like TZ='CST6CDT' uses the rules in the +# A setting like TZ='EET-2EEST' is supposed to use the rules in the # template file to determine "spring forward" and "fall back" days and # times; the environment variable itself specifies UT offsets of standard and # daylight saving time. @@ -49,6 +51,17 @@ LOCALTIME= GMT # Use the command # make zonenames # to get a list of the values you can use for POSIXRULES. +# +# If POSIXRULES is empty, no template is installed; this is the intended +# future default for POSIXRULES. +# +# Nonempty POSIXRULES is obsolete and should not be relied on, because: +# * It does not work correctly in popular implementations such as GNU/Linux. +# * It does not work in the tzdb implementation for timestamps after 2037. +# * It is incompatible with 'zic -b slim' if POSIXRULES specifies transitions +# at standard time or UT rather than at local time. +# In short, software should avoid ruleless settings like TZ='EET-2EEST' +# and so should not depend on the value of POSIXRULES. POSIXRULES= America/New_York @@ -231,6 +244,13 @@ LDLIBS= # other than simply getting garbage data # -DUSE_LTZ=0 to build zdump with the system time zone library # Also set TZDOBJS=zdump.o and CHECK_TIME_T_ALTERNATIVES= below. +# -DZIC_BLOAT_DEFAULT=\"slim\" to default zic's -b option to "slim", and +# similarly for "fat". Fat TZif files work around incompatibilities +# and bugs in some TZif readers, notably readers that mishandle 64-bit
CVS commit: src/usr.sbin/zic
Module Name:src Committed By: christos Date: Wed Jul 3 15:50:40 UTC 2019 Modified Files: src/usr.sbin/zic: Makefile Log Message: Change the default to be slim To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/zic/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/time
Module Name:src Committed By: christos Date: Wed Jul 3 15:50:16 UTC 2019 Modified Files: src/lib/libc/time: Makefile NEWS localtime.c theory.html tz-art.html tz-how-to.html tz-link.html tzfile.5 tzset.3 version zic.8 zic.c Log Message: Sync with 2019b: zic's new -b option supports a way to control data bloat and to test for year-2038 bugs in software that reads TZif files. 'zic -b fat' and 'zic -b slim' generate larger and smaller output; for example, changing from fat to slim shrinks the Europe/London file from 3648 to 1599 bytes, saving about 56%. Fat and slim files represent the same set of timestamps and use the same TZif format as documented in tzfile(5) and in Internet RFC 8536. Fat format attempts to work around bugs or incompatibilities in older software, notably software that mishandles 64-bit TZif data or uses obsolete TZ strings like "EET-2EEST" that lack DST rules. Slim format is more efficient and does not work around 64-bit bugs or obsolete TZ strings. Currently zic defaults to fat format unless you compile with -DZIC_BLOAT_DEFAULT=\"slim\"; this out-of-the-box default is intended to change in future releases as the buggy software often mishandles timestamps anyway. zic no longer treats a set of rules ending in 2037 specially. Previously, zic assumed that such a ruleset meant that future timestamps could not be predicted, and therefore omitted a POSIX-like TZ string in the TZif output. The old behavior is no longer needed for current tzdata, and caused problems with newlib when used with older tzdata (reported by David Gauchard). zic no longer generates some artifact transitions. For example, Europe/London no longer has a no-op transition in January 1996. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/lib/libc/time/Makefile cvs rdiff -u -r1.28 -r1.29 src/lib/libc/time/NEWS src/lib/libc/time/tzfile.5 cvs rdiff -u -r1.121 -r1.122 src/lib/libc/time/localtime.c cvs rdiff -u -r1.7 -r1.8 src/lib/libc/time/theory.html cvs rdiff -u -r1.4 -r1.5 src/lib/libc/time/tz-art.html cvs rdiff -u -r1.6 -r1.7 src/lib/libc/time/tz-how-to.html cvs rdiff -u -r1.5 -r1.6 src/lib/libc/time/tz-link.html cvs rdiff -u -r1.41 -r1.42 src/lib/libc/time/tzset.3 cvs rdiff -u -r1.11 -r1.12 src/lib/libc/time/version cvs rdiff -u -r1.32 -r1.33 src/lib/libc/time/zic.8 cvs rdiff -u -r1.74 -r1.75 src/lib/libc/time/zic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/include
Module Name:src
Committed By: christos
Date: Wed Jul 3 15:49:21 UTC 2019
Modified Files:
src/include: tzfile.h
Log Message:
Sync with 2019b (field name change)
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/include/tzfile.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/tzfile.h
diff -u src/include/tzfile.h:1.9 src/include/tzfile.h:1.10
--- src/include/tzfile.h:1.9 Thu Apr 4 14:18:52 2019
+++ src/include/tzfile.h Wed Jul 3 11:49:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tzfile.h,v 1.9 2019/04/04 18:18:52 christos Exp $ */
+/* $NetBSD: tzfile.h,v 1.10 2019/07/03 15:49:21 christos Exp $ */
#ifndef _TZFILE_H_
#define _TZFILE_H_
@@ -45,7 +45,7 @@ struct tzhead {
char tzh_magic[4]; /* TZ_MAGIC */
char tzh_version[1]; /* '\0' or '2' or '3' as of 2013 */
char tzh_reserved[15]; /* reserved; must be zero */
- char tzh_ttisgmtcnt[4]; /* coded number of trans. time flags */
+ char tzh_ttisutcnt[4]; /* coded number of trans. time flags */
char tzh_ttisstdcnt[4]; /* coded number of trans. time flags */
char tzh_leapcnt[4]; /* coded number of leap seconds */
char tzh_timecnt[4]; /* coded number of transition times */
@@ -68,14 +68,15 @@ struct tzhead {
** one (char [4]) total correction after above
** tzh_ttisstdcnt (char)s indexed by type; if 1, transition
** time is standard time, if 0,
-** transition time is wall clock time
-** if absent, transition times are
-** assumed to be wall clock time
-** tzh_ttisgmtcnt (char)s indexed by type; if 1, transition
-** time is UT, if 0,
-** transition time is local time
-** if absent, transition times are
+** transition time is local (wall clock)
+** time; if absent, transition times are
** assumed to be local time
+** tzh_ttisutcnt (char)s indexed by type; if 1, transition
+** time is UT, if 0, transition time is
+** local time; if absent, transition
+** times are assumed to be local time.
+** When this is 1, the corresponding
+** std/wall indicator must also be 1.
*/
/*
CVS commit: src/include
Module Name:src Committed By: christos Date: Wed Jul 3 15:49:21 UTC 2019 Modified Files: src/include: tzfile.h Log Message: Sync with 2019b (field name change) To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/include/tzfile.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/wsfont
Module Name:src Committed By: fcambus Date: Wed Jul 3 13:31:58 UTC 2019 Modified Files: src/sys/dev/wsfont: spleen12x24.h spleen16x32.h spleen32x64.h spleen5x8.h spleen8x16.h Log Message: Update Spleen kernel fonts to the latest released version, bringing the following improvements: - Shift the middle bar of the upper case 'G' one pixel down in the 12x24 version - Shift lower case 'k' character right, for better alignment in the 12x24, 16x32, and 32x64 versions - Make upper case 'X' thicker in the 16x32 and 32x64 versions - Make upper case 'V' thicker in the 32x64 version - Make lower case 'g' character smoother in the 16x32 and 32x64 versions - Add some artefacts on each side of the lower case 'i' characters OK kamil@ To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/wsfont/spleen12x24.h \ src/sys/dev/wsfont/spleen16x32.h src/sys/dev/wsfont/spleen32x64.h \ src/sys/dev/wsfont/spleen5x8.h src/sys/dev/wsfont/spleen8x16.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/wsfont
Module Name:src
Committed By: fcambus
Date: Wed Jul 3 13:31:58 UTC 2019
Modified Files:
src/sys/dev/wsfont: spleen12x24.h spleen16x32.h spleen32x64.h
spleen5x8.h spleen8x16.h
Log Message:
Update Spleen kernel fonts to the latest released version, bringing
the following improvements:
- Shift the middle bar of the upper case 'G' one pixel down in the 12x24
version
- Shift lower case 'k' character right, for better alignment in the 12x24,
16x32, and 32x64 versions
- Make upper case 'X' thicker in the 16x32 and 32x64 versions
- Make upper case 'V' thicker in the 32x64 version
- Make lower case 'g' character smoother in the 16x32 and 32x64 versions
- Add some artefacts on each side of the lower case 'i' characters
OK kamil@
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/wsfont/spleen12x24.h \
src/sys/dev/wsfont/spleen16x32.h src/sys/dev/wsfont/spleen32x64.h \
src/sys/dev/wsfont/spleen5x8.h src/sys/dev/wsfont/spleen8x16.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/wsfont/spleen12x24.h
diff -u src/sys/dev/wsfont/spleen12x24.h:1.1 src/sys/dev/wsfont/spleen12x24.h:1.2
--- src/sys/dev/wsfont/spleen12x24.h:1.1 Sun Mar 17 06:09:35 2019
+++ src/sys/dev/wsfont/spleen12x24.h Wed Jul 3 13:31:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: spleen12x24.h,v 1.1 2019/03/17 06:09:35 tnn Exp $ */
+/* $NetBSD: spleen12x24.h,v 1.2 2019/07/03 13:31:57 fcambus Exp $ */
/* $OpenBSD: spleen12x24.h,v 1.2 2019/03/08 10:53:59 fcambus Exp $ */
/*
@@ -1028,13 +1028,13 @@ static u_char spleen12x24_data[] = {
0x60, 0x00, /* .**. */
0x60, 0x00, /* .**. */
0x60, 0x00, /* .**. */
+ 0x60, 0x00, /* .**. */
0x63, 0xe0, /* .**...*. */
0x60, 0x60, /* .**..**. */
0x60, 0x60, /* .**..**. */
0x60, 0x60, /* .**..**. */
0x60, 0x60, /* .**..**. */
0x60, 0x60, /* .**..**. */
- 0x60, 0x60, /* .**..**. */
0x30, 0x60, /* ..**.**. */
0x1f, 0xe0, /* .... */
0x00, 0x00, /* */
@@ -1876,6 +1876,7 @@ static u_char spleen12x24_data[] = {
0x06, 0x00, /* .**. */
0x00, 0x00, /* */
0x00, 0x00, /* */
+ 0x1e, 0x00, /* .... */
0x06, 0x00, /* .**. */
0x06, 0x00, /* .**. */
0x06, 0x00, /* .**. */
@@ -1885,8 +1886,7 @@ static u_char spleen12x24_data[] = {
0x06, 0x00, /* .**. */
0x06, 0x00, /* .**. */
0x06, 0x00, /* .**. */
- 0x06, 0x00, /* .**. */
- 0x06, 0x00, /* .**. */
+ 0x07, 0x80, /* .... */
0x00, 0x00, /* */
0x00, 0x00, /* */
0x00, 0x00, /* */
@@ -1922,21 +1922,21 @@ static u_char spleen12x24_data[] = {
0x00, 0x00, /* */
0x00, 0x00, /* */
0x00, 0x00, /* */
- 0x60, 0x00, /* .**. */
- 0x60, 0x00, /* .**. */
- 0x60, 0x00, /* .**. */
- 0x60, 0x00, /* .**. */
- 0x61, 0x80, /* .****... */
- 0x61, 0x80, /* .****... */
- 0x63, 0x00, /* .**...** */
- 0x66, 0x00, /* .**..**. */
- 0x7c, 0x00, /* .*.. */
- 0x6c, 0x00, /* .**.**.. */
- 0x66, 0x00, /* .**..**. */
- 0x63, 0x00, /* .**...** */
- 0x61, 0x80, /* .****... */
- 0x60, 0xc0, /* .**.**.. */
- 0x60, 0xc0, /* .**.**.. */
+ 0x30, 0x00, /* ..** */
+ 0x30, 0x00, /* ..** */
+ 0x30, 0x00, /* ..** */
+ 0x30, 0x00, /* ..** */
+ 0x30, 0xc0, /* ..****.. */
+ 0x30, 0xc0, /* ..****.. */
+ 0x31, 0x80, /* ..**...**... */
+ 0x33, 0x00, /* ..**..** */
+ 0x3e, 0x00, /* ..*. */
+ 0x36, 0x00, /* ..**.**. */
+ 0x33, 0x00, /* ..**..** */
+ 0x31, 0x80, /* ..**...**... */
+ 0x30, 0xc0, /* ..****.. */
+ 0x30, 0x60, /* ..**.**. */
+ 0x30, 0x60, /* ..**.**. */
0x00, 0x00, /* */
0x00, 0x00, /* */
0x00, 0x00, /* */
@@ -5151,6 +5151,7 @@ static u_char spleen12x24_data[] = {
0x03, 0x00, /* ..** */
0x00, 0x00, /* */
0x00, 0x00, /* */
+ 0x1e, 0x00, /* .... */
0x06, 0x00, /* .**. */
0x06, 0x00, /* .**. */
0x06, 0x00, /* .**. */
@@ -5160,8 +5161,7 @@ static u_char spleen12x24_data[] = {
0x06, 0x00, /* .**. */
0x06, 0x00, /* .**. */
0x06, 0x00, /* .**. */
- 0x06, 0x00, /* .**. */
- 0x06, 0x00, /* .**. */
+ 0x07, 0x80, /* .... */
0x00, 0x00, /*
CVS commit: src/doc
Module Name:src Committed By: sevan Date: Wed Jul 3 12:38:28 UTC 2019 Modified Files: src/doc: 3RDPARTY Log Message: New Postfix release. Add a date field To generate a diff of this commit: cvs rdiff -u -r1.1632 -r1.1633 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: sevan Date: Wed Jul 3 12:38:28 UTC 2019 Modified Files: src/doc: 3RDPARTY Log Message: New Postfix release. Add a date field To generate a diff of this commit: cvs rdiff -u -r1.1632 -r1.1633 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.1632 src/doc/3RDPARTY:1.1633 --- src/doc/3RDPARTY:1.1632 Sat Jun 29 06:57:48 2019 +++ src/doc/3RDPARTY Wed Jul 3 12:38:28 2019 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1632 2019/06/29 06:57:48 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1633 2019/07/03 12:38:28 sevan Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1211,10 +1211,11 @@ now to do a new import. Package: Postfix Version: 3.1.4 -Current Vers: 3.1.9/3.2.6/3.3.2 +Current Vers: 3.1.13/3.2.10/3.3.5/3.4.6 Maintainer: Wietse Venema Archive Site: Home Page: http://www.postfix.org/ +Date: 2019-07-03 Mailing List: postfix-us...@postfix.org Responsible: christos License: IBM Public License. See also src/external/ibm-public/postfix/dist.
CVS commit: src/sys/dev/i2c
Module Name:src Committed By: jmcneill Date: Wed Jul 3 10:21:41 UTC 2019 Modified Files: src/sys/dev/i2c: rkpmic.c Log Message: Fix enable mask for RK808 LDO regulators To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/i2c/rkpmic.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/i2c
Module Name:src
Committed By: jmcneill
Date: Wed Jul 3 10:21:41 UTC 2019
Modified Files:
src/sys/dev/i2c: rkpmic.c
Log Message:
Fix enable mask for RK808 LDO regulators
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/i2c/rkpmic.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/i2c/rkpmic.c
diff -u src/sys/dev/i2c/rkpmic.c:1.2 src/sys/dev/i2c/rkpmic.c:1.3
--- src/sys/dev/i2c/rkpmic.c:1.2 Thu Sep 20 09:02:46 2018
+++ src/sys/dev/i2c/rkpmic.c Wed Jul 3 10:21:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rkpmic.c,v 1.2 2018/09/20 09:02:46 jmcneill Exp $ */
+/* $NetBSD: rkpmic.c,v 1.3 2019/07/03 10:21:41 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rkpmic.c,v 1.2 2018/09/20 09:02:46 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rkpmic.c,v 1.3 2019/07/03 10:21:41 jmcneill Exp $");
#include
#include
@@ -123,31 +123,31 @@ static const struct rkpmic_ctrl rk808_ct
.vsel_reg = 0x3b, .vsel_mask = __BITS(4,0),
.base = 180, .step = 10 },
{ .name = "LDO_REG2",
- .enable_reg = 0x24, .enable_mask = __BIT(0),
+ .enable_reg = 0x24, .enable_mask = __BIT(1),
.vsel_reg = 0x3d, .vsel_mask = __BITS(4,0),
.base = 180, .step = 10 },
{ .name = "LDO_REG3",
- .enable_reg = 0x24, .enable_mask = __BIT(0),
+ .enable_reg = 0x24, .enable_mask = __BIT(2),
.vsel_reg = 0x3f, .vsel_mask = __BITS(3,0),
.base = 80, .step = 10 },
{ .name = "LDO_REG4",
- .enable_reg = 0x24, .enable_mask = __BIT(0),
+ .enable_reg = 0x24, .enable_mask = __BIT(3),
.vsel_reg = 0x41, .vsel_mask = __BITS(4,0),
.base = 180, .step = 10 },
{ .name = "LDO_REG5",
- .enable_reg = 0x24, .enable_mask = __BIT(0),
+ .enable_reg = 0x24, .enable_mask = __BIT(4),
.vsel_reg = 0x43, .vsel_mask = __BITS(4,0),
.base = 180, .step = 10 },
{ .name = "LDO_REG6",
- .enable_reg = 0x24, .enable_mask = __BIT(0),
+ .enable_reg = 0x24, .enable_mask = __BIT(5),
.vsel_reg = 0x45, .vsel_mask = __BITS(4,0),
.base = 80, .step = 10 },
{ .name = "LDO_REG7",
- .enable_reg = 0x24, .enable_mask = __BIT(0),
+ .enable_reg = 0x24, .enable_mask = __BIT(6),
.vsel_reg = 0x47, .vsel_mask = __BITS(4,0),
.base = 80, .step = 10 },
{ .name = "LDO_REG8",
- .enable_reg = 0x24, .enable_mask = __BIT(0),
+ .enable_reg = 0x24, .enable_mask = __BIT(7),
.vsel_reg = 0x49, .vsel_mask = __BITS(4,0),
.base = 180, .step = 10 },
