svn commit: r307391 - in head/sys: amd64/amd64 dev/efidev sys
Author: kib
Date: Sun Oct 16 06:07:43 2016
New Revision: 307391
URL: https://svnweb.freebsd.org/changeset/base/307391
Log:
Do not try to create /dev/efi device node before devfs is initialized.
Split efirt.ko initialization into early stage where runtime services
KPI environment is created, to be used e.g. for RTC, and the later
devfs node creation stage, per module.
Switch the efi device to use make_dev_s(9) instead of make_dev(9). At
least, this gracefully handles the duplicated device name issue.
Remove ARGSUSED comment from efidev_ioctl(), all unused arguments are
annotated with __unused attribute.
Reported by: ambrisko, O. Hartmann
Reviewed by: imp
Sponsored by: The FreeBSD Foundation
MFC after:2 weeks
Modified:
head/sys/amd64/amd64/efirt.c
head/sys/dev/efidev/efidev.c
head/sys/sys/efi.h
Modified: head/sys/amd64/amd64/efirt.c
==
--- head/sys/amd64/amd64/efirt.cSun Oct 16 05:53:18 2016
(r307390)
+++ head/sys/amd64/amd64/efirt.cSun Oct 16 06:07:43 2016
(r307391)
@@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$");
static struct efi_systbl *efi_systbl;
static struct efi_cfgtbl *efi_cfgtbl;
static struct efi_rt *efi_runtime;
-static struct cdev *efi_cdev;
static int efi_status2err[25] = {
0, /* EFI_SUCCESS */
@@ -403,15 +402,13 @@ efi_init(void)
return (ENXIO);
}
- return (efidev_init(&efi_cdev));
+ return (0);
}
static void
efi_uninit(void)
{
- efidev_uninit(efi_cdev);
-
efi_destroy_1t1_map();
efi_systbl = NULL;
@@ -566,7 +563,6 @@ efirt_modevents(module_t m, int event, v
switch (event) {
case MOD_LOAD:
return (efi_init());
- break;
case MOD_UNLOAD:
efi_uninit();
Modified: head/sys/dev/efidev/efidev.c
==
--- head/sys/dev/efidev/efidev.cSun Oct 16 05:53:18 2016
(r307390)
+++ head/sys/dev/efidev/efidev.cSun Oct 16 06:07:43 2016
(r307391)
@@ -47,7 +47,6 @@ static struct cdevsw efi_cdevsw = {
.d_ioctl = efidev_ioctl,
};
-/* ARGSUSED */
static int
efidev_ioctl(struct cdev *dev __unused, u_long cmd, caddr_t addr,
int flags __unused, struct thread *td __unused)
@@ -173,21 +172,45 @@ vs_out:
return (error);
}
-int
-efidev_init(struct cdev **cdev)
+static struct cdev *efidev;
+
+static int
+efidev_modevents(module_t m, int event, void *arg __unused)
{
-
- *cdev = make_dev(&efi_cdevsw, 0, UID_ROOT, GID_WHEEL, 0700,
- "efi");
+ struct make_dev_args mda;
+ int error;
- return (0);
-}
+ switch (event) {
+ case MOD_LOAD:
+ make_dev_args_init(&mda);
+ mda.mda_flags = MAKEDEV_WAITOK | MAKEDEV_CHECKNAME;
+ mda.mda_devsw = &efi_cdevsw;
+ mda.mda_uid = UID_ROOT;
+ mda.mda_gid = GID_WHEEL;
+ mda.mda_mode = 0700;
+ error = make_dev_s(&mda, &efidev, "efi");
+ return (error);
+
+ case MOD_UNLOAD:
+ if (efidev != NULL)
+ destroy_dev(efidev);
+ efidev = NULL;
+ return (0);
-int
-efidev_uninit(struct cdev *cdev)
-{
-
- destroy_dev(cdev);
+ case MOD_SHUTDOWN:
+ return (0);
- return (0);
+ default:
+ return (EOPNOTSUPP);
+ }
}
+
+static moduledata_t efidev_moddata = {
+ .name = "efidev",
+ .evhand = efidev_modevents,
+ .priv = NULL,
+};
+
+DECLARE_MODULE(efidev, efidev_moddata, SI_SUB_DEVFS, SI_ORDER_ANY);
+MODULE_VERSION(efidev, 1);
+MODULE_DEPEND(efidev, efirt, 1, 1, 1);
Modified: head/sys/sys/efi.h
==
--- head/sys/sys/efi.h Sun Oct 16 05:53:18 2016(r307390)
+++ head/sys/sys/efi.h Sun Oct 16 06:07:43 2016(r307391)
@@ -165,9 +165,6 @@ struct efi_systbl {
#ifdef _KERNEL
extern vm_paddr_t efi_systbl_phys;
-struct cdev;
-int efidev_init(struct cdev **);
-int efidev_uninit(struct cdev *);
#endif /* _KERNEL */
#endif /* _SYS_EFI_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: r307390 - head/usr.sbin/efivar
Author: imp
Date: Sun Oct 16 05:53:18 2016
New Revision: 307390
URL: https://svnweb.freebsd.org/changeset/base/307390
Log:
style(9) nit: space after |.
Modified:
head/usr.sbin/efivar/efivar.c
Modified: head/usr.sbin/efivar/efivar.c
==
--- head/usr.sbin/efivar/efivar.c Sun Oct 16 05:32:28 2016
(r307389)
+++ head/usr.sbin/efivar/efivar.c Sun Oct 16 05:53:18 2016
(r307390)
@@ -62,7 +62,7 @@ static struct option longopts[] = {
static int aflag, Aflag, bflag, dflag, Dflag, Hflag, Nflag,
lflag, Lflag, Rflag, wflag, pflag;
static char *varname;
-static u_long attrib = EFI_VARIABLE_NON_VOLATILE
|EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS;
+static u_long attrib = EFI_VARIABLE_NON_VOLATILE |
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS;
static void
usage(void)
___
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: r307388 - head/sys/powerpc/powerpc
Author: jhibbits Date: Sun Oct 16 04:22:04 2016 New Revision: 307388 URL: https://svnweb.freebsd.org/changeset/base/307388 Log: Fix booting on systems that use loader(8) (most of them). r306065/r306067 introduced ofw_parse_bootargs(), setting environment variables from Open Firmware's /chosen/bootargs property. On systems booting with loader(8) (meaning, most systems), the initial static kenv is created with no extra space, causing kern_setenv() to panic. Since these already have the environment set directly, there is no need to parse bootargs anyway. Found by: swills Modified: head/sys/powerpc/powerpc/machdep.c Modified: head/sys/powerpc/powerpc/machdep.c == --- head/sys/powerpc/powerpc/machdep.c Sun Oct 16 02:55:52 2016 (r307387) +++ head/sys/powerpc/powerpc/machdep.c Sun Oct 16 04:22:04 2016 (r307388) @@ -238,6 +238,7 @@ powerpc_init(vm_offset_t fdt, vm_offset_ vm_offset_t startkernel, endkernel; void*kmdp; char *env; +bool ofw_bootargs = false; #ifdef DDB vm_offset_t ksym_start; vm_offset_t ksym_end; @@ -295,6 +296,7 @@ powerpc_init(vm_offset_t fdt, vm_offset_ bzero(__bss_start, _end - __bss_start); #endif init_static_kenv(init_kenv, sizeof(init_kenv)); + ofw_bootargs = true; } /* Store boot environment state */ OF_initial_setup((void *)fdt, NULL, (int (*)(void *))ofentry); @@ -337,7 +339,8 @@ powerpc_init(vm_offset_t fdt, vm_offset_ OF_bootstrap(); - ofw_parse_bootargs(); + if (ofw_bootargs) + ofw_parse_bootargs(); /* * Initialize the console before printing anything. ___ 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: r307387 - head/usr.bin/mkimg
Author: marcel
Date: Sun Oct 16 02:55:52 2016
New Revision: 307387
URL: https://svnweb.freebsd.org/changeset/base/307387
Log:
Switch to using the portable partition scheme headers.
Modified:
head/usr.bin/mkimg/Makefile
head/usr.bin/mkimg/apm.c
head/usr.bin/mkimg/bsd.c
head/usr.bin/mkimg/ebr.c
head/usr.bin/mkimg/gpt.c
head/usr.bin/mkimg/mbr.c
head/usr.bin/mkimg/pc98.c
head/usr.bin/mkimg/vtoc8.c
Modified: head/usr.bin/mkimg/Makefile
==
--- head/usr.bin/mkimg/Makefile Sun Oct 16 02:43:51 2016(r307386)
+++ head/usr.bin/mkimg/Makefile Sun Oct 16 02:55:52 2016(r307387)
@@ -11,6 +11,7 @@ mkimg.o: Makefile
CFLAGS+=-DMKIMG_VERSION=${MKIMG_VERSION}
CFLAGS+=-DSPARSE_WRITE
+CFLAGS+=-I${.CURDIR:H:H}/sys
# List of formats to support
SRCS+= \
Modified: head/usr.bin/mkimg/apm.c
==
--- head/usr.bin/mkimg/apm.cSun Oct 16 02:43:51 2016(r307386)
+++ head/usr.bin/mkimg/apm.cSun Oct 16 02:55:52 2016(r307387)
@@ -33,20 +33,13 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include
+#include
#include "endian.h"
#include "image.h"
#include "mkimg.h"
#include "scheme.h"
-#ifndef APM_ENT_TYPE_APPLE_BOOT
-#defineAPM_ENT_TYPE_APPLE_BOOT "Apple_Bootstrap"
-#endif
-#ifndef APM_ENT_TYPE_FREEBSD_NANDFS
-#defineAPM_ENT_TYPE_FREEBSD_NANDFS "FreeBSD-nandfs"
-#endif
-
static struct mkimg_alias apm_aliases[] = {
{ ALIAS_FREEBSD, ALIAS_PTR2TYPE(APM_ENT_TYPE_FREEBSD) },
{ ALIAS_FREEBSD_BOOT, ALIAS_PTR2TYPE(APM_ENT_TYPE_APPLE_BOOT) },
Modified: head/usr.bin/mkimg/bsd.c
==
--- head/usr.bin/mkimg/bsd.cSun Oct 16 02:43:51 2016(r307386)
+++ head/usr.bin/mkimg/bsd.cSun Oct 16 02:55:52 2016(r307387)
@@ -33,17 +33,13 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include
+#include
#include "endian.h"
#include "image.h"
#include "mkimg.h"
#include "scheme.h"
-#ifndef FS_NANDFS
-#defineFS_NANDFS 30
-#endif
-
static struct mkimg_alias bsd_aliases[] = {
{ ALIAS_FREEBSD_NANDFS, ALIAS_INT2TYPE(FS_NANDFS) },
{ ALIAS_FREEBSD_SWAP, ALIAS_INT2TYPE(FS_SWAP) },
@@ -58,7 +54,7 @@ bsd_metadata(u_int where, lba_t blk)
{
if (where == SCHEME_META_IMG_START)
- blk += BBSIZE / secsz;
+ blk += BSD_BOOTBLOCK_SIZE / secsz;
else if (where == SCHEME_META_IMG_END)
blk = round_cylinder(blk);
else
@@ -76,21 +72,21 @@ bsd_write(lba_t imgsz, void *bootcode)
int bsdparts, error, n;
uint16_t checksum;
- buf = malloc(BBSIZE);
+ buf = malloc(BSD_BOOTBLOCK_SIZE);
if (buf == NULL)
return (ENOMEM);
if (bootcode != NULL) {
- memcpy(buf, bootcode, BBSIZE);
+ memcpy(buf, bootcode, BSD_BOOTBLOCK_SIZE);
memset(buf + secsz, 0, sizeof(struct disklabel));
} else
- memset(buf, 0, BBSIZE);
+ memset(buf, 0, BSD_BOOTBLOCK_SIZE);
bsdparts = nparts + 1; /* Account for c partition */
- if (bsdparts < MAXPARTITIONS)
- bsdparts = MAXPARTITIONS;
+ if (bsdparts < BSD_NPARTS_MIN)
+ bsdparts = BSD_NPARTS_MIN;
d = (void *)(buf + secsz);
- le32enc(&d->d_magic, DISKMAGIC);
+ le32enc(&d->d_magic, BSD_MAGIC);
le32enc(&d->d_secsize, secsz);
le32enc(&d->d_nsectors, nsecs);
le32enc(&d->d_ntracks, nheads);
@@ -98,14 +94,14 @@ bsd_write(lba_t imgsz, void *bootcode)
le32enc(&d->d_secpercyl, nsecs * nheads);
le32enc(&d->d_secperunit, imgsz);
le16enc(&d->d_rpm, 3600);
- le32enc(&d->d_magic2, DISKMAGIC);
+ le32enc(&d->d_magic2, BSD_MAGIC);
le16enc(&d->d_npartitions, bsdparts);
- le32enc(&d->d_bbsize, BBSIZE);
+ le32enc(&d->d_bbsize, BSD_BOOTBLOCK_SIZE);
- dp = &d->d_partitions[RAW_PART];
+ dp = &d->d_partitions[BSD_PART_RAW];
le32enc(&dp->p_size, imgsz);
TAILQ_FOREACH(part, &partlist, link) {
- n = part->index + ((part->index >= RAW_PART) ? 1 : 0);
+ n = part->index + ((part->index >= BSD_PART_RAW) ? 1 : 0);
dp = &d->d_partitions[n];
le32enc(&dp->p_size, part->size);
le32enc(&dp->p_offset, part->block);
@@ -121,7 +117,7 @@ bsd_write(lba_t imgsz, void *bootcode)
checksum ^= le16dec(p);
le16enc(&d->d_checksum, checksum);
- error = image_write(0, buf, BBSIZE / secsz);
+ error = image_write(0, buf, BSD_BOOTBLOCK_SIZE / secsz);
free(buf);
return (error);
}
@@ -132,8 +128,8 @@ static struct mkimg_scheme bsd_scheme =
.aliases = bsd_aliases,
.metadata = bsd_metadata,
.write = b
svn commit: r307386 - in head: etc/mtree include sys/sys sys/sys/disk
Author: marcel
Date: Sun Oct 16 02:43:51 2016
New Revision: 307386
URL: https://svnweb.freebsd.org/changeset/base/307386
Log:
Re-apply change 306811 or alternatively, revert change 307385.
Added:
head/sys/sys/disk/
head/sys/sys/disk/apm.h
- copied, changed from r307385, head/sys/sys/apm.h
head/sys/sys/disk/bsd.h
- copied, changed from r307385, head/sys/sys/disklabel.h
head/sys/sys/disk/gpt.h
- copied, changed from r307385, head/sys/sys/gpt.h
head/sys/sys/disk/mbr.h
- copied, changed from r307385, head/sys/sys/diskmbr.h
head/sys/sys/disk/pc98.h
- copied, changed from r307385, head/sys/sys/diskpc98.h
head/sys/sys/disk/vtoc.h
- copied, changed from r307385, head/sys/sys/vtoc.h
Modified:
head/etc/mtree/BSD.include.dist
head/include/Makefile
head/sys/sys/apm.h
head/sys/sys/disklabel.h
head/sys/sys/diskmbr.h
head/sys/sys/diskpc98.h
head/sys/sys/gpt.h
head/sys/sys/vtoc.h
Modified: head/etc/mtree/BSD.include.dist
==
--- head/etc/mtree/BSD.include.dist Sun Oct 16 02:05:22 2016
(r307385)
+++ head/etc/mtree/BSD.include.dist Sun Oct 16 02:43:51 2016
(r307386)
@@ -336,6 +336,8 @@
ssp
..
sys
+disk
+..
..
teken
..
Modified: head/include/Makefile
==
--- head/include/Makefile Sun Oct 16 02:05:22 2016(r307385)
+++ head/include/Makefile Sun Oct 16 02:43:51 2016(r307386)
@@ -59,6 +59,7 @@ LSUBDIRS= cam/ata cam/nvme cam/scsi \
security/audit \
security/mac_biba security/mac_bsdextended security/mac_lomac \
security/mac_mls security/mac_partition \
+ sys/disk \
ufs/ffs ufs/ufs
LSUBSUBDIRS= dev/mpt/mpilib
Modified: head/sys/sys/apm.h
==
--- head/sys/sys/apm.h Sun Oct 16 02:05:22 2016(r307385)
+++ head/sys/sys/apm.h Sun Oct 16 02:43:51 2016(r307386)
@@ -1,69 +1,5 @@
/*-
- * Copyright (c) 2007 Marcel Moolenaar
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *notice, this list of conditions and the following disclaimer in the
- *documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
+ * This file is in the public domain.
*/
-
-#ifndef _SYS_APM_H_
-#define_SYS_APM_H_
-
-/* Driver Descriptor Record. */
-struct apm_ddr {
- uint16_tddr_sig;
-#defineAPM_DDR_SIG 0x4552
- uint16_tddr_blksize;
- uint32_tddr_blkcount;
-};
-
-#defineAPM_ENT_NAMELEN 32
-#defineAPM_ENT_TYPELEN 32
-
-/* Partition Map Entry Record. */
-struct apm_ent {
- uint16_tent_sig;
-#defineAPM_ENT_SIG 0x504d
- uint16_t_pad_;
- uint32_tent_pmblkcnt;
- uint32_tent_start;
- uint32_tent_size;
- charent_name[APM_ENT_NAMELEN];
- charent_type[APM_ENT_TYPELEN];
-};
-
-#defineAPM_ENT_TYPE_SELF "Apple_partition_map"
-#defineAPM_ENT_TYPE_UNUSED "Apple_Free"
-
-#defineAPM_ENT_TYPE_FREEBSD"FreeBSD"
-#defineAPM_ENT_TYPE_FREEBSD_NANDFS "FreeBSD-nandfs"
-#defineAPM_ENT_TYPE_FREEBSD_SWAP "FreeBSD-swap"
-#defineAPM_ENT_TYPE_FREEBSD_UFS"FreeBSD-UFS"
-#defineAPM_ENT_TYPE_FREEBSD_VINUM "FreeBSD-Vinum"
-#defineAPM_ENT_TYPE_FREEBSD_ZFS"FreeBSD-ZFS"
-
-#defineAPM_ENT_TYPE_APPLE_BOOT "Apple_Bootstrap"
-#defineAPM_ENT_TYPE_APPLE_HFS "Apple_HFS"
-#defineAPM_ENT_TYPE_APPLE_UFS "Apple_UNIX_SVR2"
-
-#endif /* _SYS_APM_H_ */
+/*
svn commit: r307385 - in head: etc/mtree include sys/sys sys/sys/disk
Author: marcel
Date: Sun Oct 16 02:05:22 2016
New Revision: 307385
URL: https://svnweb.freebsd.org/changeset/base/307385
Log:
Revert change 306811 so that the change can be re-done using
svn copy instead of svn move. This to preserve history on
the originals headers as well.
Replaced:
head/sys/sys/apm.h
- copied unchanged from r306810, head/sys/sys/apm.h
head/sys/sys/disklabel.h
- copied unchanged from r306810, head/sys/sys/disklabel.h
head/sys/sys/diskmbr.h
- copied unchanged from r306810, head/sys/sys/diskmbr.h
head/sys/sys/diskpc98.h
- copied unchanged from r306810, head/sys/sys/diskpc98.h
head/sys/sys/gpt.h
- copied unchanged from r306810, head/sys/sys/gpt.h
head/sys/sys/vtoc.h
- copied unchanged from r306810, head/sys/sys/vtoc.h
Deleted:
head/sys/sys/disk/
Modified:
head/etc/mtree/BSD.include.dist
head/include/Makefile
Modified: head/etc/mtree/BSD.include.dist
==
--- head/etc/mtree/BSD.include.dist Sat Oct 15 23:46:55 2016
(r307384)
+++ head/etc/mtree/BSD.include.dist Sun Oct 16 02:05:22 2016
(r307385)
@@ -336,8 +336,6 @@
ssp
..
sys
-disk
-..
..
teken
..
Modified: head/include/Makefile
==
--- head/include/Makefile Sat Oct 15 23:46:55 2016(r307384)
+++ head/include/Makefile Sun Oct 16 02:05:22 2016(r307385)
@@ -59,7 +59,6 @@ LSUBDIRS= cam/ata cam/nvme cam/scsi \
security/audit \
security/mac_biba security/mac_bsdextended security/mac_lomac \
security/mac_mls security/mac_partition \
- sys/disk \
ufs/ffs ufs/ufs
LSUBSUBDIRS= dev/mpt/mpilib
Copied: head/sys/sys/apm.h (from r306810, head/sys/sys/apm.h)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/sys/apm.h Sun Oct 16 02:05:22 2016(r307385, copy of
r306810, head/sys/sys/apm.h)
@@ -0,0 +1,69 @@
+/*-
+ * Copyright (c) 2007 Marcel Moolenaar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _SYS_APM_H_
+#define_SYS_APM_H_
+
+/* Driver Descriptor Record. */
+struct apm_ddr {
+ uint16_tddr_sig;
+#defineAPM_DDR_SIG 0x4552
+ uint16_tddr_blksize;
+ uint32_tddr_blkcount;
+};
+
+#defineAPM_ENT_NAMELEN 32
+#defineAPM_ENT_TYPELEN 32
+
+/* Partition Map Entry Record. */
+struct apm_ent {
+ uint16_tent_sig;
+#defineAPM_ENT_SIG 0x504d
+ uint16_t_pad_;
+ uint32_tent_pmblkcnt;
+ uint32_tent_start;
+ uint32_tent_size;
+ charent_name[APM_ENT_NAMELEN];
+ charent_type[APM_ENT_TYPELEN];
+};
+
+#defineAPM_ENT_TYPE_SELF "Apple_partition_map"
+#defineAPM_ENT_TYPE_UNUSED "Apple_Free"
+
+#defineAPM_ENT_TYPE_FREEBSD"FreeBSD"
+#defineAPM_ENT_TYPE_FREEBSD_NANDFS "FreeBSD-nandfs"
+#defineAPM_ENT_TYPE_FREEBSD_SWAP "FreeBSD-swap"
+#defineAPM_ENT_TYPE_FREEBSD_UFS"FreeBSD-UFS"
+#defineAPM_ENT_TYPE_FREEBSD_VINUM "FreeBSD-Vinum"
+#defineAPM_ENT_TYPE_FREEBSD_ZFS"FreeBSD-ZFS"
+
+#defineAPM_ENT_TYPE_APPLE_BOOT "Apple_Bootstrap"
+#defineAPM_ENT_TYPE_APPLE_HFS "Apple_HFS"
+#defineAPM_ENT_TYPE_APPLE_UFS "Apple_UNIX_SVR2"
+
+#endif /* _SYS_APM_H_ */
Copied: head/sy
svn commit: r307384 - head/usr.sbin/pmcstat
Author: markj
Date: Sat Oct 15 23:46:55 2016
New Revision: 307384
URL: https://svnweb.freebsd.org/changeset/base/307384
Log:
Remove an unused field from struct pmcstat_image.
MFC after:3 days
Modified:
head/usr.sbin/pmcstat/pmcstat_log.h
Modified: head/usr.sbin/pmcstat/pmcstat_log.h
==
--- head/usr.sbin/pmcstat/pmcstat_log.h Sat Oct 15 22:49:04 2016
(r307383)
+++ head/usr.sbin/pmcstat/pmcstat_log.h Sat Oct 15 23:46:55 2016
(r307384)
@@ -76,7 +76,6 @@ enum pmcstat_image_type {
struct pmcstat_image {
LIST_ENTRY(pmcstat_image) pi_next; /* hash link */
- TAILQ_ENTRY(pmcstat_image) pi_lru; /* LRU list */
pmcstat_interned_string pi_execpath;/* cookie */
pmcstat_interned_string pi_samplename; /* sample path name */
pmcstat_interned_string pi_fullpath;/* path to FS object */
___
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: r307382 - in head/sys: arm/conf conf dev/gpio
Author: jmcneill
Date: Sat Oct 15 20:04:14 2016
New Revision: 307382
URL: https://svnweb.freebsd.org/changeset/base/307382
Log:
Add driver for GPIO controlled regulator.
Reviewed by: gonzo, manu, mmel
Differential Revision:https://reviews.freebsd.org/D8257
Added:
head/sys/dev/gpio/gpioregulator.c (contents, props changed)
Modified:
head/sys/arm/conf/GENERIC
head/sys/conf/files
Modified: head/sys/arm/conf/GENERIC
==
--- head/sys/arm/conf/GENERIC Sat Oct 15 19:55:07 2016(r307381)
+++ head/sys/arm/conf/GENERIC Sat Oct 15 20:04:14 2016(r307382)
@@ -112,6 +112,7 @@ device icee
# GPIO
device gpio
device gpioled
+device gpioregulator
# SPI
device spibus
Modified: head/sys/conf/files
==
--- head/sys/conf/files Sat Oct 15 19:55:07 2016(r307381)
+++ head/sys/conf/files Sat Oct 15 20:04:14 2016(r307382)
@@ -1573,6 +1573,7 @@ dev/gpio/gpioc.c optional gpio
\
dependency "gpio_if.h"
dev/gpio/gpioiic.c optional gpioiic
dev/gpio/gpioled.c optional gpioled
+dev/gpio/gpioregulator.c optional gpioregulator fdt ext_resources
dev/gpio/gpiospi.c optional gpiospi
dev/gpio/gpio_if.m optional gpio
dev/gpio/gpiobus_if.m optional gpio
Added: head/sys/dev/gpio/gpioregulator.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/dev/gpio/gpioregulator.c Sat Oct 15 20:04:14 2016
(r307382)
@@ -0,0 +1,348 @@
+/*-
+ * Copyright (c) 2016 Jared McNeill
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+/*
+ * GPIO controlled regulators
+ */
+
+#include
+__FBSDID("$FreeBSD$");
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+
+#include
+
+#include
+
+#include "regdev_if.h"
+
+struct gpioregulator_state {
+ int val;
+ uint32_tmask;
+};
+
+struct gpioregulator_init_def {
+ struct regnode_init_def reg_init_def;
+ struct gpiobus_pin *enable_pin;
+ int enable_pin_valid;
+ int startup_delay_us;
+ int nstates;
+ struct gpioregulator_state *states;
+ int npins;
+ struct gpiobus_pin **pins;
+};
+
+struct gpioregulator_reg_sc {
+ struct regnode *regnode;
+ device_tbase_dev;
+ struct regnode_std_param*param;
+ struct gpioregulator_init_def *def;
+};
+
+struct gpioregulator_softc {
+ device_tdev;
+ struct gpioregulator_reg_sc *reg_sc;
+ struct gpioregulator_init_def init_def;
+};
+
+static int
+gpioregulator_regnode_init(struct regnode *regnode)
+{
+ struct gpioregulator_reg_sc *sc;
+ int error, n;
+
+ sc = regnode_get_softc(regnode);
+
+ if (sc->def->enable_pin_valid == 1) {
+ error = gpio_pin_setflags(sc->def->enable_pin, GPIO_PIN_OUTPUT);
+ if (error != 0)
+ return (error);
+ }
+
+ for (n = 0; n < sc->def->npins; n++) {
+ error = gpio_pin_setflags(sc->def->pins[n], GPIO_PIN_OUTPUT);
+ if (error != 0)
+ return (error);
+ }
+
+ retur
svn commit: r307381 - head/usr.bin/sdiff
Author: bapt
Date: Sat Oct 15 19:55:07 2016
New Revision: 307381
URL: https://svnweb.freebsd.org/changeset/base/307381
Log:
Fix typos in sdiff(1) message and improve display
Modified:
head/usr.bin/sdiff/sdiff.c
Modified: head/usr.bin/sdiff/sdiff.c
==
--- head/usr.bin/sdiff/sdiff.c Sat Oct 15 18:20:15 2016(r307380)
+++ head/usr.bin/sdiff/sdiff.c Sat Oct 15 19:55:07 2016(r307381)
@@ -137,24 +137,25 @@ static struct option longopts[] = {
};
static const char *help_msg[] = {
- "\nusage: sdiff [-abdilstW] [-I regexp] [-o outfile] [-w width] file1
file2\n",
- "\t-l, --left-column, Only print the left column for identical lines.",
- "\t-o OUTFILE, --output=OUTFILE, nteractively merge file1 and file2
into outfile.",
- "\t-s, --suppress-common-lines, Skip identical lines.",
- "\t-w WIDTH, --width=WIDTH, Print a maximum of WIDTH characters on each
line.",
- "\tOptions passed to diff(1) are:",
- "\t\t-a, --text, Treat file1 and file2 as text files.",
- "\t\t-b, --ignore-trailing-cr, Ignore trailing blank spaces.",
- "\t\t-d, --minimal, Minimize diff size.",
- "\t\t-I RE, --ignore-matching-lines=RE, Ignore changes whose line
matches RE.",
- "\t\t-i, --ignore-case, Do a case-insensitive comparison.",
- "\t\t-t, --expand-tabs Expand tabs to spaces.",
- "\t\t-W, --ignore-all-spaces, Ignore all spaces.",
- "\t\t--speed-large-files, Assume large file with scattered changes.",
- "\t\t--strip-trailing-cr, Strip trailing carriage return.",
- "\t\t--ignore-file-name-case, Ignore case of file names.",
- "\t\t--no-ignore-file-name-case, Do not ignore file name case",
- "\t\t--tabsize NUM, Change size of tabs (default 8.)",
+ "usage: sdiff [-abdilstW] [-I regexp] [-o outfile] [-w width] file1
file2\n",
+ "-l, --left-column: only print the left column for identical lines.",
+ "-o OUTFILE, --output=OUTFILE: interactively merge file1 and file2 into
outfile.",
+ "-s, --suppress-common-lines: skip identical lines.",
+ "-w WIDTH, --width=WIDTH: print a maximum of WIDTH characters on each
line.",
+ "",
+ "Options passed to diff(1) are:",
+ "\t-a, --text: treat file1 and file2 as text files.",
+ "\t-b, --ignore-trailing-cr: ignore trailing blank spaces.",
+ "\t-d, --minimal: minimize diff size.",
+ "\t-I RE, --ignore-matching-lines=RE: ignore changes whose line matches
RE.",
+ "\t-i, --ignore-case: do a case-insensitive comparison.",
+ "\t-t, --expand-tabs: sxpand tabs to spaces.",
+ "\t-W, --ignore-all-spaces: ignore all spaces.",
+ "\t--speed-large-files: assume large file with scattered changes.",
+ "\t--strip-trailing-cr: strip trailing carriage return.",
+ "\t--ignore-file-name-case: ignore case of file names.",
+ "\t--no-ignore-file-name-case: do not ignore file name case",
+ "\t--tabsize NUM: change size of tabs (default 8.)",
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: r307380 - head/sys/sys
Author: np
Date: Sat Oct 15 18:20:15 2016
New Revision: 307380
URL: https://svnweb.freebsd.org/changeset/base/307380
Log:
Fix typo in comments.
Modified:
head/sys/sys/mbuf.h
Modified: head/sys/sys/mbuf.h
==
--- head/sys/sys/mbuf.h Sat Oct 15 17:49:41 2016(r307379)
+++ head/sys/sys/mbuf.h Sat Oct 15 18:20:15 2016(r307380)
@@ -335,7 +335,7 @@ struct mbuf {
#defineM_HASHTYPE_RSS_TCP_IPV6 M_HASHTYPE_HASH(4) /* TCPv6
4-tuple */
#defineM_HASHTYPE_RSS_IPV6_EX M_HASHTYPE_HASH(5) /* IPv6
2-tuple +
* ext hdrs */
-#defineM_HASHTYPE_RSS_TCP_IPV6_EX M_HASHTYPE_HASH(6) /* TCPv6
4-tiple +
+#defineM_HASHTYPE_RSS_TCP_IPV6_EX M_HASHTYPE_HASH(6) /* TCPv6
4-tuple +
* ext hdrs */
/* Non-standard RSS hash types */
#defineM_HASHTYPE_RSS_UDP_IPV4 M_HASHTYPE_HASH(7) /* IPv4 UDP
4-tuple*/
___
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: r307379 - head/sys/arm/allwinner
Author: manu
Date: Sat Oct 15 17:49:41 2016
New Revision: 307379
URL: https://svnweb.freebsd.org/changeset/base/307379
Log:
axp209: Add support for regulators
Except for LDO4, all regulators are supported.
MFC after:1 week
Modified:
head/sys/arm/allwinner/axp209.c
head/sys/arm/allwinner/axp209reg.h
Modified: head/sys/arm/allwinner/axp209.c
==
--- head/sys/arm/allwinner/axp209.c Sat Oct 15 17:39:40 2016
(r307378)
+++ head/sys/arm/allwinner/axp209.c Sat Oct 15 17:49:41 2016
(r307379)
@@ -50,14 +50,92 @@ __FBSDID("$FreeBSD$");
#include
-#include
#include
#include
+#include
+
#include
#include "iicbus_if.h"
#include "gpio_if.h"
+#include "regdev_if.h"
+
+MALLOC_DEFINE(M_AXP209_REG, "Axp209 regulator", "Axp209 power regulator");
+
+struct axp209_regdef {
+ intptr_tid;
+ char*name;
+ uint8_t enable_reg;
+ uint8_t enable_mask;
+ uint8_t voltage_reg;
+ uint8_t voltage_mask;
+ uint8_t voltage_shift;
+ int voltage_min;
+ int voltage_max;
+ int voltage_step;
+ int voltage_nstep;
+};
+
+static struct axp209_regdef axp209_regdefs[] = {
+ {
+ .id = AXP209_REG_ID_DCDC2,
+ .name = "dcdc2",
+ .enable_reg = AXP209_POWERCTL,
+ .enable_mask = AXP209_POWERCTL_DCDC2,
+ .voltage_reg = AXP209_REG_DCDC2_VOLTAGE,
+ .voltage_mask = 0x3f,
+ .voltage_min = 700,
+ .voltage_max = 2275,
+ .voltage_step = 25,
+ .voltage_nstep = 64,
+ },
+ {
+ .id = AXP209_REG_ID_DCDC3,
+ .name = "dcdc3",
+ .enable_reg = AXP209_POWERCTL,
+ .enable_mask = AXP209_POWERCTL_DCDC3,
+ .voltage_reg = AXP209_REG_DCDC3_VOLTAGE,
+ .voltage_mask = 0x7f,
+ .voltage_min = 700,
+ .voltage_max = 3500,
+ .voltage_step = 25,
+ .voltage_nstep = 128,
+ },
+ {
+ .id = AXP209_REG_ID_LDO2,
+ .name = "ldo2",
+ .enable_reg = AXP209_POWERCTL,
+ .enable_mask = AXP209_POWERCTL_LDO2,
+ .voltage_reg = AXP209_REG_LDO24_VOLTAGE,
+ .voltage_mask = 0xf0,
+ .voltage_shift = 4,
+ .voltage_min = 1800,
+ .voltage_max = 3300,
+ .voltage_step = 100,
+ .voltage_nstep = 16,
+ },
+ {
+ .id = AXP209_REG_ID_LDO3,
+ .name = "ldo3",
+ .enable_reg = AXP209_POWERCTL,
+ .enable_mask = AXP209_POWERCTL_LDO3,
+ .voltage_reg = AXP209_REG_LDO3_VOLTAGE,
+ .voltage_mask = 0x7f,
+ .voltage_min = 700,
+ .voltage_max = 2275,
+ .voltage_step = 25,
+ .voltage_nstep = 128,
+ },
+};
+
+struct axp209_reg_sc {
+ struct regnode *regnode;
+ device_tbase_dev;
+ struct axp209_regdef*def;
+ phandle_t xref;
+ struct regnode_std_param *param;
+};
struct axp209_softc {
device_tdev;
@@ -67,6 +145,10 @@ struct axp209_softc {
struct intr_config_hook intr_hook;
device_tgpiodev;
struct mtx mtx;
+
+ /* Regulators */
+ struct axp209_reg_sc**regs;
+ int nregs;
};
/* GPIO3 is different, don't expose it for now */
@@ -125,6 +207,115 @@ axp209_write(device_t dev, uint8_t reg,
}
static int
+axp209_regnode_init(struct regnode *regnode)
+{
+ return (0);
+}
+
+static int
+axp209_regnode_enable(struct regnode *regnode, bool enable, int *udelay)
+{
+ struct axp209_reg_sc *sc;
+ uint8_t val;
+
+ sc = regnode_get_softc(regnode);
+
+ axp209_read(sc->base_dev, sc->def->enable_reg, &val, 1);
+ if (enable)
+ val |= sc->def->enable_mask;
+ else
+ val &= ~sc->def->enable_mask;
+ axp209_write(sc->base_dev, sc->def->enable_reg, val);
+
+ *udelay = 0;
+
+ return (0);
+}
+
+static void
+axp209_regnode_reg_to_voltage(struct axp209_reg_sc *sc, uint8_t val, int *uv)
+{
+ if (val < sc->def->voltage_nstep)
+ *uv = sc->def->voltage_min + val * sc->def->voltage_step;
+ else
+ *uv = sc->def->voltage_min +
+ (sc->def->voltage_nstep * sc->def->voltage_step);
+ *uv *= 1000;
+}
+
+static int
+axp209_regnode_voltage_to_reg(struct axp209_reg_sc *sc, int min_uvolt,
+int max_uvolt, uint8_t *val)
+{
+ ui
svn commit: r307378 - stable/10/sys/dev/iscsi
Author: mav
Date: Sat Oct 15 17:39:40 2016
New Revision: 307378
URL: https://svnweb.freebsd.org/changeset/base/307378
Log:
MFC r282970: Close some potential races around socket start/close.
There are some reports about panics on ic->ic_socket NULL derefence.
This kind of races is the only way I can imagine it to happen.
Modified:
stable/10/sys/dev/iscsi/icl.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/iscsi/icl.c
==
--- stable/10/sys/dev/iscsi/icl.c Sat Oct 15 16:29:06 2016
(r307377)
+++ stable/10/sys/dev/iscsi/icl.c Sat Oct 15 17:39:40 2016
(r307378)
@@ -746,10 +746,6 @@ icl_receive_thread(void *arg)
ic = arg;
so = ic->ic_socket;
- ICL_CONN_LOCK(ic);
- ic->ic_receive_running = true;
- ICL_CONN_UNLOCK(ic);
-
for (;;) {
if (ic->ic_disconnecting) {
//ICL_DEBUG("terminating");
@@ -971,8 +967,6 @@ icl_send_thread(void *arg)
STAILQ_INIT(&queue);
ICL_CONN_LOCK(ic);
- ic->ic_send_running = true;
-
for (;;) {
for (;;) {
/*
@@ -1224,35 +1218,45 @@ icl_conn_start(struct icl_conn *ic)
}
/*
+* Register socket upcall, to get notified about incoming PDUs
+* and free space to send outgoing ones.
+*/
+ SOCKBUF_LOCK(&ic->ic_socket->so_snd);
+ soupcall_set(ic->ic_socket, SO_SND, icl_soupcall_send, ic);
+ SOCKBUF_UNLOCK(&ic->ic_socket->so_snd);
+ SOCKBUF_LOCK(&ic->ic_socket->so_rcv);
+ soupcall_set(ic->ic_socket, SO_RCV, icl_soupcall_receive, ic);
+ SOCKBUF_UNLOCK(&ic->ic_socket->so_rcv);
+
+ /*
* Start threads.
*/
+ ICL_CONN_LOCK(ic);
+ ic->ic_send_running = ic->ic_receive_running = true;
+ ICL_CONN_UNLOCK(ic);
error = kthread_add(icl_send_thread, ic, NULL, NULL, 0, 0, "%stx",
ic->ic_name);
if (error != 0) {
ICL_WARN("kthread_add(9) failed with error %d", error);
+ ICL_CONN_LOCK(ic);
+ ic->ic_send_running = ic->ic_receive_running = false;
+ cv_signal(&ic->ic_send_cv);
+ ICL_CONN_UNLOCK(ic);
icl_conn_close(ic);
return (error);
}
-
error = kthread_add(icl_receive_thread, ic, NULL, NULL, 0, 0, "%srx",
ic->ic_name);
if (error != 0) {
ICL_WARN("kthread_add(9) failed with error %d", error);
+ ICL_CONN_LOCK(ic);
+ ic->ic_receive_running = false;
+ cv_signal(&ic->ic_send_cv);
+ ICL_CONN_UNLOCK(ic);
icl_conn_close(ic);
return (error);
}
- /*
-* Register socket upcall, to get notified about incoming PDUs
-* and free space to send outgoing ones.
-*/
- SOCKBUF_LOCK(&ic->ic_socket->so_snd);
- soupcall_set(ic->ic_socket, SO_SND, icl_soupcall_send, ic);
- SOCKBUF_UNLOCK(&ic->ic_socket->so_snd);
- SOCKBUF_LOCK(&ic->ic_socket->so_rcv);
- soupcall_set(ic->ic_socket, SO_RCV, icl_soupcall_receive, ic);
- SOCKBUF_UNLOCK(&ic->ic_socket->so_rcv);
-
return (0);
}
@@ -1306,46 +1310,42 @@ void
icl_conn_close(struct icl_conn *ic)
{
struct icl_pdu *pdu;
+ struct socket *so;
- ICL_CONN_LOCK_ASSERT_NOT(ic);
-
- ICL_CONN_LOCK(ic);
- if (ic->ic_socket == NULL) {
- ICL_CONN_UNLOCK(ic);
- return;
- }
-
- /*
-* Deregister socket upcalls.
-*/
- ICL_CONN_UNLOCK(ic);
- SOCKBUF_LOCK(&ic->ic_socket->so_snd);
- if (ic->ic_socket->so_snd.sb_upcall != NULL)
- soupcall_clear(ic->ic_socket, SO_SND);
- SOCKBUF_UNLOCK(&ic->ic_socket->so_snd);
- SOCKBUF_LOCK(&ic->ic_socket->so_rcv);
- if (ic->ic_socket->so_rcv.sb_upcall != NULL)
- soupcall_clear(ic->ic_socket, SO_RCV);
- SOCKBUF_UNLOCK(&ic->ic_socket->so_rcv);
ICL_CONN_LOCK(ic);
- ic->ic_disconnecting = true;
-
/*
* Wake up the threads, so they can properly terminate.
*/
+ ic->ic_disconnecting = true;
while (ic->ic_receive_running || ic->ic_send_running) {
- //ICL_DEBUG("waiting for send/receive threads to terminate");
cv_signal(&ic->ic_receive_cv);
cv_signal(&ic->ic_send_cv);
cv_wait(&ic->ic_send_cv, ic->ic_lock);
}
- //ICL_DEBUG("send/receive threads terminated");
+ /* Some other thread could close the connection same time. */
+ so = ic->ic_socket;
+ if (so == NULL) {
+ ICL_CONN_UNLOCK(ic);
+ return;
+ }
+ ic->ic_socket = NULL;
+
+ /*
+* Deregister socket upcalls.
+*/
svn commit: r307377 - head/sys/arm64/include
Author: andrew
Date: Sat Oct 15 16:29:06 2016
New Revision: 307377
URL: https://svnweb.freebsd.org/changeset/base/307377
Log:
Fix the build, struct vfpstate needs to be visible to userspace as it's
part of struct pcb which is in a header used in libutil.
Obtained from:ABT Systems Ltd
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/arm64/include/vfp.h
Modified: head/sys/arm64/include/vfp.h
==
--- head/sys/arm64/include/vfp.hSat Oct 15 15:55:04 2016
(r307376)
+++ head/sys/arm64/include/vfp.hSat Oct 15 16:29:06 2016
(r307377)
@@ -32,7 +32,6 @@
#ifndef _MACHINE_VFP_H_
#define_MACHINE_VFP_H_
-#ifdef _KERNEL
#ifndef LOCORE
struct vfpstate {
@@ -41,6 +40,7 @@ struct vfpstate {
uint32_tvfp_fpsr;
};
+#ifdef _KERNEL
void vfp_init(void);
void vfp_discard(struct thread *);
void vfp_restore_state(void);
___
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: r307376 - head
Author: bapt Date: Sat Oct 15 15:55:04 2016 New Revision: 307376 URL: https://svnweb.freebsd.org/changeset/base/307376 Log: Improve wording Submitted by: lidl Modified: head/UPDATING Modified: head/UPDATING == --- head/UPDATING Sat Oct 15 14:42:41 2016(r307375) +++ head/UPDATING Sat Oct 15 15:55:04 2016(r307376) @@ -34,7 +34,8 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12 20161015: GNU rcs has been removed from base. It is available as packages: - rcs: Latest GPLv3 GNU rcs version. - - rcs57: Copy of the latest version of GNU rcs (GPLv2) from base. + - rcs57: Copy of the latest version of GNU rcs (GPLv2) before it was + removed from base. 20161008: Use of the cc_cdg, cc_chd, cc_hd, or cc_vegas congestion control ___ 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: r306346 - head/sys/kern
On 10/04/2016 15:56, Gleb Smirnoff wrote:
> Eric,
>
> E> @@ -924,7 +924,7 @@ __mtx_assert(const volatile uintptr_t *c
> E> {
> E>const struct mtx *m;
> E>
> E> - if (panicstr != NULL || dumping)
> E> + if (panicstr != NULL || dumping || SCHEDULER_STOPPED())
> E>return;
>
> I wonder if all this disjunct can be reduced just to SCHEDULER_STOPPED()?
> Positive panicstr and dumping imply scheduler stopped.
If I read correctly, that's /almost/ true, but the scheduler is only stopped
#ifdef SMP and we're panicking, so we need the full expression to cover the !SMP
and reboot(RB_DUMP) cases.
Eric
___
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: r307374 - in head: sys/cam/ctl usr.sbin/ctladm
Author: mav
Date: Sat Oct 15 14:40:34 2016
New Revision: 307374
URL: https://svnweb.freebsd.org/changeset/base/307374
Log:
Add LU option to control reported provisioning type.
MFC after:2 weeks
Modified:
head/sys/cam/ctl/ctl.c
head/usr.sbin/ctladm/ctladm.8
Modified: head/sys/cam/ctl/ctl.c
==
--- head/sys/cam/ctl/ctl.c Sat Oct 15 13:45:12 2016(r307373)
+++ head/sys/cam/ctl/ctl.c Sat Oct 15 14:40:34 2016(r307374)
@@ -10040,6 +10040,7 @@ ctl_inquiry_evpd_lbp(struct ctl_scsiio *
{
struct scsi_vpd_logical_block_prov *lbp_ptr;
struct ctl_lun *lun;
+ const char *value;
lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
@@ -10077,7 +10078,14 @@ ctl_inquiry_evpd_lbp(struct ctl_scsiio *
if (lun != NULL && lun->be_lun->flags & CTL_LUN_FLAG_UNMAP) {
lbp_ptr->flags = SVPD_LBP_UNMAP | SVPD_LBP_WS16 |
SVPD_LBP_WS10 | SVPD_LBP_RZ | SVPD_LBP_ANC_SUP;
- lbp_ptr->prov_type = SVPD_LBP_THIN;
+ value = ctl_get_opt(&lun->be_lun->options, "provisioning_type");
+ if (value != NULL) {
+ if (strcmp(value, "resource") == 0)
+ lbp_ptr->prov_type = SVPD_LBP_RESOURCE;
+ else if (strcmp(value, "thin") == 0)
+ lbp_ptr->prov_type = SVPD_LBP_THIN;
+ } else
+ lbp_ptr->prov_type = SVPD_LBP_THIN;
}
ctl_set_success(ctsio);
Modified: head/usr.sbin/ctladm/ctladm.8
==
--- head/usr.sbin/ctladm/ctladm.8 Sat Oct 15 13:45:12 2016
(r307373)
+++ head/usr.sbin/ctladm/ctladm.8 Sat Oct 15 14:40:34 2016
(r307374)
@@ -903,8 +903,14 @@ Specifies medium rotation rate of the de
.It Va formfactor
Specifies nominal form factor of the device: 0 -- not reported, 1 -- 5.25",
2 -- 3.5", 3 -- 2.5", 4 -- 1.8", 5 -- less then 1.8".
+.It Va provisioning_type
+When UNMAP support is enabled, this option specifies provisioning type:
+"resource", "thin" or "unknown".
+Default value is "thin".
+Logical units without UNMAP support are reported as fully provisioned.
.It Va unmap
-Set to "on", enables UNMAP support for the LUN, if supported by the backend.
+Setting to "on" or "off" controls UNMAP support for the logical unit.
+Default value is "on" if supported by the backend.
.It Va unmap_max_lba
.It Va unmap_max_descr
Specify maximum allowed number of LBAs and block descriptors per UNMAP
___
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: r307372 - head/usr.bin/sdiff
Author: bapt
Date: Sat Oct 15 13:45:09 2016
New Revision: 307372
URL: https://svnweb.freebsd.org/changeset/base/307372
Log:
Move cleanup() into the edit.c file which is the only users of that function
Remove common.{c,h}
Deleted:
head/usr.bin/sdiff/common.c
head/usr.bin/sdiff/common.h
Modified:
head/usr.bin/sdiff/Makefile
head/usr.bin/sdiff/edit.c
Modified: head/usr.bin/sdiff/Makefile
==
--- head/usr.bin/sdiff/Makefile Sat Oct 15 13:44:13 2016(r307371)
+++ head/usr.bin/sdiff/Makefile Sat Oct 15 13:45:09 2016(r307372)
@@ -3,7 +3,7 @@
.include
PROG= sdiff
-SRCS= common.c edit.c sdiff.c
+SRCS= edit.c sdiff.c
WARNS= 3
MAN1= sdiff.1
Modified: head/usr.bin/sdiff/edit.c
==
--- head/usr.bin/sdiff/edit.c Sat Oct 15 13:44:13 2016(r307371)
+++ head/usr.bin/sdiff/edit.c Sat Oct 15 13:45:09 2016(r307372)
@@ -21,9 +21,17 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include "common.h"
#include "extern.h"
+static void
+cleanup(const char *filename)
+{
+
+ if (unlink(filename))
+ err(2, "could not delete: %s", filename);
+ exit(2);
+}
+
/*
* Execute an editor on the specified pathname, which is interpreted
* from the shell. This means flags may be included.
___
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: r307373 - stable/10/sys/dev/sfxge/common
Author: arybchik
Date: Sat Oct 15 13:45:12 2016
New Revision: 307373
URL: https://svnweb.freebsd.org/changeset/base/307373
Log:
MFC r307038
sfxge(4): update external port mapping for Medford
Extend the mapping table for external port numbering to support port modes
which output to the second external port only. Where supported, map from
the current port mode rather than inferring from all the available modes.
Updated comments for clarity.
Submitted by: Richard Houldsworth
Sponsored by: Solarflare Communications, Inc.
Modified:
stable/10/sys/dev/sfxge/common/ef10_nic.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/sfxge/common/ef10_nic.c
==
--- stable/10/sys/dev/sfxge/common/ef10_nic.c Sat Oct 15 13:45:09 2016
(r307372)
+++ stable/10/sys/dev/sfxge/common/ef10_nic.c Sat Oct 15 13:45:12 2016
(r307373)
@@ -1099,41 +1099,50 @@ fail1:
/*
- * The external port mapping is a one-based numbering of the external
- * connectors on the board. It does not distinguish off-board separated
- * outputs such as multi-headed cables.
- * The number of ports that map to each external port connector
- * on the board is determined by the chip family and the port modes to
- * which the NIC can be configured. The mapping table lists modes with
- * port numbering requirements in increasing order.
+ * Table of mapping schemes from port number to the number of the external
+ * connector on the board. The external numbering does not distinguish
+ * off-board separated outputs such as from multi-headed cables.
+ *
+ * The count of adjacent port numbers that map to each external port
+ * and the offset in the numbering, is determined by the chip family and
+ * current port mode.
+ *
+ * For the Huntington family, the current port mode cannot be discovered,
+ * so the mapping used is instead the last match in the table to the full
+ * set of port modes to which the NIC can be configured. Therefore the
+ * ordering of entries in the the mapping table is significant.
*/
static struct {
efx_family_tfamily;
uint32_tmodes_mask;
- uint32_tstride;
+ int32_t count;
+ int32_t offset;
} __ef10_external_port_mappings[] = {
- /* Supported modes requiring 1 output per port */
+ /* Supported modes with 1 output per external port */
{
EFX_FAMILY_HUNTINGTON,
(1 << TLV_PORT_MODE_10G) |
(1 << TLV_PORT_MODE_10G_10G) |
(1 << TLV_PORT_MODE_10G_10G_10G_10G),
+ 1,
1
},
{
EFX_FAMILY_MEDFORD,
(1 << TLV_PORT_MODE_10G) |
(1 << TLV_PORT_MODE_10G_10G),
+ 1,
1
},
- /* Supported modes requiring 2 outputs per port */
+ /* Supported modes with 2 outputs per external port */
{
EFX_FAMILY_HUNTINGTON,
(1 << TLV_PORT_MODE_40G) |
(1 << TLV_PORT_MODE_40G_40G) |
(1 << TLV_PORT_MODE_40G_10G_10G) |
(1 << TLV_PORT_MODE_10G_10G_40G),
- 2
+ 2,
+ 1
},
{
EFX_FAMILY_MEDFORD,
@@ -1142,15 +1151,22 @@ static struct {
(1 << TLV_PORT_MODE_40G_10G_10G) |
(1 << TLV_PORT_MODE_10G_10G_40G) |
(1 << TLV_PORT_MODE_10G_10G_10G_10G_Q1_Q2),
- 2
+ 2,
+ 1
},
- /* Supported modes requiring 4 outputs per port */
+ /* Supported modes with 4 outputs per external port */
{
EFX_FAMILY_MEDFORD,
(1 << TLV_PORT_MODE_10G_10G_10G_10G_Q) |
- (1 << TLV_PORT_MODE_10G_10G_10G_10G_Q1) |
+ (1 << TLV_PORT_MODE_10G_10G_10G_10G_Q1),
+ 4,
+ 1,
+ },
+ {
+ EFX_FAMILY_MEDFORD,
(1 << TLV_PORT_MODE_10G_10G_10G_10G_Q2),
- 4
+ 4,
+ 2
},
};
@@ -1164,11 +1180,26 @@ ef10_external_port_mapping(
int i;
uint32_t port_modes;
uint32_t matches;
- uint32_t stride = 1; /* default 1-1 mapping */
-
- if ((rc = efx_mcdi_get_port_modes(enp, &port_modes, NULL)) != 0) {
- /* No port mode information available - use default mapping */
- goto out;
+ uint32_t current;
+ int32_t count = 1; /* Default 1-1 mapping */
+ int32_t offset = 1; /* Default starting external port number */
+
+ if ((rc = efx_mcdi_get_port_modes(enp, &port_modes, ¤t)) != 0) {
+ /*
+* No current port mode information
+* - infer mapping from available modes
+*/
+ if ((rc = efx_mcdi_get_port_modes(
svn commit: r307371 - stable/10/sys/dev/sfxge/common
Author: arybchik
Date: Sat Oct 15 13:44:13 2016
New Revision: 307371
URL: https://svnweb.freebsd.org/changeset/base/307371
Log:
MFC r306944
sfxge(4): sync tlv_layout.h with firmwaresrc and update port-mode
definition use
It fixes driver attach issue to a new firmware which reports a new
port-modes.
Submitted by: Tom Millington
Sponsored by: Solarflare Communications, Inc.
Modified:
stable/10/sys/dev/sfxge/common/ef10_nic.c
stable/10/sys/dev/sfxge/common/ef10_tlv_layout.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/sfxge/common/ef10_nic.c
==
--- stable/10/sys/dev/sfxge/common/ef10_nic.c Sat Oct 15 13:42:52 2016
(r307370)
+++ stable/10/sys/dev/sfxge/common/ef10_nic.c Sat Oct 15 13:44:13 2016
(r307371)
@@ -164,6 +164,7 @@ ef10_nic_get_port_mode_bandwidth(
break;
case TLV_PORT_MODE_10G_10G_10G_10G:
case TLV_PORT_MODE_10G_10G_10G_10G_Q:
+ case TLV_PORT_MODE_10G_10G_10G_10G_Q1_Q2:
case TLV_PORT_MODE_10G_10G_10G_10G_Q2:
bandwidth = 1 * 4;
break;
@@ -1122,8 +1123,7 @@ static struct {
{
EFX_FAMILY_MEDFORD,
(1 << TLV_PORT_MODE_10G) |
- (1 << TLV_PORT_MODE_10G_10G) |
- (1 << TLV_PORT_MODE_10G_10G_10G_10G),
+ (1 << TLV_PORT_MODE_10G_10G),
1
},
/* Supported modes requiring 2 outputs per port */
@@ -1140,13 +1140,15 @@ static struct {
(1 << TLV_PORT_MODE_40G) |
(1 << TLV_PORT_MODE_40G_40G) |
(1 << TLV_PORT_MODE_40G_10G_10G) |
- (1 << TLV_PORT_MODE_10G_10G_40G),
+ (1 << TLV_PORT_MODE_10G_10G_40G) |
+ (1 << TLV_PORT_MODE_10G_10G_10G_10G_Q1_Q2),
2
},
/* Supported modes requiring 4 outputs per port */
{
EFX_FAMILY_MEDFORD,
(1 << TLV_PORT_MODE_10G_10G_10G_10G_Q) |
+ (1 << TLV_PORT_MODE_10G_10G_10G_10G_Q1) |
(1 << TLV_PORT_MODE_10G_10G_10G_10G_Q2),
4
},
Modified: stable/10/sys/dev/sfxge/common/ef10_tlv_layout.h
==
--- stable/10/sys/dev/sfxge/common/ef10_tlv_layout.hSat Oct 15 13:42:52
2016(r307370)
+++ stable/10/sys/dev/sfxge/common/ef10_tlv_layout.hSat Oct 15 13:44:13
2016(r307371)
@@ -553,12 +553,14 @@ struct tlv_global_port_mode {
#define TLV_PORT_MODE_40G(1) /* 40G, single
QSFP/40G-KR */
#define TLV_PORT_MODE_10G_10G(2) /* 2x10G, dual SFP/10G-KR
or single QSFP */
#define TLV_PORT_MODE_40G_40G(3) /* 40G + 40G, dual
QSFP/40G-KR (Greenport, Medford) */
-#define TLV_PORT_MODE_10G_10G_10G_10G(4) /* 2x10G + 2x10G, quad
SFP/10G-KR or dual QSFP (Greenport, Medford) */
-#define TLV_PORT_MODE_10G_10G_10G_10G_Q (5) /* 4x10G, single QSFP,
cage 0 (Medford) */
+#define TLV_PORT_MODE_10G_10G_10G_10G(4) /* 2x10G + 2x10G, quad
SFP/10G-KR or dual QSFP (Greenport) */
+#define TLV_PORT_MODE_10G_10G_10G_10G_Q1 (4) /* 4x10G, single QSFP,
cage 0 (Medford) */
+#define TLV_PORT_MODE_10G_10G_10G_10G_Q (5) /* 4x10G, single QSFP,
cage 0 (Medford) OBSOLETE DO NOT USE */
#define TLV_PORT_MODE_40G_10G_10G(6) /* 1x40G + 2x10G, dual
QSFP (Greenport, Medford) */
#define TLV_PORT_MODE_10G_10G_40G(7) /* 2x10G + 1x40G, dual
QSFP (Greenport, Medford) */
#define TLV_PORT_MODE_10G_10G_10G_10G_Q2 (8) /* 4x10G, single QSFP,
cage 1 (Medford) */
-#define TLV_PORT_MODE_MAX TLV_PORT_MODE_10G_10G_10G_10G_Q2
+#define TLV_PORT_MODE_10G_10G_10G_10G_Q1_Q2 (9) /* 2x10G + 2x10G, dual
QSFP (Medford) */
+#define TLV_PORT_MODE_MAX TLV_PORT_MODE_10G_10G_10G_10G_Q1_Q2
};
/* Type of the v-switch created implicitly by the firmware */
@@ -765,8 +767,8 @@ struct tlv_rx_event_merging_config {
#define TLV_RX_EVENT_MERGING_CONFIG_MAX_EVENTS_MAX ((1 << 4) - 1)
uint32_t timeout_ns;
};
-#define TLV_RX_EVENT_MERGING_MAX_EVENTS_DEFAULT 7
-#define TLV_RX_EVENT_MERGING_TIMEOUT_NS_DEFAULT 8740
+#define TLV_RX_EVENT_MERGING_MAX_EVENTS_DEFAULT (0x)
+#define TLV_RX_EVENT_MERGING_TIMEOUT_NS_DEFAULT (0x)
#define TLV_TAG_PCIE_LINK_SETTINGS (0x101f)
struct tlv_pcie_link_settings {
@@ -791,9 +793,9 @@ struct tlv_tx_event_merging_config {
uint32_t timeout_ns;
uint32_t qempty_timeout_ns; /* Medford only */
};
-#define TLV_TX_EVENT_MERGING_MAX_EVENTS_DEFAULT 7
-#define TLV_TX_EVENT_MERGING_TIMEOUT_NS_DEFAULT 1400
-#define TLV_TX_EVENT_MERGING_QEMPTY_TIMEOUT_NS_DEFAULT 700
+#define TLV_TX_EVENT_MERGING_MAX_EVENTS_DEFAULT (0x)
+#define TLV_TX_EVENT_MERGING_TIMEOUT_NS_DEFAULT (0x)
+#define TLV_TX_EVENT_MER
svn commit: r307370 - stable/11/sys/dev/sfxge/common
Author: arybchik
Date: Sat Oct 15 13:42:52 2016
New Revision: 307370
URL: https://svnweb.freebsd.org/changeset/base/307370
Log:
MFC r307038
sfxge(4): update external port mapping for Medford
Extend the mapping table for external port numbering to support port modes
which output to the second external port only. Where supported, map from
the current port mode rather than inferring from all the available modes.
Updated comments for clarity.
Submitted by: Richard Houldsworth
Sponsored by: Solarflare Communications, Inc.
Modified:
stable/11/sys/dev/sfxge/common/ef10_nic.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/dev/sfxge/common/ef10_nic.c
==
--- stable/11/sys/dev/sfxge/common/ef10_nic.c Sat Oct 15 13:42:38 2016
(r307369)
+++ stable/11/sys/dev/sfxge/common/ef10_nic.c Sat Oct 15 13:42:52 2016
(r307370)
@@ -1099,41 +1099,50 @@ fail1:
/*
- * The external port mapping is a one-based numbering of the external
- * connectors on the board. It does not distinguish off-board separated
- * outputs such as multi-headed cables.
- * The number of ports that map to each external port connector
- * on the board is determined by the chip family and the port modes to
- * which the NIC can be configured. The mapping table lists modes with
- * port numbering requirements in increasing order.
+ * Table of mapping schemes from port number to the number of the external
+ * connector on the board. The external numbering does not distinguish
+ * off-board separated outputs such as from multi-headed cables.
+ *
+ * The count of adjacent port numbers that map to each external port
+ * and the offset in the numbering, is determined by the chip family and
+ * current port mode.
+ *
+ * For the Huntington family, the current port mode cannot be discovered,
+ * so the mapping used is instead the last match in the table to the full
+ * set of port modes to which the NIC can be configured. Therefore the
+ * ordering of entries in the the mapping table is significant.
*/
static struct {
efx_family_tfamily;
uint32_tmodes_mask;
- uint32_tstride;
+ int32_t count;
+ int32_t offset;
} __ef10_external_port_mappings[] = {
- /* Supported modes requiring 1 output per port */
+ /* Supported modes with 1 output per external port */
{
EFX_FAMILY_HUNTINGTON,
(1 << TLV_PORT_MODE_10G) |
(1 << TLV_PORT_MODE_10G_10G) |
(1 << TLV_PORT_MODE_10G_10G_10G_10G),
+ 1,
1
},
{
EFX_FAMILY_MEDFORD,
(1 << TLV_PORT_MODE_10G) |
(1 << TLV_PORT_MODE_10G_10G),
+ 1,
1
},
- /* Supported modes requiring 2 outputs per port */
+ /* Supported modes with 2 outputs per external port */
{
EFX_FAMILY_HUNTINGTON,
(1 << TLV_PORT_MODE_40G) |
(1 << TLV_PORT_MODE_40G_40G) |
(1 << TLV_PORT_MODE_40G_10G_10G) |
(1 << TLV_PORT_MODE_10G_10G_40G),
- 2
+ 2,
+ 1
},
{
EFX_FAMILY_MEDFORD,
@@ -1142,15 +1151,22 @@ static struct {
(1 << TLV_PORT_MODE_40G_10G_10G) |
(1 << TLV_PORT_MODE_10G_10G_40G) |
(1 << TLV_PORT_MODE_10G_10G_10G_10G_Q1_Q2),
- 2
+ 2,
+ 1
},
- /* Supported modes requiring 4 outputs per port */
+ /* Supported modes with 4 outputs per external port */
{
EFX_FAMILY_MEDFORD,
(1 << TLV_PORT_MODE_10G_10G_10G_10G_Q) |
- (1 << TLV_PORT_MODE_10G_10G_10G_10G_Q1) |
+ (1 << TLV_PORT_MODE_10G_10G_10G_10G_Q1),
+ 4,
+ 1,
+ },
+ {
+ EFX_FAMILY_MEDFORD,
(1 << TLV_PORT_MODE_10G_10G_10G_10G_Q2),
- 4
+ 4,
+ 2
},
};
@@ -1164,11 +1180,26 @@ ef10_external_port_mapping(
int i;
uint32_t port_modes;
uint32_t matches;
- uint32_t stride = 1; /* default 1-1 mapping */
-
- if ((rc = efx_mcdi_get_port_modes(enp, &port_modes, NULL)) != 0) {
- /* No port mode information available - use default mapping */
- goto out;
+ uint32_t current;
+ int32_t count = 1; /* Default 1-1 mapping */
+ int32_t offset = 1; /* Default starting external port number */
+
+ if ((rc = efx_mcdi_get_port_modes(enp, &port_modes, ¤t)) != 0) {
+ /*
+* No current port mode information
+* - infer mapping from available modes
+*/
+ if ((rc = efx_mcdi_get_port_modes(
svn commit: r307369 - head/usr.bin/sdiff
Author: bapt
Date: Sat Oct 15 13:42:38 2016
New Revision: 307369
URL: https://svnweb.freebsd.org/changeset/base/307369
Log:
Turn editit into a static function
Modified:
head/usr.bin/sdiff/edit.c
Modified: head/usr.bin/sdiff/edit.c
==
--- head/usr.bin/sdiff/edit.c Sat Oct 15 13:41:58 2016(r307368)
+++ head/usr.bin/sdiff/edit.c Sat Oct 15 13:42:38 2016(r307369)
@@ -24,15 +24,13 @@ __FBSDID("$FreeBSD$");
#include "common.h"
#include "extern.h"
-int editit(const char *);
-
/*
* Execute an editor on the specified pathname, which is interpreted
* from the shell. This means flags may be included.
*
* Returns -1 on error, or the exit value on success.
*/
-int
+static int
editit(const char *pathname)
{
sig_t sighup, sigint, sigquit, sigchld;
___
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: r307368 - head/usr.bin/sdiff
Author: bapt
Date: Sat Oct 15 13:41:58 2016
New Revision: 307368
URL: https://svnweb.freebsd.org/changeset/base/307368
Log:
Remove the common.h include which is actually not used in sdiff.c
Modified:
head/usr.bin/sdiff/sdiff.c
Modified: head/usr.bin/sdiff/sdiff.c
==
--- head/usr.bin/sdiff/sdiff.c Sat Oct 15 13:39:30 2016(r307367)
+++ head/usr.bin/sdiff/sdiff.c Sat Oct 15 13:41:58 2016(r307368)
@@ -27,7 +27,6 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include "common.h"
#include "extern.h"
#define DIFF_PATH "/usr/bin/diff"
___
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: r307367 - stable/11/sys/dev/sfxge/common
Author: arybchik
Date: Sat Oct 15 13:39:30 2016
New Revision: 307367
URL: https://svnweb.freebsd.org/changeset/base/307367
Log:
MFC r306944
sfxge(4): sync tlv_layout.h with firmwaresrc and update port-mode
definition use
It fixes driver attach issue to a new firmware which reports a new
port-modes.
Submitted by: Tom Millington
Sponsored by: Solarflare Communications, Inc.
Modified:
stable/11/sys/dev/sfxge/common/ef10_nic.c
stable/11/sys/dev/sfxge/common/ef10_tlv_layout.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/dev/sfxge/common/ef10_nic.c
==
--- stable/11/sys/dev/sfxge/common/ef10_nic.c Sat Oct 15 13:27:01 2016
(r307366)
+++ stable/11/sys/dev/sfxge/common/ef10_nic.c Sat Oct 15 13:39:30 2016
(r307367)
@@ -164,6 +164,7 @@ ef10_nic_get_port_mode_bandwidth(
break;
case TLV_PORT_MODE_10G_10G_10G_10G:
case TLV_PORT_MODE_10G_10G_10G_10G_Q:
+ case TLV_PORT_MODE_10G_10G_10G_10G_Q1_Q2:
case TLV_PORT_MODE_10G_10G_10G_10G_Q2:
bandwidth = 1 * 4;
break;
@@ -1122,8 +1123,7 @@ static struct {
{
EFX_FAMILY_MEDFORD,
(1 << TLV_PORT_MODE_10G) |
- (1 << TLV_PORT_MODE_10G_10G) |
- (1 << TLV_PORT_MODE_10G_10G_10G_10G),
+ (1 << TLV_PORT_MODE_10G_10G),
1
},
/* Supported modes requiring 2 outputs per port */
@@ -1140,13 +1140,15 @@ static struct {
(1 << TLV_PORT_MODE_40G) |
(1 << TLV_PORT_MODE_40G_40G) |
(1 << TLV_PORT_MODE_40G_10G_10G) |
- (1 << TLV_PORT_MODE_10G_10G_40G),
+ (1 << TLV_PORT_MODE_10G_10G_40G) |
+ (1 << TLV_PORT_MODE_10G_10G_10G_10G_Q1_Q2),
2
},
/* Supported modes requiring 4 outputs per port */
{
EFX_FAMILY_MEDFORD,
(1 << TLV_PORT_MODE_10G_10G_10G_10G_Q) |
+ (1 << TLV_PORT_MODE_10G_10G_10G_10G_Q1) |
(1 << TLV_PORT_MODE_10G_10G_10G_10G_Q2),
4
},
Modified: stable/11/sys/dev/sfxge/common/ef10_tlv_layout.h
==
--- stable/11/sys/dev/sfxge/common/ef10_tlv_layout.hSat Oct 15 13:27:01
2016(r307366)
+++ stable/11/sys/dev/sfxge/common/ef10_tlv_layout.hSat Oct 15 13:39:30
2016(r307367)
@@ -553,12 +553,14 @@ struct tlv_global_port_mode {
#define TLV_PORT_MODE_40G(1) /* 40G, single
QSFP/40G-KR */
#define TLV_PORT_MODE_10G_10G(2) /* 2x10G, dual SFP/10G-KR
or single QSFP */
#define TLV_PORT_MODE_40G_40G(3) /* 40G + 40G, dual
QSFP/40G-KR (Greenport, Medford) */
-#define TLV_PORT_MODE_10G_10G_10G_10G(4) /* 2x10G + 2x10G, quad
SFP/10G-KR or dual QSFP (Greenport, Medford) */
-#define TLV_PORT_MODE_10G_10G_10G_10G_Q (5) /* 4x10G, single QSFP,
cage 0 (Medford) */
+#define TLV_PORT_MODE_10G_10G_10G_10G(4) /* 2x10G + 2x10G, quad
SFP/10G-KR or dual QSFP (Greenport) */
+#define TLV_PORT_MODE_10G_10G_10G_10G_Q1 (4) /* 4x10G, single QSFP,
cage 0 (Medford) */
+#define TLV_PORT_MODE_10G_10G_10G_10G_Q (5) /* 4x10G, single QSFP,
cage 0 (Medford) OBSOLETE DO NOT USE */
#define TLV_PORT_MODE_40G_10G_10G(6) /* 1x40G + 2x10G, dual
QSFP (Greenport, Medford) */
#define TLV_PORT_MODE_10G_10G_40G(7) /* 2x10G + 1x40G, dual
QSFP (Greenport, Medford) */
#define TLV_PORT_MODE_10G_10G_10G_10G_Q2 (8) /* 4x10G, single QSFP,
cage 1 (Medford) */
-#define TLV_PORT_MODE_MAX TLV_PORT_MODE_10G_10G_10G_10G_Q2
+#define TLV_PORT_MODE_10G_10G_10G_10G_Q1_Q2 (9) /* 2x10G + 2x10G, dual
QSFP (Medford) */
+#define TLV_PORT_MODE_MAX TLV_PORT_MODE_10G_10G_10G_10G_Q1_Q2
};
/* Type of the v-switch created implicitly by the firmware */
@@ -765,8 +767,8 @@ struct tlv_rx_event_merging_config {
#define TLV_RX_EVENT_MERGING_CONFIG_MAX_EVENTS_MAX ((1 << 4) - 1)
uint32_t timeout_ns;
};
-#define TLV_RX_EVENT_MERGING_MAX_EVENTS_DEFAULT 7
-#define TLV_RX_EVENT_MERGING_TIMEOUT_NS_DEFAULT 8740
+#define TLV_RX_EVENT_MERGING_MAX_EVENTS_DEFAULT (0x)
+#define TLV_RX_EVENT_MERGING_TIMEOUT_NS_DEFAULT (0x)
#define TLV_TAG_PCIE_LINK_SETTINGS (0x101f)
struct tlv_pcie_link_settings {
@@ -791,9 +793,9 @@ struct tlv_tx_event_merging_config {
uint32_t timeout_ns;
uint32_t qempty_timeout_ns; /* Medford only */
};
-#define TLV_TX_EVENT_MERGING_MAX_EVENTS_DEFAULT 7
-#define TLV_TX_EVENT_MERGING_TIMEOUT_NS_DEFAULT 1400
-#define TLV_TX_EVENT_MERGING_QEMPTY_TIMEOUT_NS_DEFAULT 700
+#define TLV_TX_EVENT_MERGING_MAX_EVENTS_DEFAULT (0x)
+#define TLV_TX_EVENT_MERGING_TIMEOUT_NS_DEFAULT (0x)
+#define TLV_TX_EVENT_MER
svn commit: r307366 - head/sys/arm/allwinner/clk
Author: jmcneill
Date: Sat Oct 15 13:27:01 2016
New Revision: 307366
URL: https://svnweb.freebsd.org/changeset/base/307366
Log:
Match "allwinner,sun8i-h3-apb0-gates-clk" compatible string.
Modified:
head/sys/arm/allwinner/clk/aw_gate.c
Modified: head/sys/arm/allwinner/clk/aw_gate.c
==
--- head/sys/arm/allwinner/clk/aw_gate.cSat Oct 15 13:17:27 2016
(r307365)
+++ head/sys/arm/allwinner/clk/aw_gate.cSat Oct 15 13:27:01 2016
(r307366)
@@ -91,6 +91,8 @@ static struct ofw_compat_data compat_dat
{ "allwinner,sun8i-h3-bus-gates-clk",
(uintptr_t)"Allwinner Bus Clock Gates" },
+ { "allwinner,sun8i-h3-apb0-gates-clk",
+ (uintptr_t)"Allwinner APB0 Clock Gates" },
{ "allwinner,sun9i-a80-apbs-gates-clk",
(uintptr_t)"Allwinner APBS Clock Gates" },
___
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: r307365 - head/lib/libucl
Author: bapt
Date: Sat Oct 15 13:17:27 2016
New Revision: 307365
URL: https://svnweb.freebsd.org/changeset/base/307365
Log:
Use SRCTOP to find the sources of libucl
Modified:
head/lib/libucl/Makefile
Modified: head/lib/libucl/Makefile
==
--- head/lib/libucl/MakefileSat Oct 15 13:16:52 2016(r307364)
+++ head/lib/libucl/MakefileSat Oct 15 13:17:27 2016(r307365)
@@ -1,6 +1,6 @@
# $FreeBSD$
-LIBUCL=${.CURDIR}/../../contrib/libucl
+LIBUCL=${SRCTOP}/contrib/libucl
PACKAGE=lib${LIB}
LIB= ucl
___
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: r307364 - head/lib/libdevdctl
Author: bapt Date: Sat Oct 15 13:16:52 2016 New Revision: 307364 URL: https://svnweb.freebsd.org/changeset/base/307364 Log: directly create the socket with SOCK_NONBLOCK instead of calling fcntl(2) Modified: head/lib/libdevdctl/consumer.cc Modified: head/lib/libdevdctl/consumer.cc == --- head/lib/libdevdctl/consumer.cc Sat Oct 15 12:42:47 2016 (r307363) +++ head/lib/libdevdctl/consumer.cc Sat Oct 15 13:16:52 2016 (r307364) @@ -108,11 +108,9 @@ Consumer::ConnectToDevd() strlcpy(devdAddr.sun_path, s_devdSockPath, sizeof(devdAddr.sun_path)); sLen = SUN_LEN(&devdAddr); - m_devdSockFD = socket(AF_UNIX, SOCK_SEQPACKET, 0); + m_devdSockFD = socket(AF_UNIX, SOCK_SEQPACKET | SOCK_NONBLOCK, 0); if (m_devdSockFD == -1) err(1, "Unable to create socket"); -if (fcntl(m_devdSockFD, F_SETFL, O_NONBLOCK) < 0) -err(1, "fcntl"); result = connect(m_devdSockFD, reinterpret_cast(&devdAddr), sLen); ___ 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: r307363 - stable/9/contrib/tzdata
Author: bapt Date: Sat Oct 15 12:42:47 2016 New Revision: 307363 URL: https://svnweb.freebsd.org/changeset/base/307363 Log: MFC r306853 Import tzdata 2016g Modified: stable/9/contrib/tzdata/africa stable/9/contrib/tzdata/antarctica stable/9/contrib/tzdata/asia stable/9/contrib/tzdata/australasia stable/9/contrib/tzdata/backward stable/9/contrib/tzdata/etcetera stable/9/contrib/tzdata/europe stable/9/contrib/tzdata/factory stable/9/contrib/tzdata/leap-seconds.list stable/9/contrib/tzdata/leapseconds stable/9/contrib/tzdata/northamerica stable/9/contrib/tzdata/southamerica stable/9/contrib/tzdata/zone.tab stable/9/contrib/tzdata/zone1970.tab Directory Properties: stable/9/ (props changed) stable/9/contrib/ (props changed) stable/9/contrib/tzdata/ (props changed) Modified: stable/9/contrib/tzdata/africa == --- stable/9/contrib/tzdata/africa Sat Oct 15 12:41:41 2016 (r307362) +++ stable/9/contrib/tzdata/africa Sat Oct 15 12:42:47 2016 (r307363) @@ -343,6 +343,12 @@ Rule Egypt 2007only- Sep Thu>=1 24:00 # decision to abandon DST permanently. See Ahram Online 2015-04-24. # http://english.ahram.org.eg/NewsContent/1/64/128509/Egypt/Politics-/Sisi-cancels-daylight-saving-time-in-Egypt.aspx +# From Steffen Thorsen (2016-04-29): +# Egypt will have DST from July 7 until the end of October +# http://english.ahram.org.eg/NewsContentP/1/204655/Egypt/Daylight-savings-time-returning-to-Egypt-on--July.aspx +# From Mina Samuel (2016-07-04): +# Egyptian government took the decision to cancel the DST, + Rule Egypt 2008only- Aug lastThu 24:00 0 - Rule Egypt 2009only- Aug 20 24:00 0 - Rule Egypt 2010only- Aug 10 24:00 0 - @@ -458,7 +464,7 @@ ZoneAfrica/Monrovia -0:43:08 - LMT 1882 # http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/ # # From Paul Eggert (2013-10-25): -# For now, assume they're reverting to the pre-2012 rules of permanent UTC+2. +# For now, assume they're reverting to the pre-2012 rules of permanent UT +02. # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S Rule Libya 1951only- Oct 14 2:001:00S @@ -858,11 +864,11 @@ Rule Morocco 2009only- Aug 21 0:00 0 Rule Morocco 2010only- May 2 0:00 1:00S Rule Morocco 2010only- Aug 8 0:00 0 - Rule Morocco 2011only- Apr 3 0:00 1:00S -Rule Morocco 2011only- Jul 31 0 0 - +Rule Morocco 2011only- Jul 31 0:00 0 - Rule Morocco 20122013- Apr lastSun 2:00 1:00S -Rule Morocco 2012only- Sep 30 3:00 0 - Rule Morocco 2012only- Jul 20 3:00 0 - Rule Morocco 2012only- Aug 20 2:00 1:00S +Rule Morocco 2012only- Sep 30 3:00 0 - Rule Morocco 2013only- Jul 7 3:00 0 - Rule Morocco 2013only- Aug 10 2:00 1:00S Rule Morocco 2013max - Oct lastSun 3:00 0 - Modified: stable/9/contrib/tzdata/antarctica == --- stable/9/contrib/tzdata/antarctica Sat Oct 15 12:41:41 2016 (r307362) +++ stable/9/contrib/tzdata/antarctica Sat Oct 15 12:42:47 2016 (r307363) @@ -10,10 +10,8 @@ # http://www.spri.cam.ac.uk/bob/periant.htm # for information. # Unless otherwise specified, we have no time zone information. -# -# Except for the French entries, -# I made up all time zone abbreviations mentioned here; corrections welcome! -# FORMAT is 'zzz' and GMTOFF is 0 for locations while uninhabited. + +# FORMAT is '-00' and GMTOFF is 0 for locations while uninhabited. # Argentina - year-round bases # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05 @@ -29,7 +27,7 @@ # previously sealers and scientific personnel wintered # Margaret Turner reports # http://web.archive.org/web/2002120445/http://www.dstc.qut.edu.au/DST/marg/daylight.html -# (1999-09-30) that they're UTC+5, with no DST; +# (1999-09-30) that they're UT +05, with no DST; # presumably this is when they have visitors. # # year-round bases @@ -67,24 +65,23 @@ # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html # Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Antarctica/Casey 0 - zzz 1969 - 8:00- AWST2009 Oct 18 2:00 - # A
svn commit: r307362 - stable/10/contrib/tzdata
Author: bapt Date: Sat Oct 15 12:41:41 2016 New Revision: 307362 URL: https://svnweb.freebsd.org/changeset/base/307362 Log: MFC r306853 Import tzdata 2016g Modified: stable/10/contrib/tzdata/africa stable/10/contrib/tzdata/antarctica stable/10/contrib/tzdata/asia stable/10/contrib/tzdata/australasia stable/10/contrib/tzdata/backward stable/10/contrib/tzdata/etcetera stable/10/contrib/tzdata/europe stable/10/contrib/tzdata/factory stable/10/contrib/tzdata/leap-seconds.list stable/10/contrib/tzdata/leapseconds stable/10/contrib/tzdata/northamerica stable/10/contrib/tzdata/southamerica stable/10/contrib/tzdata/zone.tab stable/10/contrib/tzdata/zone1970.tab Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/tzdata/africa == --- stable/10/contrib/tzdata/africa Sat Oct 15 12:41:11 2016 (r307361) +++ stable/10/contrib/tzdata/africa Sat Oct 15 12:41:41 2016 (r307362) @@ -343,6 +343,12 @@ Rule Egypt 2007only- Sep Thu>=1 24:00 # decision to abandon DST permanently. See Ahram Online 2015-04-24. # http://english.ahram.org.eg/NewsContent/1/64/128509/Egypt/Politics-/Sisi-cancels-daylight-saving-time-in-Egypt.aspx +# From Steffen Thorsen (2016-04-29): +# Egypt will have DST from July 7 until the end of October +# http://english.ahram.org.eg/NewsContentP/1/204655/Egypt/Daylight-savings-time-returning-to-Egypt-on--July.aspx +# From Mina Samuel (2016-07-04): +# Egyptian government took the decision to cancel the DST, + Rule Egypt 2008only- Aug lastThu 24:00 0 - Rule Egypt 2009only- Aug 20 24:00 0 - Rule Egypt 2010only- Aug 10 24:00 0 - @@ -458,7 +464,7 @@ ZoneAfrica/Monrovia -0:43:08 - LMT 1882 # http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/ # # From Paul Eggert (2013-10-25): -# For now, assume they're reverting to the pre-2012 rules of permanent UTC+2. +# For now, assume they're reverting to the pre-2012 rules of permanent UT +02. # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S Rule Libya 1951only- Oct 14 2:001:00S @@ -858,11 +864,11 @@ Rule Morocco 2009only- Aug 21 0:00 0 Rule Morocco 2010only- May 2 0:00 1:00S Rule Morocco 2010only- Aug 8 0:00 0 - Rule Morocco 2011only- Apr 3 0:00 1:00S -Rule Morocco 2011only- Jul 31 0 0 - +Rule Morocco 2011only- Jul 31 0:00 0 - Rule Morocco 20122013- Apr lastSun 2:00 1:00S -Rule Morocco 2012only- Sep 30 3:00 0 - Rule Morocco 2012only- Jul 20 3:00 0 - Rule Morocco 2012only- Aug 20 2:00 1:00S +Rule Morocco 2012only- Sep 30 3:00 0 - Rule Morocco 2013only- Jul 7 3:00 0 - Rule Morocco 2013only- Aug 10 2:00 1:00S Rule Morocco 2013max - Oct lastSun 3:00 0 - Modified: stable/10/contrib/tzdata/antarctica == --- stable/10/contrib/tzdata/antarctica Sat Oct 15 12:41:11 2016 (r307361) +++ stable/10/contrib/tzdata/antarctica Sat Oct 15 12:41:41 2016 (r307362) @@ -10,10 +10,8 @@ # http://www.spri.cam.ac.uk/bob/periant.htm # for information. # Unless otherwise specified, we have no time zone information. -# -# Except for the French entries, -# I made up all time zone abbreviations mentioned here; corrections welcome! -# FORMAT is 'zzz' and GMTOFF is 0 for locations while uninhabited. + +# FORMAT is '-00' and GMTOFF is 0 for locations while uninhabited. # Argentina - year-round bases # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05 @@ -29,7 +27,7 @@ # previously sealers and scientific personnel wintered # Margaret Turner reports # http://web.archive.org/web/2002120445/http://www.dstc.qut.edu.au/DST/marg/daylight.html -# (1999-09-30) that they're UTC+5, with no DST; +# (1999-09-30) that they're UT +05, with no DST; # presumably this is when they have visitors. # # year-round bases @@ -67,24 +65,23 @@ # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html # Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Antarctica/Casey 0 - zzz 1969 - 8:00- AWST2009 Oct 18 2:00 - # Australian Western Std Time - 11:00 -
svn commit: r307361 - stable/11/contrib/tzdata
Author: bapt Date: Sat Oct 15 12:41:11 2016 New Revision: 307361 URL: https://svnweb.freebsd.org/changeset/base/307361 Log: MFC r306853 Import tzdata 2016g Modified: stable/11/contrib/tzdata/africa stable/11/contrib/tzdata/antarctica stable/11/contrib/tzdata/asia stable/11/contrib/tzdata/australasia stable/11/contrib/tzdata/backward stable/11/contrib/tzdata/etcetera stable/11/contrib/tzdata/europe stable/11/contrib/tzdata/factory stable/11/contrib/tzdata/leap-seconds.list stable/11/contrib/tzdata/leapseconds stable/11/contrib/tzdata/northamerica stable/11/contrib/tzdata/southamerica stable/11/contrib/tzdata/zone.tab stable/11/contrib/tzdata/zone1970.tab Directory Properties: stable/11/ (props changed) Modified: stable/11/contrib/tzdata/africa == --- stable/11/contrib/tzdata/africa Sat Oct 15 12:38:50 2016 (r307360) +++ stable/11/contrib/tzdata/africa Sat Oct 15 12:41:11 2016 (r307361) @@ -343,6 +343,12 @@ Rule Egypt 2007only- Sep Thu>=1 24:00 # decision to abandon DST permanently. See Ahram Online 2015-04-24. # http://english.ahram.org.eg/NewsContent/1/64/128509/Egypt/Politics-/Sisi-cancels-daylight-saving-time-in-Egypt.aspx +# From Steffen Thorsen (2016-04-29): +# Egypt will have DST from July 7 until the end of October +# http://english.ahram.org.eg/NewsContentP/1/204655/Egypt/Daylight-savings-time-returning-to-Egypt-on--July.aspx +# From Mina Samuel (2016-07-04): +# Egyptian government took the decision to cancel the DST, + Rule Egypt 2008only- Aug lastThu 24:00 0 - Rule Egypt 2009only- Aug 20 24:00 0 - Rule Egypt 2010only- Aug 10 24:00 0 - @@ -458,7 +464,7 @@ ZoneAfrica/Monrovia -0:43:08 - LMT 1882 # http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/ # # From Paul Eggert (2013-10-25): -# For now, assume they're reverting to the pre-2012 rules of permanent UTC+2. +# For now, assume they're reverting to the pre-2012 rules of permanent UT +02. # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S Rule Libya 1951only- Oct 14 2:001:00S @@ -858,11 +864,11 @@ Rule Morocco 2009only- Aug 21 0:00 0 Rule Morocco 2010only- May 2 0:00 1:00S Rule Morocco 2010only- Aug 8 0:00 0 - Rule Morocco 2011only- Apr 3 0:00 1:00S -Rule Morocco 2011only- Jul 31 0 0 - +Rule Morocco 2011only- Jul 31 0:00 0 - Rule Morocco 20122013- Apr lastSun 2:00 1:00S -Rule Morocco 2012only- Sep 30 3:00 0 - Rule Morocco 2012only- Jul 20 3:00 0 - Rule Morocco 2012only- Aug 20 2:00 1:00S +Rule Morocco 2012only- Sep 30 3:00 0 - Rule Morocco 2013only- Jul 7 3:00 0 - Rule Morocco 2013only- Aug 10 2:00 1:00S Rule Morocco 2013max - Oct lastSun 3:00 0 - Modified: stable/11/contrib/tzdata/antarctica == --- stable/11/contrib/tzdata/antarctica Sat Oct 15 12:38:50 2016 (r307360) +++ stable/11/contrib/tzdata/antarctica Sat Oct 15 12:41:11 2016 (r307361) @@ -10,10 +10,8 @@ # http://www.spri.cam.ac.uk/bob/periant.htm # for information. # Unless otherwise specified, we have no time zone information. -# -# Except for the French entries, -# I made up all time zone abbreviations mentioned here; corrections welcome! -# FORMAT is 'zzz' and GMTOFF is 0 for locations while uninhabited. + +# FORMAT is '-00' and GMTOFF is 0 for locations while uninhabited. # Argentina - year-round bases # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05 @@ -29,7 +27,7 @@ # previously sealers and scientific personnel wintered # Margaret Turner reports # http://web.archive.org/web/2002120445/http://www.dstc.qut.edu.au/DST/marg/daylight.html -# (1999-09-30) that they're UTC+5, with no DST; +# (1999-09-30) that they're UT +05, with no DST; # presumably this is when they have visitors. # # year-round bases @@ -67,24 +65,23 @@ # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html # Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Antarctica/Casey 0 - zzz 1969 - 8:00- AWST2009 Oct 18 2:00 - # Australian Western Std Time - 11:00 -
svn commit: r307360 - stable/9/contrib/tzcode/zic
Author: bapt
Date: Sat Oct 15 12:38:50 2016
New Revision: 307360
URL: https://svnweb.freebsd.org/changeset/base/307360
Log:
MFC r306852
Incorporate a change from OpenBSD by mill...@openbsd.org
Don't warn about valid time zone abbreviations. POSIX
through 2000 says that an abbreviation cannot start with ':', and
cannot contain ',', '-', '+', NUL, or a digit. POSIX from 2001
on changes this rule to say that an abbreviation can contain only
'-', '+', and alphanumeric characters from the portable character
set in the current locale. To be portable to both sets of rules,
an abbreviation must therefore use only ASCII letters." Adapted
from tzcode2015f.
This is needed to be able to update tzdata to a newer version
Modified:
stable/9/contrib/tzcode/zic/zdump.c
stable/9/contrib/tzcode/zic/zic.c
Directory Properties:
stable/9/ (props changed)
stable/9/contrib/ (props changed)
stable/9/contrib/tzcode/ (props changed)
stable/9/contrib/tzcode/zic/ (props changed)
Modified: stable/9/contrib/tzcode/zic/zdump.c
==
--- stable/9/contrib/tzcode/zic/zdump.c Sat Oct 15 12:38:21 2016
(r307359)
+++ stable/9/contrib/tzcode/zic/zdump.c Sat Oct 15 12:38:50 2016
(r307360)
@@ -212,24 +212,16 @@ const char * constzone;
return;
cp = abbrp;
wp = NULL;
- while (isascii((unsigned char) *cp) && isalpha((unsigned char) *cp))
+ while (isascii((unsigned char) *cp) &&
+ (isalnum((unsigned char)*cp) || *cp == '-' || *cp == '+'))
++cp;
- if (cp - abbrp == 0)
- wp = _("lacks alphabetic at start");
- else if (cp - abbrp < 3)
- wp = _("has fewer than 3 alphabetics");
+ if (cp - abbrp < 3)
+ wp = _("has fewer than 3 characters");
else if (cp - abbrp > 6)
- wp = _("has more than 6 alphabetics");
- if (wp == NULL && (*cp == '+' || *cp == '-')) {
- ++cp;
- if (isascii((unsigned char) *cp) &&
- isdigit((unsigned char) *cp))
- if (*cp++ == '1' && *cp >= '0' && *cp <= '4')
- ++cp;
- if (*cp != '\0')
- wp = _("differs from POSIX standard");
- }
- if (wp == NULL)
+ wp = _("has more than 6 characters");
+ else if (*cp)
+ wp = "has characters other than ASCII alphanumerics, '-' or
'+'";
+ else
return;
(void) fflush(stdout);
(void) fprintf(stderr,
Modified: stable/9/contrib/tzcode/zic/zic.c
==
--- stable/9/contrib/tzcode/zic/zic.c Sat Oct 15 12:38:21 2016
(r307359)
+++ stable/9/contrib/tzcode/zic/zic.c Sat Oct 15 12:38:50 2016
(r307360)
@@ -2615,29 +2615,15 @@ const char * const string;
register const char * cp;
register char * wp;
- /*
- ** Want one to ZIC_MAX_ABBR_LEN_WO_WARN alphabetics
- ** optionally followed by a + or - and a number from 1 to 14.
- */
cp = string;
wp = NULL;
while (isascii((unsigned char) *cp) &&
- isalpha((unsigned char) *cp))
+ (isalnum((unsigned char)*cp) || *cp == '-' || *cp ==
'+'))
++cp;
- if (cp - string == 0)
-wp = _("time zone abbreviation lacks alphabetic at start");
if (noise && cp - string > 3)
-wp = _("time zone abbreviation has more than 3 alphabetics");
+wp = _("time zone abbreviation has more than 3 characters");
if (cp - string > ZIC_MAX_ABBR_LEN_WO_WARN)
-wp = _("time zone abbreviation has too many alphabetics");
- if (wp == NULL && (*cp == '+' || *cp == '-')) {
- ++cp;
- if (isascii((unsigned char) *cp) &&
- isdigit((unsigned char) *cp))
- if (*cp++ == '1' &&
- *cp >= '0' && *cp <= '4')
- ++cp;
- }
+wp = _("time zone abbreviation has too many characters");
if (*cp != '\0')
wp = _("time zone abbreviation differs from POSIX standard");
if (wp != 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: r307359 - stable/10/contrib/tzcode/zic
Author: bapt
Date: Sat Oct 15 12:38:21 2016
New Revision: 307359
URL: https://svnweb.freebsd.org/changeset/base/307359
Log:
MFC r306852
Incorporate a change from OpenBSD by mill...@openbsd.org
Don't warn about valid time zone abbreviations. POSIX
through 2000 says that an abbreviation cannot start with ':', and
cannot contain ',', '-', '+', NUL, or a digit. POSIX from 2001
on changes this rule to say that an abbreviation can contain only
'-', '+', and alphanumeric characters from the portable character
set in the current locale. To be portable to both sets of rules,
an abbreviation must therefore use only ASCII letters." Adapted
from tzcode2015f.
This is needed to be able to update tzdata to a newer version
Modified:
stable/10/contrib/tzcode/zic/zdump.c
stable/10/contrib/tzcode/zic/zic.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/contrib/tzcode/zic/zdump.c
==
--- stable/10/contrib/tzcode/zic/zdump.cSat Oct 15 12:37:57 2016
(r307358)
+++ stable/10/contrib/tzcode/zic/zdump.cSat Oct 15 12:38:21 2016
(r307359)
@@ -212,24 +212,16 @@ const char * constzone;
return;
cp = abbrp;
wp = NULL;
- while (isascii((unsigned char) *cp) && isalpha((unsigned char) *cp))
+ while (isascii((unsigned char) *cp) &&
+ (isalnum((unsigned char)*cp) || *cp == '-' || *cp == '+'))
++cp;
- if (cp - abbrp == 0)
- wp = _("lacks alphabetic at start");
- else if (cp - abbrp < 3)
- wp = _("has fewer than 3 alphabetics");
+ if (cp - abbrp < 3)
+ wp = _("has fewer than 3 characters");
else if (cp - abbrp > 6)
- wp = _("has more than 6 alphabetics");
- if (wp == NULL && (*cp == '+' || *cp == '-')) {
- ++cp;
- if (isascii((unsigned char) *cp) &&
- isdigit((unsigned char) *cp))
- if (*cp++ == '1' && *cp >= '0' && *cp <= '4')
- ++cp;
- if (*cp != '\0')
- wp = _("differs from POSIX standard");
- }
- if (wp == NULL)
+ wp = _("has more than 6 characters");
+ else if (*cp)
+ wp = "has characters other than ASCII alphanumerics, '-' or
'+'";
+ else
return;
(void) fflush(stdout);
(void) fprintf(stderr,
Modified: stable/10/contrib/tzcode/zic/zic.c
==
--- stable/10/contrib/tzcode/zic/zic.c Sat Oct 15 12:37:57 2016
(r307358)
+++ stable/10/contrib/tzcode/zic/zic.c Sat Oct 15 12:38:21 2016
(r307359)
@@ -2615,29 +2615,15 @@ const char * const string;
register const char * cp;
register char * wp;
- /*
- ** Want one to ZIC_MAX_ABBR_LEN_WO_WARN alphabetics
- ** optionally followed by a + or - and a number from 1 to 14.
- */
cp = string;
wp = NULL;
while (isascii((unsigned char) *cp) &&
- isalpha((unsigned char) *cp))
+ (isalnum((unsigned char)*cp) || *cp == '-' || *cp ==
'+'))
++cp;
- if (cp - string == 0)
-wp = _("time zone abbreviation lacks alphabetic at start");
if (noise && cp - string > 3)
-wp = _("time zone abbreviation has more than 3 alphabetics");
+wp = _("time zone abbreviation has more than 3 characters");
if (cp - string > ZIC_MAX_ABBR_LEN_WO_WARN)
-wp = _("time zone abbreviation has too many alphabetics");
- if (wp == NULL && (*cp == '+' || *cp == '-')) {
- ++cp;
- if (isascii((unsigned char) *cp) &&
- isdigit((unsigned char) *cp))
- if (*cp++ == '1' &&
- *cp >= '0' && *cp <= '4')
- ++cp;
- }
+wp = _("time zone abbreviation has too many characters");
if (*cp != '\0')
wp = _("time zone abbreviation differs from POSIX standard");
if (wp != 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: r307358 - stable/11/contrib/tzcode/zic
Author: bapt
Date: Sat Oct 15 12:37:57 2016
New Revision: 307358
URL: https://svnweb.freebsd.org/changeset/base/307358
Log:
MFC r306852
Incorporate a change from OpenBSD by mill...@openbsd.org
Don't warn about valid time zone abbreviations. POSIX
through 2000 says that an abbreviation cannot start with ':', and
cannot contain ',', '-', '+', NUL, or a digit. POSIX from 2001
on changes this rule to say that an abbreviation can contain only
'-', '+', and alphanumeric characters from the portable character
set in the current locale. To be portable to both sets of rules,
an abbreviation must therefore use only ASCII letters." Adapted
from tzcode2015f.
This is needed to be able to update tzdata to a newer version
Modified:
stable/11/contrib/tzcode/zic/zdump.c
stable/11/contrib/tzcode/zic/zic.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/contrib/tzcode/zic/zdump.c
==
--- stable/11/contrib/tzcode/zic/zdump.cSat Oct 15 12:35:16 2016
(r307357)
+++ stable/11/contrib/tzcode/zic/zdump.cSat Oct 15 12:37:57 2016
(r307358)
@@ -212,24 +212,16 @@ const char * constzone;
return;
cp = abbrp;
wp = NULL;
- while (isascii((unsigned char) *cp) && isalpha((unsigned char) *cp))
+ while (isascii((unsigned char) *cp) &&
+ (isalnum((unsigned char)*cp) || *cp == '-' || *cp == '+'))
++cp;
- if (cp - abbrp == 0)
- wp = _("lacks alphabetic at start");
- else if (cp - abbrp < 3)
- wp = _("has fewer than 3 alphabetics");
+ if (cp - abbrp < 3)
+ wp = _("has fewer than 3 characters");
else if (cp - abbrp > 6)
- wp = _("has more than 6 alphabetics");
- if (wp == NULL && (*cp == '+' || *cp == '-')) {
- ++cp;
- if (isascii((unsigned char) *cp) &&
- isdigit((unsigned char) *cp))
- if (*cp++ == '1' && *cp >= '0' && *cp <= '4')
- ++cp;
- if (*cp != '\0')
- wp = _("differs from POSIX standard");
- }
- if (wp == NULL)
+ wp = _("has more than 6 characters");
+ else if (*cp)
+ wp = "has characters other than ASCII alphanumerics, '-' or
'+'";
+ else
return;
(void) fflush(stdout);
(void) fprintf(stderr,
Modified: stable/11/contrib/tzcode/zic/zic.c
==
--- stable/11/contrib/tzcode/zic/zic.c Sat Oct 15 12:35:16 2016
(r307357)
+++ stable/11/contrib/tzcode/zic/zic.c Sat Oct 15 12:37:57 2016
(r307358)
@@ -2615,29 +2615,15 @@ const char * const string;
register const char * cp;
register char * wp;
- /*
- ** Want one to ZIC_MAX_ABBR_LEN_WO_WARN alphabetics
- ** optionally followed by a + or - and a number from 1 to 14.
- */
cp = string;
wp = NULL;
while (isascii((unsigned char) *cp) &&
- isalpha((unsigned char) *cp))
+ (isalnum((unsigned char)*cp) || *cp == '-' || *cp ==
'+'))
++cp;
- if (cp - string == 0)
-wp = _("time zone abbreviation lacks alphabetic at start");
if (noise && cp - string > 3)
-wp = _("time zone abbreviation has more than 3 alphabetics");
+wp = _("time zone abbreviation has more than 3 characters");
if (cp - string > ZIC_MAX_ABBR_LEN_WO_WARN)
-wp = _("time zone abbreviation has too many alphabetics");
- if (wp == NULL && (*cp == '+' || *cp == '-')) {
- ++cp;
- if (isascii((unsigned char) *cp) &&
- isdigit((unsigned char) *cp))
- if (*cp++ == '1' &&
- *cp >= '0' && *cp <= '4')
- ++cp;
- }
+wp = _("time zone abbreviation has too many characters");
if (*cp != '\0')
wp = _("time zone abbreviation differs from POSIX standard");
if (wp != 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: r307357 - stable/11/tools/build/options
Author: bapt Date: Sat Oct 15 12:35:16 2016 New Revision: 307357 URL: https://svnweb.freebsd.org/changeset/base/307357 Log: MFC r306877 Remove the WITH_FMAKE option left over from r284464 Deleted: stable/11/tools/build/options/WITH_FMAKE Modified: Directory Properties: stable/11/ (props changed) ___ 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: r307356 - head
Author: bapt Date: Sat Oct 15 12:32:59 2016 New Revision: 307356 URL: https://svnweb.freebsd.org/changeset/base/307356 Log: Fix typo Reported by: "N.J. Mann" Modified: head/UPDATING Modified: head/UPDATING == --- head/UPDATING Sat Oct 15 12:28:14 2016(r307355) +++ head/UPDATING Sat Oct 15 12:32:59 2016(r307356) @@ -32,7 +32,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12 "ln -s 'abort:false,junk:false' /etc/malloc.conf".) 20161015: - GNU rcs has been removed rom base. It is available as packages: + GNU rcs has been removed from base. It is available as packages: - rcs: Latest GPLv3 GNU rcs version. - rcs57: Copy of the latest version of GNU rcs (GPLv2) from base. ___ 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: r307355 - stable/10/share/misc
Author: bapt Date: Sat Oct 15 12:28:14 2016 New Revision: 307355 URL: https://svnweb.freebsd.org/changeset/base/307355 Log: MFC r297289, r300542, r306854 Update pci_vendors to 2016-10-03 Modified: stable/10/share/misc/pci_vendors Directory Properties: stable/10/ (props changed) Modified: stable/10/share/misc/pci_vendors == --- stable/10/share/misc/pci_vendorsSat Oct 15 12:23:54 2016 (r307354) +++ stable/10/share/misc/pci_vendorsSat Oct 15 12:28:14 2016 (r307355) @@ -3,11 +3,11 @@ # # List of PCI ID's # -# Version: 2015.07.31 -# Date:2015-07-31 03:15:02 +# Version: 2016.10.03 +# Date:2016-10-03 03:15:01 # -# Maintained by Martin Mares and other volunteers from the -# PCI ID Project at http://pci-ids.ucw.cz/. +# Maintained by Albert Pool, Martin Mares, and other volunteers from +# the PCI ID Project at http://pci-ids.ucw.cz/. # # New data are always welcome, especially if they are accurate. If you have # anything to contribute, please follow the instructions at the web site. @@ -23,6 +23,7 @@ # device device_name <-- single tab # subvendor subdevice subsystem_name <-- two tabs +0001 SafeNet (wrong ID) 0010 Allied Telesis, Inc (Wrong ID) # This is a relabelled RTL-8139 8139 AT-2500TX V3 Ethernet @@ -243,6 +244,19 @@ 1000 1000 LSI53C895A PCI to Ultra2 SCSI Controller 0013 53c875a 1000 1000 LSI53C875A PCI to Ultra SCSI Controller + 0014 MegaRAID Tri-Mode SAS3516 + 1d49 0602 ThinkSystem RAID 930-16i 4GB Flash PCIe 12Gb Adapter + 0016 MegaRAID Tri-Mode SAS3508 + 1d49 0601 ThinkSystem RAID 930-8i 2GB Flash PCIe 12Gb Adapter + 1d49 0603 ThinkSystem RAID 930-24i 4GB Flash PCIe 12Gb Adapter + 1d49 0604 ThinkSystem RAID 930-8e 4GB Flash PCIe 12Gb Adapter + 0017 MegaRAID Tri-Mode SAS3408 + 1d49 0500 ThinkSystem RAID 530-8i PCIe 12Gb Adapter + 1d49 0502 ThinkSystem RAID 530-8i Dense Adapter + 001b MegaRAID Tri-Mode SAS3504 + 1d49 0605 ThinkSystem RAID 930-4i 2GB Flash Flex Adapter + 001c MegaRAID Tri-Mode SAS3404 + 1d49 0501 ThinkSystem RAID 530-4i Flex Adapter 0020 53c1010 Ultra3 SCSI Adapter 1000 1000 LSI53C1010-33 PCI to Dual Channel Ultra160 SCSI Controller 107b 1040 Server Onboard 53C1010-33 @@ -272,6 +286,7 @@ 103c 12c5 Ultra320 SCSI [A7173A] 103c 1323 Core I/O LAN/SCSI Combo [AB314A] 103c 3108 Single Channel Ultra320 SCSI HBA G2 + 103c 322a SC11Xe Ultra320 Single Channel PCIe x4 SCSI Host Bus Adapter (412911-B21) 124b 1170 PMC-USCSI320 # VMware's emulation of this device. Was missing from the list. 15ad 1976 LSI Logic Parallel SCSI Controller @@ -287,6 +302,10 @@ 0050 SAS1064 PCI-X Fusion-MPT SAS 1028 1f04 SAS 5/E 1028 1f09 SAS 5i/R + 0052 MegaRAID SAS-3 3216/3224 [Cutlass] + 0053 MegaRAID SAS-3 3216/3224 [Cutlass] + 1000 9350 MegaRAID SAS 9341-16i + 1000 9351 MegaRAID SAS 9341-24i 0054 SAS1068 PCI-X Fusion-MPT SAS 1028 1f04 SAS 5/E Adapter Controller 1028 1f05 SAS 5/i Adapter Controller @@ -345,6 +364,8 @@ 005c SAS1064A PCI-X Fusion-MPT SAS 005d MegaRAID SAS-3 3108 [Invader] 1000 9361 MegaRAID SAS 9361-8i + 1000 9364 MegaRAID SAS 9364-8i + 1000 936a MegaRAID SAS 9364-8i 1028 1f41 PERC H830 Adapter 1028 1f42 PERC H730P Adapter 1028 1f43 PERC H730 Adapter @@ -357,6 +378,7 @@ 1028 1f54 PERC FD33xD 17aa 1052 ThinkServer RAID 720i 17aa 1053 ThinkServer RAID 720ix + 1d49 0600 ThinkSystem RAID 730-8i 1GB Cache PCIe 12Gb Adapter 005e SAS1066 PCI-X Fusion-MPT SAS 005f MegaRAID SAS-3 3008 [Fury] 1028 1f44 PERC H330 Adapter @@ -364,6 +386,7 @@ 1028 1f4c PERC H330 Mini (for blades) 1028 1f4d PERC H330 Embedded (for monolithic) 1054 306a SAS 3004 iMR ROMB + 1d49 04db ServeRAID M1210 SAS/SATA Controller 0060 MegaRAID SAS 1078 1000 1006 MegaRAID SAS ELP 1000 100a MegaRAID SAS 8708ELP @@ -474,6 +497,21 @@ 007c MegaRAID SAS 1078DE 1014 0395 ServeRAID-AR10is SAS/SATA Controller 007e SSS6200 PCI-Express Flash SSD + 1000 0504 Nytro NWD-BLP4-800 + 1000 0507 Nytro NWD-BLP4-1600 + 1000 0581 Nytro NWD-BLP4-400 +
svn commit: r307354 - head/sys/arm/allwinner/clk
Author: jmcneill
Date: Sat Oct 15 12:23:54 2016
New Revision: 307354
URL: https://svnweb.freebsd.org/changeset/base/307354
Log:
Provide a complete A23 PLL1 factor table, from 60MHz to 1872MHz.
Modified:
head/sys/arm/allwinner/clk/aw_pll.c
Modified: head/sys/arm/allwinner/clk/aw_pll.c
==
--- head/sys/arm/allwinner/clk/aw_pll.c Sat Oct 15 12:22:06 2016
(r307353)
+++ head/sys/arm/allwinner/clk/aw_pll.c Sat Oct 15 12:23:54 2016
(r307354)
@@ -193,12 +193,76 @@ struct aw_pll_factor {
{ .n = (_n), .k = (_k), .m = (_m), .p = (_p), .freq = (_freq) }
static struct aw_pll_factor aw_a23_pll1_factors[] = {
+ PLLFACTOR(9, 0, 0, 2, 6000),
+ PLLFACTOR(10, 0, 0, 2, 6600),
+ PLLFACTOR(11, 0, 0, 2, 7200),
+ PLLFACTOR(12, 0, 0, 2, 7800),
+ PLLFACTOR(13, 0, 0, 2, 8400),
+ PLLFACTOR(14, 0, 0, 2, 9000),
+ PLLFACTOR(15, 0, 0, 2, 9600),
+ PLLFACTOR(16, 0, 0, 2, 10200),
+ PLLFACTOR(17, 0, 0, 2, 10800),
+ PLLFACTOR(18, 0, 0, 2, 11400),
+ PLLFACTOR(9, 0, 0, 1, 12000),
+ PLLFACTOR(10, 0, 0, 1, 13200),
+ PLLFACTOR(11, 0, 0, 1, 14400),
+ PLLFACTOR(12, 0, 0, 1, 15600),
+ PLLFACTOR(13, 0, 0, 1, 16800),
+ PLLFACTOR(14, 0, 0, 1, 18000),
+ PLLFACTOR(15, 0, 0, 1, 19200),
+ PLLFACTOR(16, 0, 0, 1, 20400),
+ PLLFACTOR(17, 0, 0, 1, 21600),
+ PLLFACTOR(18, 0, 0, 1, 22800),
+ PLLFACTOR(9, 0, 0, 0, 24000),
+ PLLFACTOR(10, 0, 0, 0, 26400),
+ PLLFACTOR(11, 0, 0, 0, 28800),
+ PLLFACTOR(12, 0, 0, 0, 31200),
+ PLLFACTOR(13, 0, 0, 0, 33600),
+ PLLFACTOR(14, 0, 0, 0, 36000),
+ PLLFACTOR(15, 0, 0, 0, 38400),
PLLFACTOR(16, 0, 0, 0, 40800),
+ PLLFACTOR(17, 0, 0, 0, 43200),
+ PLLFACTOR(18, 0, 0, 0, 45600),
+ PLLFACTOR(19, 0, 0, 0, 48000),
+ PLLFACTOR(20, 0, 0, 0, 50400),
+ PLLFACTOR(21, 0, 0, 0, 52800),
+ PLLFACTOR(22, 0, 0, 0, 55200),
+ PLLFACTOR(23, 0, 0, 0, 57600),
+ PLLFACTOR(24, 0, 0, 0, 6),
+ PLLFACTOR(25, 0, 0, 0, 62400),
PLLFACTOR(26, 0, 0, 0, 64800),
+ PLLFACTOR(27, 0, 0, 0, 67200),
+ PLLFACTOR(28, 0, 0, 0, 69600),
+ PLLFACTOR(29, 0, 0, 0, 72000),
+ PLLFACTOR(15, 1, 0, 0, 76800),
+ PLLFACTOR(10, 2, 0, 0, 79200),
PLLFACTOR(16, 1, 0, 0, 81600),
+ PLLFACTOR(17, 1, 0, 0, 86400),
+ PLLFACTOR(18, 1, 0, 0, 91200),
+ PLLFACTOR(12, 2, 0, 0, 93600),
+ PLLFACTOR(19, 1, 0, 0, 96000),
PLLFACTOR(20, 1, 0, 0, 100800),
+ PLLFACTOR(21, 1, 0, 0, 105600),
+ PLLFACTOR(14, 2, 0, 0, 108000),
+ PLLFACTOR(22, 1, 0, 0, 110400),
+ PLLFACTOR(23, 1, 0, 0, 115200),
PLLFACTOR(24, 1, 0, 0, 12),
+ PLLFACTOR(16, 2, 0, 0, 122400),
+ PLLFACTOR(25, 1, 0, 0, 124800),
PLLFACTOR(26, 1, 0, 0, 129600),
+ PLLFACTOR(27, 1, 0, 0, 134400),
+ PLLFACTOR(18, 2, 0, 0, 136800),
+ PLLFACTOR(28, 1, 0, 0, 139200),
+ PLLFACTOR(29, 1, 0, 0, 144000),
+ PLLFACTOR(20, 2, 0, 0, 151200),
+ PLLFACTOR(15, 3, 0, 0, 153600),
+ PLLFACTOR(21, 2, 0, 0, 158400),
+ PLLFACTOR(16, 3, 0, 0, 163200),
+ PLLFACTOR(22, 2, 0, 0, 165600),
+ PLLFACTOR(23, 2, 0, 0, 172800),
+ PLLFACTOR(24, 2, 0, 0, 18),
+ PLLFACTOR(18, 3, 0, 0, 182400),
+ PLLFACTOR(25, 2, 0, 0, 187200),
};
enum aw_pll_type {
___
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: r307353 - stable/11/share/misc
Author: bapt Date: Sat Oct 15 12:22:06 2016 New Revision: 307353 URL: https://svnweb.freebsd.org/changeset/base/307353 Log: MFC r306854 Update pci_vendors to 2016-10-03 Modified: stable/11/share/misc/pci_vendors Directory Properties: stable/11/ (props changed) Modified: stable/11/share/misc/pci_vendors == --- stable/11/share/misc/pci_vendorsSat Oct 15 12:11:30 2016 (r307352) +++ stable/11/share/misc/pci_vendorsSat Oct 15 12:22:06 2016 (r307353) @@ -3,8 +3,8 @@ # # List of PCI ID's # -# Version: 2016.05.23 -# Date:2016-05-23 03:15:02 +# Version: 2016.10.03 +# Date:2016-10-03 03:15:01 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at http://pci-ids.ucw.cz/. @@ -244,6 +244,19 @@ 1000 1000 LSI53C895A PCI to Ultra2 SCSI Controller 0013 53c875a 1000 1000 LSI53C875A PCI to Ultra SCSI Controller + 0014 MegaRAID Tri-Mode SAS3516 + 1d49 0602 ThinkSystem RAID 930-16i 4GB Flash PCIe 12Gb Adapter + 0016 MegaRAID Tri-Mode SAS3508 + 1d49 0601 ThinkSystem RAID 930-8i 2GB Flash PCIe 12Gb Adapter + 1d49 0603 ThinkSystem RAID 930-24i 4GB Flash PCIe 12Gb Adapter + 1d49 0604 ThinkSystem RAID 930-8e 4GB Flash PCIe 12Gb Adapter + 0017 MegaRAID Tri-Mode SAS3408 + 1d49 0500 ThinkSystem RAID 530-8i PCIe 12Gb Adapter + 1d49 0502 ThinkSystem RAID 530-8i Dense Adapter + 001b MegaRAID Tri-Mode SAS3504 + 1d49 0605 ThinkSystem RAID 930-4i 2GB Flash Flex Adapter + 001c MegaRAID Tri-Mode SAS3404 + 1d49 0501 ThinkSystem RAID 530-4i Flex Adapter 0020 53c1010 Ultra3 SCSI Adapter 1000 1000 LSI53C1010-33 PCI to Dual Channel Ultra160 SCSI Controller 107b 1040 Server Onboard 53C1010-33 @@ -351,6 +364,8 @@ 005c SAS1064A PCI-X Fusion-MPT SAS 005d MegaRAID SAS-3 3108 [Invader] 1000 9361 MegaRAID SAS 9361-8i + 1000 9364 MegaRAID SAS 9364-8i + 1000 936a MegaRAID SAS 9364-8i 1028 1f41 PERC H830 Adapter 1028 1f42 PERC H730P Adapter 1028 1f43 PERC H730 Adapter @@ -363,6 +378,7 @@ 1028 1f54 PERC FD33xD 17aa 1052 ThinkServer RAID 720i 17aa 1053 ThinkServer RAID 720ix + 1d49 0600 ThinkSystem RAID 730-8i 1GB Cache PCIe 12Gb Adapter 005e SAS1066 PCI-X Fusion-MPT SAS 005f MegaRAID SAS-3 3008 [Fury] 1028 1f44 PERC H330 Adapter @@ -506,6 +522,7 @@ 0087 SAS2308 PCI-Express Fusion-MPT SAS-2 1000 3020 9207-8i SAS2.1 HBA 1000 3040 9207-8e SAS2.1 HBA + 1000 3050 SAS9217-8i 1590 0044 H220i 008f 53c875J 1092 8000 FirePort 40 SCSI Controller @@ -516,8 +533,20 @@ 0095 SAS3108 PCI-Express Fusion-MPT SAS-3 0096 SAS3004 PCI-Express Fusion-MPT SAS-3 0097 SAS3008 PCI-Express Fusion-MPT SAS-3 + 1000 3090 SAS9311-8i + 1000 30e0 SAS9300-8i 1028 1f45 12GB/s HBA internal 1028 1f46 12Gbps HBA + 00ab SAS3516 Fusion-MPT Tri-Mode RAID On Chip (ROC) + 00ac SAS3416 Fusion-MPT Tri-Mode I/O Controller Chip (IOC) + 1d49 0201 ThinkSystem 9400-16i PCIe 12Gb HBA + 1d49 0203 ThinkSystem 9400-16e PCIe 12Gb HBA + 00ae SAS3508 Fusion-MPT Tri-Mode RAID On Chip (ROC) + 00af SAS3408 Fusion-MPT Tri-Mode I/O Controller Chip (IOC) + 1d49 0200 ThinkSystem 9400-8i PCIe 12Gb HBA + 1d49 0202 ThinkSystem 9400-8e PCIe 12Gb HBA + 00be SAS3504 Fusion-MPT Tri-Mode RAID On Chip (ROC) + 00bf SAS3404 Fusion-MPT Tri-Mode I/O Controller Chip (IOC) 00c0 SAS3324 PCI-Express Fusion-MPT SAS-3 00c1 SAS3324 PCI-Express Fusion-MPT SAS-3 00c2 SAS3324 PCI-Express Fusion-MPT SAS-3 @@ -533,6 +562,9 @@ 1000 9390 MegaRAID SAS 9380-8i8e 00cf MegaRAID SAS-3 3324 [Intruder] 1000 9370 MegaRAID SAS 9361-24i + 00d0 SAS3716 Fusion-MPT Tri-Mode RAID Controller Chip (ROC) + 00d1 SAS3616 Fusion-MPT Tri-Mode I/O Controller Chip (IOC) + 00d3 MegaRAID Tri-Mode SAS3716W 0407 MegaRAID 1000 0530 MegaRAID 530 SCSI 320-0X RAID Controller 1000 0531 MegaRAID 531 SCSI 320-4X RAID Controller @@ -1389,23 +1421,23 @@ 5a11 RD890 Northbridge only single slot PCI-e GFX Hydra part 5a12 RD890 Northbridge only dual slot (2x8) PCI-e GFX Hydra part 15d9 a811 H8DGU - 5a13 RD890 PCI to PCI bridge (external gfx0 port A) - 5a14 RD890 PCI to
svn commit: r307352 - head/share/man/man5
Author: bapt Date: Sat Oct 15 12:11:30 2016 New Revision: 307352 URL: https://svnweb.freebsd.org/changeset/base/307352 Log: Regen Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 == --- head/share/man/man5/src.conf.5 Sat Oct 15 12:07:37 2016 (r307351) +++ head/share/man/man5/src.conf.5 Sat Oct 15 12:11:30 2016 (r307352) @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 306729 2016-10-05 20:12:00Z emaste .\" $FreeBSD$ -.Dd October 10, 2016 +.Dd October 15, 2016 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1322,11 +1322,6 @@ This includes .Xr rlogin 1 , .Xr rsh 1 , etc. -.It Va WITH_RCS -.\" from FreeBSD: head/tools/build/options/WITH_RCS 305931 2016-09-18 15:01:11Z bapt -Set to build -.Xr rcs 1 -and related utilities. .It Va WITHOUT_RESCUE .\" from FreeBSD: head/tools/build/options/WITHOUT_RESCUE 156932 2006-03-21 07:50:50Z ru Set to not build ___ 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: r307351 - in head: . etc/mtree gnu/usr.bin gnu/usr.bin/rcs share/doc/psd share/doc/psd/13.rcs tools/build/mk tools/build/options
Author: bapt
Date: Sat Oct 15 12:07:37 2016
New Revision: 307351
URL: https://svnweb.freebsd.org/changeset/base/307351
Log:
Remove GNU rcs from base.
GNU rcs is still available as a package:
- rcs: Latest GPLv3 GNU rcs version.
- rcs57: Copy of the latest version of GNU rcs (GPLv2) from base.
Relnotes: yes
Deleted:
head/gnu/usr.bin/rcs/
head/share/doc/psd/13.rcs/
head/tools/build/options/WITH_RCS
Modified:
head/ObsoleteFiles.inc
head/UPDATING
head/etc/mtree/BSD.usr.dist
head/gnu/usr.bin/Makefile
head/share/doc/psd/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Sat Oct 15 10:29:33 2016(r307350)
+++ head/ObsoleteFiles.inc Sat Oct 15 12:07:37 2016(r307351)
@@ -38,6 +38,30 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20161015: Remove GNU rcs
+OLD_FILES+=usr/bin/ci
+OLD_FILES+=usr/bin/co
+OLD_FILES+=usr/bin/merge
+OLD_FILES+=usr/bin/rcs
+OLD_FILES+=usr/bin/rcsclean
+OLD_FILES+=usr/bin/rcsdiff
+OLD_FILES+=usr/bin/rcsfreeze
+OLD_FILES+=usr/bin/rcsmerge
+OLD_FILES+=usr/bin/rlog
+OLD_FILES+=usr/share/doc/psd/13.rcs/paper.ascii.gz
+OLD_FILES+=usr/share/doc/psd/13.rcs/rcs_func.ascii.gz
+OLD_DIRS+=usr/share/doc/psd/13.rcs
+OLD_FILES+=usr/share/man/man1/ci.1.gz
+OLD_FILES+=usr/share/man/man1/co.1.gz
+OLD_FILES+=usr/share/man/man1/merge.1.gz
+OLD_FILES+=usr/share/man/man1/rcs.1.gz
+OLD_FILES+=usr/share/man/man1/rcsclean.1.gz
+OLD_FILES+=usr/share/man/man1/rcsdiff.1.gz
+OLD_FILES+=usr/share/man/man1/rcsfreeze.1.gz
+OLD_FILES+=usr/share/man/man1/rcsintro.1.gz
+OLD_FILES+=usr/share/man/man1/rcsmerge.1.gz
+OLD_FILES+=usr/share/man/man1/rlog.1.gz
+OLD_FILES+=usr/share/man/man5/rcsfile.5.gz
# 20161010: remove link to removed m_getclr(9) macro
OLD_FILES+=usr/share/man/man9/m_getclr.9.gz
# 20161003: MK_ELFCOPY_AS_OBJCOPY option retired
Modified: head/UPDATING
==
--- head/UPDATING Sat Oct 15 10:29:33 2016(r307350)
+++ head/UPDATING Sat Oct 15 12:07:37 2016(r307351)
@@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20161015:
+ GNU rcs has been removed rom base. It is available as packages:
+ - rcs: Latest GPLv3 GNU rcs version.
+ - rcs57: Copy of the latest version of GNU rcs (GPLv2) from base.
+
20161008:
Use of the cc_cdg, cc_chd, cc_hd, or cc_vegas congestion control
modules now requires that the kernel configuration contain the
Modified: head/etc/mtree/BSD.usr.dist
==
--- head/etc/mtree/BSD.usr.dist Sat Oct 15 10:29:33 2016(r307350)
+++ head/etc/mtree/BSD.usr.dist Sat Oct 15 12:07:37 2016(r307351)
@@ -228,8 +228,6 @@
..
12.make
..
-13.rcs
-..
15.yacc
..
16.lex
Modified: head/gnu/usr.bin/Makefile
==
--- head/gnu/usr.bin/Makefile Sat Oct 15 10:29:33 2016(r307350)
+++ head/gnu/usr.bin/Makefile Sat Oct 15 12:07:37 2016(r307351)
@@ -11,7 +11,6 @@ SUBDIR= ${_binutils} \
${_gperf} \
grep \
${_groff} \
- ${_rcs} \
${_tests}
SUBDIR_DEPEND_gdb= ${_binutils}
@@ -29,10 +28,6 @@ _groff= groff
_dtc= dtc
.endif
-.if ${MK_RCS} != "no"
-_rcs= rcs
-.endif
-
.if ${MK_TESTS} != "no"
_tests=tests
.endif
Modified: head/share/doc/psd/Makefile
==
--- head/share/doc/psd/Makefile Sat Oct 15 10:29:33 2016(r307350)
+++ head/share/doc/psd/Makefile Sat Oct 15 12:07:37 2016(r307351)
@@ -20,7 +20,6 @@ SUBDIR= title \
05.sysman \
06.Clang \
12.make \
- 13.rcs \
15.yacc \
16.lex \
17.m4 \
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Sat Oct 15 10:29:33
2016(r307350)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Sat Oct 15 12:07:37
2016(r307351)
@@ -6810,29 +6810,6 @@ OLD_FILES+=usr/share/man/man8/rshd.8.gz
OLD_FILES+=usr/share/man/man8/rwhod.8.gz
.endif
-.if ${MK_RCS} == no
-OLD_FILES+=usr/bin/ci
-OLD_FILES+=usr/bin/co
-OLD_FILES+=usr/bin/merge
-OLD_FILES+=usr/bin/rcs
-OLD_FILES+=usr/bin/rcsclean
-OLD_FILES+=usr/bin/rcsdiff
-OLD_FILES+=usr/bin/rcsfreeze
-OLD_FILES+=usr/bin/rcsmerge
-OLD_FILES
Re: svn commit: r307321 - in head/sys/arm64: arm64 include
Hi Andrew,
On 10/14/2016 17:53, Andrew Turner wrote:
> Author: andrew
> Date: Fri Oct 14 15:53:48 2016
> New Revision: 307321
> URL: https://svnweb.freebsd.org/changeset/base/307321
>
> Log:
> Rework how we store the VFP registers in the pcb. This will be used when
> creating a floating-point context within the kernel without having to move
> the stored values in memory.
>
> Sponsored by: The FreeBSD Foundation
>
> Modified:
> head/sys/arm64/arm64/machdep.c
> head/sys/arm64/arm64/vfp.c
> head/sys/arm64/arm64/vm_machdep.c
> head/sys/arm64/include/pcb.h
> head/sys/arm64/include/vfp.h
[...]
> Modified: head/sys/arm64/include/pcb.h
> ==
> --- head/sys/arm64/include/pcb.h Fri Oct 14 15:16:44 2016
> (r307320)
> +++ head/sys/arm64/include/pcb.h Fri Oct 14 15:53:48 2016
> (r307321)
> @@ -31,6 +31,8 @@
>
> #ifndef LOCORE
>
> +#include
> +
> struct trapframe;
>
> #define PCB_LR 30
> @@ -49,13 +51,17 @@ struct pcb {
> #define PCB_SINGLE_STEP_SHIFT 0
> #define PCB_SINGLE_STEP (1 << PCB_SINGLE_STEP_SHIFT)
>
> - /* Place last to simplify the asm to access the rest if the struct */
> - __uint128_t pcb_vfp[32];
> - uint32_tpcb_fpcr;
> - uint32_tpcb_fpsr;
> + struct vfpstate *pcb_fpusaved;
> int pcb_fpflags;
> #define PCB_FP_STARTED 0x01
> u_int pcb_vfpcpu; /* Last cpu this thread ran VFP code */
> +
> + /*
> + * The userspace VFP state. The pcb_fpusaved pointer will point to
> + * this unless the kernel has allocated a VFP context.
> + * Place last to simplify the asm to access the rest if the struct.
> + */
> + struct vfpstate pcb_fpustate;
> };
>
> #ifdef _KERNEL
>
> Modified: head/sys/arm64/include/vfp.h
> ==
> --- head/sys/arm64/include/vfp.h Fri Oct 14 15:16:44 2016
> (r307320)
> +++ head/sys/arm64/include/vfp.h Fri Oct 14 15:53:48 2016
> (r307321)
> @@ -35,6 +35,12 @@
> #ifdef _KERNEL
>
> #ifndef LOCORE
> +struct vfpstate {
> + __uint128_t vfp_regs[32];
> + uint32_tvfp_fpcr;
> + uint32_tvfp_fpsr;
> +};
> +
> void vfp_init(void);
> void vfp_discard(struct thread *);
> void vfp_restore_state(void);
These changes break buildworld for arm64:
In file included from
/usr/home/def/FreeBSD/ekcd/repo/lib/libutil/kinfo_getfile.c:5:
In file included from
/usr/obj/arm64.aarch64/usr/home/def/FreeBSD/ekcd/repo/tmp/usr/include/sys/user.h:38:
/usr/obj/arm64.aarch64/usr/home/def/FreeBSD/ekcd/repo/tmp/usr/include/machine/pcb.h:64:18:
error: field has incomplete type 'struct vfpstate'
struct vfpstate pcb_fpustate;
^
/usr/obj/arm64.aarch64/usr/home/def/FreeBSD/ekcd/repo/tmp/usr/include/machine/pcb.h:54:9:
note: forward declaration of 'struct vfpstate'
struct vfpstate *pcb_fpusaved;
^
1 error generated.
--- kinfo_getfile.o ---
*** [kinfo_getfile.o] Error code 1
You might want to consider making vfpstate available for userland as in arm
case. If so I'm attaching a patch for it.
Konrad
diff --git a/sys/arm64/include/vfp.h b/sys/arm64/include/vfp.h
index de99118..9429247 100644
--- a/sys/arm64/include/vfp.h
+++ b/sys/arm64/include/vfp.h
@@ -32,15 +32,15 @@
#ifndef _MACHINE_VFP_H_
#define _MACHINE_VFP_H_
-#ifdef _KERNEL
-
#ifndef LOCORE
+
struct vfpstate {
__uint128_t vfp_regs[32];
uint32_t vfp_fpcr;
uint32_t vfp_fpsr;
};
+#ifdef _KERNEL
void vfp_init(void);
void vfp_discard(struct thread *);
void vfp_restore_state(void);
signature.asc
Description: OpenPGP digital signature
Re: svn commit: r307257 - in head/sys: arm/broadcom/bcm2835 arm64/broadcom arm64/broadcom/bcm2837 arm64/conf conf
On Fri, 14 Oct 2016 10:23:24 -0700 Oleksandr Tymoshenko wrote: > > On Oct 14, 2016, at 1:31 AM, Andrew Turner > > wrote: > > > > On Fri, 14 Oct 2016 03:37:36 + (UTC) > > Oleksandr Tymoshenko mailto:go...@freebsd.org>> > > wrote: > >> > >> Added: head/sys/arm64/conf/RPI3 > > > > Why a new kernel config and not GENERIC? > I thought about it. But no SMP support yet. When we have SMP support > we can get rid of RPI3 config. The RPI3 config should then include GENERIC and add nooption SMP. We should possible name it GENERIC-UP or similar. Andrew ___ 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: r307350 - in head: sys/cam/ctl usr.sbin/ctladm
Author: mav
Date: Sat Oct 15 10:29:33 2016
New Revision: 307350
URL: https://svnweb.freebsd.org/changeset/base/307350
Log:
Add LUN options to limit UNMAP and WRITE SAME sizes.
CTL itself has no limits on on UNMAP and WRITE SAME sizes. But depending
on backends large requests may take too much time. To avoid that new
configuration options allow to hint initiator maximal sizes it should not
exceed.
MFC after:2 weeks
Modified:
head/sys/cam/ctl/ctl.c
head/sys/cam/ctl/ctl.h
head/sys/cam/ctl/ctl_backend.c
head/usr.sbin/ctladm/ctladm.8
Modified: head/sys/cam/ctl/ctl.c
==
--- head/sys/cam/ctl/ctl.c Sat Oct 15 09:54:22 2016(r307349)
+++ head/sys/cam/ctl/ctl.c Sat Oct 15 10:29:33 2016(r307350)
@@ -9903,6 +9903,7 @@ ctl_inquiry_evpd_block_limits(struct ctl
{
struct scsi_vpd_block_limits *bl_ptr;
struct ctl_lun *lun;
+ uint64_t ival;
lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
@@ -9941,8 +9942,14 @@ ctl_inquiry_evpd_block_limits(struct ctl
if (lun != NULL) {
scsi_ulto4b(lun->be_lun->opttxferlen, bl_ptr->opt_txfer_len);
if (lun->be_lun->flags & CTL_LUN_FLAG_UNMAP) {
- scsi_ulto4b(0x, bl_ptr->max_unmap_lba_cnt);
- scsi_ulto4b(0x, bl_ptr->max_unmap_blk_cnt);
+ ival = 0x;
+ ctl_get_opt_number(&lun->be_lun->options,
+ "unmap_max_lba", &ival);
+ scsi_ulto4b(ival, bl_ptr->max_unmap_lba_cnt);
+ ival = 0x;
+ ctl_get_opt_number(&lun->be_lun->options,
+ "unmap_max_descr", &ival);
+ scsi_ulto4b(ival, bl_ptr->max_unmap_blk_cnt);
if (lun->be_lun->ublockexp != 0) {
scsi_ulto4b((1 << lun->be_lun->ublockexp),
bl_ptr->opt_unmap_grain);
@@ -9956,8 +9963,10 @@ ctl_inquiry_evpd_block_limits(struct ctl
scsi_ulto4b(0, bl_ptr->atomic_transfer_length_granularity);
scsi_ulto4b(0,
bl_ptr->max_atomic_transfer_length_with_atomic_boundary);
scsi_ulto4b(0, bl_ptr->max_atomic_boundary_size);
+ ival = UINT64_MAX;
+ ctl_get_opt_number(&lun->be_lun->options, "write_same_max_lba",
&ival);
+ scsi_u64to8b(ival, bl_ptr->max_write_same_length);
}
- scsi_u64to8b(UINT64_MAX, bl_ptr->max_write_same_length);
ctl_set_success(ctsio);
ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
Modified: head/sys/cam/ctl/ctl.h
==
--- head/sys/cam/ctl/ctl.h Sat Oct 15 09:54:22 2016(r307349)
+++ head/sys/cam/ctl/ctl.h Sat Oct 15 10:29:33 2016(r307350)
@@ -217,6 +217,7 @@ void ctl_update_opts(ctl_options_t *opts
struct ctl_be_arg *args);
void ctl_free_opts(ctl_options_t *opts);
char * ctl_get_opt(ctl_options_t *opts, const char *name);
+int ctl_get_opt_number(ctl_options_t *opts, const char *name, uint64_t *num);
int ctl_expand_number(const char *buf, uint64_t *num);
#endif /* _KERNEL */
Modified: head/sys/cam/ctl/ctl_backend.c
==
--- head/sys/cam/ctl/ctl_backend.c Sat Oct 15 09:54:22 2016
(r307349)
+++ head/sys/cam/ctl/ctl_backend.c Sat Oct 15 10:29:33 2016
(r307350)
@@ -243,3 +243,14 @@ ctl_get_opt(ctl_options_t *opts, const c
}
return (NULL);
}
+
+int
+ctl_get_opt_number(ctl_options_t *opts, const char *name, uint64_t *val)
+{
+ const char *value;
+
+ value = ctl_get_opt(opts, name);
+ if (value == NULL)
+ return (-2);
+ return (ctl_expand_number(value, val));
+}
Modified: head/usr.sbin/ctladm/ctladm.8
==
--- head/usr.sbin/ctladm/ctladm.8 Sat Oct 15 09:54:22 2016
(r307349)
+++ head/usr.sbin/ctladm/ctladm.8 Sat Oct 15 10:29:33 2016
(r307350)
@@ -35,7 +35,7 @@
.\" $Id: //depot/users/kenm/FreeBSD-test2/usr.sbin/ctladm/ctladm.8#3 $
.\" $FreeBSD$
.\"
-.Dd September 26, 2015
+.Dd October 15, 2016
.Dt CTLADM 8
.Os
.Sh NAME
@@ -905,6 +905,13 @@ Specifies nominal form factor of the dev
2 -- 3.5", 3 -- 2.5", 4 -- 1.8", 5 -- less then 1.8".
.It Va unmap
Set to "on", enables UNMAP support for the LUN, if supported by the backend.
+.It Va unmap_max_lba
+.It Va unmap_max_descr
+Specify maximum allowed number of LBAs and block descriptors per UNMAP
+command to report in Block Limits VPD page.
+.It Va write_same_max_lba
+Specify maximum allowed number of LBAs per WRITE SAME command to report
+in Block Limits VPD page.
svn commit: r307349 - head/sys/arm64/arm64
Author: andrew
Date: Sat Oct 15 09:54:22 2016
New Revision: 307349
URL: https://svnweb.freebsd.org/changeset/base/307349
Log:
Check we are in a critical section when calling vfp_discard. As we may call
it with a NULL thread pointer only check when it is non-NULL.
Obtained from:ABT Systems Ltd
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/arm64/arm64/vfp.c
Modified: head/sys/arm64/arm64/vfp.c
==
--- head/sys/arm64/arm64/vfp.c Sat Oct 15 09:10:35 2016(r307348)
+++ head/sys/arm64/arm64/vfp.c Sat Oct 15 09:54:22 2016(r307349)
@@ -79,6 +79,10 @@ void
vfp_discard(struct thread *td)
{
+#ifdef INVARIANTS
+ if (td != NULL)
+ CRITICAL_ASSERT(td);
+#endif
if (PCPU_GET(fpcurthread) == td)
PCPU_SET(fpcurthread, 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: r307348 - head/sys/dev/acpi_support
Author: avg
Date: Sat Oct 15 09:10:35 2016
New Revision: 307348
URL: https://svnweb.freebsd.org/changeset/base/307348
Log:
aibs / atk0110: add support for querying sensors via GGRP and GITM
Comparing to the Linux driver there is still one missing feature.
The Linux driver finds and enables "Embedded Controller" item in
the 0x11 group if it's not enabled yet.
I tested the new method, Torfinn Ingolfsen tested the old method
and helped to fix several bugs in the earlier versions of the patch.
Tested by:Torfinn Ingolfsen
Reviewed by: rpaulo
MFC after:3 weeks
Differential Revision: https://reviews.freebsd.org/D8227
Modified:
head/sys/dev/acpi_support/atk0110.c
Modified: head/sys/dev/acpi_support/atk0110.c
==
--- head/sys/dev/acpi_support/atk0110.c Sat Oct 15 09:09:25 2016
(r307347)
+++ head/sys/dev/acpi_support/atk0110.c Sat Oct 15 09:10:35 2016
(r307348)
@@ -28,6 +28,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
@@ -51,18 +52,23 @@ ACPI_SERIAL_DECL(aibs, "aibs");
#define AIBS_MORE_SENSORS
#define AIBS_VERBOSE
-enum aibs_type {
- AIBS_VOLT,
- AIBS_TEMP,
- AIBS_FAN
-};
+#defineAIBS_GROUP_SENSORS 0x06
+
+#define AIBS_SENS_TYPE(x) (((x) >> 16) & 0xff)
+#define AIBS_SENS_TYPE_VOLT2
+#define AIBS_SENS_TYPE_TEMP3
+#define AIBS_SENS_TYPE_FAN 4
+
+#defineAIBS_SENS_TYPE_VOLT_NAME"volt"
+#defineAIBS_SENS_TYPE_VOLT_TEMP"temp"
+#defineAIBS_SENS_TYPE_VOLT_FAN "fan"
struct aibs_sensor {
ACPI_INTEGERv;
ACPI_INTEGERi;
ACPI_INTEGERl;
ACPI_INTEGERh;
- enum aibs_type t;
+ int t;
};
struct aibs_softc {
@@ -72,14 +78,23 @@ struct aibs_softc {
struct aibs_sensor *sc_asens_volt;
struct aibs_sensor *sc_asens_temp;
struct aibs_sensor *sc_asens_fan;
+ struct aibs_sensor *sc_asens_all;
+
+ struct sysctl_oid *sc_volt_sysctl;
+ struct sysctl_oid *sc_temp_sysctl;
+ struct sysctl_oid *sc_fan_sysctl;
+
+ boolsc_ggrp_method;
};
static int aibs_probe(device_t);
static int aibs_attach(device_t);
static int aibs_detach(device_t);
static int aibs_sysctl(SYSCTL_HANDLER_ARGS);
+static int aibs_sysctl_ggrp(SYSCTL_HANDLER_ARGS);
-static void aibs_attach_sif(struct aibs_softc *, enum aibs_type);
+static int aibs_attach_ggrp(struct aibs_softc *);
+static int aibs_attach_sif(struct aibs_softc *, int);
static device_method_t aibs_methods[] = {
DEVMETHOD(device_probe, aibs_probe),
@@ -109,54 +124,240 @@ aibs_probe(device_t dev)
{
if (acpi_disabled("aibs") ||
ACPI_ID_PROBE(device_get_parent(dev), dev, aibs_hids) == NULL)
- return ENXIO;
+ return (ENXIO);
device_set_desc(dev, "ASUSTeK AI Booster (ACPI ASOC ATK0110)");
- return 0;
+ return (0);
}
static int
aibs_attach(device_t dev)
{
struct aibs_softc *sc = device_get_softc(dev);
+ int err;
sc->sc_dev = dev;
sc->sc_ah = acpi_get_handle(dev);
- aibs_attach_sif(sc, AIBS_VOLT);
- aibs_attach_sif(sc, AIBS_TEMP);
- aibs_attach_sif(sc, AIBS_FAN);
+ sc->sc_ggrp_method = false;
+ err = aibs_attach_sif(sc, AIBS_SENS_TYPE_VOLT);
+ if (err == 0)
+ err = aibs_attach_sif(sc, AIBS_SENS_TYPE_TEMP);
+ if (err == 0)
+ err = aibs_attach_sif(sc, AIBS_SENS_TYPE_FAN);
+
+ if (err == 0)
+ return (0);
+
+ /* Clean up whatever was allocated earlier. */
+ if (sc->sc_volt_sysctl != NULL)
+ sysctl_remove_oid(sc->sc_volt_sysctl, true, true);
+ if (sc->sc_temp_sysctl != NULL)
+ sysctl_remove_oid(sc->sc_temp_sysctl, true, true);
+ if (sc->sc_fan_sysctl != NULL)
+ sysctl_remove_oid(sc->sc_fan_sysctl, true, true);
+ aibs_detach(dev);
+
+ sc->sc_ggrp_method = true;
+ err = aibs_attach_ggrp(sc);
+ return (err);
+}
+
+static int
+aibs_add_sensor(struct aibs_softc *sc, ACPI_OBJECT *o,
+struct aibs_sensor* sensor, const char ** descr)
+{
+ int off;
- return 0;
+ /*
+* Packages for the old and new methods are quite
+* similar except that the new package has two
+* new (unknown / unused) fields after the name field.
+*/
+ if (sc->sc_ggrp_method)
+ off = 4;
+ else
+ off = 2;
+
+ if (o->Type != ACPI_TYPE_PACKAGE) {
+ device_printf(sc->sc_dev,
+ "sensor object is not a package: %i type\n",
+o->Type);
+ return (ENXIO);
+ }
+ if (o[0].Package.Count != (off + 3) ||
+
svn commit: r307347 - stable/11/sys/dev/ofw
Author: mmel
Date: Sat Oct 15 09:09:25 2016
New Revision: 307347
URL: https://svnweb.freebsd.org/changeset/base/307347
Log:
MFC r302951,r302952,r304071:
r302951:
OFWPCI: Improve resource handling. - add new rman for prefetchable
memory.
Is used only if given 'ranges'
property contains prefetchable memory range.
r302952:
OFWPCI: Add support for NEW_PCIB.
r304071:
OFWPCI: Don't strip RF_ACTIVE from flags when parent bus method is called.
Modified:
stable/11/sys/dev/ofw/ofwpci.c
stable/11/sys/dev/ofw/ofwpci.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/dev/ofw/ofwpci.c
==
--- stable/11/sys/dev/ofw/ofwpci.c Sat Oct 15 08:52:42 2016
(r307346)
+++ stable/11/sys/dev/ofw/ofwpci.c Sat Oct 15 09:09:25 2016
(r307347)
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
#include
#include
+#include
#include
#include
@@ -94,6 +95,7 @@ static phandle_t ofw_pci_get_node(device
* local methods
*/
static int ofw_pci_fill_ranges(phandle_t, struct ofw_pci_range *);
+static struct rman *ofw_pci_get_rman(struct ofw_pci_softc *, int, u_int);
/*
* Driver methods.
@@ -137,13 +139,14 @@ ofw_pci_init(device_t dev)
phandle_t node;
u_int32_t busrange[2];
struct ofw_pci_range *rp;
- int error;
+ int i, error;
struct ofw_pci_cell_info *cell_info;
node = ofw_bus_get_node(dev);
sc = device_get_softc(dev);
sc->sc_initialized = 1;
sc->sc_range = NULL;
+ sc->sc_pci_domain = device_get_unit(dev);
cell_info = (struct ofw_pci_cell_info *)malloc(sizeof(*cell_info),
M_DEVBUF, M_WAITOK | M_ZERO);
@@ -201,17 +204,27 @@ ofw_pci_init(device_t dev)
}
sc->sc_mem_rman.rm_type = RMAN_ARRAY;
- sc->sc_mem_rman.rm_descr = "PCI Memory";
+ sc->sc_mem_rman.rm_descr = "PCI Non Prefetchable Memory";
error = rman_init(&sc->sc_mem_rman);
if (error != 0) {
device_printf(dev, "rman_init() failed. error = %d\n", error);
goto out;
}
- for (rp = sc->sc_range; rp < sc->sc_range + sc->sc_nrange &&
- rp->pci_hi != 0; rp++) {
+ sc->sc_pmem_rman.rm_type = RMAN_ARRAY;
+ sc->sc_pmem_rman.rm_descr = "PCI Prefetchable Memory";
+ error = rman_init(&sc->sc_pmem_rman);
+ if (error != 0) {
+ device_printf(dev, "rman_init() failed. error = %d\n", error);
+ goto out;
+ }
+
+ for (i = 0; i < sc->sc_nrange; i++) {
error = 0;
+ rp = sc->sc_range + i;
+ if (sc->sc_range_mask & ((uint64_t)1 << i))
+ continue;
switch (rp->pci_hi & OFW_PCI_PHYS_HI_SPACEMASK) {
case OFW_PCI_PHYS_HI_SPACE_CONFIG:
break;
@@ -221,8 +234,14 @@ ofw_pci_init(device_t dev)
break;
case OFW_PCI_PHYS_HI_SPACE_MEM32:
case OFW_PCI_PHYS_HI_SPACE_MEM64:
- error = rman_manage_region(&sc->sc_mem_rman, rp->pci,
- rp->pci + rp->size - 1);
+ if (rp->pci_hi & OFW_PCI_PHYS_HI_PREFETCHABLE) {
+ sc->sc_have_pmem = 1;
+ error = rman_manage_region(&sc->sc_pmem_rman,
+ rp->pci, rp->pci + rp->size - 1);
+ } else {
+ error = rman_manage_region(&sc->sc_mem_rman,
+ rp->pci, rp->pci + rp->size - 1);
+ }
break;
}
@@ -244,6 +263,7 @@ out:
free(sc->sc_range, M_DEVBUF);
rman_fini(&sc->sc_io_rman);
rman_fini(&sc->sc_mem_rman);
+ rman_fini(&sc->sc_pmem_rman);
return (error);
}
@@ -318,7 +338,7 @@ ofw_pci_read_ivar(device_t dev, device_t
switch (which) {
case PCIB_IVAR_DOMAIN:
- *result = device_get_unit(dev);
+ *result = sc->sc_pci_domain;
return (0);
case PCIB_IVAR_BUS:
*result = sc->sc_bus;
@@ -385,28 +405,23 @@ ofw_pci_alloc_resource(device_t bus, dev
struct rman *rm;
int needactivate;
+
needactivate = flags & RF_ACTIVE;
flags &= ~RF_ACTIVE;
sc = device_get_softc(bus);
- switch (type) {
- case SYS_RES_MEMORY:
- rm = &sc->sc_mem_rman;
- break;
-
- case SYS_RES_IOPORT:
- rm = &sc->sc_io_rman;
- break;
-
- case SYS_RES_IRQ:
- return (bus_alloc_resource(bus, type, rid, start, end, count,
- flags));
+#if defined(NEW_PCIB) && defined(PCI_RES_BUS)
+ if (type == PCI_RES_BUS) {
+ return (pci_dom
svn commit: r307346 - stable/11/sys/dev/ofw
Author: mmel
Date: Sat Oct 15 08:52:42 2016
New Revision: 307346
URL: https://svnweb.freebsd.org/changeset/base/307346
Log:
MFC r302560:
OFWPCI: Fix style(9). No functional change.
Modified:
stable/11/sys/dev/ofw/ofwpci.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/dev/ofw/ofwpci.c
==
--- stable/11/sys/dev/ofw/ofwpci.c Sat Oct 15 08:31:46 2016
(r307345)
+++ stable/11/sys/dev/ofw/ofwpci.c Sat Oct 15 08:52:42 2016
(r307346)
@@ -195,7 +195,7 @@ ofw_pci_init(device_t dev)
sc->sc_io_rman.rm_type = RMAN_ARRAY;
sc->sc_io_rman.rm_descr = "PCI I/O Ports";
error = rman_init(&sc->sc_io_rman);
- if (error) {
+ if (error != 0) {
device_printf(dev, "rman_init() failed. error = %d\n", error);
goto out;
}
@@ -203,7 +203,7 @@ ofw_pci_init(device_t dev)
sc->sc_mem_rman.rm_type = RMAN_ARRAY;
sc->sc_mem_rman.rm_descr = "PCI Memory";
error = rman_init(&sc->sc_mem_rman);
- if (error) {
+ if (error != 0) {
device_printf(dev, "rman_init() failed. error = %d\n", error);
goto out;
}
@@ -226,7 +226,7 @@ ofw_pci_init(device_t dev)
break;
}
- if (error) {
+ if (error != 0) {
device_printf(dev,
"rman_manage_region(%x, %#jx, %#jx) failed. "
"error = %d\n", rp->pci_hi &
@@ -257,7 +257,7 @@ ofw_pci_attach(device_t dev)
sc = device_get_softc(dev);
if (!sc->sc_initialized) {
error = ofw_pci_init(dev);
- if (error)
+ if (error != 0)
return (error);
}
@@ -437,9 +437,11 @@ ofw_pci_release_resource(device_t bus, d
{
if (rman_get_flags(res) & RF_ACTIVE) {
- int error = bus_deactivate_resource(child, type, rid, res);
- if (error)
- return error;
+ int error;
+
+ error = bus_deactivate_resource(child, type, rid, res);
+ if (error != 0)
+ return (error);
}
return (rman_release_resource(res));
@@ -544,9 +546,10 @@ static int
ofw_pci_adjust_resource(device_t bus, device_t child, int type,
struct resource *res, rman_res_t start, rman_res_t end)
{
- struct rman *rm = NULL;
- struct ofw_pci_softc *sc = device_get_softc(bus);
+ struct rman *rm;
+ struct ofw_pci_softc *sc;
+ sc = device_get_softc(bus);
KASSERT(!(rman_get_flags(res) & RF_ACTIVE),
("active resources cannot be adjusted"));
if (rman_get_flags(res) & RF_ACTIVE)
___
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: r307345 - stable/11/sys/arm/arm
Author: mmel
Date: Sat Oct 15 08:31:46 2016
New Revision: 307345
URL: https://svnweb.freebsd.org/changeset/base/307345
Log:
MFC r306759:
ARM: Remove ARMv4 #defines from busdma_machdep-v6.c, it's ARMv6 specific
file. Consistently use BUSDMA_DCACHE_ALIGN for cache line alignment.
Modified:
stable/11/sys/arm/arm/busdma_machdep-v6.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/arm/arm/busdma_machdep-v6.c
==
--- stable/11/sys/arm/arm/busdma_machdep-v6.c Sat Oct 15 08:27:54 2016
(r307344)
+++ stable/11/sys/arm/arm/busdma_machdep-v6.c Sat Oct 15 08:31:46 2016
(r307345)
@@ -61,13 +61,8 @@ __FBSDID("$FreeBSD$");
#include
#include
-#if __ARM_ARCH < 6
-#defineBUSDMA_DCACHE_ALIGN arm_dcache_align
-#defineBUSDMA_DCACHE_MASK arm_dcache_align_mask
-#else
#defineBUSDMA_DCACHE_ALIGN cpuinfo.dcache_line_size
#defineBUSDMA_DCACHE_MASK cpuinfo.dcache_line_mask
-#endif
#defineMAX_BPAGES 64
#defineMAX_DMA_SEGMENTS4096
@@ -340,7 +335,7 @@ cacheline_bounce(bus_dmamap_t map, bus_a
if (map->flags & (DMAMAP_DMAMEM_ALLOC | DMAMAP_COHERENT | DMAMAP_MBUF))
return (0);
- return ((addr | size) & arm_dcache_align_mask);
+ return ((addr | size) & BUSDMA_DCACHE_MASK);
}
/*
___
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: r307344 - in stable/11/sys/arm: allwinner altera/socfpga amlogic/aml8726 arm broadcom/bcm2835 freescale/imx include mv/armada38x nvidia/tegra124 rockchip samsung/exynos ti/omap4 xilinx
Author: mmel
Date: Sat Oct 15 08:27:54 2016
New Revision: 307344
URL: https://svnweb.freebsd.org/changeset/base/307344
Log:
MFC r306756:
ARM: SEV/WFE instructions are implemented starting from ARMv6K, use it
directly.
Modified:
stable/11/sys/arm/allwinner/aw_mp.c
stable/11/sys/arm/altera/socfpga/socfpga_mp.c
stable/11/sys/arm/amlogic/aml8726/aml8726_mp.c
stable/11/sys/arm/arm/cpufunc_asm_armv7.S
stable/11/sys/arm/arm/mp_machdep.c
stable/11/sys/arm/broadcom/bcm2835/bcm2836_mp.c
stable/11/sys/arm/freescale/imx/imx6_mp.c
stable/11/sys/arm/include/cpu-v6.h
stable/11/sys/arm/include/cpufunc.h
stable/11/sys/arm/mv/armada38x/pmsu.c
stable/11/sys/arm/nvidia/tegra124/tegra124_mp.c
stable/11/sys/arm/rockchip/rk30xx_mp.c
stable/11/sys/arm/samsung/exynos/exynos5_mp.c
stable/11/sys/arm/ti/omap4/omap4_mp.c
stable/11/sys/arm/xilinx/zy7_mp.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/arm/allwinner/aw_mp.c
==
--- stable/11/sys/arm/allwinner/aw_mp.c Sat Oct 15 08:09:55 2016
(r307343)
+++ stable/11/sys/arm/allwinner/aw_mp.c Sat Oct 15 08:27:54 2016
(r307344)
@@ -193,7 +193,8 @@ aw_mp_start_ap(platform_t plat)
val |= (1 << i);
bus_space_write_4(fdtbus_bs_tag, cpucfg, CPUCFG_DBGCTL1, val);
- armv7_sev();
+ dsb();
+ sev();
bus_space_unmap(fdtbus_bs_tag, cpucfg, CPUCFG_SIZE);
if (soc_family != ALLWINNERSOC_SUN7I)
bus_space_unmap(fdtbus_bs_tag, prcm, PRCM_SIZE);
@@ -279,7 +280,8 @@ a83t_mp_start_ap(platform_t plat)
panic("Couldn't map the PRCM\n");
aw_mc_mp_start_ap(cpuscfg, cpuxcfg, prcm);
- armv7_sev();
+ dsb();
+ sev();
bus_space_unmap(fdtbus_bs_tag, cpuxcfg, CPUXCFG_SIZE);
bus_space_unmap(fdtbus_bs_tag, cpuscfg, CPUCFG_SIZE);
bus_space_unmap(fdtbus_bs_tag, prcm, PRCM_SIZE);
Modified: stable/11/sys/arm/altera/socfpga/socfpga_mp.c
==
--- stable/11/sys/arm/altera/socfpga/socfpga_mp.c Sat Oct 15 08:09:55
2016(r307343)
+++ stable/11/sys/arm/altera/socfpga/socfpga_mp.c Sat Oct 15 08:27:54
2016(r307344)
@@ -151,7 +151,8 @@ platform_mp_start_ap(void)
/* Put CPU1 out from reset */
bus_space_write_4(fdtbus_bs_tag, rst, MPUMODRST, 0);
- armv7_sev();
+ dsb();
+ sev();
bus_space_unmap(fdtbus_bs_tag, scu, SCU_SIZE);
bus_space_unmap(fdtbus_bs_tag, rst, RSTMGR_SIZE);
Modified: stable/11/sys/arm/amlogic/aml8726/aml8726_mp.c
==
--- stable/11/sys/arm/amlogic/aml8726/aml8726_mp.c Sat Oct 15 08:09:55
2016(r307343)
+++ stable/11/sys/arm/amlogic/aml8726/aml8726_mp.c Sat Oct 15 08:27:54
2016(r307344)
@@ -487,7 +487,8 @@ platform_mp_start_ap(void)
CPUCONF_BARRIER(AML_CPUCONF_CONTROL_REG);
/* Wakeup the now enabled APs */
- armv7_sev();
+ dsb();
+ sev();
/*
* Free the resources which are not needed after startup.
Modified: stable/11/sys/arm/arm/cpufunc_asm_armv7.S
==
--- stable/11/sys/arm/arm/cpufunc_asm_armv7.S Sat Oct 15 08:09:55 2016
(r307343)
+++ stable/11/sys/arm/arm/cpufunc_asm_armv7.S Sat Oct 15 08:27:54 2016
(r307344)
@@ -297,13 +297,6 @@ ENTRY(armv7_drain_writebuf)
RET
END(armv7_drain_writebuf)
-ENTRY(armv7_sev)
- dsb
- sev
- nop
- RET
-END(armv7_sev)
-
ENTRY(armv7_auxctrl)
mrc CP15_ACTLR(r2)
bic r3, r2, r0 /* Clear bits */
Modified: stable/11/sys/arm/arm/mp_machdep.c
==
--- stable/11/sys/arm/arm/mp_machdep.c Sat Oct 15 08:09:55 2016
(r307343)
+++ stable/11/sys/arm/arm/mp_machdep.c Sat Oct 15 08:27:54 2016
(r307344)
@@ -467,9 +467,8 @@ release_aps(void *dummy __unused)
#endif
atomic_store_rel_int(&aps_ready, 1);
/* Wake the other threads up */
-#if __ARM_ARCH >= 7
- armv7_sev();
-#endif
+ dsb();
+ sev();
printf("Release APs\n");
Modified: stable/11/sys/arm/broadcom/bcm2835/bcm2836_mp.c
==
--- stable/11/sys/arm/broadcom/bcm2835/bcm2836_mp.c Sat Oct 15 08:09:55
2016(r307343)
+++ stable/11/sys/arm/broadcom/bcm2835/bcm2836_mp.c Sat Oct 15 08:27:54
2016(r307344)
@@ -132,7 +132,8 @@ platform_mp_start_ap(void)
} while (1);
/* dsb and sev */
- armv7_sev();
+ dsb();
+ sev();
/* recode AP in CPU map */
CPU_SET(i, &all_cpus);
Mo
svn commit: r307343 - head/lib/libc/stdlib
Author: ed Date: Sat Oct 15 08:09:55 2016 New Revision: 307343 URL: https://svnweb.freebsd.org/changeset/base/307343 Log: Improve phrasing of the STANDARDS section. Reported by: wblock MFC after:1 month Differential Revision:https://reviews.freebsd.org/D8205 Modified: head/lib/libc/stdlib/tsearch.3 Modified: head/lib/libc/stdlib/tsearch.3 == --- head/lib/libc/stdlib/tsearch.3 Sat Oct 15 07:38:27 2016 (r307342) +++ head/lib/libc/stdlib/tsearch.3 Sat Oct 15 08:09:55 2016 (r307343) @@ -142,10 +142,10 @@ The .Fa posix_tnode type is not part of .St -p1003.1-2008 , -but it is expected to be standardized by future versions of the standard. +but is expected to be standardized by future versions of the standard. It is defined as .Fa void for source-level compatibility. Using .Fa posix_tnode -makes it easier to distinguish between nodes and keys. +makes distinguishing between nodes and keys easier. ___ 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: r307342 - in stable/11/sys/arm: arm include
Author: mmel
Date: Sat Oct 15 07:38:27 2016
New Revision: 307342
URL: https://svnweb.freebsd.org/changeset/base/307342
Log:
MFC r306755:
ARM: Add identifiers for ARM Cortex v8 and Marvell Sheeva v7 cores. Not a
functional change.
Modified:
stable/11/sys/arm/arm/cpuinfo.c
stable/11/sys/arm/include/cpuinfo.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/arm/arm/cpuinfo.c
==
--- stable/11/sys/arm/arm/cpuinfo.c Sat Oct 15 07:30:13 2016
(r307341)
+++ stable/11/sys/arm/arm/cpuinfo.c Sat Oct 15 07:38:27 2016
(r307342)
@@ -163,7 +163,11 @@ cpuinfo_get_actlr_modifier(uint32_t *act
if (cpuinfo.implementer == CPU_IMPLEMENTER_ARM) {
switch (cpuinfo.part_number) {
-
+ case CPU_ARCH_CORTEX_A72:
+ case CPU_ARCH_CORTEX_A57:
+ case CPU_ARCH_CORTEX_A53:
+ /* Nothing to do for AArch32 */
+ break;
case CPU_ARCH_CORTEX_A17:
case CPU_ARCH_CORTEX_A12: /* A12 is merged to A17 */
/*
Modified: stable/11/sys/arm/include/cpuinfo.h
==
--- stable/11/sys/arm/include/cpuinfo.h Sat Oct 15 07:30:13 2016
(r307341)
+++ stable/11/sys/arm/include/cpuinfo.h Sat Oct 15 07:38:27 2016
(r307342)
@@ -45,10 +45,18 @@
#define CPU_ARCH_CORTEX_A120xC0D
#define CPU_ARCH_CORTEX_A150xC0F
#define CPU_ARCH_CORTEX_A170xC11
+#define CPU_ARCH_CORTEX_A530xD03
+#define CPU_ARCH_CORTEX_A570xD07
+#define CPU_ARCH_CORTEX_A720xD08
+
/* QCOM */
#define CPU_ARCH_KRAIT_300 0x06F
+/* MRVL */
+#define CPU_ARCH_SHEEVA_8510x581 /* PJ4/PJ4B */
+#define CPU_ARCH_SHEEVA_5840x584 /* PJ4B-MP/PJ4C */
+
struct cpuinfo {
/* raw id registers */
uint32_t midr;
___
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: r307341 - stable/11/sys/arm/arm
Author: mmel Date: Sat Oct 15 07:30:13 2016 New Revision: 307341 URL: https://svnweb.freebsd.org/changeset/base/307341 Log: MFC r306754: ARM: Remove unused variable. Not a functional change. Modified: stable/11/sys/arm/arm/locore-v6.S Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm/arm/locore-v6.S == --- stable/11/sys/arm/arm/locore-v6.S Sat Oct 15 07:28:46 2016 (r307340) +++ stable/11/sys/arm/arm/locore-v6.S Sat Oct 15 07:30:13 2016 (r307341) @@ -439,9 +439,6 @@ boot_pt1: .text .align 2 -.Lcpufuncs: - .word _C_LABEL(cpufuncs) - #if defined(SMP) ASENTRY_NP(mpentry) ___ 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: r307340 - in stable/11: . share/man/man9
Author: avos Date: Sat Oct 15 07:28:46 2016 New Revision: 307340 URL: https://svnweb.freebsd.org/changeset/base/307340 Log: MFC r307000, r307001: mbuf(9), mbuf_tags(9): fix function prototypes. - Add m_getclr(9) symlink to ObsoleteFiles.inc (removed in r295481). - Add const qualifiers in m_dup(), m_dup_pkthdr() and m_tag_copy_chain() (r286450). - Fix m_dup_pkthdr() definition (it's not the same as m_move_pkthdr()). Modified: stable/11/ObsoleteFiles.inc stable/11/share/man/man9/Makefile stable/11/share/man/man9/mbuf.9 stable/11/share/man/man9/mbuf_tags.9 Directory Properties: stable/11/ (props changed) Modified: stable/11/ObsoleteFiles.inc == --- stable/11/ObsoleteFiles.inc Sat Oct 15 06:16:35 2016(r307339) +++ stable/11/ObsoleteFiles.inc Sat Oct 15 07:28:46 2016(r307340) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20161015: remove link to removed m_getclr(9) macro +OLD_FILES+=usr/share/man/man9/m_getclr.9.gz # 20160703: POSIXify locales with variants OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_COLLATE OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_CTYPE Modified: stable/11/share/man/man9/Makefile == --- stable/11/share/man/man9/Makefile Sat Oct 15 06:16:35 2016 (r307339) +++ stable/11/share/man/man9/Makefile Sat Oct 15 07:28:46 2016 (r307340) @@ -1089,7 +1089,6 @@ MLINKS+=\ mbuf.9 m_get2.9 \ mbuf.9 m_getjcl.9 \ mbuf.9 m_getcl.9 \ - mbuf.9 m_getclr.9 \ mbuf.9 MGETHDR.9 \ mbuf.9 m_gethdr.9 \ mbuf.9 m_getm.9 \ Modified: stable/11/share/man/man9/mbuf.9 == --- stable/11/share/man/man9/mbuf.9 Sat Oct 15 06:16:35 2016 (r307339) +++ stable/11/share/man/man9/mbuf.9 Sat Oct 15 07:28:46 2016 (r307340) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 29, 2016 +.Dd October 10, 2016 .Dt MBUF 9 .Os .\" @@ -79,8 +79,6 @@ .Ft struct mbuf * .Fn m_getcl "int how" "short type" "int flags" .Ft struct mbuf * -.Fn m_getclr "int how" "short type" -.Ft struct mbuf * .Fn m_gethdr "int how" "short type" .Ft struct mbuf * .Fn m_free "struct mbuf *mbuf" @@ -107,7 +105,7 @@ .Ft struct mbuf * .Fn m_copypacket "struct mbuf *mbuf" "int how" .Ft struct mbuf * -.Fn m_dup "struct mbuf *mbuf" "int how" +.Fn m_dup "const struct mbuf *mbuf" "int how" .Ft void .Fn m_copydata "const struct mbuf *mbuf" "int offset" "int len" "caddr_t buf" .Ft void @@ -126,8 +124,8 @@ .Fn m_catpkt "struct mbuf *m" "struct mbuf *n" .Ft u_int .Fn m_fixhdr "struct mbuf *mbuf" -.Ft void -.Fn m_dup_pkthdr "struct mbuf *to" "struct mbuf *from" +.Ft int +.Fn m_dup_pkthdr "struct mbuf *to" "const struct mbuf *from" "int how" .Ft void .Fn m_move_pkthdr "struct mbuf *to" "struct mbuf *from" .Ft u_int @@ -602,10 +600,6 @@ This is like but it the size of the cluster allocated will be large enough for .Fa size bytes. -.It Fn m_getclr how type -Allocate an -.Vt mbuf -and zero out the data region. .It Fn m_free mbuf Frees .Vt mbuf . Modified: stable/11/share/man/man9/mbuf_tags.9 == --- stable/11/share/man/man9/mbuf_tags.9Sat Oct 15 06:16:35 2016 (r307339) +++ stable/11/share/man/man9/mbuf_tags.9Sat Oct 15 07:28:46 2016 (r307340) @@ -33,7 +33,7 @@ .Ft "struct m_tag *" .Fn m_tag_copy "struct m_tag *t" "int how" .Ft int -.Fn m_tag_copy_chain "struct mbuf *to" "struct mbuf *from" "int how" +.Fn m_tag_copy_chain "struct mbuf *to" "const struct mbuf *from" "int how" .Ft void .Fn m_tag_delete "struct mbuf *m" "struct m_tag *t" .Ft void ___ 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"
