svn commit: r327672 - head/bin/cat
Author: delphij
Date: Sun Jan 7 07:08:59 2018
New Revision: 327672
URL: https://svnweb.freebsd.org/changeset/base/327672
Log:
stddef.h is not used by cat.c, remove the include.
Modified:
head/bin/cat/cat.c
Modified: head/bin/cat/cat.c
==
--- head/bin/cat/cat.c Sun Jan 7 05:38:53 2018(r327671)
+++ head/bin/cat/cat.c Sun Jan 7 07:08:59 2018(r327672)
@@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
-#include
#include
#include
#include
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327671 - head/sbin/ldconfig
Author: eadler Date: Sun Jan 7 05:38:53 2018 New Revision: 327671 URL: https://svnweb.freebsd.org/changeset/base/327671 Log: ldconfig(8): clarify language for files The previous language did not make it clear that 'Files' are the files specified above. Clarify it. Reported by: dana Reviewed by: dana MFC After:1 week Modified: head/sbin/ldconfig/ldconfig.8 Modified: head/sbin/ldconfig/ldconfig.8 == --- head/sbin/ldconfig/ldconfig.8 Sun Jan 7 04:59:28 2018 (r327670) +++ head/sbin/ldconfig/ldconfig.8 Sun Jan 7 05:38:53 2018 (r327671) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 19, 2013 +.Dd January 6, 2018 .Dt LDCONFIG 8 .Os .Sh NAME @@ -58,7 +58,9 @@ the overhead that would otherwise result from the dire operations the dynamic linker would have to perform to load the required shared libraries. .Pp -Files named on the command line are expected to contain directories +Alternatively, +.Ar files +may be specified; these are expected to contain directories to scan for shared libraries. Each directory's pathname must start on a new line. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327670 - in head: share/man/man4 sys/arm/allwinner
Author: kevans
Date: Sun Jan 7 04:59:28 2018
New Revision: 327670
URL: https://svnweb.freebsd.org/changeset/base/327670
Log:
aw_sid(4): Add support for Allwinner H3
The sid controller on the H3 is generally identical in location, size, and
efuse offset to the a64 and the a83t. The main difference is that the H3 has
a silicon bug that sometimes causes the rootkey (at least) to be garbled
unless first read by the prctl registers.
This device is currently not in our DTS and, as of now, is not yet present
in mainline Linux DTS.
Tested on:OrangePi One
Modified:
head/share/man/man4/aw_sid.4
head/sys/arm/allwinner/aw_sid.c
Modified: head/share/man/man4/aw_sid.4
==
--- head/share/man/man4/aw_sid.4Sun Jan 7 03:31:55 2018
(r327669)
+++ head/share/man/man4/aw_sid.4Sun Jan 7 04:59:28 2018
(r327670)
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd January 2, 2018
+.Dd January 6, 2018
.Dt AW_SID 4
.Os
.Sh NAME
@@ -52,6 +52,8 @@ allwinner,sun7i-a20-sid
allwinner,sun50i-a64-sid
.It
allwinner,sun8i-a83t-sid
+.It
+allwinner,sun8i-h3-sid
.El
.Sh SYSCTL VARIABLES
The following read-only variables are available via
Modified: head/sys/arm/allwinner/aw_sid.c
==
--- head/sys/arm/allwinner/aw_sid.c Sun Jan 7 03:31:55 2018
(r327669)
+++ head/sys/arm/allwinner/aw_sid.c Sun Jan 7 04:59:28 2018
(r327670)
@@ -67,36 +67,51 @@ __FBSDID("$FreeBSD$");
#defineROOT_KEY_SIZE 4
struct aw_sid_conf {
+ bus_size_t efuse_size;
bus_size_t rootkey_offset;
boolhas_prctl;
boolhas_thermal;
+ boolrequires_prctl_read;
};
static const struct aw_sid_conf a10_conf = {
+ .efuse_size = 0x10,
.rootkey_offset = 0,
};
static const struct aw_sid_conf a20_conf = {
+ .efuse_size = 0x10,
.rootkey_offset = 0,
};
static const struct aw_sid_conf a64_conf = {
+ .efuse_size = 0x100,
.rootkey_offset = SID_SRAM,
.has_prctl = true,
.has_thermal = true,
};
static const struct aw_sid_conf a83t_conf = {
+ .efuse_size = 0x100,
.rootkey_offset = SID_SRAM,
.has_prctl = true,
.has_thermal = true,
};
+static const struct aw_sid_conf h3_conf = {
+ .efuse_size = 0x100,
+ .rootkey_offset = SID_SRAM,
+ .has_prctl = true,
+ .has_thermal = true,
+ .requires_prctl_read = true,
+};
+
static struct ofw_compat_data compat_data[] = {
{ "allwinner,sun4i-a10-sid",(uintptr_t)&a10_conf},
{ "allwinner,sun7i-a20-sid",(uintptr_t)&a20_conf},
{ "allwinner,sun50i-a64-sid", (uintptr_t)&a64_conf},
{ "allwinner,sun8i-a83t-sid", (uintptr_t)&a83t_conf},
+ { "allwinner,sun8i-h3-sid", (uintptr_t)&h3_conf},
{ NULL, 0 }
};
@@ -168,6 +183,8 @@ static int
aw_sid_attach(device_t dev)
{
struct aw_sid_softc *sc;
+ bus_size_t i;
+ uint32_t val;
sc = device_get_softc(dev);
@@ -179,6 +196,19 @@ aw_sid_attach(device_t dev)
mtx_init(&sc->prctl_mtx, device_get_nameunit(dev), NULL, MTX_DEF);
sc->sid_conf = (struct aw_sid_conf *)ofw_bus_search_compatible(dev,
compat_data)->ocd_data;
aw_sid_sc = sc;
+
+ /*
+* This set of reads is solely for working around a silicon bug on some
+* SoC that require a prctl read in order for direct register access to
+* return a non-garbled value. Hence, the values we read are simply
+* ignored.
+*/
+ if (sc->sid_conf->requires_prctl_read)
+ for (i = 0; i < sc->sid_conf->efuse_size; i += 4)
+ if (aw_sid_prctl_read(dev, i, &val) != 0) {
+ device_printf(dev, "failed prctl read\n");
+ return (ENXIO);
+ }
SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327668 - stable/11/share/man/man4
Author: ian
Date: Sun Jan 7 02:59:27 2018
New Revision: 327668
URL: https://svnweb.freebsd.org/changeset/base/327668
Log:
MFC r327220-r327221
r327220:
Update the FDT example for the lm75 sensor to match current devicetree
standards and what the existing driver expects.
Also change 'like' to 'such as' where the text is providing an example
rather than a simile.
r327221:
Complete the changing of the old "i2c-address" property to the modern "reg"
property by updating the description text to match the updated example.
This should have been part of r327220
Modified:
stable/11/share/man/man4/lm75.4
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/share/man/man4/lm75.4
==
--- stable/11/share/man/man4/lm75.4 Sun Jan 7 02:57:35 2018
(r327667)
+++ stable/11/share/man/man4/lm75.4 Sun Jan 7 02:59:27 2018
(r327668)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 11, 2014
+.Dd December 26, 2017
.Dt LM75 4
.Os
.Sh NAME
@@ -122,7 +122,7 @@ clones may not work reliably.
.Pp
On a
.Xr device.hints 5
-based system, like
+based system, such as
.Li MIPS ,
these values are configurable for
.Nm :
@@ -140,31 +140,28 @@ i2c address on the
.Pp
On a
.Xr FDT 4
-based system, like
+based system, such as
.Li ARM ,
the DTS part for a
.Nm
device usually looks like:
.Bd -literal
i2c {
-
+ /* Properties describing the controller appear here. */
...
-
- lm750 {
+ lm750@49 {
compatible = "national,lm75";
- i2c-address = <0x49>;
+ reg = <0x49>;
};
};
.Ed
.Pp
Where:
-.Bl -tag -width ".Va i2c-address"
+.Bl -tag -width ".Va compatible"
.It Va compatible
Should always be set to "national,lm75".
-.It Va i2c-address
-The
-.Va i2c-address
-property indicates which i2c address the
+.It Va reg
+Indicates which 7-bit i2c address the
.Nm
is wired at.
.Nm
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327667 - in stable/11/sys: arm/arm conf
Author: ian
Date: Sun Jan 7 02:57:35 2018
New Revision: 327667
URL: https://svnweb.freebsd.org/changeset/base/327667
Log:
MFC r327222:
Add a new ARM kernel option, LOCORE_MAP_MB, to control the size of the
kernel VA mapping in the temporary page tables set up by locore-v6.S.
The number used to be hard-coded to 64MB, which is still the default if
the kernel option is not specified. However, 64MB is insufficient for
using a large mdroot filesystem. The hard-coded number can't be safely
increased because too large a number may run into memory-mapped IO space
on some SoCs that must not be mapped as ordinary memory.
Modified:
stable/11/sys/arm/arm/genassym.c
stable/11/sys/arm/arm/locore-v6.S
stable/11/sys/conf/options.arm
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/arm/arm/genassym.c
==
--- stable/11/sys/arm/arm/genassym.cSun Jan 7 02:30:08 2018
(r327666)
+++ stable/11/sys/arm/arm/genassym.cSun Jan 7 02:57:35 2018
(r327667)
@@ -161,3 +161,12 @@ ASSYM(DCACHE_LINE_SIZE, offsetof(struct cpuinfo, dcach
ASSYM(DCACHE_LINE_MASK, offsetof(struct cpuinfo, dcache_line_mask));
ASSYM(ICACHE_LINE_SIZE, offsetof(struct cpuinfo, icache_line_size));
ASSYM(ICACHE_LINE_MASK, offsetof(struct cpuinfo, icache_line_mask));
+
+/*
+ * Emit the LOCORE_MAP_MB option as a #define only if the option was set.
+ */
+#include "opt_locore.h"
+
+#ifdef LOCORE_MAP_MB
+ASSYM(LOCORE_MAP_MB, LOCORE_MAP_MB);
+#endif
Modified: stable/11/sys/arm/arm/locore-v6.S
==
--- stable/11/sys/arm/arm/locore-v6.S Sun Jan 7 02:30:08 2018
(r327666)
+++ stable/11/sys/arm/arm/locore-v6.S Sun Jan 7 02:57:35 2018
(r327667)
@@ -38,6 +38,10 @@
__FBSDID("$FreeBSD$");
+/* We map 64MB of kernel unless overridden in assym.s by the kernel option. */
+#ifndef LOCORE_MAP_MB
+#defineLOCORE_MAP_MB 64
+#endif
#if __ARM_ARCH >= 7
#if defined(__ARM_ARCH_7VE__) || defined(__clang__)
@@ -172,12 +176,13 @@ ASENTRY_NP(_start)
bl build_pagetables
/*
-* Next we do 64MiB starting at the physical load address, mapped to
-* the VA the kernel is linked for.
+* Next we map the kernel starting at the physical load address, mapped
+* to the VA the kernel is linked for. The default size we map is 64MiB
+* but it can be overridden with a kernel option.
*/
mov r1, r5
ldr r2, =(KERNVIRTADDR)
- mov r3, #64
+ ldr r3, =(LOCORE_MAP_MB)
bl build_pagetables
/* Create a device mapping for early_printf if specified. */
Modified: stable/11/sys/conf/options.arm
==
--- stable/11/sys/conf/options.arm Sun Jan 7 02:30:08 2018
(r327666)
+++ stable/11/sys/conf/options.arm Sun Jan 7 02:57:35 2018
(r327667)
@@ -34,6 +34,7 @@ KERNVIRTADDR opt_global.h
LINUX_BOOT_ABI opt_global.h
LOADERRAMADDR opt_global.h
MULTIDELAY opt_global.h
+LOCORE_MAP_MB opt_locore.h
PHYSADDR opt_global.h
PLATFORM opt_global.h
PLATFORM_SMP opt_global.h
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327669 - head/sys/arm/allwinner
Author: kevans
Date: Sun Jan 7 03:31:55 2018
New Revision: 327669
URL: https://svnweb.freebsd.org/changeset/base/327669
Log:
aw_sid: Add method for reading keys via prctl registers
Technically supported on the later SoCs, this will only really be used to
add support for the H3 sid. The H3 has a silicon bug that manifests itself
by returning garbled rootkeys unless first read via the prctl registers.
Modified:
head/sys/arm/allwinner/aw_sid.c
Modified: head/sys/arm/allwinner/aw_sid.c
==
--- head/sys/arm/allwinner/aw_sid.c Sun Jan 7 02:59:27 2018
(r327668)
+++ head/sys/arm/allwinner/aw_sid.c Sun Jan 7 03:31:55 2018
(r327669)
@@ -39,6 +39,8 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
+#include
#include
#include
#include
@@ -48,6 +50,16 @@ __FBSDID("$FreeBSD$");
#include
+/* efuse registers */
+#defineSID_PRCTL 0x40
+#define SID_PRCTL_OFFSET_MASK 0xff
+#define SID_PRCTL_OFFSET(n)(((n) & SID_PRCTL_OFFSET_MASK) << 16)
+#define SID_PRCTL_LOCK (0xac << 8)
+#define SID_PRCTL_READ (0x01 << 1)
+#define SID_PRCTL_WRITE(0x01 << 0)
+#defineSID_PRKEY 0x50
+#defineSID_RDKEY 0x60
+
#defineSID_SRAM0x200
#defineSID_THERMAL_CALIB0 (SID_SRAM + 0x34)
#defineSID_THERMAL_CALIB1 (SID_SRAM + 0x38)
@@ -56,6 +68,7 @@ __FBSDID("$FreeBSD$");
struct aw_sid_conf {
bus_size_t rootkey_offset;
+ boolhas_prctl;
boolhas_thermal;
};
@@ -69,11 +82,13 @@ static const struct aw_sid_conf a20_conf = {
static const struct aw_sid_conf a64_conf = {
.rootkey_offset = SID_SRAM,
+ .has_prctl = true,
.has_thermal = true,
};
static const struct aw_sid_conf a83t_conf = {
.rootkey_offset = SID_SRAM,
+ .has_prctl = true,
.has_thermal = true,
};
@@ -88,6 +103,7 @@ static struct ofw_compat_data compat_data[] = {
struct aw_sid_softc {
struct resource *res;
struct aw_sid_conf *sid_conf;
+ struct mtx prctl_mtx;
};
static struct aw_sid_softc *aw_sid_sc;
@@ -105,8 +121,37 @@ enum sid_keys {
#defineWR4(sc, reg, val) bus_write_4((sc)->res, (reg), (val))
static int aw_sid_sysctl(SYSCTL_HANDLER_ARGS);
+static int aw_sid_prctl_read(device_t dev, bus_size_t offset, uint32_t *val);
+
+/*
+ * offset here is offset into efuse space, rather than offset into sid register
+ * space. This form of read is only an option for newer SoC: A83t, H3, A64
+ */
static int
+aw_sid_prctl_read(device_t dev, bus_size_t offset, uint32_t *val)
+{
+ struct aw_sid_softc *sc;
+ uint32_t readval;
+
+ sc = device_get_softc(dev);
+ if (!sc->sid_conf->has_prctl)
+ return (1);
+
+ mtx_lock(&sc->prctl_mtx);
+ readval = SID_PRCTL_OFFSET(offset) | SID_PRCTL_LOCK | SID_PRCTL_READ;
+ WR4(sc, SID_PRCTL, readval);
+ /* Read bit will be cleared once read has concluded */
+ while (RD4(sc, SID_PRCTL) & SID_PRCTL_READ)
+ continue;
+ readval = RD4(sc, SID_RDKEY);
+ mtx_unlock(&sc->prctl_mtx);
+ *val = readval;
+
+ return (0);
+}
+
+static int
aw_sid_probe(device_t dev)
{
if (!ofw_bus_status_okay(dev))
@@ -131,8 +176,9 @@ aw_sid_attach(device_t dev)
return (ENXIO);
}
- aw_sid_sc = sc;
+ mtx_init(&sc->prctl_mtx, device_get_nameunit(dev), NULL, MTX_DEF);
sc->sid_conf = (struct aw_sid_conf *)ofw_bus_search_compatible(dev,
compat_data)->ocd_data;
+ aw_sid_sc = sc;
SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327665 - head/sys/dev/extres/syscon
Author: kevans
Date: Sun Jan 7 02:19:54 2018
New Revision: 327665
URL: https://svnweb.freebsd.org/changeset/base/327665
Log:
Fix bogus pass for syscon_generic introduced in r327621
ian@ pointed out that BUS_PASS_DEFAULT + $anything is bogus, given that
BUS_PASS_DEFAULT is defined as __INT_MAX. Instead, we take a page out of
imx6_usbphy's book and use BUS_PASS_DEFAULT - 1000 to achieve the desired
effect of syscon_generic attaching before if_awg and other potential
consumers, but late enough that more specialized implementations should have
no problem attaching instead.
Reported by: ian
Modified:
head/sys/dev/extres/syscon/syscon_generic.c
Modified: head/sys/dev/extres/syscon/syscon_generic.c
==
--- head/sys/dev/extres/syscon/syscon_generic.c Sun Jan 7 01:08:10 2018
(r327664)
+++ head/sys/dev/extres/syscon/syscon_generic.c Sun Jan 7 02:19:54 2018
(r327665)
@@ -206,6 +206,11 @@ static device_method_t syscon_generic_dmethods[] = {
DEFINE_CLASS_0(syscon_generic, syscon_generic_driver, syscon_generic_dmethods,
sizeof(struct syscon_generic_softc));
static devclass_t syscon_generic_devclass;
+/*
+ * syscon_generic needs to attach before other devices that may require it,
such
+ * as if_awg, but later than others to give way for more specialized syscon
+ * implementations.
+ */
EARLY_DRIVER_MODULE(syscon_generic, simplebus, syscon_generic_driver,
-syscon_generic_devclass, 0, 0, BUS_PASS_DEFAULT + BUS_PASS_ORDER_FIRST);
+syscon_generic_devclass, 0, 0, BUS_PASS_DEFAULT - 1000);
MODULE_VERSION(syscon_generic, 1);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327666 - head/tests/sys/geom/class/eli
Author: asomers
Date: Sun Jan 7 02:30:08 2018
New Revision: 327666
URL: https://svnweb.freebsd.org/changeset/base/327666
Log:
geli: fix parallel execution of tests
The trick is not to destroy an md(4) device during a test. That can create
a "double-free" situation, because we also destroy md devices during test
cleanup.
MFC after:2 weeks
Modified:
head/tests/sys/geom/class/eli/conf.sh
head/tests/sys/geom/class/eli/init_test.sh
head/tests/sys/geom/class/eli/onetime_test.sh
Modified: head/tests/sys/geom/class/eli/conf.sh
==
--- head/tests/sys/geom/class/eli/conf.sh Sun Jan 7 02:19:54 2018
(r327665)
+++ head/tests/sys/geom/class/eli/conf.sh Sun Jan 7 02:30:08 2018
(r327666)
@@ -4,6 +4,7 @@
class="eli"
base=$(atf_get ident)
[ -z "$base" ] && base=`basename $0` # for TAP compatibility
+MAX_SECSIZE=8192
TEST_MDS_FILE=md.devs
attach_md()
@@ -21,6 +22,11 @@ attach_md()
for_each_geli_config() {
func=$1
+ # Double the sector size to allow for the HMACs' storage space.
+ osecsize=$(( $MAX_SECSIZE * 2 ))
+ # geli needs 512B for the label.
+ bytes=`expr $osecsize \* $sectors + 512`b
+ md=$(attach_md -t malloc -s $bytes)
for cipher in aes-xts:128 aes-xts:256 \
aes-cbc:128 aes-cbc:192 aes-cbc:256 \
3des-cbc:192 \
@@ -33,16 +39,9 @@ for_each_geli_config() {
keylen=${cipher##*:}
for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 \
hmac/sha384 hmac/sha512; do
- for secsize in 512 1024 2048 4096 8192; do
- # Double the requested sector size to allow
- # for the HMACs' storage space.
- osecsize=$(( $secsize * 2 ))
- # geli needs 512B for the label.
- bytes=`expr $osecsize \* $sectors + 512`b
- md=$(attach_md -t malloc -s $bytes)
+ for secsize in 512 1024 2048 4096 $MAX_SECSIZE; do
${func} $cipher $aalgo $secsize
geli detach ${md} 2>/dev/null
- mdconfig -d -u ${md} 2>/dev/null
done
done
done
@@ -54,6 +53,9 @@ for_each_geli_config() {
for_each_geli_config_nointegrity() {
func=$1
+ # geli needs 512B for the label.
+ bytes=`expr $MAX_SECSIZE \* $sectors + 512`b
+ md=$(attach_md -t malloc -s $bytes)
for cipher in aes-xts:128 aes-xts:256 \
aes-cbc:128 aes-cbc:192 aes-cbc:256 \
3des-cbc:192 \
@@ -64,13 +66,9 @@ for_each_geli_config_nointegrity() {
camellia-cbc:128 camellia-cbc:192 camellia-cbc:256; do
ealgo=${cipher%%:*}
keylen=${cipher##*:}
- for secsize in 512 1024 2048 4096 8192; do
- # geli needs 512B for the label.
- bytes=`expr $secsize \* $sectors + 512`b
- md=$(attach_md -t malloc -s $bytes)
+ for secsize in 512 1024 2048 4096 $MAX_SECSIZE; do
${func} $cipher $secsize
geli detach ${md} 2>/dev/null
- mdconfig -d -u ${md} 2>/dev/null
done
done
}
Modified: head/tests/sys/geom/class/eli/init_test.sh
==
--- head/tests/sys/geom/class/eli/init_test.sh Sun Jan 7 02:19:54 2018
(r327665)
+++ head/tests/sys/geom/class/eli/init_test.sh Sun Jan 7 02:30:08 2018
(r327666)
@@ -9,19 +9,18 @@ init_test()
keylen=${cipher##*:}
atf_check -s exit:0 -e ignore \
- geli init -B none -e $ealgo -l $keylen -P -K keyfile -s
$secsize ${md}
+ geli init -B none -e $ealgo -l $keylen -P -K keyfile
+ -s $secsize ${md}
atf_check geli attach -p -k keyfile ${md}
- secs=`diskinfo /dev/${md}.eli | awk '{print $4}'`
+ atf_check dd if=rnd of=/dev/${md}.eli bs=${secsize} count=${sectors} \
+ status=none
- atf_check dd if=/dev/random of=rnd bs=${secsize} count=${secs}
status=none
- atf_check dd if=rnd of=/dev/${md}.eli bs=${secsize} count=${secs}
status=none
-
- md_rnd=`dd if=rnd bs=${secsize} count=${secs} status=none | md5`
+ md_rnd=`dd if=rnd bs=${secsize} count=${sectors} status=none | md5`
atf_check_equal 0 $?
- md_ddev=`dd if=/dev/${md}.eli bs=${secsize} count=${secs} 2>/dev/null |
md5`
+ md_ddev=`dd if=/dev/${md}.eli bs=${secsize} count=${sectors}
status=none | md5`
atf_check_equal 0 $?
- md_edev=`dd if=/dev/${md} bs=${secsize} count=${secs} status=none | md5`
+ md_edev=`dd if=/dev/
svn commit: r327664 - stable/11/share/man/man4
Author: ian Date: Sun Jan 7 01:08:10 2018 New Revision: 327664 URL: https://svnweb.freebsd.org/changeset/base/327664 Log: MFC r327226, r327356 r327226: Add a section describing how to tune ARM kernel options to use an MD_ROOT filesystem larger than about 50-55 MiB. The description of VM_KMEM_SIZE_SCALE is roughly as hand-wavy as my understanding of the option, but at least mentioning that it's a factor and giving an empirical datapoint that works will give folks some idea of what to tweak if they have problems. r327356: Correct a mistake and reword a couple sentences to clarify that "the value" refers to the scale value, not the kmem_arena size that results from scaling. Suggested by: alc@ Modified: stable/11/share/man/man4/md.4 Directory Properties: stable/11/ (props changed) Modified: stable/11/share/man/man4/md.4 == --- stable/11/share/man/man4/md.4 Sun Jan 7 01:06:04 2018 (r327663) +++ stable/11/share/man/man4/md.4 Sun Jan 7 01:08:10 2018 (r327664) @@ -7,7 +7,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 7, 2017 +.Dd December 26, 2017 .Dt MD 4 .Os .Sh NAME @@ -93,6 +93,47 @@ disk found in the .Xr mdconfig 8 man page. Other tools will also create these images, such as NanoBSD. +.Sh ARM KERNEL OPTIONS +On armv6 and armv7 architectures, an MD_ROOT image larger than +approximately 55 MiB may require building a custom kernel using +several tuning options related to kernel memory usage. +.Bl -tag -width indent +.It Cd options LOCORE_MAP_MB= +This configures how much memory is mapped for the kernel during +the early initialization stages. +The value must be at least as large as the kernel plus all preloaded +modules, including the root image. +There is no downside to setting this value too large, as long +as it does not exceed the amount of physical memory. +The default is 64 MiB. +.It Cd options NKPT2PG= +This configures the number of kernel L2 page table pages to +preallocate during kernel initialization. +Each L2 page can map 4 MiB of kernel space. +The value must be large enough to map the kernel plus all preloaded +modules, including the root image. +The default value is 32, which is sufficient to map 128 MiB. +.It Cd options VM_KMEM_SIZE_SCALE= +This configures the amount of kernel virtual address (KVA) space to +dedicate to the kmem_arena map. +The scale value is the ratio of physical to virtual pages. +The default value of 3 allocates a page of KVA for each 3 pages +of physical ram in the system. + +The kernel and modules, including the root image, also consume KVA. +The combination of a large root image and the default scaling +may preallocate so much KVA that there is not enough +remaining address space to allocate kernel stacks, IO buffers, +and other resources that are not part of kmem_arena. +Overallocating kmem_arena space is likely to manifest as failure to +launch userland processes with "cannot allocate kernel stack" messages. + +Setting the scale value too high may result in kernel failure to allocate +memory because kmem_arena is too small, and the failure may require +significant runtime to manifest. +Empirically, a value of 5 works well for a 200 MiB root image on +a system with 2 GiB of physical ram. +.El .Sh SEE ALSO .Xr gpart 8 , .Xr loader 8 , ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327663 - in stable/11: . share/man/man7
Author: ian
Date: Sun Jan 7 01:06:04 2018
New Revision: 327663
URL: https://svnweb.freebsd.org/changeset/base/327663
Log:
MFC r327439:
Allow use of .WAIT in the LOCAL_DIRS and LOCAL_LIB_DIRS lists.
A comment in Makefile.inc1 has long stated that LOCAL_DIRS are built last,
after the base system. Incremental improvements in parallel building over
the years have led to LOCAL_DIRS being built in parallel with base system
directories. This change allows the .WAIT directive to appear in LOCAL_DIRS
and LOCAL_LIB_DIRS lists to give the user some control over parallel
building of local additions.
Differential Revision:https://reviews.freebsd.org/D13622
Modified:
stable/11/Makefile.inc1
stable/11/share/man/man7/build.7
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/Makefile.inc1
==
--- stable/11/Makefile.inc1 Sun Jan 7 00:44:22 2018(r327662)
+++ stable/11/Makefile.inc1 Sun Jan 7 01:06:04 2018(r327663)
@@ -260,10 +260,11 @@ SUBDIR+= tests
SUBDIR+=contrib/ofed
.endif
-# Local directories are last, since it is nice to at least get the base
-# system rebuilt before you do them.
+# Local directories are built in parallel with the base system directories.
+# Users may insert a .WAIT directive at the beginning or elsewhere within
+# the LOCAL_DIRS and LOCAL_LIB_DIRS lists as needed.
.for _DIR in ${LOCAL_DIRS}
-.if exists(${.CURDIR}/${_DIR}/Makefile)
+.if ${_DIR} == ".WAIT" || exists(${.CURDIR}/${_DIR}/Makefile)
SUBDIR+= ${_DIR}
.endif
.endfor
@@ -274,7 +275,7 @@ SUBDIR+=${_DIR}
_REDUNDANT_LIB_DIRS+=${LOCAL_LIB_DIRS:M${_DIR}*}
.endfor
.for _DIR in ${LOCAL_LIB_DIRS}
-.if empty(_REDUNDANT_LIB_DIRS:M${_DIR}) && exists(${.CURDIR}/${_DIR}/Makefile)
+.if ${_DIR} == ".WAIT" || (empty(_REDUNDANT_LIB_DIRS:M${_DIR}) &&
exists(${.CURDIR}/${_DIR}/Makefile))
SUBDIR+= ${_DIR}
.endif
.endfor
@@ -2146,7 +2147,7 @@ lib/liblzma__L: lib/libthr__L
_generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib}
usr.bin/lex/lib ${_ofed_lib}
.for _DIR in ${LOCAL_LIB_DIRS}
-.if exists(${.CURDIR}/${_DIR}/Makefile) && empty(_generic_libs:M${_DIR})
+.if ${_DIR} == ".WAIT" || (empty(_generic_libs:M${_DIR}) &&
exists(${.CURDIR}/${_DIR}/Makefile))
_generic_libs+= ${_DIR}
.endif
.endfor
Modified: stable/11/share/man/man7/build.7
==
--- stable/11/share/man/man7/build.7Sun Jan 7 00:44:22 2018
(r327662)
+++ stable/11/share/man/man7/build.7Sun Jan 7 01:06:04 2018
(r327663)
@@ -441,6 +441,15 @@ If set, this variable supplies a list of additional di
the root of the source tree to build as part of the
.Cm everything
target.
+The directories are built in parallel with each other,
+and with the base system directories.
+Insert a
+.Va .WAIT
+directive at the beginning of the
+.Va LOCAL_DIRS
+list to ensure all base system directories are built first.
+.Va .WAIT
+may also be used as needed elsewhere within the list.
.It Va LOCAL_ITOOLS
If set, this variable supplies a list of additional tools that are used by the
.Cm installworld
@@ -452,6 +461,15 @@ If set, this variable supplies a list of additional di
the root of the source tree to build as part of the
.Cm libraries
target.
+The directories are built in parallel with each other,
+and with the base system libraries.
+Insert a
+.Va .WAIT
+directive at the beginning of the
+.Va LOCAL_DIRS
+list to ensure all base system libraries are built first.
+.Va .WAIT
+may also be used as needed elsewhere within the list.
.It Va LOCAL_MTREE
If set, this variable supplies a list of additional mtrees relative to the
root of the source tree to use as part of the
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327662 - in head: . tests/sys/geom/class/eli
Author: asomers
Date: Sun Jan 7 00:44:22 2018
New Revision: 327662
URL: https://svnweb.freebsd.org/changeset/base/327662
Log:
geli: convert most tests from TAP to ATF
I'm leaving readonly_test and nokey_test alone for now. In a future commit
they should be broken up into several smaller test cases and distributed
between multiple files.
Reviewed by: ngie
MFC after:2 weeks
Differential Revision:https://reviews.freebsd.org/D13717
Added:
head/tests/sys/geom/class/eli/attach_test.sh (contents, props changed)
head/tests/sys/geom/class/eli/configure_test.sh (contents, props changed)
head/tests/sys/geom/class/eli/detach_test.sh (contents, props changed)
head/tests/sys/geom/class/eli/integrity_test.sh (contents, props changed)
Deleted:
head/tests/sys/geom/class/eli/attach_d_test.sh
head/tests/sys/geom/class/eli/configure_b_B_test.sh
head/tests/sys/geom/class/eli/detach_l_test.sh
head/tests/sys/geom/class/eli/init_B_test.sh
head/tests/sys/geom/class/eli/init_J_test.sh
head/tests/sys/geom/class/eli/init_a_test.sh
head/tests/sys/geom/class/eli/init_alias_test.sh
head/tests/sys/geom/class/eli/init_i_P_test.sh
head/tests/sys/geom/class/eli/integrity_copy_test.sh
head/tests/sys/geom/class/eli/integrity_data_test.sh
head/tests/sys/geom/class/eli/integrity_hmac_test.sh
head/tests/sys/geom/class/eli/onetime_a_test.sh
head/tests/sys/geom/class/eli/onetime_d_test.sh
Modified:
head/ObsoleteFiles.inc
head/tests/sys/geom/class/eli/Makefile
head/tests/sys/geom/class/eli/conf.sh
head/tests/sys/geom/class/eli/delkey_test.sh
head/tests/sys/geom/class/eli/init_test.sh
head/tests/sys/geom/class/eli/kill_test.sh
head/tests/sys/geom/class/eli/onetime_test.sh
head/tests/sys/geom/class/eli/resize_test.sh
head/tests/sys/geom/class/eli/setkey_test.sh
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Sun Jan 7 00:38:34 2018(r327661)
+++ head/ObsoleteFiles.inc Sun Jan 7 00:44:22 2018(r327662)
@@ -38,6 +38,20 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20180106: Convert most geli(8) tests to ATF
+OLD_FILES+=tests/sys/geom/class/eli/attach_d_test.sh
+OLD_FILES+=tests/sys/geom/class/eli/configure_b_B_test.sh
+OLD_FILES+=tests/sys/geom/class/eli/detach_l_test.sh
+OLD_FILES+=tests/sys/geom/class/eli/init_B_test.sh
+OLD_FILES+=tests/sys/geom/class/eli/init_J_test.sh
+OLD_FILES+=tests/sys/geom/class/eli/init_a_test.sh
+OLD_FILES+=tests/sys/geom/class/eli/init_alias_test.sh
+OLD_FILES+=tests/sys/geom/class/eli/init_i_P_test.sh
+OLD_FILES+=tests/sys/geom/class/eli/integrity_copy_test.sh
+OLD_FILES+=tests/sys/geom/class/eli/integrity_data_test.sh
+OLD_FILES+=tests/sys/geom/class/eli/integrity_hmac_test.sh
+OLD_FILES+=tests/sys/geom/class/eli/onetime_a_test.sh
+OLD_FILES+=tests/sys/geom/class/eli/onetime_d_test.sh
# 20171230: Remove /etc/skel from mtree
OLD_DIRS+=/etc/skel
# 20171208: Remove basename_r(3)
Modified: head/tests/sys/geom/class/eli/Makefile
==
--- head/tests/sys/geom/class/eli/Makefile Sun Jan 7 00:38:34 2018
(r327661)
+++ head/tests/sys/geom/class/eli/Makefile Sun Jan 7 00:44:22 2018
(r327662)
@@ -7,36 +7,20 @@ PACKAGE= tests
TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T}
ATF_TESTS_C= pbkdf2_test
+ATF_TESTS_SH+= attach_test
+ATF_TESTS_SH+= configure_test
+ATF_TESTS_SH+= delkey_test
+ATF_TESTS_SH+= detach_test
+ATF_TESTS_SH+= init_test
+ATF_TESTS_SH+= integrity_test
+ATF_TESTS_SH+= kill_test
+ATF_TESTS_SH+= onetime_test
+ATF_TESTS_SH+= resize_test
+ATF_TESTS_SH+= setkey_test
-TAP_TESTS_SH+= attach_d_test
-TAP_TESTS_SH+= configure_b_B_test
-TAP_TESTS_SH+= delkey_test
-TAP_TESTS_SH+= detach_l_test
-TAP_TESTS_SH+= init_B_test
-TAP_TESTS_SH+= init_J_test
-TAP_TESTS_SH+= init_a_test
-TAP_TESTS_SH+= init_alias_test
-TAP_TESTS_SH+= init_i_P_test
-TAP_TESTS_SH+= init_test
-TAP_TESTS_SH+= integrity_copy_test
-TAP_TESTS_SH+= integrity_data_test
-TAP_TESTS_SH+= integrity_hmac_test
-TAP_TESTS_SH+= kill_test
TAP_TESTS_SH+= nokey_test
-TAP_TESTS_SH+= onetime_a_test
-TAP_TESTS_SH+= onetime_d_test
-TAP_TESTS_SH+= onetime_test
TAP_TESTS_SH+= readonly_test
-TAP_TESTS_SH+= resize_test
-TAP_TESTS_SH+= setkey_test
-TEST_METADATA.init_a_test+=timeout="3600"
-TEST_METADATA.init_test+= timeout="600"
-TEST_METADATA.integrity_copy_test+=timeout="3600"
-TEST_METADATA.integrity_data_test+=timeout="1800"
-TEST_METADATA.integrity_hmac_test+=timeout="1800"
-TEST_METADATA.onetime_a_test+= timeout="1800"
-TEST_METADATA.onetime_test+= timeout="1800"
${PACKAGE}FILES+= conf.sh
Added: head/tests/sys/geom/class/eli/attach_test.sh
==
--
svn commit: r327661 - stable/11/lib/libc/gen
Author: eadler Date: Sun Jan 7 00:38:34 2018 New Revision: 327661 URL: https://svnweb.freebsd.org/changeset/base/327661 Log: MFC r327398: isgreater(3): correct description of isunordered macro PR: 211376 Submitted by: Duane Modified: stable/11/lib/libc/gen/isgreater.3 Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libc/gen/isgreater.3 == --- stable/11/lib/libc/gen/isgreater.3 Sun Jan 7 00:35:52 2018 (r327660) +++ stable/11/lib/libc/gen/isgreater.3 Sun Jan 7 00:38:34 2018 (r327661) @@ -75,9 +75,9 @@ macro takes arguments .Fa x and .Fa y -and returns non-zero if and only if neither +and returns non-zero if and only if any of .Fa x -nor +or .Fa y are NaNs. For any pair of floating-point values, one ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327660 - stable/11/usr.bin/man
Author: eadler Date: Sun Jan 7 00:35:52 2018 New Revision: 327660 URL: https://svnweb.freebsd.org/changeset/base/327660 Log: MFC r327396: man(1): document exit code man(1) uses standard exit codes, document that. PR: 223517 Reported by: wosch Modified: stable/11/usr.bin/man/man.1 Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/man/man.1 == --- stable/11/usr.bin/man/man.1 Sun Jan 7 00:31:45 2018(r327659) +++ stable/11/usr.bin/man/man.1 Sun Jan 7 00:35:52 2018(r327660) @@ -355,6 +355,8 @@ System configuration file. .It Pa /usr/local/etc/man.d/*.conf Local configuration files. .El +.Sh EXIT STATUS +.Ex -std .Sh SEE ALSO .Xr apropos 1 , .Xr intro 1 , ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327659 - stable/11/share/skel
Author: eadler Date: Sun Jan 7 00:31:45 2018 New Revision: 327659 URL: https://svnweb.freebsd.org/changeset/base/327659 Log: MFC r327420: skel: Quote PAGER in dot.shrc PR: 181853 Submitted by: p...@catslair.org Modified: stable/11/share/skel/dot.shrc Directory Properties: stable/11/ (props changed) Modified: stable/11/share/skel/dot.shrc == --- stable/11/share/skel/dot.shrc Sun Jan 7 00:04:13 2018 (r327658) +++ stable/11/share/skel/dot.shrc Sun Jan 7 00:31:45 2018 (r327659) @@ -21,7 +21,7 @@ # some useful aliases alias h='fc -l' alias j=jobs -alias m=$PAGER +alias m="$PAGER" alias ll='ls -laFo' alias l='ls -l' alias g='egrep -i' ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327658 - in stable/11/sys: arm/allwinner arm/altera/socfpga arm/arm arm/broadcom/bcm2835 arm/conf arm/freescale/imx arm/freescale/vybrid arm/include arm/mv/armada38x arm/mv/armadaxp ar...
Author: ian
Date: Sun Jan 7 00:04:13 2018
New Revision: 327658
URL: https://svnweb.freebsd.org/changeset/base/327658
Log:
MFC r327367:
Make kernel option KERNVIRTADDR optional, remove it from std.
files that can use the default value.
It used to be required that the low-order bits of KERNVIRTADDR matched
the low-order bits of the physical load address for all arm platforms.
That hasn't been a requirement for armv6 platforms since FreeBSD 10.
There is no longer any relationship between load addr and KERNVIRTADDR
except that both must be aligned to a 2 MiB boundary.
This change makes the default KERNVIRTADDR value 0xc000, and removes the
options from all the platforms that can use the default value. The default
is now defined in vmparam.h, and that file is now included in a few new
places that reference KERNVIRTADDR, since it may not come in via the
forced-include of opt_global.h on the compile command line.
Modified:
stable/11/sys/arm/allwinner/std.allwinner
stable/11/sys/arm/allwinner/std.allwinner_up
stable/11/sys/arm/altera/socfpga/std.socfpga
stable/11/sys/arm/arm/dump_machdep.c
stable/11/sys/arm/arm/elf_trampoline.c
stable/11/sys/arm/arm/genassym.c
stable/11/sys/arm/arm/machdep_boot.c
stable/11/sys/arm/broadcom/bcm2835/std.rpi
stable/11/sys/arm/conf/NOTES
stable/11/sys/arm/freescale/imx/std.imx51
stable/11/sys/arm/freescale/imx/std.imx53
stable/11/sys/arm/freescale/imx/std.imx6
stable/11/sys/arm/freescale/vybrid/std.vybrid
stable/11/sys/arm/include/vmparam.h
stable/11/sys/arm/mv/armada38x/std.armada38x
stable/11/sys/arm/mv/armadaxp/std.armadaxp
stable/11/sys/arm/nvidia/tegra124/std.tegra124
stable/11/sys/arm/rockchip/std.rk30xx
stable/11/sys/arm/samsung/exynos/std.exynos5250
stable/11/sys/arm/samsung/exynos/std.exynos5420
stable/11/sys/arm/ti/am335x/std.am335x
stable/11/sys/arm/ti/omap4/std.omap4
stable/11/sys/arm/xilinx/std.zynq7
stable/11/sys/conf/Makefile.arm
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/arm/allwinner/std.allwinner
==
--- stable/11/sys/arm/allwinner/std.allwinner Sat Jan 6 23:44:14 2018
(r327657)
+++ stable/11/sys/arm/allwinner/std.allwinner Sun Jan 7 00:04:13 2018
(r327658)
@@ -5,9 +5,6 @@ cpu CPU_CORTEXA
machinearm armv6
makeoptionsCONF_CFLAGS="-march=armv7a"
-makeoptionsKERNVIRTADDR=0xc020
-optionsKERNVIRTADDR=0xc020
-
optionsIPI_IRQ_START=0
optionsIPI_IRQ_END=15
Modified: stable/11/sys/arm/allwinner/std.allwinner_up
==
--- stable/11/sys/arm/allwinner/std.allwinner_upSat Jan 6 23:44:14
2018(r327657)
+++ stable/11/sys/arm/allwinner/std.allwinner_upSun Jan 7 00:04:13
2018(r327658)
@@ -5,9 +5,6 @@ cpu CPU_CORTEXA
machinearm armv6
makeoptionsCONF_CFLAGS="-march=armv7a"
-makeoptionsKERNVIRTADDR=0xc020
-optionsKERNVIRTADDR=0xc020
-
files "../allwinner/files.allwinner_up"
files "../allwinner/files.allwinner"
files "../allwinner/a10/files.a10"
Modified: stable/11/sys/arm/altera/socfpga/std.socfpga
==
--- stable/11/sys/arm/altera/socfpga/std.socfpgaSat Jan 6 23:44:14
2018(r327657)
+++ stable/11/sys/arm/altera/socfpga/std.socfpgaSun Jan 7 00:04:13
2018(r327658)
@@ -4,9 +4,6 @@ cpu CPU_CORTEXA
machinearm armv6
makeoptionsCONF_CFLAGS="-march=armv7a"
-makeoptionsKERNVIRTADDR=0xc0f0
-optionsKERNVIRTADDR=0xc0f0
-
optionsIPI_IRQ_START=0
optionsIPI_IRQ_END=15
Modified: stable/11/sys/arm/arm/dump_machdep.c
==
--- stable/11/sys/arm/arm/dump_machdep.cSat Jan 6 23:44:14 2018
(r327657)
+++ stable/11/sys/arm/arm/dump_machdep.cSun Jan 7 00:04:13 2018
(r327658)
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include/* For KERNVIRTADDR */
int do_minidump = 1;
SYSCTL_INT(_debug, OID_AUTO, minidump, CTLFLAG_RWTUN, &do_minidump, 0,
Modified: stable/11/sys/arm/arm/elf_trampoline.c
==
--- stable/11/sys/arm/arm/elf_trampoline.c Sat Jan 6 23:44:14 2018
(r327657)
+++ stable/11/sys/arm/arm/elf_trampoline.c Sun Jan 7 00:04:13 2018
(r327658)
@@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include/* For KERNVIRTADDR */
extern char kernel_start[];
extern char kernel_end[];
Modified: stable/11/sys/arm/arm/genassym.c
svn commit: r327656 - stable/11/sys/arm/arm
Author: ian
Date: Sat Jan 6 23:24:52 2018
New Revision: 327656
URL: https://svnweb.freebsd.org/changeset/base/327656
Log:
MFC r327048-r327050
r327048:
Restore the ability to use EARLY_PRINTF support during most of initarm().
The real kernel page tables are set up much earlier in initarm() now than
they were when early printf support was first added, and they end up undoing
the mapping made in locore.S for early printf support. This re-adds the
mapping after switching to the new/real kernel page tables, making early
printf work again right after switching to them.
r327049:
Allow pmap_kremove() to remove 1MB section mappings as well as 4K pages.
This will allow it to undo temporary device mappings such as those made
with pmap_preboot_map_attr().
Reviewed by: cognet
r327050:
If a temporary mapping is made to support EARLY_PRINTF, undo that mapping
after cninit() runs, otherwise we leave a bogus device-memory mapping in
userspace VA in the kernel pmap forever.
Pointed out by: cognet
Modified:
stable/11/sys/arm/arm/machdep.c
stable/11/sys/arm/arm/pmap-v6.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/arm/arm/machdep.c
==
--- stable/11/sys/arm/arm/machdep.c Sat Jan 6 23:20:35 2018
(r327655)
+++ stable/11/sys/arm/arm/machdep.c Sat Jan 6 23:24:52 2018
(r327656)
@@ -1115,6 +1115,19 @@ initarm(struct arm_boot_params *abp)
pmap_bootstrap_prepare(lastaddr);
/*
+* If EARLY_PRINTF support is enabled, we need to re-establish the
+* mapping after pmap_bootstrap_prepare() switches to new page tables.
+* Note that we can only do the remapping if the VA is outside the
+* kernel, now that we have real virtual (not VA=PA) mappings in effect.
+* Early printf does not work between the time pmap_set_tex() does
+* cp15_prrr_set() and this code remaps the VA.
+*/
+#if defined(EARLY_PRINTF) && defined(SOCDEV_PA) && defined(SOCDEV_VA) &&
SOCDEV_VA < KERNBASE
+ pmap_preboot_map_attr(SOCDEV_PA, SOCDEV_VA, 1024 * 1024,
+ VM_PROT_READ | VM_PROT_WRITE, VM_MEMATTR_DEVICE);
+#endif
+
+ /*
* Now that proper page tables are installed, call cpu_setup() to enable
* instruction and data caches and other chip-specific features.
*/
@@ -1176,6 +1189,14 @@ initarm(struct arm_boot_params *abp)
OF_interpret("perform-fixup", 0);
platform_gpio_init();
cninit();
+
+ /*
+* If we made a mapping for EARLY_PRINTF after pmap_bootstrap_prepare(),
+* undo it now that the normal console printf works.
+*/
+#if defined(EARLY_PRINTF) && defined(SOCDEV_PA) && defined(SOCDEV_VA) &&
SOCDEV_VA < KERNBASE
+ pmap_kremove(SOCDEV_VA);
+#endif
debugf("initarm: console initialized\n");
debugf(" arg1 kmdp = 0x%08x\n", (uint32_t)kmdp);
Modified: stable/11/sys/arm/arm/pmap-v6.c
==
--- stable/11/sys/arm/arm/pmap-v6.c Sat Jan 6 23:20:35 2018
(r327655)
+++ stable/11/sys/arm/arm/pmap-v6.c Sat Jan 6 23:24:52 2018
(r327656)
@@ -1312,10 +1312,16 @@ pmap_kenter(vm_offset_t va, vm_paddr_t pa)
PMAP_INLINE void
pmap_kremove(vm_offset_t va)
{
+ pt1_entry_t *pte1p;
pt2_entry_t *pte2p;
- pte2p = pt2map_entry(va);
- pte2_clear(pte2p);
+ pte1p = kern_pte1(va);
+ if (pte1_is_section(pte1_load(pte1p))) {
+ pte1_clear(pte1p);
+ } else {
+ pte2p = pt2map_entry(va);
+ pte2_clear(pte2p);
+ }
}
/*
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327655 - in stable/11: share/man/man4 sys/conf sys/dev/md
Author: ian
Date: Sat Jan 6 23:20:35 2018
New Revision: 327655
URL: https://svnweb.freebsd.org/changeset/base/327655
Log:
MFC r327032:
Add a new kernel config option, MD_ROOT_READONLY, which forces on the
MD_READONLY flag for the md device automatically instantiated during
kernel init for an mdroot filesystem.
Note that there is specifically and by design no tunable or sysctl
control over this feature. Without this option, you already have control
over whether the mdroot fs is writeable using vfs.root.mountfrom.options
from loader(8), the root_rw_mount rcvar, and by using "mount -u[rw] /"
or equivelent on the fly. This option is being added to provide a way
to make the mdroot fs truly immutable before userland code begins running.
Differential Revision:https://reviews.freebsd.org/D13411
Modified:
stable/11/share/man/man4/md.4
stable/11/sys/conf/NOTES
stable/11/sys/conf/options
stable/11/sys/dev/md/md.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/share/man/man4/md.4
==
--- stable/11/share/man/man4/md.4 Sat Jan 6 23:12:32 2018
(r327654)
+++ stable/11/share/man/man4/md.4 Sat Jan 6 23:20:35 2018
(r327655)
@@ -7,7 +7,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd November 5, 2017
+.Dd December 7, 2017
.Dt MD 4
.Os
.Sh NAME
@@ -79,7 +79,8 @@ To create a kernel with a ramdisk or MD file system, y
needs the following options:
.Bd -literal -offset indent
optionsMD_ROOT # MD is a potential root device
-optionsMD_ROOT_SIZE=8192 # 8MB ram disk
+optionsMD_ROOT_READONLY# disallow mounting root writeable
+optionsMD_ROOT_SIZE=8192 # 8MB ram disk
makeoptionsMFS_IMAGE=/h/foo/ARM-MD
optionsROOTDEVNAME=\\"ufs:md0\\"
.Ed
Modified: stable/11/sys/conf/NOTES
==
--- stable/11/sys/conf/NOTESSat Jan 6 23:12:32 2018(r327654)
+++ stable/11/sys/conf/NOTESSat Jan 6 23:20:35 2018(r327655)
@@ -1102,6 +1102,9 @@ options MD_ROOT_SIZE=10
# images of type mfs_root or md_root.
optionsMD_ROOT
+# Write-protect the md root device so that it may not be mounted writeable.
+optionsMD_ROOT_READONLY
+
# Disk quotas are supported when this option is enabled.
optionsQUOTA #enable disk quotas
Modified: stable/11/sys/conf/options
==
--- stable/11/sys/conf/options Sat Jan 6 23:12:32 2018(r327654)
+++ stable/11/sys/conf/options Sat Jan 6 23:20:35 2018(r327655)
@@ -165,6 +165,7 @@ MAC_STUBopt_dontuse.h
MAC_TEST opt_dontuse.h
MD_ROOTopt_md.h
MD_ROOT_FSTYPE opt_md.h
+MD_ROOT_READONLY opt_md.h
MD_ROOT_SIZE opt_md.h
MFI_DEBUG opt_mfi.h
MFI_DECODE_LOG opt_mfi.h
Modified: stable/11/sys/dev/md/md.c
==
--- stable/11/sys/dev/md/md.c Sat Jan 6 23:12:32 2018(r327654)
+++ stable/11/sys/dev/md/md.c Sat Jan 6 23:20:35 2018(r327655)
@@ -1755,9 +1755,15 @@ md_preloaded(u_char *image, size_t length, const char
sc->pl_ptr = image;
sc->pl_len = length;
sc->start = mdstart_preload;
-#if defined(MD_ROOT) && !defined(ROOTDEVNAME)
- if (sc->unit == 0)
+#ifdef MD_ROOT
+ if (sc->unit == 0) {
+#ifndef ROOTDEVNAME
rootdevnames[0] = MD_ROOT_FSTYPE ":/dev/md0";
+#endif
+#ifdef MD_ROOT_READONLY
+ sc->flags |= MD_READONLY;
+#endif
+ }
#endif
mdinit(sc);
if (name != NULL) {
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327654 - stable/11/sys/arm/broadcom/bcm2835
Author: ian
Date: Sat Jan 6 23:12:32 2018
New Revision: 327654
URL: https://svnweb.freebsd.org/changeset/base/327654
Log:
MFC r326924-r326925
r326924:
Fix debugging output, fallout from something like s/read/readctl/g
while renaming variables in a previous change.
r326925:
Do not attempt to refill the TX fifo if there is no data left to transfer.
A comment in bcm_bsc_fill_tx_fifo() even lists sc_totlen > 0 as a
precondition for calling the routine. I apparently forgot to make the
code do what my comment said.
Modified:
stable/11/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
==
--- stable/11/sys/arm/broadcom/bcm2835/bcm2835_bsc.cSat Jan 6 23:04:14
2018(r327653)
+++ stable/11/sys/arm/broadcom/bcm2835/bcm2835_bsc.cSat Jan 6 23:12:32
2018(r327654)
@@ -505,7 +505,7 @@ bcm_bsc_intr(void *arg)
* transfer is complete; TXD will be asserted along with ERR or
* DONE if there is room in the fifo.
*/
- if (status & BCM_BSC_STATUS_TXD)
+ if ((status & BCM_BSC_STATUS_TXD) && sc->sc_totlen > 0)
bcm_bsc_fill_tx_fifo(sc);
}
@@ -607,7 +607,7 @@ bcm_bsc_transfer(device_t dev, struct iic_msg *msgs, u
*/
if (sc->sc_replen == 0) {
DEVICE_DEBUGF(sc, 1, "%-6s 0x%02x len %d: ",
- (curisread) ? "readctl" : "write", curslave,
+ (curisread) ? "read" : "write", curslave,
sc->sc_totlen);
curlen = sc->sc_totlen;
if (curisread) {
@@ -619,7 +619,7 @@ bcm_bsc_transfer(device_t dev, struct iic_msg *msgs, u
}
} else {
DEVICE_DEBUGF(sc, 1, "%-6s 0x%02x len %d: ",
- (curisread) ? "readctl" : "write", curslave,
+ (curisread) ? "read" : "write", curslave,
sc->sc_replen);
/*
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327653 - stable/11/sys/dev/iicbus
Author: ian Date: Sat Jan 6 23:04:14 2018 New Revision: 327653 URL: https://svnweb.freebsd.org/changeset/base/327653 Log: MFC r326750: Do not give up if writing to the chip's control and status registers fails during startup. When a brand new chip leaves the factory, it is in a special power-saving mode that disables most functions on the chip to save battery power. The chip is stuck in this mode until the first write to the time registers, which automatically clears the special power-saving mode and starts the oscillator. Also, the day-of-week register in this chip counts 1-7, not 0-6, so write the values accordingly. These changes are based on the patch submitted by Brian Scott, but I elimated warnings since this condition is expected, and added some comments, and so in general blame me for any mistakes. PR: 223642 Modified: stable/11/sys/dev/iicbus/ds3231.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/iicbus/ds3231.c == --- stable/11/sys/dev/iicbus/ds3231.c Sat Jan 6 22:59:10 2018 (r327652) +++ stable/11/sys/dev/iicbus/ds3231.c Sat Jan 6 23:04:14 2018 (r327653) @@ -427,13 +427,19 @@ ds3231_start(void *xdev) device_printf(sc->sc_dev, "WARNING: RTC clock stopped, check the battery.\n"); } - /* Ack any pending alarm interrupt. */ - if (ds3231_status_write(sc, 1, 1) != 0) - return; - /* Always enable the oscillator. */ - if (ds3231_ctrl_write(sc) != 0) - return; + /* +* Ack any pending alarm interrupts and clear the EOSC bit to ensure the +* clock runs even when on battery power. Do not give up if these +* writes fail, because a factory-fresh chip is in a special mode that +* disables much of the chip to save battery power, and the only thing +* that gets it out of that mode is writing to the time registers. In +* these pristine chips, the EOSC and alarm bits are zero already, so +* the first valid write of time will get everything running properly. +*/ + ds3231_status_write(sc, 1, 1); + ds3231_ctrl_write(sc); + /* Temperature. */ SYSCTL_ADD_PROC(ctx, tree, OID_AUTO, "temperature", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0, @@ -568,7 +574,7 @@ ds3231_settime(device_t dev, struct timespec *ts) data[DS3231_MINS]= TOBCD(ct.min); data[DS3231_HOUR]= TOBCD(ct.hour) | pmflags; data[DS3231_DATE]= TOBCD(ct.day); - data[DS3231_WEEKDAY] = ct.dow; + data[DS3231_WEEKDAY] = ct.dow + 1; data[DS3231_MONTH] = TOBCD(ct.mon); data[DS3231_YEAR]= TOBCD(ct.year % 100); if (sc->sc_last_c) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327652 - stable/11/usr.sbin/nandtool
Author: jilles
Date: Sat Jan 6 22:59:10 2018
New Revision: 327652
URL: https://svnweb.freebsd.org/changeset/base/327652
Log:
MFC r327211: nandtool: Add missing mode for open() with O_CREAT
If O_CREAT is given, open() needs a mode argument. Follow the umask by
passing 0666.
Modified:
stable/11/usr.sbin/nandtool/nand_read.c
stable/11/usr.sbin/nandtool/nand_readoob.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/usr.sbin/nandtool/nand_read.c
==
--- stable/11/usr.sbin/nandtool/nand_read.c Sat Jan 6 22:56:48 2018
(r327651)
+++ stable/11/usr.sbin/nandtool/nand_read.c Sat Jan 6 22:59:10 2018
(r327652)
@@ -50,7 +50,7 @@ int nand_read(struct cmd_param *params)
}
if ((out = param_get_string(params, "out"))) {
- out_fd = open(out, O_WRONLY|O_CREAT);
+ out_fd = open(out, O_WRONLY|O_CREAT, 0666);
if (out_fd == -1) {
perrorf("Cannot open %s for writing", out);
return (1);
Modified: stable/11/usr.sbin/nandtool/nand_readoob.c
==
--- stable/11/usr.sbin/nandtool/nand_readoob.c Sat Jan 6 22:56:48 2018
(r327651)
+++ stable/11/usr.sbin/nandtool/nand_readoob.c Sat Jan 6 22:59:10 2018
(r327652)
@@ -57,7 +57,7 @@ int nand_read_oob(struct cmd_param *params)
}
if ((out = param_get_string(params, "out"))) {
- if ((fd_out = open(out, O_WRONLY | O_CREAT)) == -1) {
+ if ((fd_out = open(out, O_WRONLY | O_CREAT, 0666)) == -1) {
perrorf("Cannot open %s", out);
ret = 1;
goto out;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327651 - stable/11/sys/amd64/vmm/io
Author: ian
Date: Sat Jan 6 22:56:48 2018
New Revision: 327651
URL: https://svnweb.freebsd.org/changeset/base/327651
Log:
MFC r325108:
Improve the performance of the hpet timer in bhyve guests by making the
timer frequency a power of two. This changes the frequency from 10 to
16.7 MHz (2 ^ 24 HZ). Using a power of two avoids roundoff errors when
doing arithmetic in sbintime_t units.
Testing shows this can fix erratic ntpd behavior in guests using the
hpet timer (which is the default for multicore guests).
Modified:
stable/11/sys/amd64/vmm/io/vhpet.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/amd64/vmm/io/vhpet.c
==
--- stable/11/sys/amd64/vmm/io/vhpet.c Sat Jan 6 21:37:23 2018
(r327650)
+++ stable/11/sys/amd64/vmm/io/vhpet.c Sat Jan 6 22:56:48 2018
(r327651)
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
static MALLOC_DEFINE(M_VHPET, "vhpet", "bhyve virtual hpet");
-#defineHPET_FREQ 1000/* 10.0 Mhz */
+#defineHPET_FREQ 16777216/* 16.7 (2^24) Mhz */
#defineFS_PER_S1000ul
/* Timer N Configuration and Capabilities Register */
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r327559 - in head: . sys/net
On 05.01.2018 19:11, Steven Hartland wrote: >> I am mostly concerned about the overhead of manual calculation but my >> knowledge is a bit rusty right now and lagg has always been special so >> please try this out and see. >> > > I've not been able to find any such option: > head:src> grep -ri rss sys/amd64/conf/ > head:src> > > Any other ideas on where it might be or is it just the default on HEAD? "options RSS" is not in the GENERIC kernel and it is defined in sys/conf/* -- WBR, Andrey V. Elsukov signature.asc Description: OpenPGP digital signature
svn commit: r327650 - vendor/lldb/lldb-release_60-r321788
Author: dim Date: Sat Jan 6 21:37:23 2018 New Revision: 327650 URL: https://svnweb.freebsd.org/changeset/base/327650 Log: Tag lldb release_60 branch r321788. Added: vendor/lldb/lldb-release_60-r321788/ - copied from r327649, vendor/lldb/dist-release_60/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327649 - in vendor/lldb/dist-release_60/source: Core Plugins/Instruction/ARM64 Plugins/Process/MacOSX-Kernel
Author: dim
Date: Sat Jan 6 21:37:20 2018
New Revision: 327649
URL: https://svnweb.freebsd.org/changeset/base/327649
Log:
Vendor import of lldb release_60 branch r321788:
https://llvm.org/svn/llvm-project/lldb/branches/release_60@321788
Modified:
vendor/lldb/dist-release_60/source/Core/Debugger.cpp
vendor/lldb/dist-release_60/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
vendor/lldb/dist-release_60/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp
Modified: vendor/lldb/dist-release_60/source/Core/Debugger.cpp
==
--- vendor/lldb/dist-release_60/source/Core/Debugger.cppSat Jan 6
21:36:52 2018(r327648)
+++ vendor/lldb/dist-release_60/source/Core/Debugger.cppSat Jan 6
21:37:20 2018(r327649)
@@ -1162,75 +1162,6 @@ DebuggerSP Debugger::FindDebuggerWithID(lldb::user_id_
return debugger_sp;
}
-#if 0
-static void
-TestPromptFormats (StackFrame *frame)
-{
-if (frame == nullptr)
-return;
-
-StreamString s;
-const char *prompt_format =
-"{addr = '${addr}'\n}"
-"{addr-file-or-load = '${addr-file-or-load}'\n}"
-"{current-pc-arrow = '${current-pc-arrow}'\n}"
-"{process.id = '${process.id}'\n}"
-"{process.name = '${process.name}'\n}"
-"{process.file.basename = '${process.file.basename}'\n}"
-"{process.file.fullpath = '${process.file.fullpath}'\n}"
-"{thread.id = '${thread.id}'\n}"
-"{thread.index = '${thread.index}'\n}"
-"{thread.name = '${thread.name}'\n}"
-"{thread.queue = '${thread.queue}'\n}"
-"{thread.stop-reason = '${thread.stop-reason}'\n}"
-"{target.arch = '${target.arch}'\n}"
-"{module.file.basename = '${module.file.basename}'\n}"
-"{module.file.fullpath = '${module.file.fullpath}'\n}"
-"{file.basename = '${file.basename}'\n}"
-"{file.fullpath = '${file.fullpath}'\n}"
-"{frame.index = '${frame.index}'\n}"
-"{frame.pc = '${frame.pc}'\n}"
-"{frame.sp = '${frame.sp}'\n}"
-"{frame.fp = '${frame.fp}'\n}"
-"{frame.flags = '${frame.flags}'\n}"
-"{frame.reg.rdi = '${frame.reg.rdi}'\n}"
-"{frame.reg.rip = '${frame.reg.rip}'\n}"
-"{frame.reg.rsp = '${frame.reg.rsp}'\n}"
-"{frame.reg.rbp = '${frame.reg.rbp}'\n}"
-"{frame.reg.rflags = '${frame.reg.rflags}'\n}"
-"{frame.reg.xmm0 = '${frame.reg.xmm0}'\n}"
-"{frame.reg.carp = '${frame.reg.carp}'\n}"
-"{function.id = '${function.id}'\n}"
-"{function.changed = '${function.changed}'\n}"
-"{function.initial-function = '${function.initial-function}'\n}"
-"{function.name = '${function.name}'\n}"
-"{function.name-without-args = '${function.name-without-args}'\n}"
-"{function.name-with-args = '${function.name-with-args}'\n}"
-"{function.addr-offset = '${function.addr-offset}'\n}"
-"{function.concrete-only-addr-offset-no-padding =
'${function.concrete-only-addr-offset-no-padding}'\n}"
-"{function.line-offset = '${function.line-offset}'\n}"
-"{function.pc-offset = '${function.pc-offset}'\n}"
-"{line.file.basename = '${line.file.basename}'\n}"
-"{line.file.fullpath = '${line.file.fullpath}'\n}"
-"{line.number = '${line.number}'\n}"
-"{line.start-addr = '${line.start-addr}'\n}"
-"{line.end-addr = '${line.end-addr}'\n}"
-;
-
-SymbolContext sc (frame->GetSymbolContext(eSymbolContextEverything));
-ExecutionContext exe_ctx;
-frame->CalculateExecutionContext(exe_ctx);
-if (Debugger::FormatPrompt (prompt_format, &sc, &exe_ctx,
&sc.line_entry.range.GetBaseAddress(), s))
-{
-printf("%s\n", s.GetData());
-}
-else
-{
-printf ("what we got: %s\n", s.GetData());
-}
-}
-#endif
-
bool Debugger::FormatDisassemblerAddress(const FormatEntity::Entry *format,
const SymbolContext *sc,
const SymbolContext *prev_sc,
Modified:
vendor/lldb/dist-release_60/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
==
---
vendor/lldb/dist-release_60/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
Sat Jan 6 21:36:52 2018(r327648)
+++
vendor/lldb/dist-release_60/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
Sat Jan 6 21:37:20 2018(r327649)
@@ -76,19 +76,6 @@ static inline bool IsZero(uint64_t x) { return x == 0;
static inline uint64_t NOT(uint64_t x) { return ~x; }
-#if 0
-// LSL_C()
-// ===
-static inline uint64_t
-LSL_C (uint64_t x, integer shift, bool &carry_out)
-{
-assert (shift >= 0);
-uint64_t result = x << shift;
-carry_out = ((1ull << (64-1)) >> (shift - 1)) != 0;
-return result;
-}
-#endif
-
// LSL()
// =
Modified:
vendor/lldb/dist-release_60/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp
svn commit: r327648 - vendor/lld/lld-release_60-r321788
Author: dim Date: Sat Jan 6 21:36:52 2018 New Revision: 327648 URL: https://svnweb.freebsd.org/changeset/base/327648 Log: Tag lld release_60 branch r321788. Added: vendor/lld/lld-release_60-r321788/ - copied from r327647, vendor/lld/dist-release_60/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327647 - in vendor/lld/dist-release_60: ELF docs test/ELF test/ELF/Inputs test/ELF/linkerscript
Author: dim
Date: Sat Jan 6 21:36:48 2018
New Revision: 327647
URL: https://svnweb.freebsd.org/changeset/base/327647
Log:
Vendor import of lld release_60 branch r321788:
https://llvm.org/svn/llvm-project/lld/branches/release_60@321788
Added:
vendor/lld/dist-release_60/test/ELF/Inputs/shlib-undefined-ref.s (contents,
props changed)
vendor/lld/dist-release_60/test/ELF/gnu-ifunc-dyntags.s (contents, props
changed)
vendor/lld/dist-release_60/test/ELF/linkerscript/nobits-offset.s (contents,
props changed)
vendor/lld/dist-release_60/test/ELF/relocation-size-err.s (contents, props
changed)
vendor/lld/dist-release_60/test/ELF/shlib-undefined-shared.s (contents,
props changed)
vendor/lld/dist-release_60/test/ELF/weak-undef-rw.s (contents, props
changed)
Modified:
vendor/lld/dist-release_60/ELF/Driver.cpp
vendor/lld/dist-release_60/ELF/Relocations.cpp
vendor/lld/dist-release_60/ELF/SyntheticSections.cpp
vendor/lld/dist-release_60/ELF/Writer.cpp
vendor/lld/dist-release_60/docs/ReleaseNotes.rst
Modified: vendor/lld/dist-release_60/ELF/Driver.cpp
==
--- vendor/lld/dist-release_60/ELF/Driver.cpp Sat Jan 6 21:36:38 2018
(r327646)
+++ vendor/lld/dist-release_60/ELF/Driver.cpp Sat Jan 6 21:36:48 2018
(r327647)
@@ -1043,7 +1043,8 @@ template void LinkerDriver::link(opt::Inp
return;
// Handle undefined symbols in DSOs.
- Symtab->scanShlibUndefined();
+ if (!Config->Shared)
+Symtab->scanShlibUndefined();
// Handle the -exclude-libs option.
if (Args.hasArg(OPT_exclude_libs))
Modified: vendor/lld/dist-release_60/ELF/Relocations.cpp
==
--- vendor/lld/dist-release_60/ELF/Relocations.cpp Sat Jan 6 21:36:38
2018(r327646)
+++ vendor/lld/dist-release_60/ELF/Relocations.cpp Sat Jan 6 21:36:48
2018(r327647)
@@ -367,7 +367,7 @@ static bool isRelExpr(RelExpr Expr) {
static bool isStaticLinkTimeConstant(RelExpr E, RelType Type, const Symbol
&Sym,
InputSectionBase &S, uint64_t RelOff) {
// These expressions always compute a constant
- if (isRelExprOneOfPic)
return true;
+ // The size of a non preemptible symbol is a constant.
+ if (E == R_SIZE)
+return true;
+
// For the target and the relocation, we want to know if they are
// absolute or relative.
bool AbsVal = isAbsoluteValue(Sym);
@@ -592,6 +596,12 @@ static RelExpr adjustExpr(Symbol &Sym, RelExpr Expr, R
if (IsConstant)
return Expr;
+ // We can create any dynamic relocation supported by the dynamic linker if a
+ // section is writable or we are passed -z notext.
+ bool CanWrite = (S.Flags & SHF_WRITE) || !Config->ZText;
+ if (CanWrite && Target->isPicRel(Type))
+return Expr;
+
// If the relocation is to a weak undef, and we are producing
// executable, give up on it and produce a non preemptible 0.
if (!Config->Shared && Sym.isUndefWeak()) {
@@ -599,12 +609,6 @@ static RelExpr adjustExpr(Symbol &Sym, RelExpr Expr, R
IsConstant = true;
return Expr;
}
-
- // We can create any dynamic relocation supported by the dynamic linker if a
- // section is writable or we are passed -z notext.
- bool CanWrite = (S.Flags & SHF_WRITE) || !Config->ZText;
- if (CanWrite && Target->isPicRel(Type))
-return Expr;
// If we got here we know that this relocation would require the dynamic
// linker to write a value to read only memory or use an unsupported
Modified: vendor/lld/dist-release_60/ELF/SyntheticSections.cpp
==
--- vendor/lld/dist-release_60/ELF/SyntheticSections.cppSat Jan 6
21:36:38 2018(r327646)
+++ vendor/lld/dist-release_60/ELF/SyntheticSections.cppSat Jan 6
21:36:48 2018(r327647)
@@ -1064,7 +1064,7 @@ template void DynamicSection::final
addInt(DT_DEBUG, 0);
this->Link = InX::DynStrTab->getParent()->SectionIndex;
- if (InX::RelaDyn->getParent() && !InX::RelaDyn->empty()) {
+ if (!InX::RelaDyn->empty()) {
addInSec(InX::RelaDyn->DynamicTag, InX::RelaDyn);
addSize(InX::RelaDyn->SizeDynamicTag, InX::RelaDyn->getParent());
@@ -1081,7 +1081,13 @@ template void DynamicSection::final
addInt(IsRela ? DT_RELACOUNT : DT_RELCOUNT, NumRelativeRels);
}
}
- if (InX::RelaPlt->getParent() && !InX::RelaPlt->empty()) {
+ // .rel[a].plt section usually consists of two parts, containing plt and
+ // iplt relocations. It is possible to have only iplt relocations in the
+ // output. In that case RelaPlt is empty and have zero offset, the same
offset
+ // as RelaIplt have. And we still want to emit proper dynamic tags for that
+ // case, so here we always use RelaPlt as marker for the begining of
+ // .rel[a].plt section.
+ if (InX::RelaPlt->getParent()->Live) {
svn commit: r327646 - vendor/libc++/libc++-release_60-r321788
Author: dim Date: Sat Jan 6 21:36:38 2018 New Revision: 327646 URL: https://svnweb.freebsd.org/changeset/base/327646 Log: Tag libc++ release_60 branch r321788. Added: vendor/libc++/libc++-release_60-r321788/ - copied from r327645, vendor/libc++/dist-release_60/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327643 - in vendor/compiler-rt/dist-release_60: lib/asan/scripts lib/profile test/profile test/profile/Inputs test/scudo
Author: dim
Date: Sat Jan 6 21:36:08 2018
New Revision: 327643
URL: https://svnweb.freebsd.org/changeset/base/327643
Log:
Vendor import of compiler-rt release_60 branch r321788:
https://llvm.org/svn/llvm-project/compiler-rt/branches/release_60@321788
Added:
vendor/compiler-rt/dist-release_60/test/profile/Inputs/instrprof-dlopen-dlclose-main.c
(contents, props changed)
vendor/compiler-rt/dist-release_60/test/profile/instrprof-dlopen-dlclose-gcov.test
Modified:
vendor/compiler-rt/dist-release_60/lib/asan/scripts/asan_device_setup
vendor/compiler-rt/dist-release_60/lib/profile/GCDAProfiling.c
vendor/compiler-rt/dist-release_60/test/scudo/interface.cpp
Modified: vendor/compiler-rt/dist-release_60/lib/asan/scripts/asan_device_setup
==
--- vendor/compiler-rt/dist-release_60/lib/asan/scripts/asan_device_setup
Sat Jan 6 21:35:53 2018(r327642)
+++ vendor/compiler-rt/dist-release_60/lib/asan/scripts/asan_device_setup
Sat Jan 6 21:36:08 2018(r327643)
@@ -336,6 +336,13 @@ exec $_to \$@
EOF
}
+# On Android-L not allowing user segv handler breaks some applications.
+# Since ~May 2017 this is the default setting; included for compatibility with
+# older library versions.
+if [[ PRE_L -eq 0 ]]; then
+ASAN_OPTIONS="$ASAN_OPTIONS,allow_user_segv_handler=1"
+fi
+
if [[ x$extra_options != x ]] ; then
ASAN_OPTIONS="$ASAN_OPTIONS,$extra_options"
fi
Modified: vendor/compiler-rt/dist-release_60/lib/profile/GCDAProfiling.c
==
--- vendor/compiler-rt/dist-release_60/lib/profile/GCDAProfiling.c Sat Jan
6 21:35:53 2018(r327642)
+++ vendor/compiler-rt/dist-release_60/lib/profile/GCDAProfiling.c Sat Jan
6 21:36:08 2018(r327643)
@@ -228,6 +228,7 @@ static void unmap_file() {
* profiling enabled will emit to a different file. Only one file may be
* started at a time.
*/
+COMPILER_RT_VISIBILITY
void llvm_gcda_start_file(const char *orig_filename, const char version[4],
uint32_t checksum) {
const char *mode = "r+b";
@@ -295,6 +296,7 @@ void llvm_gcda_start_file(const char *orig_filename, c
/* Given an array of pointers to counters (counters), increment the n-th one,
* where we're also given a pointer to n (predecessor).
*/
+COMPILER_RT_VISIBILITY
void llvm_gcda_increment_indirect_counter(uint32_t *predecessor,
uint64_t **counters) {
uint64_t *counter;
@@ -317,6 +319,7 @@ void llvm_gcda_increment_indirect_counter(uint32_t *pr
#endif
}
+COMPILER_RT_VISIBILITY
void llvm_gcda_emit_function(uint32_t ident, const char *function_name,
uint32_t func_checksum, uint8_t
use_extra_checksum,
uint32_t cfg_checksum) {
@@ -343,6 +346,7 @@ void llvm_gcda_emit_function(uint32_t ident, const cha
write_string(function_name);
}
+COMPILER_RT_VISIBILITY
void llvm_gcda_emit_arcs(uint32_t num_counters, uint64_t *counters) {
uint32_t i;
uint64_t *old_ctrs = NULL;
@@ -394,6 +398,7 @@ void llvm_gcda_emit_arcs(uint32_t num_counters, uint64
#endif
}
+COMPILER_RT_VISIBILITY
void llvm_gcda_summary_info() {
const uint32_t obj_summary_len = 9; /* Length for gcov compatibility. */
uint32_t i;
@@ -447,6 +452,7 @@ void llvm_gcda_summary_info() {
#endif
}
+COMPILER_RT_VISIBILITY
void llvm_gcda_end_file() {
/* Write out EOF record. */
if (output_file) {
@@ -459,6 +465,7 @@ void llvm_gcda_end_file() {
unmap_file();
}
+fflush(output_file);
lprofUnlockFd(fd);
fclose(output_file);
output_file = NULL;
@@ -471,6 +478,7 @@ void llvm_gcda_end_file() {
#endif
}
+COMPILER_RT_VISIBILITY
void llvm_register_writeout_function(writeout_fn fn) {
struct writeout_fn_node *new_node = malloc(sizeof(struct writeout_fn_node));
new_node->fn = fn;
@@ -484,6 +492,7 @@ void llvm_register_writeout_function(writeout_fn fn) {
}
}
+COMPILER_RT_VISIBILITY
void llvm_writeout_files(void) {
struct writeout_fn_node *curr = writeout_fn_head;
@@ -493,6 +502,7 @@ void llvm_writeout_files(void) {
}
}
+COMPILER_RT_VISIBILITY
void llvm_delete_writeout_function_list(void) {
while (writeout_fn_head) {
struct writeout_fn_node *node = writeout_fn_head;
@@ -503,6 +513,7 @@ void llvm_delete_writeout_function_list(void) {
writeout_fn_head = writeout_fn_tail = NULL;
}
+COMPILER_RT_VISIBILITY
void llvm_register_flush_function(flush_fn fn) {
struct flush_fn_node *new_node = malloc(sizeof(struct flush_fn_node));
new_node->fn = fn;
@@ -516,6 +527,7 @@ void llvm_register_flush_function(flush_fn fn) {
}
}
+COMPILER_RT_VISIBILITY
void __gcov_flush() {
struct flush_fn_node *curr = flush_fn_head;
@@ -525,6 +537,7 @@ void __gcov_flush() {
}
}
+COMPILER_RT_VISIBILITY
void llvm_delete_flush_function_l
svn commit: r327645 - in vendor/libc++/dist-release_60: . include test/std/containers/sequences/list/list.ops test/std/utilities/meta/meta.unary/meta.unary.prop www
Author: dim
Date: Sat Jan 6 21:36:34 2018
New Revision: 327645
URL: https://svnweb.freebsd.org/changeset/base/327645
Log:
Vendor import of libc++ release_60 branch r321788:
https://llvm.org/svn/llvm-project/libcxx/branches/release_60@321788
Added:
vendor/libc++/dist-release_60/test/std/utilities/meta/meta.unary/meta.unary.prop/has_unique_object_representations.pass.cpp
(contents, props changed)
Modified:
vendor/libc++/dist-release_60/CMakeLists.txt
vendor/libc++/dist-release_60/CREDITS.TXT
vendor/libc++/dist-release_60/include/__config
vendor/libc++/dist-release_60/include/__functional_base
vendor/libc++/dist-release_60/include/__mutex_base
vendor/libc++/dist-release_60/include/chrono
vendor/libc++/dist-release_60/include/functional
vendor/libc++/dist-release_60/include/memory
vendor/libc++/dist-release_60/include/mutex
vendor/libc++/dist-release_60/include/optional
vendor/libc++/dist-release_60/include/ratio
vendor/libc++/dist-release_60/include/system_error
vendor/libc++/dist-release_60/include/tuple
vendor/libc++/dist-release_60/include/type_traits
vendor/libc++/dist-release_60/include/utility
vendor/libc++/dist-release_60/include/variant
vendor/libc++/dist-release_60/test/std/containers/sequences/list/list.ops/sort_comp.pass.cpp
vendor/libc++/dist-release_60/www/cxx1z_status.html
Modified: vendor/libc++/dist-release_60/CMakeLists.txt
==
--- vendor/libc++/dist-release_60/CMakeLists.txtSat Jan 6 21:36:11
2018(r327644)
+++ vendor/libc++/dist-release_60/CMakeLists.txtSat Jan 6 21:36:34
2018(r327645)
@@ -23,7 +23,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR
project(libcxx CXX C)
set(PACKAGE_NAME libcxx)
- set(PACKAGE_VERSION 6.0.0svn)
+ set(PACKAGE_VERSION 6.0.0)
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
set(PACKAGE_BUGREPORT "llvm-b...@lists.llvm.org")
Modified: vendor/libc++/dist-release_60/CREDITS.TXT
==
--- vendor/libc++/dist-release_60/CREDITS.TXT Sat Jan 6 21:36:11 2018
(r327644)
+++ vendor/libc++/dist-release_60/CREDITS.TXT Sat Jan 6 21:36:34 2018
(r327645)
@@ -101,7 +101,7 @@ E: nico.ri...@gmail.com
D: Windows fixes
N: Jon Roelofs
-E: jonat...@codesourcery.com
+E: jroel...@jroelofs.com
D: Remote testing, Newlib port, baremetal/single-threaded support.
N: Jonathan Sauer
Modified: vendor/libc++/dist-release_60/include/__config
==
--- vendor/libc++/dist-release_60/include/__config Sat Jan 6 21:36:11
2018(r327644)
+++ vendor/libc++/dist-release_60/include/__config Sat Jan 6 21:36:34
2018(r327645)
@@ -461,9 +461,13 @@ namespace std {
#endif
#if __has_builtin(__builtin_launder)
-#define_LIBCPP_COMPILER_HAS_BUILTIN_LAUNDER
+#define _LIBCPP_COMPILER_HAS_BUILTIN_LAUNDER
#endif
+#if !__is_identifier(__has_unique_object_representations)
+#define _LIBCPP_HAS_UNIQUE_OBJECT_REPRESENTATIONS
+#endif
+
#elif defined(_LIBCPP_COMPILER_GCC)
#define _ALIGNAS(x) __attribute__((__aligned__(x)))
@@ -547,9 +551,13 @@ namespace std {
#endif
#if _GNUC_VER >= 700
-#define_LIBCPP_COMPILER_HAS_BUILTIN_LAUNDER
+#define _LIBCPP_COMPILER_HAS_BUILTIN_LAUNDER
#endif
+#if _GNUC_VER >= 700
+#define _LIBCPP_HAS_UNIQUE_OBJECT_REPRESENTATIONS
+#endif
+
#elif defined(_LIBCPP_COMPILER_MSVC)
#define _LIBCPP_TOSTRING2(x) #x
@@ -980,9 +988,10 @@ template struct __static_assert_check {};
#define _LIBCPP_NODISCARD_AFTER_CXX17
#endif
-// FIXME: Remove all usages of this macro once compilers catch up.
-#if !defined(__cpp_inline_variables) || (__cpp_inline_variables < 201606L)
-# define _LIBCPP_HAS_NO_INLINE_VARIABLES
+#if _LIBCPP_STD_VER > 14 && defined(__cpp_inline_variables) &&
(__cpp_inline_variables >= 201606L)
+# define _LIBCPP_INLINE_VAR inline
+#else
+# define _LIBCPP_INLINE_VAR
#endif
#ifdef _LIBCPP_HAS_NO_RVALUE_REFERENCES
Modified: vendor/libc++/dist-release_60/include/__functional_base
==
--- vendor/libc++/dist-release_60/include/__functional_base Sat Jan 6
21:36:11 2018(r327644)
+++ vendor/libc++/dist-release_60/include/__functional_base Sat Jan 6
21:36:34 2018(r327645)
@@ -564,7 +564,7 @@ struct _LIBCPP_TEMPLATE_VIS allocator_arg_t { };
#if defined(_LIBCPP_CXX03_LANG) || defined(_LIBCPP_BUILDING_MEMORY)
extern const allocator_arg_t allocator_arg;
#else
-constexpr allocator_arg_t allocator_arg = allocator_arg_t();
+/* _LIBCPP_INLINE_VAR */ constexpr allocator_arg_t allocator_arg =
allocator_arg_t();
#endif
// uses_allocator
@@ -601,7 +601,7 @@ struct _LIBCPP_TEMPLATE_VIS uses_allocator
#if _LIBCPP_STD_VER > 14
template
-constexpr size_t uses_allocator_
svn commit: r327642 - vendor/clang/clang-release_60-r321788
Author: dim Date: Sat Jan 6 21:35:53 2018 New Revision: 327642 URL: https://svnweb.freebsd.org/changeset/base/327642 Log: Tag clang release_60 branch r321788. Added: vendor/clang/clang-release_60-r321788/ - copied from r327641, vendor/clang/dist-release_60/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327644 - vendor/compiler-rt/compiler-rt-release_60-r321788
Author: dim Date: Sat Jan 6 21:36:11 2018 New Revision: 327644 URL: https://svnweb.freebsd.org/changeset/base/327644 Log: Tag compiler-rt release_60 branch r321788. Added: vendor/compiler-rt/compiler-rt-release_60-r321788/ - copied from r327643, vendor/compiler-rt/dist-release_60/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327641 - in vendor/clang/dist-release_60: docs include/clang/AST include/clang/Basic include/clang/Config include/clang/Driver include/clang/Parse include/clang/Sema lib/AST lib/Basic ...
Author: dim Date: Sat Jan 6 21:35:46 2018 New Revision: 327641 URL: https://svnweb.freebsd.org/changeset/base/327641 Log: Vendor import of clang release_60 branch r321788: https://llvm.org/svn/llvm-project/cfe/branches/release_60@321788 Added: vendor/clang/dist-release_60/test/Driver/Inputs/config/ vendor/clang/dist-release_60/test/Driver/Inputs/config-1.cfg vendor/clang/dist-release_60/test/Driver/Inputs/config-2.cfg vendor/clang/dist-release_60/test/Driver/Inputs/config-2a.cfg vendor/clang/dist-release_60/test/Driver/Inputs/config-3.cfg vendor/clang/dist-release_60/test/Driver/Inputs/config-4.cfg vendor/clang/dist-release_60/test/Driver/Inputs/config-5.cfg vendor/clang/dist-release_60/test/Driver/Inputs/config-6.cfg vendor/clang/dist-release_60/test/Driver/Inputs/config/config-4.cfg vendor/clang/dist-release_60/test/Driver/Inputs/config/i386-qqq.cfg vendor/clang/dist-release_60/test/Driver/Inputs/config/i386-qqq3.cfg vendor/clang/dist-release_60/test/Driver/Inputs/config/x86_64-qqq.cfg vendor/clang/dist-release_60/test/Driver/Inputs/config/x86_64-qqq2.cfg vendor/clang/dist-release_60/test/Driver/Inputs/config/x86_64.cfg vendor/clang/dist-release_60/test/Driver/Inputs/config2/ vendor/clang/dist-release_60/test/Driver/Inputs/config2/config-4.cfg vendor/clang/dist-release_60/test/Driver/Inputs/config2/i386.cfg vendor/clang/dist-release_60/test/Driver/config-file-errs.c (contents, props changed) vendor/clang/dist-release_60/test/Driver/config-file.c (contents, props changed) vendor/clang/dist-release_60/test/Driver/config-file2.c (contents, props changed) vendor/clang/dist-release_60/test/Driver/config-file3.c (contents, props changed) Modified: vendor/clang/dist-release_60/docs/AttributeReference.rst vendor/clang/dist-release_60/docs/ClangCommandLineReference.rst vendor/clang/dist-release_60/docs/ReleaseNotes.rst vendor/clang/dist-release_60/docs/UsersManual.rst vendor/clang/dist-release_60/include/clang/AST/StmtOpenMP.h vendor/clang/dist-release_60/include/clang/Basic/DiagnosticDriverKinds.td vendor/clang/dist-release_60/include/clang/Basic/DiagnosticGroups.td vendor/clang/dist-release_60/include/clang/Basic/DiagnosticSemaKinds.td vendor/clang/dist-release_60/include/clang/Basic/LangOptions.def vendor/clang/dist-release_60/include/clang/Config/config.h.cmake vendor/clang/dist-release_60/include/clang/Driver/Driver.h vendor/clang/dist-release_60/include/clang/Driver/Options.td vendor/clang/dist-release_60/include/clang/Parse/Parser.h vendor/clang/dist-release_60/include/clang/Parse/RAIIObjectsForParser.h vendor/clang/dist-release_60/include/clang/Sema/DeclSpec.h vendor/clang/dist-release_60/include/clang/Sema/Sema.h vendor/clang/dist-release_60/lib/AST/Decl.cpp vendor/clang/dist-release_60/lib/Basic/Targets/X86.cpp vendor/clang/dist-release_60/lib/Basic/Version.cpp vendor/clang/dist-release_60/lib/CodeGen/CGDeclCXX.cpp vendor/clang/dist-release_60/lib/CodeGen/CGException.cpp vendor/clang/dist-release_60/lib/CodeGen/CGExpr.cpp vendor/clang/dist-release_60/lib/CodeGen/CGOpenMPRuntime.cpp vendor/clang/dist-release_60/lib/CodeGen/CGOpenMPRuntime.h vendor/clang/dist-release_60/lib/CodeGen/CGStmt.cpp vendor/clang/dist-release_60/lib/CodeGen/CGStmtOpenMP.cpp vendor/clang/dist-release_60/lib/CodeGen/CodeGenFunction.cpp vendor/clang/dist-release_60/lib/CodeGen/CodeGenFunction.h vendor/clang/dist-release_60/lib/CodeGen/CodeGenModule.cpp vendor/clang/dist-release_60/lib/Driver/Driver.cpp vendor/clang/dist-release_60/lib/Driver/ToolChains/Clang.cpp vendor/clang/dist-release_60/lib/Driver/ToolChains/Darwin.cpp vendor/clang/dist-release_60/lib/Frontend/CompilerInvocation.cpp vendor/clang/dist-release_60/lib/Frontend/InitPreprocessor.cpp vendor/clang/dist-release_60/lib/Headers/emmintrin.h vendor/clang/dist-release_60/lib/Headers/pmmintrin.h vendor/clang/dist-release_60/lib/Headers/smmintrin.h vendor/clang/dist-release_60/lib/Parse/ParseDecl.cpp vendor/clang/dist-release_60/lib/Parse/ParseDeclCXX.cpp vendor/clang/dist-release_60/lib/Parse/ParseExpr.cpp vendor/clang/dist-release_60/lib/Parse/ParseExprCXX.cpp vendor/clang/dist-release_60/lib/Parse/ParseObjc.cpp vendor/clang/dist-release_60/lib/Parse/ParseOpenMP.cpp vendor/clang/dist-release_60/lib/Parse/ParseStmt.cpp vendor/clang/dist-release_60/lib/Parse/ParseTemplate.cpp vendor/clang/dist-release_60/lib/Parse/Parser.cpp vendor/clang/dist-release_60/lib/Sema/DeclSpec.cpp vendor/clang/dist-release_60/lib/Sema/SemaCodeComplete.cpp vendor/clang/dist-release_60/lib/Sema/SemaDecl.cpp vendor/clang/dist-release_60/lib/Sema/SemaDeclCXX.cpp vendor/clang/dist-release_60/lib/Sema/SemaDeclObjC.cpp vendor/clang/dist-release_60/lib/Sema/SemaExpr.cpp vendor/clang/dist-release_60/lib/Sema/SemaExprCXX.cpp vendor/clang/dist-release_60/lib/Sema/SemaExprMember.cpp vendor/clang/dist-release_60/lib/Sema/SemaLambda.cpp vendor
svn commit: r327640 - vendor/llvm/llvm-release_60-r321788
Author: dim Date: Sat Jan 6 21:34:33 2018 New Revision: 327640 URL: https://svnweb.freebsd.org/changeset/base/327640 Log: Tag llvm release_60 branch r321788. Added: vendor/llvm/llvm-release_60-r321788/ - copied from r327639, vendor/llvm/dist-release_60/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327639 - in vendor/llvm/dist-release_60: . cmake include/llvm/CodeGen include/llvm/IR include/llvm/Support include/llvm/Transforms/Scalar lib/Analysis lib/CodeGen lib/CodeGen/GlobalISe...
Author: dim Date: Sat Jan 6 21:34:26 2018 New Revision: 327639 URL: https://svnweb.freebsd.org/changeset/base/327639 Log: Vendor import of llvm release_60 branch r321788: https://llvm.org/svn/llvm-project/llvm/branches/release_60@321788 Added: vendor/llvm/dist-release_60/test/CodeGen/AArch64/GlobalISel/unknown-intrinsic.ll vendor/llvm/dist-release_60/test/CodeGen/AArch64/minmax-of-minmax.ll vendor/llvm/dist-release_60/test/CodeGen/Mips/constraint-c-err.ll vendor/llvm/dist-release_60/test/CodeGen/Mips/constraint-c.ll vendor/llvm/dist-release_60/test/CodeGen/PowerPC/convert-rr-to-ri-instrs-out-of-range.mir vendor/llvm/dist-release_60/test/CodeGen/PowerPC/pr35688.ll vendor/llvm/dist-release_60/test/CodeGen/X86/pr35765.ll vendor/llvm/dist-release_60/test/MC/ELF/metadata-declaration-errors.s (contents, props changed) vendor/llvm/dist-release_60/test/Transforms/InstCombine/fmul-sqrt.ll vendor/llvm/dist-release_60/test/Transforms/InstSimplify/bitreverse-fold.ll vendor/llvm/dist-release_60/test/Transforms/InstSimplify/exp-intrinsic.ll vendor/llvm/dist-release_60/test/Transforms/InstSimplify/exp2-intrinsic.ll vendor/llvm/dist-release_60/test/Transforms/InstSimplify/fold-intrinsics.ll vendor/llvm/dist-release_60/test/Transforms/InstSimplify/log-intrinsic.ll vendor/llvm/dist-release_60/test/Transforms/InstSimplify/log2-intrinsic.ll vendor/llvm/dist-release_60/test/Transforms/SimplifyCFG/pr35774.ll Deleted: vendor/llvm/dist-release_60/test/Transforms/InstCombine/bitreverse-fold.ll Modified: vendor/llvm/dist-release_60/CMakeLists.txt vendor/llvm/dist-release_60/cmake/config-ix.cmake vendor/llvm/dist-release_60/include/llvm/CodeGen/TargetPassConfig.h vendor/llvm/dist-release_60/include/llvm/IR/Function.h vendor/llvm/dist-release_60/include/llvm/IR/IntrinsicsAMDGPU.td vendor/llvm/dist-release_60/include/llvm/Support/CommandLine.h vendor/llvm/dist-release_60/include/llvm/Support/TargetRegistry.h vendor/llvm/dist-release_60/include/llvm/Transforms/Scalar/LoopPassManager.h vendor/llvm/dist-release_60/lib/Analysis/InstructionSimplify.cpp vendor/llvm/dist-release_60/lib/Analysis/ScalarEvolution.cpp vendor/llvm/dist-release_60/lib/Analysis/ScalarEvolutionExpander.cpp vendor/llvm/dist-release_60/lib/Analysis/ValueTracking.cpp vendor/llvm/dist-release_60/lib/CodeGen/CodeGenPrepare.cpp vendor/llvm/dist-release_60/lib/CodeGen/GlobalISel/IRTranslator.cpp vendor/llvm/dist-release_60/lib/CodeGen/GlobalISel/LegalizerHelper.cpp vendor/llvm/dist-release_60/lib/CodeGen/LLVMTargetMachine.cpp vendor/llvm/dist-release_60/lib/CodeGen/LiveDebugVariables.cpp vendor/llvm/dist-release_60/lib/CodeGen/SelectionDAG/DAGCombiner.cpp vendor/llvm/dist-release_60/lib/CodeGen/SelectionDAG/FastISel.cpp vendor/llvm/dist-release_60/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp vendor/llvm/dist-release_60/lib/CodeGen/SelectionDAG/LegalizeVectorOps.cpp vendor/llvm/dist-release_60/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp vendor/llvm/dist-release_60/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp vendor/llvm/dist-release_60/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp vendor/llvm/dist-release_60/lib/CodeGen/TargetPassConfig.cpp vendor/llvm/dist-release_60/lib/CodeGen/WinEHPrepare.cpp vendor/llvm/dist-release_60/lib/IR/BasicBlock.cpp vendor/llvm/dist-release_60/lib/IR/Verifier.cpp vendor/llvm/dist-release_60/lib/MC/MCParser/ELFAsmParser.cpp vendor/llvm/dist-release_60/lib/Passes/PassBuilder.cpp vendor/llvm/dist-release_60/lib/Support/CommandLine.cpp vendor/llvm/dist-release_60/lib/Target/AArch64/AArch64ISelLowering.cpp vendor/llvm/dist-release_60/lib/Target/AArch64/AArch64RegisterInfo.td vendor/llvm/dist-release_60/lib/Target/AArch64/AArch64TargetMachine.cpp vendor/llvm/dist-release_60/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp vendor/llvm/dist-release_60/lib/Target/AArch64/Disassembler/AArch64Disassembler.cpp vendor/llvm/dist-release_60/lib/Target/AArch64/MCTargetDesc/AArch64AsmBackend.cpp vendor/llvm/dist-release_60/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.h vendor/llvm/dist-release_60/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp vendor/llvm/dist-release_60/lib/Target/AMDGPU/MCTargetDesc/AMDGPUAsmBackend.cpp vendor/llvm/dist-release_60/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h vendor/llvm/dist-release_60/lib/Target/AMDGPU/MIMGInstructions.td vendor/llvm/dist-release_60/lib/Target/AMDGPU/SIISelLowering.cpp vendor/llvm/dist-release_60/lib/Target/AMDGPU/SIMachineFunctionInfo.cpp vendor/llvm/dist-release_60/lib/Target/AMDGPU/SIMachineFunctionInfo.h vendor/llvm/dist-release_60/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp vendor/llvm/dist-release_60/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.h vendor/llvm/dist-release_60/lib/Target/ARM/MCTargetDesc/ARMAsmBackendDarwin.h vendor/llvm/dist-release_60/lib/Target/ARM/MCTargetDesc/ARMAsmBackendELF.h vendor/llvm/dist-release_60/li
svn commit: r327638 - in stable/11/sys/dev: ffec sdhci
Author: ian
Date: Sat Jan 6 21:19:52 2018
New Revision: 327638
URL: https://svnweb.freebsd.org/changeset/base/327638
Log:
MFC r325045, r325054-r325056, r325061, r325063, r325065
r325045:
Actually release resources in detach() rather than just returning EBUSY.
This will enable use of 'devctl disable', allow creation of a module, etc.
r325054:
Increase the alignment of the rx/tx descriptor ring buffers to 64 bytes.
16 was the correct alignment for older hardware, but the imx7 requires
64-byte alignment, which is a fine value to use on all systems.
PR: 222634
Submitted by: sebastian.hu...@embedded-brains.de
r325055:
Add FECFLAG_AVB variant flag to support new features on imx7.
This flag is analogous to the Linux driver FEC_QUIRK_HAS_AVB. It
indicates an FEC with support for Audio Video Bridging (AVB). This
indicator is used for various other parts in the Linux driver
(drivers/net/ethernet/freescale/fec_main.c).
Use it to customize the receive/transmit buffer alignment. The receive
buffer alignment increased to 64-bytes on the i.MX 6SoloX and i.MX
7Dual. There are no hard alignment restrictions for transmit buffers on
these chips.
Fix the ffec_softc::fectype type to provide enough storage for the
feature flags.
PR: 222634
Submitted by: sebastian.hu...@embedded-brains.de
r325056:
Avoid AXI bus issues due to a MAC reset on imx6sx and imx7.
When the FEC is connected to the AXI bus (indicated by AVB flag), a
MAC reset while a bus transaction is pending can hang the bus.
Instead of resetting, turn off the ENABLE bit, which allows the
hardware to complete any in-progress transfers (appending a bad CRC
to any partial packet) and release the AXI bus. This could probably
be done unconditionally for all hardware variants, but that hasn't
been tested.
PR: 222634
Submitted by: sebastian.hu...@embedded-brains.de
r325061:
Support up to 3 IRQs in the ffec driver.
Newer hardware splits the interrupts onto 3 different irq lines, but the
docs barely mention that there are multiple interrupts, and do not detail
how they're split up. The code now supports 1-3 irqs, and uses the same
interrupt service routine to handle all of them.
I modified the submitted changes to use bus_alloc_resources() instead of
using loops to allocate each irq separately. Thus, blame any bugs on me (I
can't actually test on imx7 hardware).
PR: 222634
Submitted by: sebastian.hu...@embedded-brains.de
r325063:
Use the 16-bit receive shift feature in ffec hardware that supports it.
When available, enabling this feature causes the hardware to write data
to the receive buffer starting at a 16-bit offset from the start address.
This eliminates the need to copy the data after receiving to re-align
the protocol headers to a 32-bit boundary.
PR: 222634
Submitted by: sebastian.hu...@embedded-brains.de
r325065:
Split the hardware type enum and the hw feature flags bits into separate
fields in the softc; they're ORed together in the ofw_compat_data.
I already caught myself doing 'sc->fectype == ' without masking
out the feature bits in one place, and that's sure to happen again.
Glomming them together is convenient for storing them in the ofw_compat_data
array, but there's no reason to keep them together in the softc.
Modified:
stable/11/sys/dev/ffec/if_ffec.c
stable/11/sys/dev/ffec/if_ffecreg.h
stable/11/sys/dev/sdhci/fsl_sdhci.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/dev/ffec/if_ffec.c
==
--- stable/11/sys/dev/ffec/if_ffec.cSat Jan 6 20:52:30 2018
(r327637)
+++ stable/11/sys/dev/ffec/if_ffec.cSat Jan 6 21:19:52 2018
(r327638)
@@ -97,16 +97,21 @@ enum {
FECTYPE_NONE,
FECTYPE_GENERIC,
FECTYPE_IMX53,
- FECTYPE_IMX6,
+ FECTYPE_IMX6, /* imx6 and imx7 */
FECTYPE_MVF,
};
/*
* Flags that describe general differences between the FEC hardware in various
- * SoCs. These are ORed into the FECTYPE enum values.
+ * SoCs. These are ORed into the FECTYPE enum values in the ofw_compat_data,
so
+ * the low 8 bits are reserved for the type enum. In the softc, the type and
+ * flags are put into separate members, so that you don't need to mask the
flags
+ * out of the type to compare it.
*/
-#defineFECTYPE_MASK0x
-#defineFECFLAG_GBE (0x0001 << 16)
+#defineFECTYPE_MASK0x00ff
+#defineFECFLAG_GBE (1 << 8)
+#defineFECFLAG_AVB (1 << 9)
+#defineFECFLAG_RACC(1 << 10)
/*
* Table of supported FDT compat strings and their associated FECTYPE values.
@@ -114,9 +119,11 @@ enum {
static struct ofw_compat_data compat_dat
svn commit: r327637 - stable/11/sys/sys
Author: ian
Date: Sat Jan 6 20:52:30 2018
New Revision: 327637
URL: https://svnweb.freebsd.org/changeset/base/327637
Log:
MFC r325060:
Add a #define RESOURCE_SPEC_END. Similar to DEVMETHOD_END and
KOBJMETHOD_END, this is to serve as the end marker in an array of
resource_spec structures.
Modified:
stable/11/sys/sys/bus.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/sys/bus.h
==
--- stable/11/sys/sys/bus.h Sat Jan 6 20:32:14 2018(r327636)
+++ stable/11/sys/sys/bus.h Sat Jan 6 20:52:30 2018(r327637)
@@ -491,6 +491,7 @@ struct resource_spec {
int rid;
int flags;
};
+#defineRESOURCE_SPEC_END {-1, 0, 0}
intbus_alloc_resources(device_t dev, struct resource_spec *rs,
struct resource **res);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327636 - head/sys/conf
Author: manu
Date: Sat Jan 6 20:32:14 2018
New Revision: 327636
URL: https://svnweb.freebsd.org/changeset/base/327636
Log:
arm64: Remove old clock driver for Allwinner 64bit SoC
All the clocks are now handled by the clkng driver.
Tested On: Pine64-LTS (A64)
Tested On: OrangePi PC2 (H5)
Modified:
head/sys/conf/files.arm64
Modified: head/sys/conf/files.arm64
==
--- head/sys/conf/files.arm64 Sat Jan 6 20:22:32 2018(r327635)
+++ head/sys/conf/files.arm64 Sat Jan 6 20:32:14 2018(r327636)
@@ -23,17 +23,13 @@ cloudabi64_vdso_blob.o optional
compat_cloudabi64 \
no-implicit-rule\
clean "cloudabi64_vdso_blob.o"
#
+
+# Allwinner common files
arm/allwinner/a10_ehci.c optionalehci aw_ehci fdt
arm/allwinner/aw_gpio.coptionalgpio aw_gpio fdt
arm/allwinner/aw_mmc.c optionalmmc aw_mmc fdt
-arm/allwinner/a64/a64_padconf.coptionalsoc_allwinner_a64 fdt
-arm/allwinner/a64/a64_r_padconf.c optional soc_allwinner_a64 fdt
-arm/allwinner/h3/h3_padconf.c optionalsoc_allwinner_h5 fdt
-arm/allwinner/h3/h3_r_padconf.c optional soc_allwinner_h5 fdt
-arm/allwinner/aw_ccu.c optionalaw_ccu fdt
arm/allwinner/aw_nmi.c optionalaw_nmi fdt \
compile-with "${NORMAL_C} -I$S/gnu/dts/include"
-arm/allwinner/aw_reset.c optionalaw_ccu fdt
arm/allwinner/aw_rsb.c optionalaw_rsb fdt
arm/allwinner/aw_rtc.c optionalaw_rtc fdt
arm/allwinner/aw_sid.c optionalaw_sid fdt
@@ -41,25 +37,23 @@ arm/allwinner/aw_thermal.c optionalaw_thermal fdt
arm/allwinner/aw_usbphy.c optionalehci aw_usbphy fdt
arm/allwinner/aw_wdog.coptionalaw_wdog fdt
arm/allwinner/axp81x.c optionalaxp81x fdt
-arm/allwinner/clk/aw_ahbclk.c optionalaw_ccu fdt
-arm/allwinner/clk/aw_apbclk.c optionalaw_ccu fdt
-arm/allwinner/clk/aw_axiclk.c optionalaw_ccu fdt
-arm/allwinner/clk/aw_cpuclk.c optionalaw_ccu fdt
-arm/allwinner/clk/aw_gate.coptionalaw_ccu fdt
-arm/allwinner/clk/aw_modclk.c optionalaw_ccu fdt
-arm/allwinner/clk/aw_pll.c optionalaw_ccu fdt \
- compile-with "${NORMAL_C} -I$S/gnu/dts/include"
-arm/allwinner/clk/aw_thsclk.c optionalaw_ccu fdt
-arm/allwinner/clk/aw_usbclk.c optionalaw_ccu fdt
-arm/allwinner/clkng/aw_ccung.c optionalaw_ccu fdt
+arm/allwinner/if_awg.c optionalawg ext_resources syscon fdt
+
+# Allwinner clock driver
+arm/allwinner/clkng/aw_ccung.c optionalaw_ccu fdt
arm/allwinner/clkng/aw_clk_nkmp.c optionalaw_ccu fdt
-arm/allwinner/clkng/aw_clk_nm.coptionalaw_ccu fdt
+arm/allwinner/clkng/aw_clk_nm.coptionalaw_ccu fdt
arm/allwinner/clkng/aw_clk_prediv_mux.coptionalaw_ccu fdt
-arm/allwinner/clkng/ccu_a64.c optionalaw_ccu fdt
-arm/allwinner/clkng/ccu_h3.c optionalaw_ccu fdt
+arm/allwinner/clkng/ccu_a64.c optionalsoc_allwinner_a64
aw_ccu fdt
+arm/allwinner/clkng/ccu_h3.c optionalsoc_allwinner_h5 aw_ccu
fdt
arm/allwinner/clkng/ccu_sun8i_r.c optionalaw_ccu fdt
-arm/allwinner/if_awg.c optionalawg ext_resources syscon fdt
+# Allwinner padconf files
+arm/allwinner/a64/a64_padconf.coptionalsoc_allwinner_a64 fdt
+arm/allwinner/a64/a64_r_padconf.c optional soc_allwinner_a64 fdt
+arm/allwinner/h3/h3_padconf.c optionalsoc_allwinner_h5 fdt
+arm/allwinner/h3/h3_r_padconf.c optional soc_allwinner_h5 fdt
+
arm/annapurna/alpine/alpine_ccu.c optionalal_ccu fdt
arm/annapurna/alpine/alpine_nb_service.c optionalal_nb_service
fdt
arm/annapurna/alpine/alpine_pci.c optionalal_pci fdt
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327635 - stable/11/sbin/ifconfig
Author: bryanv
Date: Sat Jan 6 20:22:32 2018
New Revision: 327635
URL: https://svnweb.freebsd.org/changeset/base/327635
Log:
MFC r326654:
Use consistent name for the vxlan VNI parameter name and provide shorthand
Modified:
stable/11/sbin/ifconfig/ifvxlan.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sbin/ifconfig/ifvxlan.c
==
--- stable/11/sbin/ifconfig/ifvxlan.c Sat Jan 6 19:36:29 2018
(r327634)
+++ stable/11/sbin/ifconfig/ifvxlan.c Sat Jan 6 20:22:32 2018
(r327635)
@@ -594,6 +594,7 @@ setvxlan_flush(const char *val, int d, int s, const st
static struct cmd vxlan_cmds[] = {
+ DEF_CLONE_CMD_ARG("vni",setvxlan_vni),
DEF_CLONE_CMD_ARG("vxlanid",setvxlan_vni),
DEF_CLONE_CMD_ARG("vxlanlocal", setvxlan_local),
DEF_CLONE_CMD_ARG("vxlanremote",setvxlan_remote),
@@ -608,7 +609,8 @@ static struct cmd vxlan_cmds[] = {
DEF_CLONE_CMD("vxlanlearn", 1, setvxlan_learn),
DEF_CLONE_CMD("-vxlanlearn", 0, setvxlan_learn),
- DEF_CMD_ARG("vxlanvni", setvxlan_vni),
+ DEF_CMD_ARG("vni", setvxlan_vni),
+ DEF_CMD_ARG("vxlanid", setvxlan_vni),
DEF_CMD_ARG("vxlanlocal", setvxlan_local),
DEF_CMD_ARG("vxlanremote", setvxlan_remote),
DEF_CMD_ARG("vxlangroup", setvxlan_group),
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327633 - stable/11/sys/arm/freescale/imx
Author: ian
Date: Sat Jan 6 19:24:49 2018
New Revision: 327633
URL: https://svnweb.freebsd.org/changeset/base/327633
Log:
Fix imx6 hdmi init after r323553.
This is a direct commit to 11-stable because major architectural changes in
12 prevent a direct MFC of the affected code. Conceptually, this is...
MFC r324416:
Fix imx6 hdmi init after r323553, which used a config_intrhook to defer the
attachment of i2c devices needed by hdmi.
The hdmi init also uses an intrhook callback to defer initialization, and if
the hdmi callback runs first, the i2c devices will not yet have registered
their device_t in association with their FDT phandle, which allows cross-
device references on FDT systems.
Now the hdmi deferred init checks for the i2c device registration, and if
it's not complete yet, it registers as an eventhandler watching for newbus
attach events. When the i2c device eventually attaches, the hdmi driver
unregisters from watching further events, and continues with the hdmi init.
Because the function signatures for an intrhook callback and an event
handler callback are the same, a single function is used for both callbacks.
Reported by: Russell Haley
Modified:
stable/11/sys/arm/freescale/imx/imx6_hdmi.c
Modified: stable/11/sys/arm/freescale/imx/imx6_hdmi.c
==
--- stable/11/sys/arm/freescale/imx/imx6_hdmi.c Sat Jan 6 18:42:17 2018
(r327632)
+++ stable/11/sys/arm/freescale/imx/imx6_hdmi.c Sat Jan 6 19:24:49 2018
(r327633)
@@ -63,11 +63,11 @@ struct imx_hdmi_softc {
device_tsc_dev;
struct resource *sc_mem_res;
int sc_mem_rid;
- struct intr_config_hook sc_mode_hook;
struct videomodesc_mode;
uint8_t *sc_edid;
uint8_t sc_edid_len;
phandle_t sc_i2c_xref;
+ eventhandler_tageh_tag;
};
static struct ofw_compat_data compat_data[] = {
@@ -626,15 +626,51 @@ hdmi_edid_read(struct imx_hdmi_softc *sc, uint8_t **ed
return (result);
}
+/*
+ * Deferred HDMI init. dwc_hdmi_init() does i2c transfers for DDC/EDID. The
imx
+ * i2c devices also use a config_intrhook function to finish their init,
because
+ * they require interrupts to perform transfers. There is no way to control
+ * whether the i2c or our hdmi intrhook function runs first. If we go first we
+ * have to continue waiting until after the i2c driver is ready to do transfers
+ * and has registered its phandle.
+ *
+ * This function is used as both a config_intrhook function and after that as
an
+ * eventhandler callback function (if necessary), to see if our i2c device is
+ * ready yet. When it is, continue with hdmi init. When first called as an
+ * intrhook function the i2c devices might be ready, in which case we never
+ * register as an eventhandler at all. Otherwise we register to see newbus
+ * attach events, and as each device attaches we check to see whether it was
the
+ * i2c device we care about. Once we have our i2c device we unregister from
+ * seeing further attach events.
+ */
static void
-imx_hdmi_detect_cable(void *arg)
+imx_hdmi_init(void *dev)
{
struct imx_hdmi_softc *sc;
- sc = arg;
- EVENTHANDLER_INVOKE(hdmi_event, sc->sc_dev, HDMI_EVENT_CONNECTED);
- /* Finished with the interrupt hook */
- config_intrhook_disestablish(&sc->sc_mode_hook);
+ sc = device_get_softc((device_t)dev);
+
+ if (OF_device_from_xref(sc->sc_i2c_xref) != NULL) {
+ if (sc->eh_tag != NULL) {
+ EVENTHANDLER_DEREGISTER_NOWAIT(device_attach,
+ sc->eh_tag);
+ }
+ WR1(sc, HDMI_PHY_POL0, HDMI_PHY_HPD);
+ WR1(sc, HDMI_IH_PHY_STAT0, HDMI_IH_PHY_STAT0_HPD);
+ if ((RD1(sc, HDMI_IH_PHY_STAT0) & HDMI_IH_PHY_STAT0_HPD) != 0) {
+ EVENTHANDLER_INVOKE(hdmi_event, sc->sc_dev,
+ HDMI_EVENT_CONNECTED);
+ }
+ return;
+ }
+
+ if (bootverbose)
+ device_printf((device_t)dev, "Waiting for DDC i2c device\n");
+
+ if (sc->eh_tag == NULL) {
+ sc->eh_tag = EVENTHANDLER_REGISTER(device_attach,
+ imx_hdmi_init, dev, EVENTHANDLER_PRI_ANY);
+ }
}
static int
@@ -673,14 +709,6 @@ imx_hdmi_attach(device_t dev)
goto out;
}
- sc->sc_mode_hook.ich_func = imx_hdmi_detect_cable;
- sc->sc_mode_hook.ich_arg = sc;
-
- if (config_intrhook_establish(&sc->sc_mode_hook) != 0) {
- err = ENOMEM;
- goto out;
- }
-
node = ofw_bus_get_node(dev);
if (OF_getencprop(node, "ddc-i2c-bus", &i2c_xref, sizeof(i2c_xref)) ==
-1)
sc->sc_i2c_xref = 0;
@@ -702,8 +730,8 @@ imx_
svn commit: r327632 - vendor/lldb/dist-release_60
Author: dim Date: Sat Jan 6 18:42:17 2018 New Revision: 327632 URL: https://svnweb.freebsd.org/changeset/base/327632 Log: Branch vendor/lldb/dist to vendor/lldb/dist-release_60, to allow for independent merges of the upstream trunk and release_60 branches. Added: vendor/lldb/dist-release_60/ - copied from r327631, vendor/lldb/dist/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327629 - vendor/compiler-rt/dist-release_60
Author: dim Date: Sat Jan 6 18:42:07 2018 New Revision: 327629 URL: https://svnweb.freebsd.org/changeset/base/327629 Log: Branch vendor/compiler-rt/dist to vendor/compiler-rt/dist-release_60, to allow for independent merges of the upstream trunk and release_60 branches. Added: vendor/compiler-rt/dist-release_60/ - copied from r327628, vendor/compiler-rt/dist/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327631 - vendor/lld/dist-release_60
Author: dim Date: Sat Jan 6 18:42:15 2018 New Revision: 327631 URL: https://svnweb.freebsd.org/changeset/base/327631 Log: Branch vendor/lld/dist to vendor/lld/dist-release_60, to allow for independent merges of the upstream trunk and release_60 branches. Added: vendor/lld/dist-release_60/ - copied from r327630, vendor/lld/dist/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327627 - vendor/llvm/dist-release_60
Author: dim Date: Sat Jan 6 18:41:59 2018 New Revision: 327627 URL: https://svnweb.freebsd.org/changeset/base/327627 Log: Branch vendor/llvm/dist to vendor/llvm/dist-release_60, to allow for independent merges of the upstream trunk and release_60 branches. Added: vendor/llvm/dist-release_60/ - copied from r327626, vendor/llvm/dist/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327630 - vendor/libc++/dist-release_60
Author: dim Date: Sat Jan 6 18:42:10 2018 New Revision: 327630 URL: https://svnweb.freebsd.org/changeset/base/327630 Log: Branch vendor/libc++/dist to vendor/libc++/dist-release_60, to allow for independent merges of the upstream trunk and release_60 branches. Added: vendor/libc++/dist-release_60/ - copied from r327629, vendor/libc++/dist/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327628 - vendor/clang/dist-release_60
Author: dim Date: Sat Jan 6 18:42:02 2018 New Revision: 327628 URL: https://svnweb.freebsd.org/changeset/base/327628 Log: Branch vendor/clang/dist to vendor/clang/dist-release_60, to allow for independent merges of the upstream trunk and release_60 branches. Added: vendor/clang/dist-release_60/ - copied from r327627, vendor/clang/dist/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r327616 - head/usr.bin/morse
On 6 January 2018 at 09:02, Dimitry Andric wrote: > On 6 Jan 2018, at 17:51, Eitan Adler wrote: >> >> On 6 January 2018 at 08:36, Dimitry Andric wrote: >>> On 6 Jan 2018, at 14:19, Eitan Adler wrote: > ... Why is testing with "make obj; make" in the morse directory insufficient? > ... >>> usr.bin/morse/morse.c:602:15: error: unused parameter 'stream' >>> [-Werror,-Wunused-parameter] >>> fdecode(FILE *stream) >>> ^ >>> 1 error generated. >>> >>> Maybe you have warnings turned off in your local build environment? >> >> Is there anything that I could set in my environment that would >> override the command line flags? > > It depends. Many people have /etc/make.conf or /etc/src.conf files with > extensive settings and compiler flag modifications, so usually the first > advice is to do: > > export __MAKE_CONF=/dev/null > export SRCCONF=/dev/null > > then attempt to build again. If that works, then slowly go through the > make.conf or src.conf settings, enabling them one by one until you > reproduce the failure (or unexpected success :). Makes sense. I was asking since I copy/pasted the log above which results in success and includes the compiler warnings. My best guess right now is that my timestamps are off resulting a rebuild not actually happening. Either way, thank you to Li-Wen Hsu for fixing and everyone else for dealing with me ;) -- Eitan Adler ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327626 - in stable/11: share/man/man9 sys/kern sys/sys
Author: ian Date: Sat Jan 6 17:20:58 2018 New Revision: 327626 URL: https://svnweb.freebsd.org/changeset/base/327626 Log: MFC r324413, r324415 r324413: Restore the ability to deregister an eventhandler from within the callback. When the EVENTHANDLER(9) subsystem was created, it was a documented feature that an eventhandler callback function could safely deregister itself. In r200652 that feature was inadvertantly broken by adding drain-wait logic to eventhandler_deregister(), so that it would be safe to unload a module upon return from deregistering its event handlers. There are now 145 callers of EVENTHANDLER_DEREGISTER(), and it's likely many of them are depending on the drain-wait logic that has been in place for 8 years. So instead of creating a separate eventhandler_drain() and adding it to some or all of those 145 call sites, this creates a separate eventhandler_drain_nowait() function for the specific purpose of deregistering a callback from within the running callback. Differential Revision:https://reviews.freebsd.org/D12561 r324415: Add eventhandler notifications for newbus device attach/detach. The detach case is slightly complicated by the fact that some in-kernel consumers may want to know before a device detaches (so they can release related resources, stop using the device, etc), but the detach can fail. So there are pre- and post-detach notifications for those consumers who need to handle all cases. A couple salient comments from the review, they amount to some helpful documentation about these events, but there's currently no good place for such documentation... Note that in the current newbus locking model, DETACH_BEGIN and DETACH_COMPLETE/FAILED sequence of event handler invocation might interweave with other attach/detach events arbitrarily. The handlers should be prepared for such situations. Also should note that detach may be called after the parent bus knows the hardware has left the building. In-kernel consumers have to be prepared to cope with this race. Differential Revision:https://reviews.freebsd.org/D12557 Modified: stable/11/share/man/man9/EVENTHANDLER.9 stable/11/sys/kern/subr_bus.c stable/11/sys/kern/subr_eventhandler.c stable/11/sys/sys/eventhandler.h Directory Properties: stable/11/ (props changed) Modified: stable/11/share/man/man9/EVENTHANDLER.9 == --- stable/11/share/man/man9/EVENTHANDLER.9 Sat Jan 6 16:29:00 2018 (r327625) +++ stable/11/share/man/man9/EVENTHANDLER.9 Sat Jan 6 17:20:58 2018 (r327626) @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" $FreeBSD$ .\" -.Dd March 27, 2017 +.Dd October 1, 2017 .Dt EVENTHANDLER 9 .Os .Sh NAME @@ -37,6 +37,7 @@ .Ft eventhandler_tag .Fn EVENTHANDLER_REGISTER name func arg priority .Fn EVENTHANDLER_DEREGISTER name tag +.Fn EVENTHANDLER_DEREGISTER_NOWAIT name tag .Ft eventhandler_tag .Fo eventhandler_register .Fa "struct eventhandler_list *list" @@ -50,6 +51,11 @@ .Fa "struct eventhandler_list *list" .Fa "eventhandler_tag tag" .Fc +.Ft void +.Fo eventhandler_deregister_nowait +.Fa "struct eventhandler_list *list" +.Fa "eventhandler_tag tag" +.Fc .Ft "struct eventhandler_list *" .Fn eventhandler_find_list "const char *name" .Ft void @@ -121,6 +127,18 @@ This macro removes a previously registered callback as .Fa tag from the event handler named by argument .Fa name . +It waits until no threads are running handlers for this event before +returning, making it safe to unload a module immediately upon return +from this function. +.It Fn EVENTHANDLER_DEREGISTER_NOWAIT +This macro removes a previously registered callback associated with tag +.Fa tag +from the event handler named by argument +.Fa name . +Upon return, one or more threads could still be running the removed +function(s), but no new calls will be made. +To remove a handler function from within that function, use this +version of deregister, to avoid a deadlock. .It Fn EVENTHANDLER_INVOKE This macro is used to invoke all the callbacks associated with event handler @@ -176,6 +194,21 @@ that can later be used with .Fn eventhandler_deregister to remove the particular callback function. .It Fn eventhandler_deregister +The +.Fn eventhandler_deregister +function removes the callback associated with tag +.Fa tag +from the event handler list pointed to by +.Fa list . +If +.Fa tag +is +.Va NULL , +all callback functions for the event are removed. +This function will not return until all threads have exited from the +removed handler callback function(s). +This function is not safe to call from inside an event handler callback. +.It Fn eventhandler_deregister_nowait The .Fn eventhandler_deregister function removes the callback associated with tag Modified: stable/11/sys/kern/subr_bus.c ===
Re: svn commit: r327616 - head/usr.bin/morse
On 6 Jan 2018, at 17:51, Eitan Adler wrote: > > On 6 January 2018 at 08:36, Dimitry Andric wrote: >> On 6 Jan 2018, at 14:19, Eitan Adler wrote: ... >>> Why is testing with "make obj; make" in the morse directory insufficient? ... >> usr.bin/morse/morse.c:602:15: error: unused parameter 'stream' >> [-Werror,-Wunused-parameter] >> fdecode(FILE *stream) >> ^ >> 1 error generated. >> >> Maybe you have warnings turned off in your local build environment? > > Is there anything that I could set in my environment that would > override the command line flags? It depends. Many people have /etc/make.conf or /etc/src.conf files with extensive settings and compiler flag modifications, so usually the first advice is to do: export __MAKE_CONF=/dev/null export SRCCONF=/dev/null then attempt to build again. If that works, then slowly go through the make.conf or src.conf settings, enabling them one by one until you reproduce the failure (or unexpected success :). -Dimitry signature.asc Description: Message signed with OpenPGP
Re: svn commit: r327616 - head/usr.bin/morse
On 6 January 2018 at 08:36, Dimitry Andric wrote: > On 6 Jan 2018, at 14:19, Eitan Adler wrote: >> >> On 6 January 2018 at 01:48, Li-Wen Hsu wrote: >>> Author: lwhsu (ports committer) >>> Date: Sat Jan 6 09:48:04 2018 >>> New Revision: 327616 >>> URL: https://svnweb.freebsd.org/changeset/base/327616 >>> >>> Log: >>> Unbreak build after r327614 >> >> Why is testing with "make obj; make" in the morse directory insufficient? >> >> ∴make obj; make >> rm -f .depend >> echo morse.full: /usr/lib/libc.a >> .depend >> cc -O2 -pipe -g -MD -MF.depend.morse.o -MTmorse.o -std=gnu99 >> -fstack-protector-strong -Wsystem-headers -Werror -Wall >> -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes >> -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual >> -Wwrite-strings -Wswitch -Wshadow -Wunused-parameter -Wcast-align >> -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls >> -Wold-style-definition -Wno-pointer-sign >> -Wmissing-variable-declarations -Wthread-safety -Wno-empty-body >> -Wno-string-plus-int -Wno-unused-const-variable -Qunused-arguments >> -c morse.c -o morse.o >> cc -O2 -pipe -g -std=gnu99 -fstack-protector-strong -Wsystem-headers >> -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter >> -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type >> -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wunused-parameter >> -Wcast-align -Wchar-subscripts -Winline -Wnested-externs >> -Wredundant-decls -Wold-style-definition -Wno-pointer-sign >> -Wmissing-variable-declarations -Wthread-safety -Wno-empty-body >> -Wno-string-plus-int -Wno-unused-const-variable -Qunused-arguments -o >> morse.full morse.o >> objcopy --only-keep-debug morse.full morse.debug >> objcopy --strip-debug --add-gnu-debuglink=morse.debug morse.full morse >> gzip -cn morse.6 > morse.6.gz > > Before r327616, I get: > > usr.bin/morse/morse.c:602:15: error: unused parameter 'stream' > [-Werror,-Wunused-parameter] > fdecode(FILE *stream) > ^ > 1 error generated. > > Maybe you have warnings turned off in your local build environment? Is there anything that I could set in my environment that would override the command line flags? -- Eitan Adler ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r327616 - head/usr.bin/morse
On 6 Jan 2018, at 14:19, Eitan Adler wrote: > > On 6 January 2018 at 01:48, Li-Wen Hsu wrote: >> Author: lwhsu (ports committer) >> Date: Sat Jan 6 09:48:04 2018 >> New Revision: 327616 >> URL: https://svnweb.freebsd.org/changeset/base/327616 >> >> Log: >> Unbreak build after r327614 > > Why is testing with "make obj; make" in the morse directory insufficient? > > ∴make obj; make > rm -f .depend > echo morse.full: /usr/lib/libc.a >> .depend > cc -O2 -pipe -g -MD -MF.depend.morse.o -MTmorse.o -std=gnu99 > -fstack-protector-strong -Wsystem-headers -Werror -Wall > -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes > -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual > -Wwrite-strings -Wswitch -Wshadow -Wunused-parameter -Wcast-align > -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls > -Wold-style-definition -Wno-pointer-sign > -Wmissing-variable-declarations -Wthread-safety -Wno-empty-body > -Wno-string-plus-int -Wno-unused-const-variable -Qunused-arguments > -c morse.c -o morse.o > cc -O2 -pipe -g -std=gnu99 -fstack-protector-strong -Wsystem-headers > -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter > -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type > -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wunused-parameter > -Wcast-align -Wchar-subscripts -Winline -Wnested-externs > -Wredundant-decls -Wold-style-definition -Wno-pointer-sign > -Wmissing-variable-declarations -Wthread-safety -Wno-empty-body > -Wno-string-plus-int -Wno-unused-const-variable -Qunused-arguments -o > morse.full morse.o > objcopy --only-keep-debug morse.full morse.debug > objcopy --strip-debug --add-gnu-debuglink=morse.debug morse.full morse > gzip -cn morse.6 > morse.6.gz Before r327616, I get: usr.bin/morse/morse.c:602:15: error: unused parameter 'stream' [-Werror,-Wunused-parameter] fdecode(FILE *stream) ^ 1 error generated. Maybe you have warnings turned off in your local build environment? -Dimitry signature.asc Description: Message signed with OpenPGP
svn commit: r327625 - head/share/man/man4
Author: kib Date: Sat Jan 6 16:29:00 2018 New Revision: 327625 URL: https://svnweb.freebsd.org/changeset/base/327625 Log: Document kern.smp.disabled tunable. Sponsored by: The FreeBSD Foundation MFC after:3 days Modified: head/share/man/man4/smp.4 Modified: head/share/man/man4/smp.4 == --- head/share/man/man4/smp.4 Sat Jan 6 16:13:17 2018(r327624) +++ head/share/man/man4/smp.4 Sat Jan 6 16:29:00 2018(r327625) @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 7, 2008 +.Dd January 6, 2017 .Dt SMP 4 .Os .Sh NAME @@ -56,6 +56,11 @@ i386 also requires The .Xr mptable 1 command may be used to view the status of multi-processor support. +.Pp +.Nm +support can be disabled by setting the loader tunable +.Va kern.smp.disabled +to 1. .Pp The number of CPUs detected by the system is available in the read-only sysctl variable ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327623 - head/usr.bin/morse
Author: eadler Date: Sat Jan 6 15:52:28 2018 New Revision: 327623 URL: https://svnweb.freebsd.org/changeset/base/327623 Log: morse(6): update documentation - bump Dd - use 'r' instead of 'D' from the original submission Modified: head/usr.bin/morse/morse.6 Modified: head/usr.bin/morse/morse.6 == --- head/usr.bin/morse/morse.6 Sat Jan 6 15:52:21 2018(r327622) +++ head/usr.bin/morse/morse.6 Sat Jan 6 15:52:28 2018(r327623) @@ -29,7 +29,7 @@ .\"@(#)bcd.6 8.1 (Berkeley) 5/31/93 .\" $FreeBSD$ .\" -.Dd June 7, 2005 +.Dd January 5, 2018 .Dt MORSE 6 .Os .Sh NAME @@ -37,7 +37,7 @@ .Nd reformat input as morse code .Sh SYNOPSIS .Nm -.Op Fl elps +.Op Fl elrps .Op Fl d Ar device .Op Fl w Ar speed .Op Fl c Ar speed @@ -92,7 +92,7 @@ Echo each character before it is sent, used together w .Fl p or .Fl d . -.It Fl D +.It Fl r Decode morse output consisting of dots and dashes (as generated by using the .Fl s ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r327614 - head/usr.bin/morse
[ Charset UTF-8 unsupported, converting... ]
> Author: eadler
> Date: Sat Jan 6 07:02:24 2018
> New Revision: 327614
> URL: https://svnweb.freebsd.org/changeset/base/327614
>
> Log:
> morse(6): implement support for decoding morse code
>
> - Use `-r` for "reverse" mode and to match DragonFlyBSD.
> - Move defines around to clear up logic
> - use `errx` instead of `fprintf` and `exit`
>
> PR: 35109
> Submitted By: philipp.mergentha...@stud.uni-karlsruhe.de
> Submitted on: 2002-02-19
> Reviewed by:kevans
>
> Modified:
> head/usr.bin/morse/morse.6
> head/usr.bin/morse/morse.c
>
> Modified: head/usr.bin/morse/morse.6
> ==
> --- head/usr.bin/morse/morse.6Sat Jan 6 06:34:49 2018
> (r327613)
> +++ head/usr.bin/morse/morse.6Sat Jan 6 07:02:24 2018
> (r327614)
> @@ -92,6 +92,11 @@ Echo each character before it is sent, used together w
> .Fl p
> or
> .Fl d .
> +.It Fl D
> +Decode morse output consisting of dots and dashes (as generated by using
> +the
> +.Fl s
> +option).
Dflag here, program is rflag
And I do not see an update to the SYNOPSYS section of the man page
adding the rflag, something like:
-.Op Fl elps
+.Op Fl elprs
Thanks,
> .El
> .Pp
> The
>
> Modified: head/usr.bin/morse/morse.c
> ==
> --- head/usr.bin/morse/morse.cSat Jan 6 06:34:49 2018
> (r327613)
> +++ head/usr.bin/morse/morse.cSat Jan 6 07:02:24 2018
> (r327614)
> @@ -46,6 +46,7 @@ static const char rcsid[] =
> #include
>
> #include
> +#include
> #include
> #include
> #include
> @@ -59,6 +60,9 @@ static const char rcsid[] =
> /* Always use the speaker, let the open fail if -p is selected */
> #define SPEAKER "/dev/speaker"
>
> +#define WHITESPACE " \t\n"
> +#define DELIMITERS " \t"
> +
> #ifdef SPEAKER
> #include
> #endif
> @@ -267,14 +271,11 @@ static const struct morsetab koi8rtab[] = {
> };
>
> static void show(const char *), play(const char *), morse(char);
> +static void decode (char *), fdecode(FILE *);
> static void ttyout(const char *);
> static void sighandler(int);
>
> -#define GETOPTOPTS "c:d:ef:lsw:"
> -#define USAGE \
> -"usage: morse [-els] [-d device] [-w speed] [-c speed] [-f frequency]
> [string ...]\n"
> -
> -static int pflag, lflag, sflag, eflag;
> +static int pflag, lflag, rflag, sflag, eflag;
> static int wpm = 20; /* effective words per minute */
> static int cpm;/* effective words per minute between
>* characters */
> @@ -293,11 +294,14 @@ static int olflags;
>
> #ifdef SPEAKER
> static tone_tsound;
> -#undef GETOPTOPTS
> -#define GETOPTOPTS "c:d:ef:lpsw:"
> -#undef USAGE
> +#define GETOPTOPTS "c:d:ef:lprsw:"
> #define USAGE \
> -"usage: morse [-elps] [-d device] [-w speed] [-c speed] [-f frequency]
> [string ...]\n"
> +"usage: morse [-elprs] [-d device] [-w speed] [-c speed] [-f frequency]
> [string ...]\n"
> +#else
> +#define GETOPTOPTS "c:d:ef:lrsw:"
> +#define USAGE \
> +"usage: morse [-elrs] [-d device] [-w speed] [-c speed] [-f frequency]
> [string ...]\n"
> +
> #endif
>
> static const struct morsetab *hightab;
> @@ -331,6 +335,9 @@ main(int argc, char **argv)
> pflag = 1;
> break;
> #endif
> + case 'r':
> + rflag = 1;
> + break;
> case 's':
> sflag = 1;
> break;
> @@ -339,42 +346,36 @@ main(int argc, char **argv)
> break;
> case '?':
> default:
> - fputs(USAGE, stderr);
> - exit(1);
> + errx(1, USAGE);
> }
> - if (sflag && lflag) {
> - fputs("morse: only one of -l and -s allowed\n", stderr);
> - exit(1);
> + if ((sflag && lflag) || (sflag && rflag) || (lflag && rflag)) {
> + errx(1, "morse: only one of -l, -s, and -r allowed\n");
> }
> if ((pflag || device) && (sflag || lflag)) {
> - fputs("morse: only one of -p, -d and -l, -s allowed\n", stderr);
> - exit(1);
> + errx(1, "morse: only one of -p, -d and -l, -s allowed\n");
> }
> - if (cpm == 0)
> + if (cpm == 0) {
> cpm = wpm;
> + }
> if ((pflag || device) && ((wpm < 1) || (wpm > 60) || (cpm < 1) || (cpm
> > 60))) {
> - fputs("morse: insane speed\n", stderr);
> - exit(1);
> + errx(1, "morse: insane speed\n");
> }
> - if ((pflag || device) && (freq == 0))
> + if ((pflag || device) && (freq == 0)) {
> freq = FREQUENCY;
> -
> + }
> #ifdef SPEAKER
> if (pflag) {
> if ((spkr = open(SP
Re: svn commit: r327563 - in head/sys: arm/allwinner arm/conf arm64/conf conf
> On 6. Jan 2018, at 15:24, Kyle Evans wrote: > > On Sat, Jan 6, 2018 at 7:23 AM, Michael Tuexen wrote: >>> On 4. Jan 2018, at 23:37, Kyle Evans wrote: >>> >>> Author: kevans >>> Date: Thu Jan 4 22:37:15 2018 >>> New Revision: 327563 >>> URL: https://svnweb.freebsd.org/changeset/base/327563 >>> >>> Log: >>> if_awg: Use syscon prop if it exists >>> >>> The emac bindings that are landing in Linux 4.15 specify a syscon property >>> on the emac node that point to /soc/syscon. Use this property if it's >>> specified, but maintain backwards compatibility with the old method. >>> >>> The older method is still used for boards that we get .dtb from u-boot, such >>> as pine64, that did not yet have stable emac bindings. >>> >>> Tested on: Banana Pi-M3 (a83t) >>> Tested on: Pine64 (a64) >>> Reviewed by: manu >>> Differential Revision: https://reviews.freebsd.org/D13296 >> This breaks booting on a RPi3. Please note that it is not only panic'ing, >> but there are multiple errors before that. > > Ugh, sorry about that. No problem... > FreeBSD EFI boot block >> Loader path: /boot/loader.efi >> >> Initializing modules: UFS >> Probing 3 block devices.* done >>UFS found 1 partition >> Consoles: EFI console >> Command line arguments: loader.efi >> Image base: 0x39ab8008 >> EFI version: 2.05 >> EFI Firmware: Das U-boot (rev 0.00) >> >> FreeBSD/arm64 EFI loader, Revision 1.1 >> (Wed Dec 6 19:13:14 CET 2017 r...@bsd18.fh-muenster.de) >> EFI boot environment >> Loading /boot/defaults/loader.conf >> /boot/kernel/kernel text=0x7f3b28 data=0xaac80+0x3a106d >> syms=[0x8+0x10e870+0x8+0x101345] >> /boot/entropy size=0x1000 >> /boot/kernel/geom_label.ko text=0x2a80 text=0x2710 data=0x10118+0xfeec >> syms=[0x8+0x1548+0x8+0xef2] >> >> Hit [Enter] to boot immediately, or any other key for command prompt. >> Booting [/boot/kernel/kernel]... >> Using DTB provided by EFI at 0x8004000. >> KDB: debugger backends: ddb >> KDB: current backend: ddb >> Copyright (c) 1992-2018 The FreeBSD Project. >> Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994 >>The Regents of the University of California. All rights reserved. >> FreeBSD is a registered trademark of The FreeBSD Foundation. >> FreeBSD 12.0-CURRENT #21 r327563M: Sat Jan 6 14:16:20 CET 2018 >>tue...@bsd10.fh-muenster.de:/usr/home/tuexen/head/sys/arm64/compile/TCP >> arm64 >> FreeBSD clang version 5.0.1 (branches/release_50 319231) (based on LLVM >> 5.0.1) >> VT: init without driver. >> sysctl_warn_reuse: can't re-use a leaf (kern.features.geom_label)! >> module_register: cannot register g_label from kernel; already loaded from >> geom_label.ko >> Module g_label failed to register: 17 >> Starting CPU 1 (1) >> Starting CPU 2 (2) >> Starting CPU 3 (3) >> FreeBSD/SMP: Multiprocessor System Detected: 4 CPUs >> random: unblocking device. >> module_register_init: MOD_LOAD (efirt, 0x000cb414, 0) error 12 >> random: entropy device external interface >> kbd0 at kbdmux0 >> ofwbus0: >> simplebus0: on ofwbus0 >> ofw_clkbus0: on ofwbus0 >> clk_fixed0: on ofw_clkbus0 >> clk_fixed1: on ofw_clkbus0 >> regfix0: on ofwbus0 >> regfix1: on ofwbus0 >> syscon_generic0: mem 0x4000-0x40ff on simplebus0 >> psci0: on ofwbus0 >> local_intc0: mem 0x4000-0x40ff on >> simplebus0 >> local_intc0: could not allocate memory resource >> device_attach: local_intc0 attach returned 6 > > Apologies for the breakage; this should be alleviated by r327621. > There will still be some errors (syscon_generic cannot allocate memory > resource), but that should be completely innocent in this case and > will give me time to track down why syscon shares register space with > local intc here. I can confirm that r327621 boots again on RPi3 and the system is usable. Thanks for the quick fix/workaround. Best regards Michael ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r327563 - in head/sys: arm/allwinner arm/conf arm64/conf conf
On Sat, Jan 6, 2018 at 7:23 AM, Michael Tuexen wrote: >> On 4. Jan 2018, at 23:37, Kyle Evans wrote: >> >> Author: kevans >> Date: Thu Jan 4 22:37:15 2018 >> New Revision: 327563 >> URL: https://svnweb.freebsd.org/changeset/base/327563 >> >> Log: >> if_awg: Use syscon prop if it exists >> >> The emac bindings that are landing in Linux 4.15 specify a syscon property >> on the emac node that point to /soc/syscon. Use this property if it's >> specified, but maintain backwards compatibility with the old method. >> >> The older method is still used for boards that we get .dtb from u-boot, such >> as pine64, that did not yet have stable emac bindings. >> >> Tested on: Banana Pi-M3 (a83t) >> Tested on: Pine64 (a64) >> Reviewed by: manu >> Differential Revision: https://reviews.freebsd.org/D13296 > This breaks booting on a RPi3. Please note that it is not only panic'ing, > but there are multiple errors before that. Ugh, sorry about that. >>> FreeBSD EFI boot block >Loader path: /boot/loader.efi > >Initializing modules: UFS >Probing 3 block devices.* done > UFS found 1 partition > Consoles: EFI console > Command line arguments: loader.efi > Image base: 0x39ab8008 > EFI version: 2.05 > EFI Firmware: Das U-boot (rev 0.00) > > FreeBSD/arm64 EFI loader, Revision 1.1 > (Wed Dec 6 19:13:14 CET 2017 r...@bsd18.fh-muenster.de) > EFI boot environment > Loading /boot/defaults/loader.conf > /boot/kernel/kernel text=0x7f3b28 data=0xaac80+0x3a106d > syms=[0x8+0x10e870+0x8+0x101345] > /boot/entropy size=0x1000 > /boot/kernel/geom_label.ko text=0x2a80 text=0x2710 data=0x10118+0xfeec > syms=[0x8+0x1548+0x8+0xef2] > > Hit [Enter] to boot immediately, or any other key for command prompt. > Booting [/boot/kernel/kernel]... > Using DTB provided by EFI at 0x8004000. > KDB: debugger backends: ddb > KDB: current backend: ddb > Copyright (c) 1992-2018 The FreeBSD Project. > Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994 > The Regents of the University of California. All rights reserved. > FreeBSD is a registered trademark of The FreeBSD Foundation. > FreeBSD 12.0-CURRENT #21 r327563M: Sat Jan 6 14:16:20 CET 2018 > tue...@bsd10.fh-muenster.de:/usr/home/tuexen/head/sys/arm64/compile/TCP > arm64 > FreeBSD clang version 5.0.1 (branches/release_50 319231) (based on LLVM 5.0.1) > VT: init without driver. > sysctl_warn_reuse: can't re-use a leaf (kern.features.geom_label)! > module_register: cannot register g_label from kernel; already loaded from > geom_label.ko > Module g_label failed to register: 17 > Starting CPU 1 (1) > Starting CPU 2 (2) > Starting CPU 3 (3) > FreeBSD/SMP: Multiprocessor System Detected: 4 CPUs > random: unblocking device. > module_register_init: MOD_LOAD (efirt, 0x000cb414, 0) error 12 > random: entropy device external interface > kbd0 at kbdmux0 > ofwbus0: > simplebus0: on ofwbus0 > ofw_clkbus0: on ofwbus0 > clk_fixed0: on ofw_clkbus0 > clk_fixed1: on ofw_clkbus0 > regfix0: on ofwbus0 > regfix1: on ofwbus0 > syscon_generic0: mem 0x4000-0x40ff on simplebus0 > psci0: on ofwbus0 > local_intc0: mem 0x4000-0x40ff on > simplebus0 > local_intc0: could not allocate memory resource > device_attach: local_intc0 attach returned 6 Apologies for the breakage; this should be alleviated by r327621. There will still be some errors (syscon_generic cannot allocate memory resource), but that should be completely innocent in this case and will give me time to track down why syscon shares register space with local intc here. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327621 - head/sys/dev/extres/syscon
Author: kevans Date: Sat Jan 6 14:21:32 2018 New Revision: 327621 URL: https://svnweb.freebsd.org/changeset/base/327621 Log: Move syscon_generic to attach much later It still needs to be before if_awg at least in order to be available for other operations, but it should not be attaching before interrupt controllers at the very least. This should make errors involving syscon register space colliding with other devices a little more innocent, but these conflicts should really be tracked down and resolved. One such conflict is with the Raspberry Pi 3 local interrupt controller, noticed by tuexen@ Reported by: tuexen Modified: head/sys/dev/extres/syscon/syscon_generic.c Modified: head/sys/dev/extres/syscon/syscon_generic.c == --- head/sys/dev/extres/syscon/syscon_generic.c Sat Jan 6 13:19:36 2018 (r327620) +++ head/sys/dev/extres/syscon/syscon_generic.c Sat Jan 6 14:21:32 2018 (r327621) @@ -207,5 +207,5 @@ DEFINE_CLASS_0(syscon_generic, syscon_generic_driver, sizeof(struct syscon_generic_softc)); static devclass_t syscon_generic_devclass; EARLY_DRIVER_MODULE(syscon_generic, simplebus, syscon_generic_driver, -syscon_generic_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_LATE); +syscon_generic_devclass, 0, 0, BUS_PASS_DEFAULT + BUS_PASS_ORDER_FIRST); MODULE_VERSION(syscon_generic, 1); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r327614 - head/usr.bin/morse
On Sat, Jan 06, 2018 at 08:33:07AM -0500, Shawn Webb wrote: > On Sat, Jan 06, 2018 at 07:02:24AM +, Eitan Adler wrote: > > Author: eadler > > Date: Sat Jan 6 07:02:24 2018 > > New Revision: 327614 > > URL: https://svnweb.freebsd.org/changeset/base/327614 > > > > Log: > > morse(6): implement support for decoding morse code > > > > - Use `-r` for "reverse" mode and to match DragonFlyBSD. > > - Move defines around to clear up logic > > - use `errx` instead of `fprintf` and `exit` > > > > PR: 35109 > > Submitted By: philipp.mergentha...@stud.uni-karlsruhe.de > > Submitted on: 2002-02-19 > > Reviewed by: kevans > > > > [snip] > > > > +void > > +fdecode(FILE *stream) > > Hey Eitan, > > This broke the arm64 build: > > https://jenkins.hardenedbsd.org/jenkins/job/HardenedBSD-CURRENT-arm64/159/console Catching up on email, I see it's fixed in r327616. -- Shawn Webb Cofounder and Security Engineer HardenedBSD Tor-ified Signal:+1 443-546-8752 GPG Key ID: 0x6A84658F52456EEE GPG Key Fingerprint: 2ABA B6BD EF6A F486 BE89 3D9E 6A84 658F 5245 6EEE signature.asc Description: PGP signature
Re: svn commit: r327614 - head/usr.bin/morse
On Sat, Jan 06, 2018 at 07:02:24AM +, Eitan Adler wrote: > Author: eadler > Date: Sat Jan 6 07:02:24 2018 > New Revision: 327614 > URL: https://svnweb.freebsd.org/changeset/base/327614 > > Log: > morse(6): implement support for decoding morse code > > - Use `-r` for "reverse" mode and to match DragonFlyBSD. > - Move defines around to clear up logic > - use `errx` instead of `fprintf` and `exit` > > PR: 35109 > Submitted By: philipp.mergentha...@stud.uni-karlsruhe.de > Submitted on: 2002-02-19 > Reviewed by:kevans > > [snip] > > +void > +fdecode(FILE *stream) Hey Eitan, This broke the arm64 build: https://jenkins.hardenedbsd.org/jenkins/job/HardenedBSD-CURRENT-arm64/159/console Thanks, -- Shawn Webb Cofounder and Security Engineer HardenedBSD Tor-ified Signal:+1 443-546-8752 GPG Key ID: 0x6A84658F52456EEE GPG Key Fingerprint: 2ABA B6BD EF6A F486 BE89 3D9E 6A84 658F 5245 6EEE signature.asc Description: PGP signature
Re: svn commit: r327577 - head/sys/cam/ata
On 5 January 2018 at 09:45, Rodney W. Grimes wrote: >> Author: eadler >> Date: Fri Jan 5 07:14:39 2018 >> New Revision: 327577 >> URL: https://svnweb.freebsd.org/changeset/base/327577 >> >> Log: >> cam/da: QUIRK: Add 4K quirks for WD Red and Black MHDDs > > >> >> PR: 188685 >> Submitted by: Jeremy Chadwick >> Reported by:Martin Birgmeier > > Any plans to MFC? to 10 and 11? Not 10. I might MFC to 11, but someone reported that this may not be the perfect fix. I need to read through that email first. -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r327563 - in head/sys: arm/allwinner arm/conf arm64/conf conf
> On 4. Jan 2018, at 23:37, Kyle Evans wrote: > > Author: kevans > Date: Thu Jan 4 22:37:15 2018 > New Revision: 327563 > URL: https://svnweb.freebsd.org/changeset/base/327563 > > Log: > if_awg: Use syscon prop if it exists > > The emac bindings that are landing in Linux 4.15 specify a syscon property > on the emac node that point to /soc/syscon. Use this property if it's > specified, but maintain backwards compatibility with the old method. > > The older method is still used for boards that we get .dtb from u-boot, such > as pine64, that did not yet have stable emac bindings. > > Tested on: Banana Pi-M3 (a83t) > Tested on: Pine64 (a64) > Reviewed by: manu > Differential Revision: https://reviews.freebsd.org/D13296 This breaks booting on a RPi3. Please note that it is not only panic'ing, but there are multiple errors before that. >> FreeBSD EFI boot block Loader path: /boot/loader.efi Initializing modules: UFS Probing 3 block devices.* done UFS found 1 partition Consoles: EFI console Command line arguments: loader.efi Image base: 0x39ab8008 EFI version: 2.05 EFI Firmware: Das U-boot (rev 0.00) FreeBSD/arm64 EFI loader, Revision 1.1 (Wed Dec 6 19:13:14 CET 2017 r...@bsd18.fh-muenster.de) EFI boot environment Loading /boot/defaults/loader.conf /boot/kernel/kernel text=0x7f3b28 data=0xaac80+0x3a106d syms=[0x8+0x10e870+0x8+0x101345] /boot/entropy size=0x1000 /boot/kernel/geom_label.ko text=0x2a80 text=0x2710 data=0x10118+0xfeec syms=[0x8+0x1548+0x8+0xef2] Hit [Enter] to boot immediately, or any other key for command prompt. Booting [/boot/kernel/kernel]... Using DTB provided by EFI at 0x8004000. KDB: debugger backends: ddb KDB: current backend: ddb Copyright (c) 1992-2018 The FreeBSD Project. Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994 The Regents of the University of California. All rights reserved. FreeBSD is a registered trademark of The FreeBSD Foundation. FreeBSD 12.0-CURRENT #21 r327563M: Sat Jan 6 14:16:20 CET 2018 tue...@bsd10.fh-muenster.de:/usr/home/tuexen/head/sys/arm64/compile/TCP arm64 FreeBSD clang version 5.0.1 (branches/release_50 319231) (based on LLVM 5.0.1) VT: init without driver. sysctl_warn_reuse: can't re-use a leaf (kern.features.geom_label)! module_register: cannot register g_label from kernel; already loaded from geom_label.ko Module g_label failed to register: 17 Starting CPU 1 (1) Starting CPU 2 (2) Starting CPU 3 (3) FreeBSD/SMP: Multiprocessor System Detected: 4 CPUs random: unblocking device. module_register_init: MOD_LOAD (efirt, 0x000cb414, 0) error 12 random: entropy device external interface kbd0 at kbdmux0 ofwbus0: simplebus0: on ofwbus0 ofw_clkbus0: on ofwbus0 clk_fixed0: on ofw_clkbus0 clk_fixed1: on ofw_clkbus0 regfix0: on ofwbus0 regfix1: on ofwbus0 syscon_generic0: mem 0x4000-0x40ff on simplebus0 psci0: on ofwbus0 local_intc0: mem 0x4000-0x40ff on simplebus0 local_intc0: could not allocate memory resource device_attach: local_intc0 attach returned 6 intc0: mem 0x7e00b200-0x7e00b3ff irq 16 on simplebus0 local_intc0: mem 0x4000-0x40ff on simplebus0 local_intc0: could not allocate memory resource device_attach: local_intc0 attach returned 6 local_intc0: mem 0x4000-0x40ff on simplebus0 local_intc0: could not allocate memory resource device_attach: local_intc0 attach returned 6 local_intc0: mem 0x4000-0x40ff on simplebus0 local_intc0: could not allocate memory resource device_attach: local_intc0 attach returned 6 generic_timer0: irq 47,48,49,50 on simplebus0 generic_timer0: could not allocate resources device_attach: generic_timer0 attach returned 6 bcm_dma0: mem 0x7e007000-0x7e007eff irq 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 on simplebus0 bcmwd0: mem 0x7e10-0x7e100027 on simplebus0 bcmrng0: mem 0x7e104000-0x7e10400f on simplebus0 device_attach: bcmrng0 attach returned 6 mbox0: mem 0x7e00b880-0x7e00b8bf irq 17 on simplebus0 gpio0: mem 0x7e20-0x7e2000b3 irq 18,19 on simplebus0 gpiobus0: on gpio0 gpioc0: on gpio0 uart0: mem 0x7e201000-0x7e201fff irq 20 on simplebus0 uart0: console (115200,n,8,1) spi0: mem 0x7e204000-0x7e204fff irq 21 on simplebus0 spibus0: on spi0 spibus0: at cs 0 mode 0 spibus0: at cs 1 mode 0 iichb0: mem 0x7e804000-0x7e804fff irq 32 on simplebus0 bcm283x_dwcotg0: mem 0x7e98-0x7e98,0x7e006000-0x7e006fff irq 38,39 on simplebus0 usbus0 on bcm283x_dwcotg0 sdhci_bcm0: mem 0x7e30-0x7e3000ff irq 42 on simplebus0 mmc0: on sdhci_bcm0 fb0: on simplebus0 fbd0 on fb0 VT: initialize with new VT driver "fb". fb0: 656x416(656x416@0,0) 24bpp fb0: fbswap: 1, pitch 1968, base 0x3db33000, screen_size 818688 local_intc0: mem 0x4000-0x40ff on simplebus0 local_intc0: could not allocate memory resource device_attach: local_intc0 attach returned 6 pmu0: irq 46 on simplebus0 pmu0: could not allocate resources device_attach: pmu0 attach returned 6 gener
Re: svn commit: r327616 - head/usr.bin/morse
On 6 January 2018 at 01:48, Li-Wen Hsu wrote: > Author: lwhsu (ports committer) > Date: Sat Jan 6 09:48:04 2018 > New Revision: 327616 > URL: https://svnweb.freebsd.org/changeset/base/327616 > > Log: > Unbreak build after r327614 Why is testing with "make obj; make" in the morse directory insufficient? ∴make obj; make rm -f .depend echo morse.full: /usr/lib/libc.a >> .depend cc -O2 -pipe -g -MD -MF.depend.morse.o -MTmorse.o -std=gnu99 -fstack-protector-strong -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls -Wold-style-definition -Wno-pointer-sign -Wmissing-variable-declarations -Wthread-safety -Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable -Qunused-arguments -c morse.c -o morse.o cc -O2 -pipe -g -std=gnu99 -fstack-protector-strong -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls -Wold-style-definition -Wno-pointer-sign -Wmissing-variable-declarations -Wthread-safety -Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable -Qunused-arguments -o morse.full morse.o objcopy --only-keep-debug morse.full morse.debug objcopy --strip-debug --add-gnu-debuglink=morse.debug morse.full morse gzip -cn morse.6 > morse.6.gz -- Eitan Adler ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327619 - head/lib/libc/net
Author: imp Date: Sat Jan 6 12:46:04 2018 New Revision: 327619 URL: https://svnweb.freebsd.org/changeset/base/327619 Log: The source strings are from the password database which guarantees that the data going into it is sane. Out of an abundance of caution, limit the string copies to prevent an overflow. CID: 1019035 Modified: head/lib/libc/net/rcmd.c Modified: head/lib/libc/net/rcmd.c == --- head/lib/libc/net/rcmd.cSat Jan 6 12:45:59 2018(r327618) +++ head/lib/libc/net/rcmd.cSat Jan 6 12:46:04 2018(r327619) @@ -457,8 +457,8 @@ again: first = 0; if ((pwd = getpwnam(luser)) == NULL) return (-1); - (void)strcpy(pbuf, pwd->pw_dir); - (void)strcat(pbuf, "/.rhosts"); + (void)strlcpy(pbuf, pwd->pw_dir, sizeof(pbuf)); + (void)strlcat(pbuf, "/.rhosts", sizeof(pbuf)); /* * Change effective uid while opening .rhosts. If root and ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327618 - head/bin/cat
Author: imp
Date: Sat Jan 6 12:45:59 2018
New Revision: 327618
URL: https://svnweb.freebsd.org/changeset/base/327618
Log:
Sanity check sysconf return value to ensure it's positive before we
use it. Use proper cast to convert long to size_t (instead of
blksize_t) to preclude sign extension issues.
CID: 1193754
Modified:
head/bin/cat/cat.c
Modified: head/bin/cat/cat.c
==
--- head/bin/cat/cat.c Sat Jan 6 12:34:03 2018(r327617)
+++ head/bin/cat/cat.c Sat Jan 6 12:45:59 2018(r327618)
@@ -300,6 +300,7 @@ ilseq:
static void
raw_cat(int rfd)
{
+ long pagesize;
int off, wfd;
ssize_t nr, nw;
static size_t bsize;
@@ -316,9 +317,12 @@ raw_cat(int rfd)
bsize = MIN(BUFSIZE_MAX, MAXPHYS * 8);
else
bsize = BUFSIZE_SMALL;
- } else
- bsize = MAX(sbuf.st_blksize,
- (blksize_t)sysconf(_SC_PAGESIZE));
+ } else {
+ bsize = sbuf.st_blksize;
+ pagesize = sysconf(_SC_PAGESIZE);
+ if (pagesize > 0)
+ bsize = MAX(bsize, (size_t)pagesize);
+ }
if ((buf = malloc(bsize)) == NULL)
err(1, "malloc() failure of IO buffer");
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327617 - head/usr.sbin/diskinfo
Author: imp Date: Sat Jan 6 12:34:03 2018 New Revision: 327617 URL: https://svnweb.freebsd.org/changeset/base/327617 Log: Sanity check media size and sector counts to ensure that we don't produce negative sector numbers in the testing algorithm. CID: 1198994 Modified: head/usr.sbin/diskinfo/diskinfo.c Modified: head/usr.sbin/diskinfo/diskinfo.c == --- head/usr.sbin/diskinfo/diskinfo.c Sat Jan 6 09:48:04 2018 (r327616) +++ head/usr.sbin/diskinfo/diskinfo.c Sat Jan 6 12:34:03 2018 (r327617) @@ -407,9 +407,14 @@ speeddisk(int fd, off_t mediasize, u_int sectorsize) int bulk, i; off_t b0, b1, sectorcount, step; + /* +* Drives smaller than 1MB produce negative sector numbers, +* as do 2048 or fewer sectors. +*/ sectorcount = mediasize / sectorsize; - if (sectorcount <= 0) - return; /* Can't test devices with no sectors */ + if (mediasize < 1024 * 1024 || sectorcount < 2048) + return; + step = 1ULL << (flsll(sectorcount / (4 * 200)) - 1); if (step > 16384) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327616 - head/usr.bin/morse
Author: lwhsu (ports committer)
Date: Sat Jan 6 09:48:04 2018
New Revision: 327616
URL: https://svnweb.freebsd.org/changeset/base/327616
Log:
Unbreak build after r327614
Approved by: mjg (on IRC)
Differential Revision:https://reviews.freebsd.org/D13782
Modified:
head/usr.bin/morse/morse.c
Modified: head/usr.bin/morse/morse.c
==
--- head/usr.bin/morse/morse.c Sat Jan 6 07:48:17 2018(r327615)
+++ head/usr.bin/morse/morse.c Sat Jan 6 09:48:04 2018(r327616)
@@ -605,7 +605,7 @@ fdecode(FILE *stream)
char buf[BUFSIZ];
s = buf;
- while (fgets(s, BUFSIZ - (s - buf), stdin)) {
+ while (fgets(s, BUFSIZ - (s - buf), stream)) {
p = buf;
while (*p && isblank(*p)) {
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
