svn commit: r265946 - in stable/10: lib/libc/net sys/netinet sys/netinet6 sys/sys
Author: kevlo
Date: Tue May 13 06:05:53 2014
New Revision: 265946
URL: http://svnweb.freebsd.org/changeset/base/265946
Log:
MFC r264212,r264213,r264248,r265776,r265811,r265909:
- Add support for UDP-Lite protocol (RFC 3828) to IPv4 and IPv6 stacks.
Tested with vlc and a test suite [1].
[1] http://www.erg.abdn.ac.uk/~gerrit/udp-lite/files/udplite_linux.tar.gz
Reviewed by:jhb, glebius, adrian
- Fix a logic bug which prevented the sending of UDP packet with 0 checksum.
- Disable TX checksum offload for UDP-Lite completely. It wasn't used for
partial checksum coverage, but even for full checksum coverage it doesn't
work.
Added:
stable/10/sys/netinet/udplite.h
- copied unchanged from r264212, head/sys/netinet/udplite.h
Modified:
stable/10/lib/libc/net/getaddrinfo.c
stable/10/sys/netinet/in.c
stable/10/sys/netinet/in.h
stable/10/sys/netinet/in_pcb.c
stable/10/sys/netinet/in_proto.c
stable/10/sys/netinet/udp_usrreq.c
stable/10/sys/netinet/udp_var.h
stable/10/sys/netinet6/in6_ifattach.c
stable/10/sys/netinet6/in6_proto.c
stable/10/sys/netinet6/udp6_usrreq.c
stable/10/sys/netinet6/udp6_var.h
stable/10/sys/sys/param.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/lib/libc/net/getaddrinfo.c
==
--- stable/10/lib/libc/net/getaddrinfo.cTue May 13 05:26:43 2014
(r265945)
+++ stable/10/lib/libc/net/getaddrinfo.cTue May 13 06:05:53 2014
(r265946)
@@ -170,12 +170,14 @@ static const struct explore explore[] =
{ PF_INET6, SOCK_STREAM, IPPROTO_TCP, 0x07 },
{ PF_INET6, SOCK_STREAM, IPPROTO_SCTP, 0x03 },
{ PF_INET6, SOCK_SEQPACKET, IPPROTO_SCTP, 0x07 },
+ { PF_INET6, SOCK_DGRAM, IPPROTO_UDPLITE, 0x03 },
{ PF_INET6, SOCK_RAW, ANY, 0x05 },
#endif
{ PF_INET, SOCK_DGRAM, IPPROTO_UDP, 0x07 },
{ PF_INET, SOCK_STREAM, IPPROTO_TCP, 0x07 },
{ PF_INET, SOCK_STREAM, IPPROTO_SCTP, 0x03 },
{ PF_INET, SOCK_SEQPACKET, IPPROTO_SCTP, 0x07 },
+ { PF_INET, SOCK_DGRAM, IPPROTO_UDPLITE, 0x03 },
{ PF_INET, SOCK_RAW, ANY, 0x05 },
{ -1, 0, 0, 0 },
};
@@ -1477,6 +1479,9 @@ get_port(struct addrinfo *ai, const char
case IPPROTO_SCTP:
proto = sctp;
break;
+ case IPPROTO_UDPLITE:
+ proto = udplite;
+ break;
default:
proto = NULL;
break;
Modified: stable/10/sys/netinet/in.c
==
--- stable/10/sys/netinet/in.c Tue May 13 05:26:43 2014(r265945)
+++ stable/10/sys/netinet/in.c Tue May 13 06:05:53 2014(r265946)
@@ -1167,6 +1167,7 @@ in_ifdetach(struct ifnet *ifp)
in_pcbpurgeif0(V_ripcbinfo, ifp);
in_pcbpurgeif0(V_udbinfo, ifp);
+ in_pcbpurgeif0(V_ulitecbinfo, ifp);
in_purgemaddrs(ifp);
}
Modified: stable/10/sys/netinet/in.h
==
--- stable/10/sys/netinet/in.h Tue May 13 05:26:43 2014(r265945)
+++ stable/10/sys/netinet/in.h Tue May 13 06:05:53 2014(r265946)
@@ -237,12 +237,17 @@ __END_DECLS
#defineIPPROTO_IPCOMP 108 /* payload compression
(IPComp) */
#defineIPPROTO_SCTP132 /* SCTP */
#defineIPPROTO_MH 135 /* IPv6 Mobility Header
*/
+#defineIPPROTO_UDPLITE 136 /* UDP-Lite */
+#defineIPPROTO_HIP 139 /* IP6 Host Identity
Protocol */
+#defineIPPROTO_SHIM6 140 /* IP6 Shim6 Protocol */
/* 101-254: Partly Unassigned */
#defineIPPROTO_PIM 103 /* Protocol Independent
Mcast */
#defineIPPROTO_CARP112 /* CARP */
#defineIPPROTO_PGM 113 /* PGM */
#defineIPPROTO_MPLS137 /* MPLS-in-IP */
#defineIPPROTO_PFSYNC 240 /* PFSYNC */
+#defineIPPROTO_RESERVED_253253 /* Reserved */
+#defineIPPROTO_RESERVED_254254 /* Reserved */
/* 255: Reserved */
/* BSD Private, local use, namespace incursion, no longer used */
#defineIPPROTO_OLD_DIVERT 254 /* OLD divert
pseudo-proto */
Modified: stable/10/sys/netinet/in_pcb.c
==
--- stable/10/sys/netinet/in_pcb.c Tue May 13 05:26:43 2014
(r265945)
+++ stable/10/sys/netinet/in_pcb.c Tue May 13 06:05:53 2014
(r265946)
@@ -386,13 +386,14 @@ in_pcb_lport(struct inpcb *inp, struct i
lastport =
svn commit: r265947 - stable/10/share/man/man4
Author: kevlo Date: Tue May 13 06:09:01 2014 New Revision: 265947 URL: http://svnweb.freebsd.org/changeset/base/265947 Log: MFC r264216, r265817, r265822: Add man page for udplite(4). Added: stable/10/share/man/man4/udplite.4 - copied, changed from r264215, head/share/man/man4/udplite.4 Modified: stable/10/share/man/man4/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/share/man/man4/Makefile == --- stable/10/share/man/man4/Makefile Tue May 13 06:05:53 2014 (r265946) +++ stable/10/share/man/man4/Makefile Tue May 13 06:09:01 2014 (r265947) @@ -511,6 +511,7 @@ MAN=aac.4 \ udav.4 \ udbp.4 \ udp.4 \ + udplite.4 \ uep.4 \ ufm.4 \ ufoma.4 \ Copied and modified: stable/10/share/man/man4/udplite.4 (from r264215, head/share/man/man4/udplite.4) == --- head/share/man/man4/udplite.4 Mon Apr 7 01:57:51 2014 (r264215, copy source) +++ stable/10/share/man/man4/udplite.4 Tue May 13 06:09:01 2014 (r265947) @@ -35,7 +35,7 @@ .In sys/socket.h .In netinet/udplite.h .Ft int -.Fn socket AF_INET SOCK_STREAM IPPROTO_UDPLITE +.Fn socket AF_INET SOCK_DGRAM IPPROTO_UDPLITE .Sh DESCRIPTION The .Tn UDP-Lite @@ -52,7 +52,7 @@ supports a number of socket options whic .Xr setsockopt 2 and tested with .Xr getsockopt 2 : -.Bl -tag -width .Dv SCTP_SET_PEER_PRIMARY_ADDR +.Bl -tag -width .Dv UDPLITE_SEND_CSCOV .It Dv UDPLITE_SEND_CSCOV This option sets the sender checksum coverage. A value of zero indicates that the entire packet ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r265917 - in stable/10: share/man/man4 sys/dev/bce sys/dev/bxe sys/modules/bce
On Mon, 12 May 2014, Glen Barber wrote: On Mon, May 12, 2014 at 03:52:49PM +, David C Somayajulu wrote: Log: MFC r265703 Modify Copyright information and other strings to reflect Qlogic Corporation's purchase of Broadcom's NetXtreme business. Added clean option to Makefile Modified: stable/10/sys/modules/bce/Makefile == --- stable/10/sys/modules/bce/Makefile Mon May 12 14:46:32 2014 (r265916) +++ stable/10/sys/modules/bce/Makefile Mon May 12 15:52:49 2014 (r265917) @@ -5,4 +5,9 @@ SRCS= opt_bce.h if_bce.c miibus_if.h mii #CFLAGS += -DBCE_DEBUG=0 +clean: + rm -f opt_bdg.h device_if.h bus_if.h pci_if.h export_syms + rm -f *.o *.kld *.ko + rm -f @ machine x86 miibus_if.h miidevs.h opt_bce.h + .include bsd.kmod.mk Shouldn't these be listed in CLEANFILES ? Most of them already do. Most of them are automatically generated, and a small part of this is to put automatically generated files in CLEANFILES. The existence of the clean target is a larger bug. It defeats the default clean target which handles CLEANFILES and other things, but not all of the above. Some of them belong in the cleandir target. That is not defeated. Before this commit, the clean target did: % rm -f export_syms if_bce.ko if_bce.kld if_bce.o opt_bce.h miibus_if.h pci_if.h bus_if.h device_if.h miidevs.h and the cleandir target did this plus: % rm -f @ machine x86 % rm -f .depend GPATH GRTAGS GSYMS GTAGS % if [ -L /usr/src/sys/modules/bce/obj ]; then rm -f /usr/src/sys/modules/bce/obj; fi The new clean target does exactly the same as the old one plus a strict subset of the cleandir target, except: - it adds opt_budgerigar.h (sic), which apparently still is neither generated nor used by bce. - it removes *.o, *.kld and *.ko instead of if_bce.ko if_bce.kld if_bce.o. The default rule is careful to avoid using wildcards so as to not remove anything not generated by the makefile. Removing @, machine and x86 in clean instead of in cleandir is minor breakage. .depend and obj are still not removed in clean. Handling obj in a home made rule would be very difficult, since the obj dir can be almost anywhere (and not named obj) and it might be a directory instead of a symlink. Bruce ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265948 - head/sys/vm
Author: alc
Date: Tue May 13 13:20:23 2014
New Revision: 265948
URL: http://svnweb.freebsd.org/changeset/base/265948
Log:
On a fork allow read-only wired pages to be copy-on-write shared between the
parent and child processes. Previously, we copied these pages even though
they are read only. However, the reason for copying them is historical and
no longer exists. In recent times, vm_map_protect() has developed the
ability to copy pages when write access is added to wired copy-on-write
pages. So, in this case, copy-on-write sharing of wired pages is not to be
feared. It is not going to lead to copy-on-write faults on wired memory.
Reviewed by: kib
MFC after:1 week
Sponsored by: EMC / Isilon Storage Division
Modified:
head/sys/vm/vm_map.c
Modified: head/sys/vm/vm_map.c
==
--- head/sys/vm/vm_map.cTue May 13 06:09:01 2014(r265947)
+++ head/sys/vm/vm_map.cTue May 13 13:20:23 2014(r265948)
@@ -3024,8 +3024,8 @@ vm_map_copy_entry(
if ((dst_entry-eflags|src_entry-eflags) MAP_ENTRY_IS_SUB_MAP)
return;
- if (src_entry-wired_count == 0) {
-
+ if (src_entry-wired_count == 0 ||
+ (src_entry-protection VM_PROT_WRITE) == 0) {
/*
* If the source entry is marked needs_copy, it is already
* write-protected.
@@ -3116,9 +3116,9 @@ vm_map_copy_entry(
dst_entry-end - dst_entry-start, src_entry-start);
} else {
/*
-* Of course, wired down pages can't be set copy-on-write.
-* Cause wired pages to be copied into the new map by
-* simulating faults (the new pages are pageable)
+* We don't want to make writeable wired pages copy-on-write.
+* Immediately copy these pages into the new map by simulating
+* page faults. The new pages are pageable.
*/
vm_fault_copy_entry(dst_map, src_map, dst_entry, src_entry,
fork_charge);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265949 - head/sys/dev/usb/controller
Author: hselasky
Date: Tue May 13 13:46:38 2014
New Revision: 265949
URL: http://svnweb.freebsd.org/changeset/base/265949
Log:
- Isochronous transfers should use the alternate next transfer
descriptor upon receiving a short packet, in host and device mode.
- Correct some comments.
Modified:
head/sys/dev/usb/controller/at91dci.c
head/sys/dev/usb/controller/atmegadci.c
head/sys/dev/usb/controller/avr32dci.c
head/sys/dev/usb/controller/musb_otg.c
head/sys/dev/usb/controller/uss820dci.c
Modified: head/sys/dev/usb/controller/at91dci.c
==
--- head/sys/dev/usb/controller/at91dci.c Tue May 13 13:20:23 2014
(r265948)
+++ head/sys/dev/usb/controller/at91dci.c Tue May 13 13:46:38 2014
(r265949)
@@ -898,7 +898,8 @@ at91dci_setup_standard_chain(struct usb_
temp.td = NULL;
temp.td_next = xfer-td_start[0];
temp.offset = 0;
- temp.setup_alt_next = xfer-flags_int.short_frames_ok;
+ temp.setup_alt_next = xfer-flags_int.short_frames_ok ||
+ xfer-flags_int.isochronous_xfr;
temp.did_stall = !xfer-flags_int.control_stall;
sc = AT9100_DCI_BUS2SC(xfer-xroot-bus);
@@ -1124,7 +1125,8 @@ at91dci_standard_done_sub(struct usb_xfe
}
/* Check for short transfer */
if (len 0) {
- if (xfer-flags_int.short_frames_ok) {
+ if (xfer-flags_int.short_frames_ok ||
+ xfer-flags_int.isochronous_xfr) {
/* follow alt next */
if (td-alt_next) {
td = td-obj_next;
Modified: head/sys/dev/usb/controller/atmegadci.c
==
--- head/sys/dev/usb/controller/atmegadci.c Tue May 13 13:20:23 2014
(r265948)
+++ head/sys/dev/usb/controller/atmegadci.c Tue May 13 13:46:38 2014
(r265949)
@@ -804,7 +804,8 @@ atmegadci_setup_standard_chain(struct us
temp.td = NULL;
temp.td_next = xfer-td_start[0];
temp.offset = 0;
- temp.setup_alt_next = xfer-flags_int.short_frames_ok;
+ temp.setup_alt_next = xfer-flags_int.short_frames_ok ||
+ xfer-flags_int.isochronous_xfr;
temp.did_stall = !xfer-flags_int.control_stall;
sc = ATMEGA_BUS2SC(xfer-xroot-bus);
@@ -1010,7 +1011,8 @@ atmegadci_standard_done_sub(struct usb_x
}
/* Check for short transfer */
if (len 0) {
- if (xfer-flags_int.short_frames_ok) {
+ if (xfer-flags_int.short_frames_ok ||
+ xfer-flags_int.isochronous_xfr) {
/* follow alt next */
if (td-alt_next) {
td = td-obj_next;
@@ -1380,9 +1382,9 @@ atmegadci_do_poll(struct usb_bus *bus)
}
/**
- * at91dci bulk support
- * at91dci control support
- * at91dci interrupt support
+ * atmegadci bulk support
+ * atmegadci control support
+ * atmegadci interrupt support
**/
static void
atmegadci_device_non_isoc_open(struct usb_xfer *xfer)
@@ -1419,7 +1421,7 @@ static const struct usb_pipe_methods atm
};
/**
- * at91dci full speed isochronous support
+ * atmegadci full speed isochronous support
**/
static void
atmegadci_device_isoc_fs_open(struct usb_xfer *xfer)
@@ -1505,7 +1507,7 @@ static const struct usb_pipe_methods atm
};
/**
- * at91dci root control support
+ * atmegadci root control support
**
* Simulate a hardware HUB by handling all the necessary requests.
**/
Modified: head/sys/dev/usb/controller/avr32dci.c
==
--- head/sys/dev/usb/controller/avr32dci.c Tue May 13 13:20:23 2014
(r265948)
+++ head/sys/dev/usb/controller/avr32dci.c Tue May 13 13:46:38 2014
(r265949)
@@ -771,7 +771,8 @@ avr32dci_setup_standard_chain(struct usb
temp.td = NULL;
temp.td_next = xfer-td_start[0];
temp.offset = 0;
- temp.setup_alt_next = xfer-flags_int.short_frames_ok;
+ temp.setup_alt_next = xfer-flags_int.short_frames_ok ||
+ xfer-flags_int.isochronous_xfr;
temp.did_stall = !xfer-flags_int.control_stall;
sc =
svn commit: r265950 - head/sbin/geom/class/eli
Author: thomas Date: Tue May 13 15:46:52 2014 New Revision: 265950 URL: http://svnweb.freebsd.org/changeset/base/265950 Log: Add mention of metadata version 7 in FreeBSD 10.0 Reviewed by: pjd MFC after:1 day Modified: head/sbin/geom/class/eli/geli.8 Modified: head/sbin/geom/class/eli/geli.8 == --- head/sbin/geom/class/eli/geli.8 Tue May 13 13:46:38 2014 (r265949) +++ head/sbin/geom/class/eli/geli.8 Tue May 13 15:46:52 2014 (r265950) @@ -1052,6 +1052,8 @@ metadata version supported by the given .It Li 8.2 Ta 5 .Pp .It Li 9.0 Ta 6 +.Pp +.It Li 10.0 Ta 7 .El .Sh AUTHORS .An Pawel Jakub Dawidek Aq p...@freebsd.org ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265951 - in head: lib/libvmmapi usr.sbin/bhyve
Author: neel
Date: Tue May 13 16:40:27 2014
New Revision: 265951
URL: http://svnweb.freebsd.org/changeset/base/265951
Log:
Don't include the guest memory segments in the bhyve(8) process core dump.
This has not added a lot of value when debugging bhyve issues while greatly
increasing the time and space required to store the core file.
Passing the -C option to bhyve(8) will change the default and dump guest
memory in the core dump.
Requested by: grehan
Reviewed by: grehan
Modified:
head/lib/libvmmapi/vmmapi.c
head/lib/libvmmapi/vmmapi.h
head/usr.sbin/bhyve/bhyve.8
head/usr.sbin/bhyve/bhyverun.c
Modified: head/lib/libvmmapi/vmmapi.c
==
--- head/lib/libvmmapi/vmmapi.c Tue May 13 15:46:52 2014(r265950)
+++ head/lib/libvmmapi/vmmapi.c Tue May 13 16:40:27 2014(r265951)
@@ -57,6 +57,7 @@ struct vmctx {
int fd;
uint32_t lowmem_limit;
enum vm_mmap_style vms;
+ int memflags;
size_t lowmem;
char*lowmem_addr;
size_t highmem;
@@ -101,6 +102,7 @@ vm_open(const char *name)
assert(vm != NULL);
vm-fd = -1;
+ vm-memflags = 0;
vm-lowmem_limit = 3 * GB;
vm-name = (char *)(vm + 1);
strcpy(vm-name, name);
@@ -180,10 +182,17 @@ vm_set_lowmem_limit(struct vmctx *ctx, u
ctx-lowmem_limit = limit;
}
+void
+vm_set_memflags(struct vmctx *ctx, int flags)
+{
+
+ ctx-memflags = flags;
+}
+
static int
setup_memory_segment(struct vmctx *ctx, vm_paddr_t gpa, size_t len, char
**addr)
{
- int error;
+ int error, mmap_flags;
struct vm_memory_segment seg;
/*
@@ -195,8 +204,11 @@ setup_memory_segment(struct vmctx *ctx,
seg.len = len;
error = ioctl(ctx-fd, VM_MAP_MEMORY, seg);
if (error == 0 addr != NULL) {
- *addr = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED,
- ctx-fd, gpa);
+ mmap_flags = MAP_SHARED;
+ if ((ctx-memflags VM_MEM_F_INCORE) == 0)
+ mmap_flags |= MAP_NOCORE;
+ *addr = mmap(NULL, len, PROT_READ | PROT_WRITE, mmap_flags,
+ ctx-fd, gpa);
}
return (error);
}
Modified: head/lib/libvmmapi/vmmapi.h
==
--- head/lib/libvmmapi/vmmapi.h Tue May 13 15:46:52 2014(r265950)
+++ head/lib/libvmmapi/vmmapi.h Tue May 13 16:40:27 2014(r265951)
@@ -42,6 +42,8 @@ enum vm_mmap_style {
VM_MMAP_SPARSE, /* mappings created on-demand */
};
+#defineVM_MEM_F_INCORE 0x01/* include guest memory in core file */
+
intvm_create(const char *name);
struct vmctx *vm_open(const char *name);
void vm_destroy(struct vmctx *ctx);
@@ -53,6 +55,7 @@ void *vm_map_gpa(struct vmctx *ctx, vm_p
intvm_get_gpa_pmap(struct vmctx *, uint64_t gpa, uint64_t *pte, int *num);
uint32_t vm_get_lowmem_limit(struct vmctx *ctx);
void vm_set_lowmem_limit(struct vmctx *ctx, uint32_t limit);
+void vm_set_memflags(struct vmctx *ctx, int flags);
intvm_set_desc(struct vmctx *ctx, int vcpu, int reg,
uint64_t base, uint32_t limit, uint32_t access);
intvm_get_desc(struct vmctx *ctx, int vcpu, int reg,
Modified: head/usr.sbin/bhyve/bhyve.8
==
--- head/usr.sbin/bhyve/bhyve.8 Tue May 13 15:46:52 2014(r265950)
+++ head/usr.sbin/bhyve/bhyve.8 Tue May 13 16:40:27 2014(r265951)
@@ -32,7 +32,7 @@
.Nd run a guest operating system inside a virtual machine
.Sh SYNOPSIS
.Nm
-.Op Fl aehwxAHPW
+.Op Fl aehwxACHPW
.Op Fl c Ar numcpus
.Op Fl g Ar gdbport
.Op Fl p Ar vcpu:hostcpu
@@ -70,6 +70,8 @@ guests.
.It Fl c Ar numcpus
Number of guest virtual CPUs.
The default is 1 and the maximum is 16.
+.It Fl C
+Include guest memory in core file.
.It Fl H
Yield the virtual CPU thread when a HLT instruction is detected.
If this option is not specified, virtual CPUs will use 100% of a host CPU.
Modified: head/usr.sbin/bhyve/bhyverun.c
==
--- head/usr.sbin/bhyve/bhyverun.c Tue May 13 15:46:52 2014
(r265950)
+++ head/usr.sbin/bhyve/bhyverun.c Tue May 13 16:40:27 2014
(r265951)
@@ -134,6 +134,7 @@ usage(int code)
-A: create an ACPI table\n
-g: gdb port\n
-c: # cpus (default 1)\n
+ -C: include guest memory in core file\n
-p: pin 'vcpu' to 'hostcpu'\n
-H: vmexit from the guest on hlt\n
-P: vmexit from the guest on pause\n
@@ -642,19 +643,20 @@ int
main(int argc, char *argv[])
{
int c, error, gdb_port, err, bvmcons;
- int
svn commit: r265952 - in stable/10/sys: conf powerpc/aim powerpc/booke powerpc/mpc85xx powerpc/powerpc
Author: ian
Date: Tue May 13 16:50:10 2014
New Revision: 265952
URL: http://svnweb.freebsd.org/changeset/base/265952
Log:
MFC r256792, r256793, r256799 (by nwhitehorn): Unify AIM and booke code.
Added:
stable/10/sys/powerpc/powerpc/clock.c
- copied unchanged from r256793, head/sys/powerpc/powerpc/clock.c
stable/10/sys/powerpc/powerpc/nexus.c
- copied unchanged from r256799, head/sys/powerpc/powerpc/nexus.c
stable/10/sys/powerpc/powerpc/vm_machdep.c
- copied unchanged from r256792, head/sys/powerpc/powerpc/vm_machdep.c
Deleted:
stable/10/sys/powerpc/aim/clock.c
stable/10/sys/powerpc/aim/nexus.c
stable/10/sys/powerpc/aim/vm_machdep.c
stable/10/sys/powerpc/booke/clock.c
stable/10/sys/powerpc/booke/vm_machdep.c
stable/10/sys/powerpc/mpc85xx/nexus.c
Modified:
stable/10/sys/conf/files.powerpc
stable/10/sys/powerpc/aim/machdep.c
Modified: stable/10/sys/conf/files.powerpc
==
--- stable/10/sys/conf/files.powerpcTue May 13 16:40:27 2014
(r265951)
+++ stable/10/sys/conf/files.powerpcTue May 13 16:50:10 2014
(r265952)
@@ -88,7 +88,6 @@ libkern/qdivrem.c optionalpowerpc
libkern/ucmpdi2.c optionalpowerpc
libkern/udivdi3.c optionalpowerpc
libkern/umoddi3.c optionalpowerpc
-powerpc/aim/clock.coptionalaim
powerpc/aim/copyinout.coptionalaim
powerpc/aim/interrupt.coptionalaim
powerpc/aim/locore.S optionalaim no-obj
@@ -98,14 +97,11 @@ powerpc/aim/mmu_oea64.c optionalaim
powerpc/aim/moea64_if.moptionalaim
powerpc/aim/moea64_native.coptionalaim
powerpc/aim/mp_cpudep.coptionalaim
-powerpc/aim/nexus.coptionalaim
powerpc/aim/slb.c optionalaim powerpc64
powerpc/aim/swtch32.S optionalaim powerpc
powerpc/aim/swtch64.S optionalaim powerpc64
powerpc/aim/trap.c optionalaim
powerpc/aim/uma_machdep.c optionalaim
-powerpc/aim/vm_machdep.c optionalaim
-powerpc/booke/clock.c optionalbooke
powerpc/booke/copyinout.c optionalbooke
powerpc/booke/interrupt.c optionalbooke
powerpc/booke/locore.S optionalbooke no-obj
@@ -116,7 +112,6 @@ powerpc/booke/platform_bare.c optionalm
powerpc/booke/pmap.c optionalbooke
powerpc/booke/swtch.S optionalbooke
powerpc/booke/trap.c optionalbooke
-powerpc/booke/vm_machdep.c optionalbooke
powerpc/cpufreq/dfs.c optionalcpufreq
powerpc/cpufreq/pcr.c optionalcpufreq aim
powerpc/cpufreq/pmufreq.c optionalcpufreq aim pmu
@@ -141,7 +136,6 @@ powerpc/mpc85xx/i2c.c optionaliicbus f
powerpc/mpc85xx/isa.c optionalmpc85xx isa
powerpc/mpc85xx/lbc.c optionalmpc85xx
powerpc/mpc85xx/mpc85xx.c optionalmpc85xx
-powerpc/mpc85xx/nexus.coptionalmpc85xx
powerpc/mpc85xx/pci_fdt.c optionalpci mpc85xx
powerpc/ofw/ofw_cpu.c optionalaim
powerpc/ofw/ofw_machdep.c standard
@@ -184,6 +178,7 @@ powerpc/powerpc/autoconf.c standard
powerpc/powerpc/bcopy.cstandard
powerpc/powerpc/bus_machdep.c standard
powerpc/powerpc/busdma_machdep.c standard
+powerpc/powerpc/clock.cstandard
powerpc/powerpc/copystr.c standard
powerpc/powerpc/cpu.c standard
powerpc/powerpc/db_disasm.coptionalddb
@@ -203,6 +198,7 @@ powerpc/powerpc/iommu_if.m standard
powerpc/powerpc/mem.c optionalmem
powerpc/powerpc/mmu_if.m standard
powerpc/powerpc/mp_machdep.c optionalsmp
+powerpc/powerpc/nexus.cstandard
powerpc/powerpc/openpic.c standard
powerpc/powerpc/openpic_fdt.c optionalfdt
powerpc/powerpc/pic_if.m standard
@@ -218,6 +214,7 @@ powerpc/powerpc/suswintr.c standard
powerpc/powerpc/syncicache.c standard
powerpc/powerpc/sys_machdep.c standard
powerpc/powerpc/uio_machdep.c standard
+powerpc/powerpc/vm_machdep.c standard
powerpc/ps3/ehci_ps3.c optionalps3 ehci
powerpc/ps3/ohci_ps3.c optionalps3 ohci
powerpc/ps3/if_glc.c optionalps3 glc
Modified: stable/10/sys/powerpc/aim/machdep.c
==
--- stable/10/sys/powerpc/aim/machdep.c Tue May 13 16:40:27 2014
(r265951)
+++ stable/10/sys/powerpc/aim/machdep.c Tue May 13 16:50:10 2014
(r265952)
@@ -647,14 +647,6 @@ cpu_flush_dcache(void *ptr, size_t len)
/* TBD */
}
-void
-cpu_initclocks(void)
-{
-
-
svn commit: r265953 - stable/10/sys/dev/fdt
Author: ian Date: Tue May 13 16:52:21 2014 New Revision: 265953 URL: http://svnweb.freebsd.org/changeset/base/265953 Log: MFC r256798: Return BUS_PROBE_NOWILDCARD from fdtbus_probe. Modified: stable/10/sys/dev/fdt/fdtbus.c Modified: stable/10/sys/dev/fdt/fdtbus.c == --- stable/10/sys/dev/fdt/fdtbus.c Tue May 13 16:50:10 2014 (r265952) +++ stable/10/sys/dev/fdt/fdtbus.c Tue May 13 16:52:21 2014 (r265953) @@ -161,7 +161,7 @@ fdtbus_probe(device_t dev) device_set_desc(dev, FDT main bus); if (!bootverbose) device_quiet(dev); - return (BUS_PROBE_DEFAULT); + return (BUS_PROBE_NOWILDCARD); } static int ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265954 - in stable/10/sys: dev/ofw powerpc/booke powerpc/ofw powerpc/powerpc
Author: ian
Date: Tue May 13 16:59:50 2014
New Revision: 265954
URL: http://svnweb.freebsd.org/changeset/base/265954
Log:
MFC r256814, r256816, r256818, r256846, r256855, r256864 (by nwhitehorn):
- Handle 2GB of ram
- Allow the OFW interrupt mapping code to work with PCI devices not
enumerated by Open Firmware, as in the case of FDT.
- Provide an interface for PCI bus drivers that need some of ofw_pci's
metadata during attach.
- Use standard ofw_bus helpers instead of reinventing the wheel.
- Make hard-wired TLB allocations be at minimum one page.
Modified:
stable/10/sys/dev/ofw/ofw_bus_subr.c
stable/10/sys/powerpc/booke/machdep.c
stable/10/sys/powerpc/booke/pmap.c
stable/10/sys/powerpc/ofw/ofw_pci.c
stable/10/sys/powerpc/ofw/ofw_pci.h
stable/10/sys/powerpc/ofw/ofw_pcib_pci.c
stable/10/sys/powerpc/ofw/ofw_pcibus.c
stable/10/sys/powerpc/powerpc/clock.c
stable/10/sys/powerpc/powerpc/nexus.c
Modified: stable/10/sys/dev/ofw/ofw_bus_subr.c
==
--- stable/10/sys/dev/ofw/ofw_bus_subr.cTue May 13 16:52:21 2014
(r265953)
+++ stable/10/sys/dev/ofw/ofw_bus_subr.cTue May 13 16:59:50 2014
(r265954)
@@ -223,7 +223,6 @@ ofw_bus_has_prop(device_t dev, const cha
return (OF_hasprop(node, propname));
}
-#ifndef FDT
void
ofw_bus_setup_iinfo(phandle_t node, struct ofw_bus_iinfo *ii, int intrsz)
{
@@ -261,9 +260,11 @@ ofw_bus_lookup_imap(phandle_t node, stru
KASSERT(regsz = ii-opi_addrc,
(ofw_bus_lookup_imap: register size too small: %d %d,
regsz, ii-opi_addrc));
- rv = OF_getprop(node, reg, reg, regsz);
- if (rv regsz)
- panic(ofw_bus_lookup_imap: could not get reg property);
+ if (node != -1) {
+ rv = OF_getprop(node, reg, reg, regsz);
+ if (rv regsz)
+ panic(ofw_bus_lookup_imap: cannot get reg property);
+ }
return (ofw_bus_search_intrmap(pintr, pintrsz, reg, ii-opi_addrc,
ii-opi_imap, ii-opi_imapsz, ii-opi_imapmsk, maskbuf, mintr,
mintrsz, iparent));
@@ -343,4 +344,4 @@ ofw_bus_search_intrmap(void *intr, int i
}
return (0);
}
-#endif /* !FDT */
+
Modified: stable/10/sys/powerpc/booke/machdep.c
==
--- stable/10/sys/powerpc/booke/machdep.c Tue May 13 16:52:21 2014
(r265953)
+++ stable/10/sys/powerpc/booke/machdep.c Tue May 13 16:59:50 2014
(r265954)
@@ -192,7 +192,8 @@ extern int elf32_nxstack;
static void
cpu_booke_startup(void *dummy)
{
- int indx, size;
+ int indx;
+ unsigned long size;
/* Initialise the decrementer-based clock. */
decr_init();
@@ -200,7 +201,7 @@ cpu_booke_startup(void *dummy)
/* Good {morning,afternoon,evening,night}. */
cpu_setup(PCPU_GET(cpuid));
- printf(real memory = %ld (%ld MB)\n, ptoa(physmem),
+ printf(real memory = %lu (%ld MB)\n, ptoa(physmem),
ptoa(physmem) / 1048576);
realmem = physmem;
@@ -210,7 +211,7 @@ cpu_booke_startup(void *dummy)
for (indx = 0; phys_avail[indx + 1] != 0; indx += 2) {
size = phys_avail[indx + 1] - phys_avail[indx];
- printf(0x%08x - 0x%08x, %d bytes (%ld pages)\n,
+ printf(0x%08x - 0x%08x, %lu bytes (%lu pages)\n,
phys_avail[indx], phys_avail[indx + 1] - 1,
size, size / PAGE_SIZE);
}
@@ -218,7 +219,7 @@ cpu_booke_startup(void *dummy)
vm_ksubmap_init(kmi);
- printf(avail memory = %ld (%ld MB)\n, ptoa(cnt.v_free_count),
+ printf(avail memory = %lu (%ld MB)\n, ptoa(cnt.v_free_count),
ptoa(cnt.v_free_count) / 1048576);
/* Set up buffers, so they can be used to read disk labels. */
Modified: stable/10/sys/powerpc/booke/pmap.c
==
--- stable/10/sys/powerpc/booke/pmap.c Tue May 13 16:52:21 2014
(r265953)
+++ stable/10/sys/powerpc/booke/pmap.c Tue May 13 16:59:50 2014
(r265954)
@@ -2613,6 +2613,8 @@ mmu_booke_mapdev(mmu_t mmu, vm_paddr_t p
va = (pa = 0x8000) ? pa : (0xe200 + pa);
res = (void *)va;
+ if (size PAGE_SIZE)
+ size = PAGE_SIZE;
do {
sz = 1 (ilog2(size) ~1);
Modified: stable/10/sys/powerpc/ofw/ofw_pci.c
==
--- stable/10/sys/powerpc/ofw/ofw_pci.c Tue May 13 16:52:21 2014
(r265953)
+++ stable/10/sys/powerpc/ofw/ofw_pci.c Tue May 13 16:59:50 2014
(r265954)
@@ -124,7 +124,7 @@ static device_method_t ofw_pci_methods[]
DEFINE_CLASS_0(ofw_pci, ofw_pci_driver, ofw_pci_methods, 0);
svn commit: r265955 - stable/9/sys/netinet
Author: tuexen Date: Tue May 13 17:01:22 2014 New Revision: 265955 URL: http://svnweb.freebsd.org/changeset/base/265955 Log: MFC r253472: Get the code compiling without INET and INET6 being defined. This is not possible in FreeBSD, but in the upstream code. Modified: stable/9/sys/netinet/sctp_output.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/netinet/sctp_output.c == --- stable/9/sys/netinet/sctp_output.c Tue May 13 16:59:50 2014 (r265954) +++ stable/9/sys/netinet/sctp_output.c Tue May 13 17:01:22 2014 (r265955) @@ -4543,11 +4543,7 @@ sctp_send_initiate(struct sctp_inpcb *in struct mbuf *m; struct sctp_nets *net; struct sctp_init_chunk *init; - -#if defined(INET) || defined(INET6) struct sctp_supported_addr_param *sup_addr; - -#endif struct sctp_adaptation_layer_indication *ali; struct sctp_supported_chunk_types_param *pr_supported; struct sctp_paramhdr *ph; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265956 - stable/9/sys/netinet
Author: tuexen
Date: Tue May 13 17:03:43 2014
New Revision: 265956
URL: http://svnweb.freebsd.org/changeset/base/265956
Log:
MFC r253493:
Allow the code to be compiled without warnings for any combination
of INET, INET6 and SCTP_DEBUG defines.
The issue was reported by Lally Singh.
Modified:
stable/9/sys/netinet/sctp_asconf.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/netinet/sctp_asconf.c
==
--- stable/9/sys/netinet/sctp_asconf.c Tue May 13 17:01:22 2014
(r265955)
+++ stable/9/sys/netinet/sctp_asconf.c Tue May 13 17:03:43 2014
(r265956)
@@ -1191,7 +1191,6 @@ sctp_asconf_queue_mgmt(struct sctp_tcb *
uint16_t type)
{
struct sctp_asconf_addr *aa, *aa_next;
- struct sockaddr *sa;
/* make sure the request isn't already in the queue */
TAILQ_FOREACH_SAFE(aa, stcb-asoc.asconf_queue, next, aa_next) {
@@ -1255,7 +1254,6 @@ sctp_asconf_queue_mgmt(struct sctp_tcb *
struct sockaddr_in6 *sin6;
sin6 = (struct sockaddr_in6 *)ifa-address.sa;
- sa = (struct sockaddr *)sin6;
aa-ap.addrp.ph.param_type = SCTP_IPV6_ADDRESS;
aa-ap.addrp.ph.param_length = (sizeof(struct
sctp_ipv6addr_param));
aa-ap.aph.ph.param_length = sizeof(struct
sctp_asconf_paramhdr) +
@@ -1271,7 +1269,6 @@ sctp_asconf_queue_mgmt(struct sctp_tcb *
struct sockaddr_in *sin;
sin = (struct sockaddr_in *)ifa-address.sa;
- sa = (struct sockaddr *)sin;
aa-ap.addrp.ph.param_type = SCTP_IPV4_ADDRESS;
aa-ap.addrp.ph.param_length = (sizeof(struct
sctp_ipv4addr_param));
aa-ap.aph.ph.param_length = sizeof(struct
sctp_asconf_paramhdr) +
@@ -1294,13 +1291,13 @@ sctp_asconf_queue_mgmt(struct sctp_tcb *
if (SCTP_BASE_SYSCTL(sctp_debug_on) SCTP_DEBUG_ASCONF2) {
if (type == SCTP_ADD_IP_ADDRESS) {
SCTP_PRINTF(asconf_queue_mgmt: inserted asconf
ADD_IP_ADDRESS: );
- SCTPDBG_ADDR(SCTP_DEBUG_ASCONF2, sa);
+ SCTPDBG_ADDR(SCTP_DEBUG_ASCONF2, ifa-address.sa);
} else if (type == SCTP_DEL_IP_ADDRESS) {
SCTP_PRINTF(asconf_queue_mgmt: appended asconf
DEL_IP_ADDRESS: );
- SCTPDBG_ADDR(SCTP_DEBUG_ASCONF2, sa);
+ SCTPDBG_ADDR(SCTP_DEBUG_ASCONF2, ifa-address.sa);
} else {
SCTP_PRINTF(asconf_queue_mgmt: appended asconf
SET_PRIM_ADDR: );
- SCTPDBG_ADDR(SCTP_DEBUG_ASCONF2, sa);
+ SCTPDBG_ADDR(SCTP_DEBUG_ASCONF2, ifa-address.sa);
}
}
#endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265957 - stable/9/sys/netinet
Author: tuexen
Date: Tue May 13 17:05:38 2014
New Revision: 265957
URL: http://svnweb.freebsd.org/changeset/base/265957
Log:
MFC r253858:
Micro-optimization suggested in
https://bugzilla.mozilla.org/show_bug.cgi?id=898234
by pchang9. While there simplify the code.
Modified:
stable/9/sys/netinet/sctp_usrreq.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/netinet/sctp_usrreq.c
==
--- stable/9/sys/netinet/sctp_usrreq.c Tue May 13 17:03:43 2014
(r265956)
+++ stable/9/sys/netinet/sctp_usrreq.c Tue May 13 17:05:38 2014
(r265957)
@@ -3942,7 +3942,6 @@ sctp_setopt(struct socket *so, int optna
sctp_hmaclist_t *hmaclist;
uint16_t hmacid;
uint32_t i;
- size_t found;
SCTP_CHECK_AND_CAST(shmac, optval, struct
sctp_hmacalgo, optsize);
if (optsize sizeof(struct sctp_hmacalgo) +
shmac-shmac_number_of_idents * sizeof(uint16_t)) {
@@ -3966,14 +3965,14 @@ sctp_setopt(struct socket *so, int optna
goto sctp_set_hmac_done;
}
}
- found = 0;
for (i = 0; i hmaclist-num_algo; i++) {
if (hmaclist-hmac[i] ==
SCTP_AUTH_HMAC_ID_SHA1) {
/* already in list */
- found = 1;
+ break;
}
}
- if (!found) {
+ if (i == hmaclist-num_algo) {
+ /* not found in list */
sctp_free_hmaclist(hmaclist);
SCTP_LTRACE_ERR_RET(inp, NULL, NULL,
SCTP_FROM_SCTP_USRREQ, EINVAL);
error = EINVAL;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265958 - stable/9/sys/netinet
Author: tuexen
Date: Tue May 13 17:09:50 2014
New Revision: 265958
URL: http://svnweb.freebsd.org/changeset/base/265958
Log:
MFC r254248, r254670:
Make the features a 64-bit value instead of 32-bit.
This will allow an easier integration of the support
for NDATA.
While there, do also some minor cleanups.
Obtained from:rrs@
Make also the features of the association 64-bit.
When exporting to xinpcb, just export the lower
32-bit. Using there also 64-bits will break the
ABI and will be committed separetly.
Modified:
stable/9/sys/netinet/sctp.h
stable/9/sys/netinet/sctp_indata.c
stable/9/sys/netinet/sctp_output.c
stable/9/sys/netinet/sctp_pcb.h
stable/9/sys/netinet/sctp_structs.h
stable/9/sys/netinet/sctp_sysctl.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/netinet/sctp.h
==
--- stable/9/sys/netinet/sctp.h Tue May 13 17:05:38 2014(r265957)
+++ stable/9/sys/netinet/sctp.h Tue May 13 17:09:50 2014(r265958)
@@ -425,7 +425,7 @@ struct sctp_error_unrecognized_chunk {
/* RFC4895 */
#define SCTP_AUTHENTICATION 0x0f
/* EY nr_sack chunk id*/
-#define SCTP_NR_SELECTIVE_ACK 0x10
+#define SCTP_NR_SELECTIVE_ACK 0x10
/0x40 series ***/
/0x80 series ***/
/* RFC5061 */
@@ -509,38 +509,38 @@ struct sctp_error_unrecognized_chunk {
/*
* PCB Features (in sctp_features bitmask)
*/
-#define SCTP_PCB_FLAGS_DO_NOT_PMTUD 0x0001
-#define SCTP_PCB_FLAGS_EXT_RCVINFO 0x0002/* deprecated */
-#define SCTP_PCB_FLAGS_DONOT_HEARTBEAT 0x0004
-#define SCTP_PCB_FLAGS_FRAG_INTERLEAVE 0x0008
-#define SCTP_PCB_FLAGS_INTERLEAVE_STRMS 0x0010
-#define SCTP_PCB_FLAGS_DO_ASCONF 0x0020
-#define SCTP_PCB_FLAGS_AUTO_ASCONF 0x0040
-#define SCTP_PCB_FLAGS_ZERO_COPY_ACTIVE 0x0080
+#define SCTP_PCB_FLAGS_DO_NOT_PMTUD 0x0001
+#define SCTP_PCB_FLAGS_EXT_RCVINFO 0x0002/* deprecated */
+#define SCTP_PCB_FLAGS_DONOT_HEARTBEAT 0x0004
+#define SCTP_PCB_FLAGS_FRAG_INTERLEAVE 0x0008
+#define SCTP_PCB_FLAGS_INTERLEAVE_STRMS 0x0010
+#define SCTP_PCB_FLAGS_DO_ASCONF 0x0020
+#define SCTP_PCB_FLAGS_AUTO_ASCONF 0x0040
+#define SCTP_PCB_FLAGS_ZERO_COPY_ACTIVE 0x0080
/* socket options */
-#define SCTP_PCB_FLAGS_NODELAY 0x0100
-#define SCTP_PCB_FLAGS_AUTOCLOSE 0x0200
-#define SCTP_PCB_FLAGS_RECVDATAIOEVNT0x0400/* deprecated */
-#define SCTP_PCB_FLAGS_RECVASSOCEVNT 0x0800
-#define SCTP_PCB_FLAGS_RECVPADDREVNT 0x1000
-#define SCTP_PCB_FLAGS_RECVPEERERR 0x2000
-#define SCTP_PCB_FLAGS_RECVSENDFAILEVNT 0x4000/* deprecated */
-#define SCTP_PCB_FLAGS_RECVSHUTDOWNEVNT 0x8000
-#define SCTP_PCB_FLAGS_ADAPTATIONEVNT0x0001
-#define SCTP_PCB_FLAGS_PDAPIEVNT 0x0002
-#define SCTP_PCB_FLAGS_AUTHEVNT 0x0004
-#define SCTP_PCB_FLAGS_STREAM_RESETEVNT 0x0008
-#define SCTP_PCB_FLAGS_NO_FRAGMENT 0x0010
-#define SCTP_PCB_FLAGS_EXPLICIT_EOR 0x0040
-#define SCTP_PCB_FLAGS_NEEDS_MAPPED_V4 0x0080
-#define SCTP_PCB_FLAGS_MULTIPLE_ASCONFS 0x0100
-#define SCTP_PCB_FLAGS_PORTREUSE 0x0200
-#define SCTP_PCB_FLAGS_DRYEVNT 0x0400
-#define SCTP_PCB_FLAGS_RECVRCVINFO 0x0800
-#define SCTP_PCB_FLAGS_RECVNXTINFO 0x1000
-#define SCTP_PCB_FLAGS_ASSOC_RESETEVNT 0x2000
-#define SCTP_PCB_FLAGS_STREAM_CHANGEEVNT 0x4000
-#define SCTP_PCB_FLAGS_RECVNSENDFAILEVNT 0x8000
+#define SCTP_PCB_FLAGS_NODELAY 0x0100
+#define SCTP_PCB_FLAGS_AUTOCLOSE 0x0200
+#define SCTP_PCB_FLAGS_RECVDATAIOEVNT0x0400/* deprecated */
+#define SCTP_PCB_FLAGS_RECVASSOCEVNT 0x0800
+#define SCTP_PCB_FLAGS_RECVPADDREVNT 0x1000
+#define SCTP_PCB_FLAGS_RECVPEERERR 0x2000
+#define SCTP_PCB_FLAGS_RECVSENDFAILEVNT 0x4000/* deprecated */
+#define SCTP_PCB_FLAGS_RECVSHUTDOWNEVNT 0x8000
+#define SCTP_PCB_FLAGS_ADAPTATIONEVNT0x0001
+#define SCTP_PCB_FLAGS_PDAPIEVNT 0x0002
+#define SCTP_PCB_FLAGS_AUTHEVNT 0x0004
+#define SCTP_PCB_FLAGS_STREAM_RESETEVNT 0x0008
+#define SCTP_PCB_FLAGS_NO_FRAGMENT 0x0010
+#define SCTP_PCB_FLAGS_EXPLICIT_EOR 0x0040
+#define SCTP_PCB_FLAGS_NEEDS_MAPPED_V4 0x0080
+#define SCTP_PCB_FLAGS_MULTIPLE_ASCONFS 0x0100
+#define SCTP_PCB_FLAGS_PORTREUSE 0x0200
+#define SCTP_PCB_FLAGS_DRYEVNT 0x0400
+#define SCTP_PCB_FLAGS_RECVRCVINFO 0x0800
+#define SCTP_PCB_FLAGS_RECVNXTINFO 0x1000
svn commit: r265959 - in stable/10/sys: conf dev/cfi dev/fdt dev/ofw powerpc/mambo powerpc/ofw powerpc/powermac powerpc/powerpc
Author: ian
Date: Tue May 13 17:12:07 2014
New Revision: 265959
URL: http://svnweb.freebsd.org/changeset/base/265959
Log:
MFC r256870, r256898, r256899, r256900 (by nwhitehorn):
Standards-conformance and code deduplication:
- Use bus reference phandles in place of FDT offsets as IRQ domain keys
- Unify the identical macio/fdt/mambo OpenPIC drivers into one
- Be more forgiving (following ePAPR) about what we need from the device
tree to identify an OpenPIC
- Correctly map all IRQs into an interrupt domain
- Set IRQ_*_CONFORM for interrupts on an unknown PIC type instead of
failing attachment for that device.
Allow lots of interrupts (useful on multi-domain platforms) and do not
set device_quiet() on all devices attached under nexus(4).
Added:
stable/10/sys/powerpc/ofw/openpic_ofw.c
- copied unchanged from r256898, head/sys/powerpc/ofw/openpic_ofw.c
Deleted:
stable/10/sys/powerpc/mambo/mambo_openpic.c
stable/10/sys/powerpc/powermac/openpic_macio.c
stable/10/sys/powerpc/powerpc/openpic_fdt.c
Modified:
stable/10/sys/conf/files.powerpc
stable/10/sys/dev/cfi/cfi_bus_nexus.c
stable/10/sys/dev/fdt/fdt_common.c
stable/10/sys/dev/fdt/fdt_pci.c
stable/10/sys/dev/fdt/fdt_powerpc.c
stable/10/sys/dev/fdt/fdtbus.c
stable/10/sys/dev/ofw/ofw_fdt.c
Modified: stable/10/sys/conf/files.powerpc
==
--- stable/10/sys/conf/files.powerpcTue May 13 17:09:50 2014
(r265958)
+++ stable/10/sys/conf/files.powerpcTue May 13 17:12:07 2014
(r265959)
@@ -128,7 +128,6 @@ powerpc/mambo/mambocall.S optionalmambo
powerpc/mambo/mambo.c optionalmambo
powerpc/mambo/mambo_console.c optionalmambo
powerpc/mambo/mambo_disk.c optionalmambo
-powerpc/mambo/mambo_openpic.c optionalmambo
powerpc/mpc85xx/atpic.coptionalmpc85xx isa
powerpc/mpc85xx/ds1553_bus_fdt.c optionalds1553 fdt
powerpc/mpc85xx/ds1553_core.c optionalds1553
@@ -147,6 +146,7 @@ powerpc/ofw/ofw_syscons.c optionalsc ai
powerpc/ofw/ofwcall32.Soptionalaim powerpc
powerpc/ofw/ofwcall64.Soptionalaim powerpc64
powerpc/ofw/ofwmagic.S optionalaim
+powerpc/ofw/openpic_ofw.c optionalaim | fdt
powerpc/ofw/rtas.c optionalaim
powerpc/powermac/ata_kauai.c optionalpowermac ata | powermac atamacio
powerpc/powermac/ata_macio.c optionalpowermac ata | powermac atamacio
@@ -162,7 +162,6 @@ powerpc/powermac/kiic.c optionalpowerm
powerpc/powermac/macgpio.c optionalpowermac pci
powerpc/powermac/macio.c optionalpowermac pci
powerpc/powermac/nvbl.coptionalpowermac nvbl
-powerpc/powermac/openpic_macio.c optional powermac pci
powerpc/powermac/platform_powermac.c optional powermac
powerpc/powermac/powermac_thermal.c optional powermac
powerpc/powermac/pswitch.c optionalpowermac pswitch
@@ -200,7 +199,6 @@ powerpc/powerpc/mmu_if.mstandard
powerpc/powerpc/mp_machdep.c optionalsmp
powerpc/powerpc/nexus.cstandard
powerpc/powerpc/openpic.c standard
-powerpc/powerpc/openpic_fdt.c optionalfdt
powerpc/powerpc/pic_if.m standard
powerpc/powerpc/pmap_dispatch.cstandard
powerpc/powerpc/platform.c standard
Modified: stable/10/sys/dev/cfi/cfi_bus_nexus.c
==
--- stable/10/sys/dev/cfi/cfi_bus_nexus.c Tue May 13 17:09:50 2014
(r265958)
+++ stable/10/sys/dev/cfi/cfi_bus_nexus.c Tue May 13 17:12:07 2014
(r265959)
@@ -50,14 +50,25 @@ __FBSDID($FreeBSD$);
static int
cfi_nexus_probe(device_t dev)
{
+ return (BUS_PROBE_NOWILDCARD);
+}
+
+static int
+cfi_nexus_attach(device_t dev)
+{
+ int error;
+
+ error = cfi_probe(dev);
+ if (error != 0)
+ return (error);
- return cfi_probe(dev);
+ return cfi_attach(dev);
}
static device_method_t cfi_nexus_methods[] = {
/* device interface */
DEVMETHOD(device_probe, cfi_nexus_probe),
- DEVMETHOD(device_attach,cfi_attach),
+ DEVMETHOD(device_attach,cfi_nexus_attach),
DEVMETHOD(device_detach,cfi_detach),
{0, 0}
Modified: stable/10/sys/dev/fdt/fdt_common.c
==
--- stable/10/sys/dev/fdt/fdt_common.c Tue May 13 17:09:50 2014
(r265958)
+++ stable/10/sys/dev/fdt/fdt_common.c Tue May 13 17:12:07 2014
(r265959)
@@ -478,21 +478,31 @@ fdt_intr_decode(phandle_t intr_parent, p
int *trig, int *pol)
{
fdt_pic_decode_t intr_decode;
+ phandle_t intr_offset;
int i, rv;
+
svn commit: r265960 - stable/10/sys/powerpc/powerpc
Author: ian
Date: Tue May 13 17:18:48 2014
New Revision: 265960
URL: http://svnweb.freebsd.org/changeset/base/265960
Log:
MFC r256901, r256914 (by nwhitehorn):
Catch up on 6 years of improvements in Open Firmware nexus devices by
importing the sparc64 one. At least 90% of this code is MI and will be
moved into /sys/dev/ofw at some point in the future.
Ignore registers on devices where the reg property is malformed. Issue a
warning if this happens under bootverbose. This prevents some
strange-looking entries in dmesg for SMU devices on Apple G5 systems.
Modified:
stable/10/sys/powerpc/powerpc/nexus.c
Modified: stable/10/sys/powerpc/powerpc/nexus.c
==
--- stable/10/sys/powerpc/powerpc/nexus.c Tue May 13 17:12:07 2014
(r265959)
+++ stable/10/sys/powerpc/powerpc/nexus.c Tue May 13 17:18:48 2014
(r265960)
@@ -1,5 +1,8 @@
/*-
* Copyright 1998 Massachusetts Institute of Technology
+ * Copyright 2001 by Thomas Moestl t...@freebsd.org.
+ * Copyright 2006 by Marius Strobl mar...@freebsd.org.
+ * All rights reserved.
*
* Permission to use, copy, modify, and distribute this software and
* its documentation for any purpose and without fee is hereby
@@ -25,30 +28,6 @@
* 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.
- */
-/*-
- * Copyright 2001 by Thomas Moestl t...@freebsd.org. 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
*
* from: FreeBSD: src/sys/i386/i386/nexus.c,v 1.43 2001/02/09
*/
@@ -58,81 +37,71 @@ __FBSDID($FreeBSD$);
#include sys/param.h
#include sys/systm.h
-#include sys/module.h
#include sys/bus.h
-#include sys/cons.h
#include sys/kernel.h
#include sys/malloc.h
+#include sys/module.h
+#include sys/pcpu.h
+#include sys/rman.h
+
+#include vm/vm.h
+#include vm/pmap.h
#include dev/ofw/ofw_bus.h
#include dev/ofw/ofw_bus_subr.h
#include dev/ofw/openfirm.h
#include machine/bus.h
-#include machine/frame.h
#include machine/intr_machdep.h
#include machine/resource.h
-#include sys/rman.h
-
-#include ofw_bus_if.h
-#include pic_if.h
-
/*
* The nexus (which is a pseudo-bus actually) iterates over the nodes that
- * exist in Open Firmware and adds them as devices to this bus so that drivers
- * can be attached to them.
+ * hang from the Open Firmware root node and adds them as devices to this bus
+ * (except some special nodes which are excluded) so that drivers can be
+ * attached to them.
+ *
+ * Additionally, interrupt setup/teardown and some resource management are
+ * done at this level.
*
* Maybe this code should get into dev/ofw to some extent, as some of it should
* work for all Open Firmware based machines...
*/
-static MALLOC_DEFINE(M_NEXUS, nexus, nexus device information);
-
struct nexus_devinfo {
- struct ofw_bus_devinfo ndi_ofwinfo;
+ struct ofw_bus_devinfo ndi_obdinfo;
+ struct resource_listndi_rl;
};
struct nexus_softc {
- struct rman sc_rman;
+ uint32_tacells, scells;
+ struct rman sc_intr_rman;
+ struct rman sc_mem_rman;
};
-/*
- * Device interface
- */
-static int nexus_probe(device_t);
-static int nexus_attach(device_t);
-
-/*
- * Bus interface
- */
-static device_t nexus_add_child(device_t, u_int, const char *, int);
-static voidnexus_probe_nomatch(device_t, device_t);
+static device_probe_t nexus_probe;
+static device_attach_t nexus_attach;
+static bus_print_child_t nexus_print_child;
+static bus_add_child_t nexus_add_child;
+static bus_probe_nomatch_t
svn commit: r265961 - stable/9/sys/netinet
Author: tuexen
Date: Tue May 13 17:18:59 2014
New Revision: 265961
URL: http://svnweb.freebsd.org/changeset/base/265961
Log:
MFC r255160:
All changes affect only SCTP-AUTH:
* Remove non working code related to SHA224.
* Remove support for non-standardised HMAC-IDs using SHA384 and SHA512.
* Prefer SHA256 over SHA1.
* Minor cleanup.
Modified:
stable/9/sys/netinet/sctp_auth.c
stable/9/sys/netinet/sctp_auth.h
stable/9/sys/netinet/sctp_os_bsd.h
stable/9/sys/netinet/sctp_uio.h
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/netinet/sctp_auth.c
==
--- stable/9/sys/netinet/sctp_auth.cTue May 13 17:18:48 2014
(r265960)
+++ stable/9/sys/netinet/sctp_auth.cTue May 13 17:18:59 2014
(r265961)
@@ -703,15 +703,7 @@ sctp_auth_add_hmacid(sctp_hmaclist_t * l
return (-1);
}
if ((hmac_id != SCTP_AUTH_HMAC_ID_SHA1)
-#ifdef HAVE_SHA224
- (hmac_id != SCTP_AUTH_HMAC_ID_SHA224)
-#endif
-#ifdef HAVE_SHA2
- (hmac_id != SCTP_AUTH_HMAC_ID_SHA256)
- (hmac_id != SCTP_AUTH_HMAC_ID_SHA384)
- (hmac_id != SCTP_AUTH_HMAC_ID_SHA512)
-#endif
- 1) {
+ (hmac_id != SCTP_AUTH_HMAC_ID_SHA256)) {
return (-1);
}
/* Now is it already in the list */
@@ -754,8 +746,9 @@ sctp_default_supported_hmaclist(void)
new_list = sctp_alloc_hmaclist(2);
if (new_list == NULL)
return (NULL);
- (void)sctp_auth_add_hmacid(new_list, SCTP_AUTH_HMAC_ID_SHA1);
+ /* We prefer SHA256, so list it first */
(void)sctp_auth_add_hmacid(new_list, SCTP_AUTH_HMAC_ID_SHA256);
+ (void)sctp_auth_add_hmacid(new_list, SCTP_AUTH_HMAC_ID_SHA1);
return (new_list);
}
@@ -811,19 +804,13 @@ int
sctp_verify_hmac_param(struct sctp_auth_hmac_algo *hmacs, uint32_t num_hmacs)
{
uint32_t i;
- uint16_t hmac_id;
- uint32_t sha1_supported = 0;
for (i = 0; i num_hmacs; i++) {
- hmac_id = ntohs(hmacs-hmac_ids[i]);
- if (hmac_id == SCTP_AUTH_HMAC_ID_SHA1)
- sha1_supported = 1;
+ if (ntohs(hmacs-hmac_ids[i]) == SCTP_AUTH_HMAC_ID_SHA1) {
+ return (0);
+ }
}
- /* all HMAC id's are supported */
- if (sha1_supported == 0)
- return (-1);
- else
- return (0);
+ return (-1);
}
sctp_authinfo_t *
@@ -877,18 +864,8 @@ sctp_get_hmac_digest_len(uint16_t hmac_a
switch (hmac_algo) {
case SCTP_AUTH_HMAC_ID_SHA1:
return (SCTP_AUTH_DIGEST_LEN_SHA1);
-#ifdef HAVE_SHA224
- case SCTP_AUTH_HMAC_ID_SHA224:
- return (SCTP_AUTH_DIGEST_LEN_SHA224);
-#endif
-#ifdef HAVE_SHA2
case SCTP_AUTH_HMAC_ID_SHA256:
return (SCTP_AUTH_DIGEST_LEN_SHA256);
- case SCTP_AUTH_HMAC_ID_SHA384:
- return (SCTP_AUTH_DIGEST_LEN_SHA384);
- case SCTP_AUTH_HMAC_ID_SHA512:
- return (SCTP_AUTH_DIGEST_LEN_SHA512);
-#endif
default:
/* unknown HMAC algorithm: can't do anything */
return (0);
@@ -900,17 +877,9 @@ sctp_get_hmac_block_len(uint16_t hmac_al
{
switch (hmac_algo) {
case SCTP_AUTH_HMAC_ID_SHA1:
-#ifdef HAVE_SHA224
- case SCTP_AUTH_HMAC_ID_SHA224:
-#endif
return (64);
-#ifdef HAVE_SHA2
case SCTP_AUTH_HMAC_ID_SHA256:
return (64);
- case SCTP_AUTH_HMAC_ID_SHA384:
- case SCTP_AUTH_HMAC_ID_SHA512:
- return (128);
-#endif
case SCTP_AUTH_HMAC_ID_RSVD:
default:
/* unknown HMAC algorithm: can't do anything */
@@ -923,23 +892,11 @@ sctp_hmac_init(uint16_t hmac_algo, sctp_
{
switch (hmac_algo) {
case SCTP_AUTH_HMAC_ID_SHA1:
- SHA1_Init(ctx-sha1);
- break;
-#ifdef HAVE_SHA224
- case SCTP_AUTH_HMAC_ID_SHA224:
+ SCTP_SHA1_INIT(ctx-sha1);
break;
-#endif
-#ifdef HAVE_SHA2
case SCTP_AUTH_HMAC_ID_SHA256:
- SHA256_Init(ctx-sha256);
- break;
- case SCTP_AUTH_HMAC_ID_SHA384:
- SHA384_Init(ctx-sha384);
+ SCTP_SHA256_INIT(ctx-sha256);
break;
- case SCTP_AUTH_HMAC_ID_SHA512:
- SHA512_Init(ctx-sha512);
- break;
-#endif
case SCTP_AUTH_HMAC_ID_RSVD:
default:
/* unknown HMAC algorithm: can't do anything */
@@ -953,23 +910,11 @@ sctp_hmac_update(uint16_t hmac_algo, sct
{
switch (hmac_algo) {
case SCTP_AUTH_HMAC_ID_SHA1:
- SHA1_Update(ctx-sha1, text, textlen);
+ SCTP_SHA1_UPDATE(ctx-sha1, text, textlen);
break;
-#ifdef HAVE_SHA224
- case SCTP_AUTH_HMAC_ID_SHA224:
-
svn commit: r265962 - stable/9/sys/netinet
Author: tuexen Date: Tue May 13 17:21:45 2014 New Revision: 265962 URL: http://svnweb.freebsd.org/changeset/base/265962 Log: MFC r255162: Use uint16_t instead of in_port_t for consistency with the SCTP code. Modified: stable/9/sys/netinet/sctp_output.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/netinet/sctp_output.c == --- stable/9/sys/netinet/sctp_output.c Tue May 13 17:18:59 2014 (r265961) +++ stable/9/sys/netinet/sctp_output.c Tue May 13 17:21:45 2014 (r265962) @@ -3561,7 +3561,7 @@ sctp_process_cmsgs_for_init(struct sctp_ static struct sctp_tcb * sctp_findassociation_cmsgs(struct sctp_inpcb **inp_p, -in_port_t port, +uint16_t port, struct mbuf *control, struct sctp_nets **net_p, int *error) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265963 - stable/9/sys/netinet
Author: tuexen
Date: Tue May 13 17:23:39 2014
New Revision: 265963
URL: http://svnweb.freebsd.org/changeset/base/265963
Log:
MFC r255190:
Remove redundant field pr_sctp_on.
Modified:
stable/9/sys/netinet/sctp_indata.c
stable/9/sys/netinet/sctp_output.c
stable/9/sys/netinet/sctp_structs.h
stable/9/sys/netinet/sctp_timer.c
stable/9/sys/netinet/sctputil.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/netinet/sctp_indata.c
==
--- stable/9/sys/netinet/sctp_indata.c Tue May 13 17:21:45 2014
(r265962)
+++ stable/9/sys/netinet/sctp_indata.c Tue May 13 17:23:39 2014
(r265963)
@@ -4718,7 +4718,7 @@ sctp_handle_sack(struct mbuf *m, int off
}
}
TAILQ_REMOVE(asoc-sent_queue, tp1, sctp_next);
- if (tp1-pr_sctp_on) {
+ if (PR_SCTP_ENABLED(tp1-flags)) {
if (asoc-pr_sctp_cnt != 0)
asoc-pr_sctp_cnt--;
}
Modified: stable/9/sys/netinet/sctp_output.c
==
--- stable/9/sys/netinet/sctp_output.c Tue May 13 17:21:45 2014
(r265962)
+++ stable/9/sys/netinet/sctp_output.c Tue May 13 17:23:39 2014
(r265963)
@@ -6067,7 +6067,6 @@ sctp_get_frag_point(struct sctp_tcb *stc
static void
sctp_set_prsctp_policy(struct sctp_stream_queue_pending *sp)
{
- sp-pr_sctp_on = 0;
/*
* We assume that the user wants PR_SCTP_TTL if the user provides a
* positive lifetime but does not specify any PR_SCTP policy. This
@@ -6077,7 +6076,6 @@ sctp_set_prsctp_policy(struct sctp_strea
*/
if (PR_SCTP_ENABLED(sp-sinfo_flags)) {
sp-act_flags |= PR_SCTP_POLICY(sp-sinfo_flags);
- sp-pr_sctp_on = 1;
} else {
return;
}
@@ -7425,13 +7423,8 @@ dont_do_it:
}
chk-send_size += pads;
}
- /* We only re-set the policy if it is on */
- if (sp-pr_sctp_on) {
- sctp_set_prsctp_policy(sp);
+ if (PR_SCTP_ENABLED(chk-flags)) {
asoc-pr_sctp_cnt++;
- chk-pr_sctp_on = 1;
- } else {
- chk-pr_sctp_on = 0;
}
if (sp-msg_is_complete (sp-length == 0) (sp-sender_all_done)) {
/* All done pull and kill the message */
Modified: stable/9/sys/netinet/sctp_structs.h
==
--- stable/9/sys/netinet/sctp_structs.h Tue May 13 17:21:45 2014
(r265962)
+++ stable/9/sys/netinet/sctp_structs.h Tue May 13 17:23:39 2014
(r265963)
@@ -446,7 +446,6 @@ struct sctp_tmit_chunk {
uint8_t do_rtt;
uint8_t book_size_scale;
uint8_t no_fr_allowed;
- uint8_t pr_sctp_on;
uint8_t copy_by_ref;
uint8_t window_probe;
};
@@ -522,7 +521,6 @@ struct sctp_stream_queue_pending {
uint8_t holds_key_ref;
uint8_t msg_is_complete;
uint8_t some_taken;
- uint8_t pr_sctp_on;
uint8_t sender_all_done;
uint8_t put_last_out;
uint8_t discard_rest;
Modified: stable/9/sys/netinet/sctp_timer.c
==
--- stable/9/sys/netinet/sctp_timer.c Tue May 13 17:21:45 2014
(r265962)
+++ stable/9/sys/netinet/sctp_timer.c Tue May 13 17:23:39 2014
(r265963)
@@ -446,7 +446,7 @@ sctp_recover_sent_list(struct sctp_tcb *
}
}
TAILQ_REMOVE(asoc-sent_queue, chk, sctp_next);
- if (chk-pr_sctp_on) {
+ if (PR_SCTP_ENABLED(chk-flags)) {
if (asoc-pr_sctp_cnt != 0)
asoc-pr_sctp_cnt--;
}
Modified: stable/9/sys/netinet/sctputil.c
==
--- stable/9/sys/netinet/sctputil.c Tue May 13 17:21:45 2014
(r265962)
+++ stable/9/sys/netinet/sctputil.c Tue May 13 17:23:39 2014
(r265963)
@@ -4833,7 +4833,6 @@ sctp_release_pr_sctp_chunk(struct sctp_t
atomic_add_int(chk-whoTo-ref_count, 1);
chk-rec.data.TSN_seq =
atomic_fetchadd_int(stcb-asoc.sending_seq, 1);
stcb-asoc.pr_sctp_cnt++;
- chk-pr_sctp_on = 1;
TAILQ_INSERT_TAIL(stcb-asoc.sent_queue, chk,
sctp_next);
stcb-asoc.sent_queue_cnt++;
stcb-asoc.pr_sctp_cnt++;
___
svn-src-all@freebsd.org mailing list
svn commit: r265964 - stable/9/sys/netinet
Author: tuexen
Date: Tue May 13 17:25:39 2014
New Revision: 265964
URL: http://svnweb.freebsd.org/changeset/base/265964
Log:
MFC r255337:
When computing the partial delivery point, take the
receiver socket buffer size correctly into account.
Modified:
stable/9/sys/netinet/sctp_indata.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/netinet/sctp_indata.c
==
--- stable/9/sys/netinet/sctp_indata.c Tue May 13 17:23:39 2014
(r265963)
+++ stable/9/sys/netinet/sctp_indata.c Tue May 13 17:25:39 2014
(r265964)
@@ -789,13 +789,12 @@ doit_again:
* but should we?
*/
if (stcb-sctp_socket) {
- pd_point =
min(SCTP_SB_LIMIT_RCV(stcb-sctp_socket),
+ pd_point =
min(SCTP_SB_LIMIT_RCV(stcb-sctp_socket) SCTP_PARTIAL_DELIVERY_SHIFT,
stcb-sctp_ep-partial_delivery_point);
} else {
pd_point =
stcb-sctp_ep-partial_delivery_point;
}
if (sctp_is_all_msg_on_reasm(asoc, tsize) || (tsize =
pd_point)) {
-
/*
* Yes, we setup to start reception, by
* backing down the TSN just in case we
@@ -2491,7 +2490,7 @@ doit_again:
* delivery queue and something can be delivered.
*/
if (stcb-sctp_socket) {
- pd_point = min(SCTP_SB_LIMIT_RCV(stcb-sctp_socket),
+ pd_point = min(SCTP_SB_LIMIT_RCV(stcb-sctp_socket)
SCTP_PARTIAL_DELIVERY_SHIFT,
stcb-sctp_ep-partial_delivery_point);
} else {
pd_point = stcb-sctp_ep-partial_delivery_point;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265965 - stable/9/lib/libc/net
Author: tuexen
Date: Tue May 13 17:41:39 2014
New Revision: 265965
URL: http://svnweb.freebsd.org/changeset/base/265965
Log:
MFC r255695:
Remove an unused variable and fix a memory leak in sctp_connectx().
Modified:
stable/9/lib/libc/net/sctp_sys_calls.c
Directory Properties:
stable/9/lib/ (props changed)
stable/9/lib/libc/ (props changed)
Modified: stable/9/lib/libc/net/sctp_sys_calls.c
==
--- stable/9/lib/libc/net/sctp_sys_calls.c Tue May 13 17:25:39 2014
(r265964)
+++ stable/9/lib/libc/net/sctp_sys_calls.c Tue May 13 17:41:39 2014
(r265965)
@@ -101,10 +101,10 @@ sctp_connectx(int sd, const struct socka
sctp_assoc_t * id)
{
char *buf;
- int i, ret, cnt, *aa;
+ int i, ret, *aa;
char *cpto;
const struct sockaddr *at;
- size_t len = sizeof(int);
+ size_t len;
/* validate the address count and list */
if ((addrs == NULL) || (addrcnt = 0)) {
@@ -115,8 +115,8 @@ sctp_connectx(int sd, const struct socka
errno = E2BIG;
return (-1);
}
+ len = sizeof(int);
at = addrs;
- cnt = 0;
cpto = buf + sizeof(int);
/* validate all the addresses and get the size */
for (i = 0; i addrcnt; i++) {
@@ -161,6 +161,7 @@ sctp_connectx(int sd, const struct socka
if ((ret == 0) (id != NULL)) {
*id = *(sctp_assoc_t *) buf;
}
+ free(buf);
return (ret);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265967 - in stable/10/sys: arm/mv dev/fdt dev/ofw powerpc/powerpc
Author: ian
Date: Tue May 13 17:59:17 2014
New Revision: 265967
URL: http://svnweb.freebsd.org/changeset/base/265967
Log:
MFC r256932, r256938, r256966, r256953, r256967, r256969, r257015:
Add a new function (OF_getencprop()) that undoes the transformation applied
by encode-int. Specifically, it takes a set of 32-bit cell values and
changes them to host byte order. Most non-string instances of OF_getprop()
should be using this function, which is a no-op on big-endian platforms.
Use the new function all over the place.
Modified:
stable/10/sys/arm/mv/gpio.c
stable/10/sys/dev/fdt/fdt_common.c
stable/10/sys/dev/fdt/fdt_pci.c
stable/10/sys/dev/fdt/simplebus.c
stable/10/sys/dev/ofw/ofw_bus_subr.c
stable/10/sys/dev/ofw/ofw_console.c
stable/10/sys/dev/ofw/ofw_fdt.c
stable/10/sys/dev/ofw/ofw_iicbus.c
stable/10/sys/dev/ofw/openfirm.c
stable/10/sys/powerpc/powerpc/nexus.c
Modified: stable/10/sys/arm/mv/gpio.c
==
--- stable/10/sys/arm/mv/gpio.c Tue May 13 17:51:15 2014(r265966)
+++ stable/10/sys/arm/mv/gpio.c Tue May 13 17:59:17 2014(r265967)
@@ -605,7 +605,6 @@ int
platform_gpio_init(void)
{
phandle_t child, parent, root, ctrl;
- ihandle_t ctrl_ihandle;
pcell_t gpios[MAX_PINS_PER_NODE * GPIOS_PROP_CELLS];
struct gpio_ctrl_entry *e;
int len, rv;
@@ -639,9 +638,7 @@ platform_gpio_init(void)
* contain a ref. to a node defining GPIO
* controller.
*/
- ctrl_ihandle = (ihandle_t)gpios[0];
- ctrl_ihandle = fdt32_to_cpu(ctrl_ihandle);
- ctrl = OF_instance_to_package(ctrl_ihandle);
+ ctrl = OF_xref_phandle(fdt32_to_cpu(gpios[0]));
if (fdt_is_compatible(ctrl, e-compat))
/* Call a handler. */
Modified: stable/10/sys/dev/fdt/fdt_common.c
==
--- stable/10/sys/dev/fdt/fdt_common.c Tue May 13 17:51:15 2014
(r265966)
+++ stable/10/sys/dev/fdt/fdt_common.c Tue May 13 17:59:17 2014
(r265967)
@@ -523,7 +523,7 @@ fdt_intr_to_rl(phandle_t node, struct re
/*
* Find #interrupt-cells of the interrupt domain.
*/
- if (OF_getprop(node, interrupt-parent, iph, sizeof(iph)) = 0) {
+ if (OF_getencprop(node, interrupt-parent, iph, sizeof(iph)) = 0) {
debugf(no intr-parent phandle\n);
intr_par = OF_parent(node);
} else {
@@ -583,7 +583,7 @@ fdt_get_phyaddr(phandle_t node, device_t
uint32_t i;
device_t parent, child;
- if (OF_getprop(node, phy-handle, (void *)phy_handle,
+ if (OF_getencprop(node, phy-handle, (void *)phy_handle,
sizeof(phy_handle)) = 0)
return (ENXIO);
Modified: stable/10/sys/dev/fdt/fdt_pci.c
==
--- stable/10/sys/dev/fdt/fdt_pci.c Tue May 13 17:51:15 2014
(r265966)
+++ stable/10/sys/dev/fdt/fdt_pci.c Tue May 13 17:59:17 2014
(r265967)
@@ -258,7 +258,7 @@ fdt_pci_route_intr(int bus, int slot, in
struct fdt_pci_intr *intr_info, int *interrupt)
{
pcell_t child_spec[4], masked[4];
- ihandle_t iph;
+ phandle_t iph;
pcell_t intr_par;
pcell_t *map_ptr;
uint32_t addr;
@@ -283,7 +283,7 @@ fdt_pci_route_intr(int bus, int slot, in
i = 0;
while (i map_len) {
iph = fdt32_to_cpu(map_ptr[par_idx]);
- intr_par = OF_instance_to_package(iph);
+ intr_par = OF_xref_phandle(iph);
err = fdt_addr_cells(intr_par, par_addr_cells);
if (err != 0) {
Modified: stable/10/sys/dev/fdt/simplebus.c
==
--- stable/10/sys/dev/fdt/simplebus.c Tue May 13 17:51:15 2014
(r265966)
+++ stable/10/sys/dev/fdt/simplebus.c Tue May 13 17:59:17 2014
(r265967)
@@ -339,8 +339,7 @@ simplebus_get_interrupt_parent(device_t
struct simplebus_devinfo *di;
struct fdt_ic *ic;
device_t ip;
- ihandle_t iph;
- phandle_t ph;
+ phandle_t ph, iph;
ip = NULL;
@@ -348,10 +347,9 @@ simplebus_get_interrupt_parent(device_t
if (di == NULL)
return (NULL);
- if (OF_getprop(di-di_ofw.obd_node, interrupt-parent, iph,
+ if (OF_getencprop(di-di_ofw.obd_node, interrupt-parent, iph,
sizeof(iph)) 0) {
- iph = fdt32_to_cpu(iph);
- ph = OF_instance_to_package(iph);
+ ph = OF_xref_phandle(iph);
SLIST_FOREACH(ic,
svn commit: r265968 - stable/10/sys/powerpc/booke
Author: ian
Date: Tue May 13 18:00:41 2014
New Revision: 265968
URL: http://svnweb.freebsd.org/changeset/base/265968
Log:
MFC r256973, r256974
If the device tree directly contains the timebase frequency, use it. This
property is required by ePAPR, but maintain the fallback to bus-frequency
for compatibility. Allow 32 or 64 bits.
Modified:
stable/10/sys/powerpc/booke/platform_bare.c
Modified: stable/10/sys/powerpc/booke/platform_bare.c
==
--- stable/10/sys/powerpc/booke/platform_bare.c Tue May 13 17:59:17 2014
(r265967)
+++ stable/10/sys/powerpc/booke/platform_bare.c Tue May 13 18:00:41 2014
(r265968)
@@ -188,6 +188,25 @@ bare_timebase_freq(platform_t plat, stru
if ((child = OF_child(cpus)) == 0)
goto out;
+ switch (OF_getproplen(child, timebase-frequency)) {
+ case 4:
+ {
+ uint32_t tbase;
+ OF_getprop(child, timebase-frequency, tbase, sizeof(tbase));
+ ticks = tbase;
+ return (ticks);
+ }
+ case 8:
+ {
+ uint64_t tbase;
+ OF_getprop(child, timebase-frequency, tbase, sizeof(tbase));
+ ticks = tbase;
+ return (ticks);
+ }
+ default:
+ break;
+ }
+
freq = 0;
if (OF_getprop(child, bus-frequency, (void *)freq,
sizeof(freq)) = 0)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265969 - in stable/10/sys: conf dev/fdt dev/ofw powerpc/include powerpc/mpc85xx powerpc/ofw powerpc/powerpc powerpc/pseries
Author: ian
Date: Tue May 13 18:06:26 2014
New Revision: 265969
URL: http://svnweb.freebsd.org/changeset/base/265969
Log:
MFC r256994, r257016, r257055, r257059, r257060, r257075
Add two new interfaces to ofw_bus:
- ofw_bus_map_intr()
Maps an (iparent, IRQ) tuple to a system-global interrupt number in some
platform dependent way. This is meant to be implemented as a replacement
for [FDT_]MAP_IRQ() that is an MI interface that knows about the bus
hierarchy.
- ofw_bus_config_intr()
Configures an interrupt (previously mapped) based on firmware sense flags.
This replaces manual interpretation of the sense field in bus drivers and
will, in a follow-up, allow that interpretation to be redirected to the
PIC
drivers where it belongs. This will eventually replace the tables in
/sys/dev/fdt/fdt_ARCH.c
The PowerPC/AIM code has been converted to use these globally, with an
implementation in terms of MAP_IRQ() and powerpc_config_intr(), assuming
OpenPIC, at the bus root in nexus(4). The ofw_bus_config_intr() will shortly
be integrated into pic_if.m and bounced through nexus into the PIC tree.
Factor out MI portions of the PowerPC nexus device into /sys/dev/ofw. The
sparc64 driver will be modified to use this shortly.
Allow PIC drivers to translate firmware sense codes for themselves. This
is designed to replace the tables in dev/fdt/fdt_ARCH.c, but will not
happen quite yet.
Do not map IRQs twice. This fixes PowerPC/FDT systems with multiple PICs,
which would try to treat the previously-mapped interrupts from
fdt_decode_intr() as interrupt line numbers on the same parent PIC.
Remove some of the code required for supporting ssm(4) on SPARC in favor
of a more PowerPC/FDT-focused design. Whenever SPARC64 is integrated
into this rework, this should be (trivially) revisited.
Added:
stable/10/sys/dev/ofw/ofw_nexus.c
- copied, changed from r257016, head/sys/dev/ofw/ofw_nexus.c
stable/10/sys/dev/ofw/ofw_nexus.h
- copied unchanged from r257016, head/sys/dev/ofw/ofw_nexus.h
Modified:
stable/10/sys/conf/files.powerpc
stable/10/sys/dev/fdt/fdt_common.c
stable/10/sys/dev/ofw/ofw_bus.h
stable/10/sys/dev/ofw/ofw_bus_if.m
stable/10/sys/powerpc/include/intr_machdep.h
stable/10/sys/powerpc/mpc85xx/atpic.c
stable/10/sys/powerpc/ofw/ofw_pci.c
stable/10/sys/powerpc/ofw/ofw_pcib_pci.c
stable/10/sys/powerpc/ofw/ofw_pcibus.c
stable/10/sys/powerpc/ofw/openpic_ofw.c
stable/10/sys/powerpc/powerpc/intr_machdep.c
stable/10/sys/powerpc/powerpc/nexus.c
stable/10/sys/powerpc/powerpc/pic_if.m
stable/10/sys/powerpc/pseries/vdevice.c
Modified: stable/10/sys/conf/files.powerpc
==
--- stable/10/sys/conf/files.powerpcTue May 13 18:00:41 2014
(r265968)
+++ stable/10/sys/conf/files.powerpcTue May 13 18:06:26 2014
(r265969)
@@ -48,6 +48,7 @@ dev/ofw/ofw_bus_subr.coptionalaim
dev/ofw/ofw_console.c optionalaim
dev/ofw/ofw_disk.c optionalofwd aim
dev/ofw/ofw_iicbus.c optionaliicbus aim
+dev/ofw/ofw_nexus.coptionalaim | fdt
dev/ofw/ofw_standard.c optionalaim powerpc
dev/powermac_nvram/powermac_nvram.c optional powermac_nvram powermac
dev/quicc/quicc_bfe_fdt.c optionalquicc mpc85xx
Modified: stable/10/sys/dev/fdt/fdt_common.c
==
--- stable/10/sys/dev/fdt/fdt_common.c Tue May 13 18:00:41 2014
(r265968)
+++ stable/10/sys/dev/fdt/fdt_common.c Tue May 13 18:06:26 2014
(r265969)
@@ -514,7 +514,7 @@ fdt_intr_to_rl(phandle_t node, struct re
pcell_t *intr;
pcell_t intr_cells;
int interrupt, trig, pol;
- int i, intr_num, irq, rv;
+ int i, intr_num, rv;
if (OF_getproplen(node, interrupts) = 0)
/* Node does not have 'interrupts' property. */
@@ -566,8 +566,7 @@ fdt_intr_to_rl(phandle_t node, struct re
intr_sl[i].trig = trig;
intr_sl[i].pol = pol;
- irq = FDT_MAP_IRQ(iph, interrupt);
- resource_list_add(rl, SYS_RES_IRQ, i, irq, irq, 1);
+ resource_list_add(rl, SYS_RES_IRQ, i, interrupt, interrupt, 1);
}
out:
Modified: stable/10/sys/dev/ofw/ofw_bus.h
==
--- stable/10/sys/dev/ofw/ofw_bus.h Tue May 13 18:00:41 2014
(r265968)
+++ stable/10/sys/dev/ofw/ofw_bus.h Tue May 13 18:06:26 2014
(r265969)
@@ -70,4 +70,16 @@ ofw_bus_get_type(device_t dev)
return (OFW_BUS_GET_TYPE(device_get_parent(dev), dev));
}
+static __inline int
+ofw_bus_map_intr(device_t dev, phandle_t iparent, int irq)
+{
+ return
svn commit: r265970 - stable/10/sys/powerpc/powermac
Author: ian
Date: Tue May 13 18:08:15 2014
New Revision: 265970
URL: http://svnweb.freebsd.org/changeset/base/265970
Log:
MFC r257093:
Be a little more suspicious of thermal sensors, which can have single
crazy readings occasionally. One wild reading should not be enough to
trigger a shutdown, so instead wait for several concerning readings in
a row.
Modified:
stable/10/sys/powerpc/powermac/powermac_thermal.c
Modified: stable/10/sys/powerpc/powermac/powermac_thermal.c
==
--- stable/10/sys/powerpc/powermac/powermac_thermal.c Tue May 13 18:06:26
2014(r265969)
+++ stable/10/sys/powerpc/powermac/powermac_thermal.c Tue May 13 18:08:15
2014(r265970)
@@ -68,6 +68,8 @@ struct pmac_fan_le {
struct pmac_sens_le {
struct pmac_therm *sensor;
int last_val;
+#define MAX_CRITICAL_COUNT 6
+ int critical_count;
SLIST_ENTRY(pmac_sens_le) entries;
};
static SLIST_HEAD(pmac_fans, pmac_fan_le) fans = SLIST_HEAD_INITIALIZER(fans);
@@ -106,14 +108,27 @@ pmac_therm_manage_fans(void)
sensor-last_val = temp;
if (sensor-last_val sensor-sensor-max_temp) {
+ sensor-critical_count++;
printf(WARNING: Current temperature (%s: %d.%d C)
- exceeds critical temperature (%d.%d C)!
- Shutting down!\n, sensor-sensor-name,
- (sensor-last_val - ZERO_C_TO_K) / 10,
- (sensor-last_val - ZERO_C_TO_K) % 10,
- (sensor-sensor-max_temp - ZERO_C_TO_K) / 10,
- (sensor-sensor-max_temp - ZERO_C_TO_K) % 10);
- shutdown_nice(RB_POWEROFF);
+ exceeds critical temperature (%d.%d C);
+ count=%d\n,
+ sensor-sensor-name,
+ (sensor-last_val - ZERO_C_TO_K) / 10,
+ (sensor-last_val - ZERO_C_TO_K) % 10,
+ (sensor-sensor-max_temp - ZERO_C_TO_K) / 10,
+ (sensor-sensor-max_temp - ZERO_C_TO_K) % 10,
+ sensor-critical_count);
+ if (sensor-critical_count = MAX_CRITICAL_COUNT) {
+ printf(WARNING: %s temperature exceeded
+ critical temperature %d times in a row;
+ shutting down!\n,
+ sensor-sensor-name,
+ sensor-critical_count);
+ shutdown_nice(RB_POWEROFF);
+ }
+ } else {
+ if (sensor-critical_count 0)
+ sensor-critical_count--;
}
}
@@ -177,6 +192,8 @@ pmac_thermal_sensor_register(struct pmac
list_entry = malloc(sizeof(struct pmac_sens_le), M_PMACTHERM,
M_ZERO | M_WAITOK);
list_entry-sensor = sensor;
+ list_entry-last_val = 0;
+ list_entry-critical_count = 0;
SLIST_INSERT_HEAD(sensors, list_entry, entries);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265971 - in stable/10/sys: conf dev/fdt dev/ofw
Author: ian
Date: Tue May 13 18:14:31 2014
New Revision: 265971
URL: http://svnweb.freebsd.org/changeset/base/265971
Log:
MFC r257114, r257118
Use common OFW root code to set up fdtbus. This is an almost purely
negative diff that should improve reliability somewhat. There should be
no differences in behavior -- please report any that crop up. This has been
tested on ARM and PPC systems.
Make sure to get the right node when looking up #interrupt-cells.
Modified:
stable/10/sys/conf/files
stable/10/sys/dev/fdt/fdtbus.c
stable/10/sys/dev/ofw/ofw_nexus.c
Modified: stable/10/sys/conf/files
==
--- stable/10/sys/conf/filesTue May 13 18:08:15 2014(r265970)
+++ stable/10/sys/conf/filesTue May 13 18:14:31 2014(r265971)
@@ -1969,6 +1969,7 @@ dev/ofw/ofw_bus_subr.coptional fdt
dev/ofw/ofw_fdt.c optional fdt
dev/ofw/ofw_if.m optional fdt
dev/ofw/ofw_iicbus.c optional fdt iicbus
+dev/ofw/ofw_nexus.coptional fdt
dev/ofw/openfirm.c optional fdt
dev/ofw/openfirmio.c optional fdt
dev/patm/if_patm.c optional patm pci
Modified: stable/10/sys/dev/fdt/fdtbus.c
==
--- stable/10/sys/dev/fdt/fdtbus.c Tue May 13 18:08:15 2014
(r265970)
+++ stable/10/sys/dev/fdt/fdtbus.c Tue May 13 18:14:31 2014
(r265971)
@@ -42,63 +42,20 @@ __FBSDID($FreeBSD$);
#include machine/fdt.h
#include dev/ofw/openfirm.h
+#include dev/ofw/ofw_nexus.h
-#include fdt_common.h
#include ofw_bus_if.h
-#ifdef DEBUG
-#define debugf(fmt, args...) do { printf(%s(): , __func__); \
-printf(fmt,##args); } while (0)
-#else
-#define debugf(fmt, args...)
-#endif
-
-static MALLOC_DEFINE(M_FDTBUS, fdtbus, FDTbus devices information);
-
-struct fdtbus_devinfo {
- phandle_t di_node;
- char*di_name;
- char*di_type;
- char*di_compat;
- struct resource_listdi_res;
-
- /* Interrupts sense-level info for this device */
- struct fdt_sense_level di_intr_sl[DI_MAX_INTR_NUM];
-};
-
-struct fdtbus_softc {
- struct rman sc_irq;
- struct rman sc_mem;
-};
-
/*
* Prototypes.
*/
static void fdtbus_identify(driver_t *, device_t);
static int fdtbus_probe(device_t);
-static int fdtbus_attach(device_t);
-static int fdtbus_print_child(device_t, device_t);
-static struct resource *fdtbus_alloc_resource(device_t, device_t, int,
-int *, u_long, u_long, u_long, u_int);
-static int fdtbus_release_resource(device_t, device_t, int, int,
-struct resource *);
static int fdtbus_activate_resource(device_t, device_t, int, int,
struct resource *);
static int fdtbus_deactivate_resource(device_t, device_t, int, int,
struct resource *);
-static int fdtbus_setup_intr(device_t, device_t, struct resource *, int,
-driver_filter_t *, driver_intr_t *, void *, void **);
-
-static const char *fdtbus_ofw_get_name(device_t, device_t);
-static phandle_t fdtbus_ofw_get_node(device_t, device_t);
-static const char *fdtbus_ofw_get_type(device_t, device_t);
-static const char *fdtbus_ofw_get_compat(device_t, device_t);
-
-/*
- * Local routines.
- */
-static void newbus_device_from_fdt_node(device_t, phandle_t);
/*
* Bus interface definition.
@@ -107,47 +64,26 @@ static device_method_t fdtbus_methods[]
/* Device interface */
DEVMETHOD(device_identify, fdtbus_identify),
DEVMETHOD(device_probe, fdtbus_probe),
- DEVMETHOD(device_attach,fdtbus_attach),
- DEVMETHOD(device_detach,bus_generic_detach),
- DEVMETHOD(device_shutdown, bus_generic_shutdown),
- DEVMETHOD(device_suspend, bus_generic_suspend),
- DEVMETHOD(device_resume,bus_generic_resume),
/* Bus interface */
- DEVMETHOD(bus_print_child, fdtbus_print_child),
- DEVMETHOD(bus_alloc_resource, fdtbus_alloc_resource),
- DEVMETHOD(bus_release_resource, fdtbus_release_resource),
DEVMETHOD(bus_activate_resource, fdtbus_activate_resource),
DEVMETHOD(bus_deactivate_resource, fdtbus_deactivate_resource),
DEVMETHOD(bus_config_intr, bus_generic_config_intr),
- DEVMETHOD(bus_setup_intr, fdtbus_setup_intr),
+ DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
DEVMETHOD(bus_teardown_intr,bus_generic_teardown_intr),
- /* OFW bus interface */
- DEVMETHOD(ofw_bus_get_node, fdtbus_ofw_get_node),
- DEVMETHOD(ofw_bus_get_name, fdtbus_ofw_get_name),
- DEVMETHOD(ofw_bus_get_type, fdtbus_ofw_get_type),
- DEVMETHOD(ofw_bus_get_compat, fdtbus_ofw_get_compat),
-
- { 0, 0 }
-};
-
-static driver_t fdtbus_driver = {
- fdtbus,
-
svn commit: r265966 - stable/9/sys/netinet
Author: tuexen
Date: Tue May 13 17:51:15 2014
New Revision: 265966
URL: http://svnweb.freebsd.org/changeset/base/265966
Log:
MFC r255434:
Fix the aborting of association with the iterator using an empty
user initiated error cause (using SCTP_ABORT|SCTP_SENDALL).
Modified:
stable/9/sys/netinet/sctp_output.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/netinet/sctp_output.c
==
--- stable/9/sys/netinet/sctp_output.c Tue May 13 17:41:39 2014
(r265965)
+++ stable/9/sys/netinet/sctp_output.c Tue May 13 17:51:15 2014
(r265966)
@@ -6412,7 +6412,7 @@ sctp_sendall_iterator(struct sctp_inpcb
/* TSNH */
return;
}
- if ((ca-m) ca-sndlen) {
+ if (ca-sndlen 0) {
m = SCTP_M_COPYM(ca-m, 0, M_COPYALL, M_DONTWAIT);
if (m == NULL) {
/* can't copy so we are done */
@@ -6441,38 +6441,40 @@ sctp_sendall_iterator(struct sctp_inpcb
}
if (ca-sndrcv.sinfo_flags SCTP_ABORT) {
/* Abort this assoc with m as the user defined reason */
- if (m) {
+ if (m != NULL) {
+ SCTP_BUF_PREPEND(m, sizeof(struct sctp_paramhdr),
M_NOWAIT);
+ } else {
+ m = sctp_get_mbuf_for_msg(sizeof(struct sctp_paramhdr),
+ 0, M_NOWAIT, 1, MT_DATA);
+ SCTP_BUF_LEN(m) = sizeof(struct sctp_paramhdr);
+ }
+ if (m != NULL) {
struct sctp_paramhdr *ph;
- SCTP_BUF_PREPEND(m, sizeof(struct sctp_paramhdr),
M_DONTWAIT);
- if (m) {
- ph = mtod(m, struct sctp_paramhdr *);
- ph-param_type =
htons(SCTP_CAUSE_USER_INITIATED_ABT);
- ph-param_length = htons(sizeof(struct
sctp_paramhdr) + ca-sndlen);
- }
- /*
-* We add one here to keep the assoc from
-* dis-appearing on us.
-*/
- atomic_add_int(stcb-asoc.refcnt, 1);
- sctp_abort_an_association(inp, stcb, m,
SCTP_SO_NOT_LOCKED);
- /*
-* sctp_abort_an_association calls sctp_free_asoc()
-* free association will NOT free it since we
-* incremented the refcnt .. we do this to prevent
-* it being freed and things getting tricky since we
-* could end up (from free_asoc) calling inpcb_free
-* which would get a recursive lock call to the
-* iterator lock.. But as a consequence of that the
-* stcb will return to us un-locked.. since
-* free_asoc returns with either no TCB or the TCB
-* unlocked, we must relock.. to unlock in the
-* iterator timer :-0
-*/
- SCTP_TCB_LOCK(stcb);
- atomic_add_int(stcb-asoc.refcnt, -1);
- goto no_chunk_output;
+ ph = mtod(m, struct sctp_paramhdr *);
+ ph-param_type = htons(SCTP_CAUSE_USER_INITIATED_ABT);
+ ph-param_length = htons(sizeof(struct sctp_paramhdr) +
ca-sndlen);
}
+ /*
+* We add one here to keep the assoc from dis-appearing on
+* us.
+*/
+ atomic_add_int(stcb-asoc.refcnt, 1);
+ sctp_abort_an_association(inp, stcb, m, SCTP_SO_NOT_LOCKED);
+ /*
+* sctp_abort_an_association calls sctp_free_asoc() free
+* association will NOT free it since we incremented the
+* refcnt .. we do this to prevent it being freed and things
+* getting tricky since we could end up (from free_asoc)
+* calling inpcb_free which would get a recursive lock call
+* to the iterator lock.. But as a consequence of that the
+* stcb will return to us un-locked.. since free_asoc
+* returns with either no TCB or the TCB unlocked, we must
+* relock.. to unlock in the iterator timer :-0
+*/
+ SCTP_TCB_LOCK(stcb);
+ atomic_add_int(stcb-asoc.refcnt, -1);
+ goto no_chunk_output;
} else {
if (m) {
ret = sctp_msg_append(stcb, net, m,
@@ -6566,8 +6568,7 @@ sctp_sendall_iterator(struct sctp_inpcb
if ((sctp_is_feature_off(inp, SCTP_PCB_FLAGS_NODELAY))
svn commit: r265972 - in stable/10/sys: conf powerpc/include powerpc/mpc85xx powerpc/powerpc
Author: ian Date: Tue May 13 18:24:02 2014 New Revision: 265972 URL: http://svnweb.freebsd.org/changeset/base/265972 Log: MFC r257115, r257116, r257117 Remove dead and duplicated code. Added: stable/10/sys/powerpc/mpc85xx/pci_mpc85xx.c - copied unchanged from r257117, head/sys/powerpc/mpc85xx/pci_mpc85xx.c Deleted: stable/10/sys/powerpc/mpc85xx/pci_fdt.c Modified: stable/10/sys/conf/files.powerpc stable/10/sys/powerpc/include/psl.h stable/10/sys/powerpc/powerpc/exec_machdep.c stable/10/sys/powerpc/powerpc/genassym.c Modified: stable/10/sys/conf/files.powerpc == --- stable/10/sys/conf/files.powerpcTue May 13 18:14:31 2014 (r265971) +++ stable/10/sys/conf/files.powerpcTue May 13 18:24:02 2014 (r265972) @@ -136,12 +136,12 @@ powerpc/mpc85xx/i2c.c optionaliicbus f powerpc/mpc85xx/isa.c optionalmpc85xx isa powerpc/mpc85xx/lbc.c optionalmpc85xx powerpc/mpc85xx/mpc85xx.c optionalmpc85xx -powerpc/mpc85xx/pci_fdt.c optionalpci mpc85xx +powerpc/mpc85xx/pci_mpc85xx.c optionalpci mpc85xx powerpc/ofw/ofw_cpu.c optionalaim powerpc/ofw/ofw_machdep.c standard -powerpc/ofw/ofw_pci.c optionalpci aim -powerpc/ofw/ofw_pcibus.c optionalpci aim -powerpc/ofw/ofw_pcib_pci.c optionalpci aim +powerpc/ofw/ofw_pci.c optionalpci +powerpc/ofw/ofw_pcibus.c optionalpci +powerpc/ofw/ofw_pcib_pci.c optionalpci powerpc/ofw/ofw_real.c optionalaim powerpc/ofw/ofw_syscons.c optionalsc aim powerpc/ofw/ofwcall32.Soptionalaim powerpc Modified: stable/10/sys/powerpc/include/psl.h == --- stable/10/sys/powerpc/include/psl.h Tue May 13 18:14:31 2014 (r265971) +++ stable/10/sys/powerpc/include/psl.h Tue May 13 18:24:02 2014 (r265972) @@ -35,96 +35,44 @@ #ifndef_MACHINE_PSL_H_ #define_MACHINE_PSL_H_ -#if defined(BOOKE_E500) /* - * Machine State Register (MSR) - e500 core - * - * The PowerPC e500 does not implement the following bits: - * - * FP, FE0, FE1 - reserved, always cleared, setting has no effect. - * + * Machine State Register (MSR) - All cores */ +#definePSL_VEC 0x0200UL/* AltiVec/SPE vector unit available */ +#definePSL_EE 0x8000UL/* external interrupt enable */ +#definePSL_PR 0x4000UL/* privilege mode (1 == user) */ +#definePSL_FP 0x2000UL/* floating point enable */ +#definePSL_ME 0x1000UL/* machine check enable */ +#definePSL_FE0 0x0800UL/* floating point interrupt mode 0 */ +#definePSL_BE 0x0200UL/* branch trace enable */ +#definePSL_FE1 0x0100UL/* floating point interrupt mode 1 */ +#definePSL_PMM 0x0004UL/* performance monitor mark */ + +/* Machine State Register - Book-E cores */ #define PSL_UCLE 0x0400UL/* User mode cache lock enable */ -#define PSL_SPE0x0200UL/* SPE enable */ #define PSL_WE 0x0004UL/* Wait state enable */ #define PSL_CE 0x0002UL/* Critical interrupt enable */ -#define PSL_EE 0x8000UL/* External interrupt enable */ -#define PSL_PR 0x4000UL/* User mode */ -#define PSL_FP 0x2000UL/* Floating point available */ -#define PSL_ME 0x1000UL/* Machine check interrupt enable */ -#define PSL_FE00x0800UL/* Floating point exception mode 0 */ -#define PSL_UBLE 0x0400UL/* BTB lock enable */ +#define PSL_UBLE 0x0400UL/* BTB lock enable - e500 only */ +#define PSL_DWE0x0400UL/* Debug Wait Enable - 440 only*/ #define PSL_DE 0x0200UL/* Debug interrupt enable */ -#define PSL_FE10x0100UL/* Floating point exception mode 1 */ #define PSL_IS 0x0020UL/* Instruction address space */ #define PSL_DS 0x0010UL/* Data address space */ -#define PSL_PMM0x0004UL/* Performance monitor mark */ - -#define PSL_FE_DFLT0xUL/* default == none */ - -/* Initial kernel MSR, use IS=1 ad DS=1. */ -#define PSL_KERNSET_INIT (PSL_IS | PSL_DS) -#define PSL_KERNSET(PSL_CE | PSL_ME | PSL_EE) -#define PSL_USERSET(PSL_KERNSET | PSL_PR) - -#elif defined(BOOKE_PPC4XX) -/* - * Machine State Register (MSR) - PPC4xx core - */ -#define PSL_WE (0x8000 13) /* Wait State Enable */ -#define PSL_CE (0x8000 14) /* Critical Interrupt Enable */ -#define PSL_EE (0x8000 16) /*
svn commit: r265973 - stable/10/sys/dev/uart
Author: ian
Date: Tue May 13 19:09:00 2014
New Revision: 265973
URL: http://svnweb.freebsd.org/changeset/base/265973
Log:
MFC r257111, r257144, r257157, r257183
Test UARTs physical address instead of virtual.
Be a bit more flexible in how we find the console from the properties on
/chosen, following the list of allowed console properties in ePAPR. Also
do not require that stdin be defined and equal to stdout: stdin is
nonstandard (for ePAPR) and console in an unexpected place is after all
better than no console.
Modified:
stable/10/sys/dev/uart/uart_cpu_fdt.c
Modified: stable/10/sys/dev/uart/uart_cpu_fdt.c
==
--- stable/10/sys/dev/uart/uart_cpu_fdt.c Tue May 13 18:24:02 2014
(r265972)
+++ stable/10/sys/dev/uart/uart_cpu_fdt.c Tue May 13 19:09:00 2014
(r265973)
@@ -36,6 +36,10 @@ __FBSDID($FreeBSD$);
#include sys/bus.h
#include sys/kernel.h
#include sys/module.h
+#include sys/systm.h
+
+#include vm/vm.h
+#include vm/pmap.h
#include machine/bus.h
#include machine/fdt.h
@@ -88,13 +92,34 @@ int
uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2)
{
- return ((b1-bsh == b2-bsh b1-bst == b2-bst) ? 1 : 0);
+ if (b1-bst != b2-bst)
+ return (0);
+ if (pmap_kextract(b1-bsh) == 0)
+ return (0);
+ if (pmap_kextract(b2-bsh) == 0)
+ return (0);
+ return ((pmap_kextract(b1-bsh) == pmap_kextract(b2-bsh)) ? 1 : 0);
+}
+
+static int
+phandle_chosen_propdev(phandle_t chosen, const char *name, phandle_t *node)
+{
+ char buf[64];
+
+ if (OF_getprop(chosen, name, buf, sizeof(buf)) = 0)
+ return (ENXIO);
+ if ((*node = OF_finddevice(buf)) == -1)
+ return (ENXIO);
+
+ return (0);
}
int
uart_cpu_getdev(int devtype, struct uart_devinfo *di)
{
- char buf[64];
+ const char *propnames[] = {stdout-path, linux,stdout-path, stdout,
+ stdin-path, stdin, NULL};
+ const char **name;
const struct ofw_compat_data *cd;
struct uart_class *class;
phandle_t node, chosen;
@@ -105,7 +130,7 @@ uart_cpu_getdev(int devtype, struct uart
uart_bus_space_mem = fdtbus_bs_tag;
uart_bus_space_io = NULL;
- /* Allow overriding the FDT uning the environment. */
+ /* Allow overriding the FDT using the environment. */
class = uart_ns8250_class;
err = uart_getenv(devtype, di, class);
if (!err)
@@ -119,14 +144,11 @@ uart_cpu_getdev(int devtype, struct uart
*/
if ((chosen = OF_finddevice(/chosen)) == -1)
return (ENXIO);
- if (OF_getprop(chosen, stdin, buf, sizeof(buf)) = 0)
- return (ENXIO);
- if ((node = OF_finddevice(buf)) == -1)
- return (ENXIO);
- if (OF_getprop(chosen, stdout, buf, sizeof(buf)) = 0)
- return (ENXIO);
- if (OF_finddevice(buf) != node)
- /* Only stdin == stdout is supported. */
+ for (name = propnames; *name != NULL; name++) {
+ if (phandle_chosen_propdev(chosen, *name, node) == 0)
+ break;
+ }
+ if (*name == NULL)
return (ENXIO);
/*
* Retrieve serial attributes.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265974 - in stable/10/sys/powerpc: aim include pseries
Author: ian Date: Tue May 13 19:12:53 2014 New Revision: 265974 URL: http://svnweb.freebsd.org/changeset/base/265974 Log: MFC r257162, r257175 The old trap.h (then trap_aim.h) actually had trap ID codes for Book-E CPUs. Use it universally. Book-E traps may also need revisiting due to the introduction of fixed-offset traps and the deprecation of IVORs in POWER ISA 2.06, but that's very much an issue for another day. Deleted: stable/10/sys/powerpc/include/trap_aim.h stable/10/sys/powerpc/include/trap_booke.h Modified: stable/10/sys/powerpc/aim/mmu_oea.c stable/10/sys/powerpc/aim/mp_cpudep.c stable/10/sys/powerpc/include/trap.h stable/10/sys/powerpc/pseries/platform_chrp.c Modified: stable/10/sys/powerpc/aim/mmu_oea.c == --- stable/10/sys/powerpc/aim/mmu_oea.c Tue May 13 19:09:00 2014 (r265973) +++ stable/10/sys/powerpc/aim/mmu_oea.c Tue May 13 19:12:53 2014 (r265974) @@ -141,7 +141,7 @@ __FBSDID($FreeBSD$); #include machine/smp.h #include machine/sr.h #include machine/mmuvar.h -#include machine/trap_aim.h +#include machine/trap.h #include mmu_if.h Modified: stable/10/sys/powerpc/aim/mp_cpudep.c == --- stable/10/sys/powerpc/aim/mp_cpudep.c Tue May 13 19:09:00 2014 (r265973) +++ stable/10/sys/powerpc/aim/mp_cpudep.c Tue May 13 19:12:53 2014 (r265974) @@ -43,7 +43,7 @@ __FBSDID($FreeBSD$); #include machine/psl.h #include machine/smp.h #include machine/spr.h -#include machine/trap_aim.h +#include machine/trap.h #include dev/ofw/openfirm.h #include machine/ofw_machdep.h Modified: stable/10/sys/powerpc/include/trap.h == --- stable/10/sys/powerpc/include/trap.hTue May 13 19:09:00 2014 (r265973) +++ stable/10/sys/powerpc/include/trap.hTue May 13 19:12:53 2014 (r265974) @@ -1,8 +1,128 @@ -/* $FreeBSD$ */ +/*- + * Copyright (C) 1995, 1996 Wolfgang Solfrank. + * Copyright (C) 1995, 1996 TooLs GmbH. + * 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. + * 3. All advertising materials mentioning features or use of this software + *must display the following acknowledgement: + * This product includes software developed by TooLs GmbH. + * 4. The name of TooLs GmbH may not be used to endorse or promote products + *derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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. + * + * $NetBSD: trap.h,v 1.7 2002/02/22 13:51:40 kleink Exp $ + * $FreeBSD$ + */ -#if defined(AIM) -#include machine/trap_aim.h -#elif defined(BOOKE) -#include machine/trap_booke.h +#ifndef_POWERPC_TRAP_H_ +#define_POWERPC_TRAP_H_ + +#defineEXC_RSVD0x /* Reserved */ +#defineEXC_RST 0x0100 /* Reset; all but IBM4xx */ +#defineEXC_MCHK0x0200 /* Machine Check */ +#defineEXC_DSI 0x0300 /* Data Storage Interrupt */ +#defineEXC_DSE 0x0380 /* Data Segment Interrupt */ +#defineEXC_ISI 0x0400 /* Instruction Storage Interrupt */ +#defineEXC_ISE 0x0480 /* Instruction Segment Interrupt */ +#defineEXC_EXI 0x0500 /* External Interrupt */ +#defineEXC_ALI 0x0600 /* Alignment Interrupt */ +#defineEXC_PGM 0x0700 /* Program Interrupt */ +#defineEXC_FPU 0x0800 /* Floating-point Unavailable */ +#defineEXC_DECR0x0900 /* Decrementer Interrupt */ +#defineEXC_SC
Re: svn commit: r265973 - stable/10/sys/dev/uart
On 13 May 2014 23:09, Ian Lepore i...@freebsd.org wrote: Author: ian Date: Tue May 13 19:09:00 2014 New Revision: 265973 URL: http://svnweb.freebsd.org/changeset/base/265973 Log: MFC r257111, r257144, r257157, r257183 Test UARTs physical address instead of virtual. Be a bit more flexible in how we find the console from the properties on /chosen, following the list of allowed console properties in ePAPR. Also do not require that stdin be defined and equal to stdout: stdin is nonstandard (for ePAPR) and console in an unexpected place is after all better than no console. Modified: stable/10/sys/dev/uart/uart_cpu_fdt.c Taking random commit of your merge series: all of them miss svn:mergeinfo. -- wbr, pluknet ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265975 - vendor/tzdata/dist
Author: edwin Date: Tue May 13 21:22:04 2014 New Revision: 265975 URL: http://svnweb.freebsd.org/changeset/base/265975 Log: Vendor import of tzdata2014c - Egypt goes to DST on 15 May 2014. Obtained from:ftp://ftp.iana.org/tz/releases/ Modified: vendor/tzdata/dist/africa vendor/tzdata/dist/asia vendor/tzdata/dist/europe Modified: vendor/tzdata/dist/africa == --- vendor/tzdata/dist/africa Tue May 13 19:12:53 2014(r265974) +++ vendor/tzdata/dist/africa Tue May 13 21:22:04 2014(r265975) @@ -335,11 +335,54 @@ Rule Egypt 2007only- Sep Thu=1 23:00s # http://www.worldtimezone.com/dst_news/dst_news_egypt02.html # /a +# From Ahmad El-Dardiry (2014-05-07): +# Egypt is to change back to Daylight system on May 15 +# http://english.ahram.org.eg/NewsContent/1/64/100735/Egypt/Politics-/Egypts-government-to-reapply-daylight-saving-time-.aspx + +# From Gunther Vermier (2015-05-13): +# our Egypt office confirms that the change will be at 15 May midnight (24:00) + +# From Paul Eggert (2014-05-13): +# Sarah El Deeb and Lee Keath of AP report that the Egyptian government says +# the change is because of blackouts in Cairo, even though Ahram Online (cited +# above) says DST had no affect on electricity consumption. The AP story says +# DST will not be observed during Ramadan. There is no information about when +# DST will end. See: +# http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833 +# +# For now, guess that later transitions will use 2010's rules, and that +# Egypt will agree with Morocco (see below) about the date Ramadan starts and +# ends, though (unlike Morocco) it will switch at 00:00 standard time. In +# Egypt the spring-forward transitions are removed for 2020-2022, when the +# guessed spring-forward date falls during the estimated Ramadan, and all +# transitions removed for 2023-2038, where the estimated Ramadan falls entirely +# outside the guessed daylight-saving time. Ramadan intrudes on the guessed +# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff. + Rule Egypt 2008only- Aug lastThu 23:00s 0 - Rule Egypt 2009only- Aug 20 23:00s 0 - Rule Egypt 2010only- Aug 11 0:000 - Rule Egypt 2010only- Sep 10 0:001:00S Rule Egypt 2010only- Sep lastThu 23:00s 0 - +Rule Egypt 2014only- May 15 24:00 1:00S +Rule Egypt 2014only- Jun 29 0:00s 0 - +Rule Egypt 2014only- Jul 29 0:00s 1:00S +Rule Egypt 2014max - Sep lastThu 23:00s 0 - +Rule Egypt 20152019- Apr lastFri 0:00s 1:00S +Rule Egypt 2015only- Jun 18 0:00s 0 - +Rule Egypt 2015only- Jul 18 0:00s 1:00S +Rule Egypt 2016only- Jun 7 0:00s 0 - +Rule Egypt 2016only- Jul 7 0:00s 1:00S +Rule Egypt 2017only- May 27 0:00s 0 - +Rule Egypt 2017only- Jun 26 0:00s 1:00S +Rule Egypt 2018only- May 16 0:00s 0 - +Rule Egypt 2018only- Jun 15 0:00s 1:00S +Rule Egypt 2019only- May 6 0:00s 0 - +Rule Egypt 2019only- Jun 5 0:00s 1:00S +Rule Egypt 2020only- May 24 0:00s 1:00S +Rule Egypt 2021only- May 13 0:00s 1:00S +Rule Egypt 2022only- May 3 0:00s 1:00S +Rule Egypt 2023max - Apr lastFri 0:00s 1:00S # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Africa/Cairo2:05:09 - LMT 1900 Oct Modified: vendor/tzdata/dist/asia == --- vendor/tzdata/dist/asia Tue May 13 19:12:53 2014(r265974) +++ vendor/tzdata/dist/asia Tue May 13 21:22:04 2014(r265975) @@ -1347,22 +1347,6 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 3 # Jordan will switch to winter time on Friday, October 27. # -# From Phil Pizzey (2009-04-02): -# ...I think I may have spotted an error in the timezone data for -# Jordan. -# The current (2009d) asia file shows Jordan going to daylight -# saving -# time on the last Thursday in March. -# -# Rule Jordan 2000 max - Mar lastThu 0:00s 1:00 S -# -# However timeanddate.com, which I usually find reliable, shows Jordan -# going to daylight saving time on the last Friday in March since 2002. -# Please see -# a
svn commit: r265976 - vendor/tzdata/tzdata2014c
Author: edwin Date: Tue May 13 21:23:49 2014 New Revision: 265976 URL: http://svnweb.freebsd.org/changeset/base/265976 Log: Tag of tzdata2014c sources Added: vendor/tzdata/tzdata2014c/ - copied from r265975, vendor/tzdata/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265977 - head/usr.bin/printf
Author: jilles
Date: Tue May 13 21:24:55 2014
New Revision: 265977
URL: http://svnweb.freebsd.org/changeset/base/265977
Log:
printf: Fix missing arguments for %u/%o/%x/%X after r265592.
If a numeric argument is missing, zero should be assumed, for signed as well
as unsigned conversions.
This fixes the 'zero' regression tests.
r265592 erroneously reverted r244407.
Modified:
head/usr.bin/printf/printf.c
Modified: head/usr.bin/printf/printf.c
==
--- head/usr.bin/printf/printf.cTue May 13 21:23:49 2014
(r265976)
+++ head/usr.bin/printf/printf.cTue May 13 21:24:55 2014
(r265977)
@@ -575,7 +575,7 @@ getnum(intmax_t *ip, uintmax_t *uip, int
int rval;
if (!*gargv) {
- *ip = 0;
+ *ip = *uip = 0;
return (0);
}
if (**gargv == '' || **gargv == '\'') {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265978 - head/contrib/tzdata
Author: edwin Date: Tue May 13 21:25:59 2014 New Revision: 265978 URL: http://svnweb.freebsd.org/changeset/base/265978 Log: MFV of 265975, tzdata2014c - Egypt will go into DST on 15 May 2014 Modified: head/contrib/tzdata/africa head/contrib/tzdata/asia head/contrib/tzdata/europe Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/africa == --- head/contrib/tzdata/africa Tue May 13 21:24:55 2014(r265977) +++ head/contrib/tzdata/africa Tue May 13 21:25:59 2014(r265978) @@ -335,11 +335,54 @@ Rule Egypt 2007only- Sep Thu=1 23:00s # http://www.worldtimezone.com/dst_news/dst_news_egypt02.html # /a +# From Ahmad El-Dardiry (2014-05-07): +# Egypt is to change back to Daylight system on May 15 +# http://english.ahram.org.eg/NewsContent/1/64/100735/Egypt/Politics-/Egypts-government-to-reapply-daylight-saving-time-.aspx + +# From Gunther Vermier (2015-05-13): +# our Egypt office confirms that the change will be at 15 May midnight (24:00) + +# From Paul Eggert (2014-05-13): +# Sarah El Deeb and Lee Keath of AP report that the Egyptian government says +# the change is because of blackouts in Cairo, even though Ahram Online (cited +# above) says DST had no affect on electricity consumption. The AP story says +# DST will not be observed during Ramadan. There is no information about when +# DST will end. See: +# http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833 +# +# For now, guess that later transitions will use 2010's rules, and that +# Egypt will agree with Morocco (see below) about the date Ramadan starts and +# ends, though (unlike Morocco) it will switch at 00:00 standard time. In +# Egypt the spring-forward transitions are removed for 2020-2022, when the +# guessed spring-forward date falls during the estimated Ramadan, and all +# transitions removed for 2023-2038, where the estimated Ramadan falls entirely +# outside the guessed daylight-saving time. Ramadan intrudes on the guessed +# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff. + Rule Egypt 2008only- Aug lastThu 23:00s 0 - Rule Egypt 2009only- Aug 20 23:00s 0 - Rule Egypt 2010only- Aug 11 0:000 - Rule Egypt 2010only- Sep 10 0:001:00S Rule Egypt 2010only- Sep lastThu 23:00s 0 - +Rule Egypt 2014only- May 15 24:00 1:00S +Rule Egypt 2014only- Jun 29 0:00s 0 - +Rule Egypt 2014only- Jul 29 0:00s 1:00S +Rule Egypt 2014max - Sep lastThu 23:00s 0 - +Rule Egypt 20152019- Apr lastFri 0:00s 1:00S +Rule Egypt 2015only- Jun 18 0:00s 0 - +Rule Egypt 2015only- Jul 18 0:00s 1:00S +Rule Egypt 2016only- Jun 7 0:00s 0 - +Rule Egypt 2016only- Jul 7 0:00s 1:00S +Rule Egypt 2017only- May 27 0:00s 0 - +Rule Egypt 2017only- Jun 26 0:00s 1:00S +Rule Egypt 2018only- May 16 0:00s 0 - +Rule Egypt 2018only- Jun 15 0:00s 1:00S +Rule Egypt 2019only- May 6 0:00s 0 - +Rule Egypt 2019only- Jun 5 0:00s 1:00S +Rule Egypt 2020only- May 24 0:00s 1:00S +Rule Egypt 2021only- May 13 0:00s 1:00S +Rule Egypt 2022only- May 3 0:00s 1:00S +Rule Egypt 2023max - Apr lastFri 0:00s 1:00S # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Africa/Cairo2:05:09 - LMT 1900 Oct Modified: head/contrib/tzdata/asia == --- head/contrib/tzdata/asiaTue May 13 21:24:55 2014(r265977) +++ head/contrib/tzdata/asiaTue May 13 21:25:59 2014(r265978) @@ -1347,22 +1347,6 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 3 # Jordan will switch to winter time on Friday, October 27. # -# From Phil Pizzey (2009-04-02): -# ...I think I may have spotted an error in the timezone data for -# Jordan. -# The current (2009d) asia file shows Jordan going to daylight -# saving -# time on the last Thursday in March. -# -# Rule Jordan 2000 max - Mar lastThu 0:00s 1:00 S -# -# However timeanddate.com, which I usually find reliable, shows Jordan -# going to daylight saving time on the last Friday in March since 2002. -# Please see -# a
svn commit: r265979 - stable/6/share/zoneinfo
Author: edwin Date: Tue May 13 21:27:18 2014 New Revision: 265979 URL: http://svnweb.freebsd.org/changeset/base/265979 Log: MFC of 265978, tzdata2014c - Egypt will go into DST on 15 May 2014 Modified: stable/6/share/zoneinfo/africa stable/6/share/zoneinfo/asia stable/6/share/zoneinfo/europe Directory Properties: stable/6/share/zoneinfo/ (props changed) Modified: stable/6/share/zoneinfo/africa == --- stable/6/share/zoneinfo/africa Tue May 13 21:25:59 2014 (r265978) +++ stable/6/share/zoneinfo/africa Tue May 13 21:27:18 2014 (r265979) @@ -335,11 +335,54 @@ Rule Egypt 2007only- Sep Thu=1 23:00s # http://www.worldtimezone.com/dst_news/dst_news_egypt02.html # /a +# From Ahmad El-Dardiry (2014-05-07): +# Egypt is to change back to Daylight system on May 15 +# http://english.ahram.org.eg/NewsContent/1/64/100735/Egypt/Politics-/Egypts-government-to-reapply-daylight-saving-time-.aspx + +# From Gunther Vermier (2015-05-13): +# our Egypt office confirms that the change will be at 15 May midnight (24:00) + +# From Paul Eggert (2014-05-13): +# Sarah El Deeb and Lee Keath of AP report that the Egyptian government says +# the change is because of blackouts in Cairo, even though Ahram Online (cited +# above) says DST had no affect on electricity consumption. The AP story says +# DST will not be observed during Ramadan. There is no information about when +# DST will end. See: +# http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833 +# +# For now, guess that later transitions will use 2010's rules, and that +# Egypt will agree with Morocco (see below) about the date Ramadan starts and +# ends, though (unlike Morocco) it will switch at 00:00 standard time. In +# Egypt the spring-forward transitions are removed for 2020-2022, when the +# guessed spring-forward date falls during the estimated Ramadan, and all +# transitions removed for 2023-2038, where the estimated Ramadan falls entirely +# outside the guessed daylight-saving time. Ramadan intrudes on the guessed +# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff. + Rule Egypt 2008only- Aug lastThu 23:00s 0 - Rule Egypt 2009only- Aug 20 23:00s 0 - Rule Egypt 2010only- Aug 11 0:000 - Rule Egypt 2010only- Sep 10 0:001:00S Rule Egypt 2010only- Sep lastThu 23:00s 0 - +Rule Egypt 2014only- May 15 24:00 1:00S +Rule Egypt 2014only- Jun 29 0:00s 0 - +Rule Egypt 2014only- Jul 29 0:00s 1:00S +Rule Egypt 2014max - Sep lastThu 23:00s 0 - +Rule Egypt 20152019- Apr lastFri 0:00s 1:00S +Rule Egypt 2015only- Jun 18 0:00s 0 - +Rule Egypt 2015only- Jul 18 0:00s 1:00S +Rule Egypt 2016only- Jun 7 0:00s 0 - +Rule Egypt 2016only- Jul 7 0:00s 1:00S +Rule Egypt 2017only- May 27 0:00s 0 - +Rule Egypt 2017only- Jun 26 0:00s 1:00S +Rule Egypt 2018only- May 16 0:00s 0 - +Rule Egypt 2018only- Jun 15 0:00s 1:00S +Rule Egypt 2019only- May 6 0:00s 0 - +Rule Egypt 2019only- Jun 5 0:00s 1:00S +Rule Egypt 2020only- May 24 0:00s 1:00S +Rule Egypt 2021only- May 13 0:00s 1:00S +Rule Egypt 2022only- May 3 0:00s 1:00S +Rule Egypt 2023max - Apr lastFri 0:00s 1:00S # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Africa/Cairo2:05:09 - LMT 1900 Oct Modified: stable/6/share/zoneinfo/asia == --- stable/6/share/zoneinfo/asiaTue May 13 21:25:59 2014 (r265978) +++ stable/6/share/zoneinfo/asiaTue May 13 21:27:18 2014 (r265979) @@ -1347,22 +1347,6 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 3 # Jordan will switch to winter time on Friday, October 27. # -# From Phil Pizzey (2009-04-02): -# ...I think I may have spotted an error in the timezone data for -# Jordan. -# The current (2009d) asia file shows Jordan going to daylight -# saving -# time on the last Thursday in March. -# -# Rule Jordan 2000 max - Mar lastThu 0:00s 1:00 S -# -# However timeanddate.com, which I usually find reliable, shows Jordan -# going to daylight saving time on the last Friday in
svn commit: r265980 - stable/7/share/zoneinfo
Author: edwin Date: Tue May 13 21:29:19 2014 New Revision: 265980 URL: http://svnweb.freebsd.org/changeset/base/265980 Log: MFC of 265978, tzdata2014c - Egypt will go into DST on 15 May 2014. Modified: stable/7/share/zoneinfo/africa stable/7/share/zoneinfo/asia stable/7/share/zoneinfo/europe Directory Properties: stable/7/share/zoneinfo/ (props changed) Modified: stable/7/share/zoneinfo/africa == --- stable/7/share/zoneinfo/africa Tue May 13 21:27:18 2014 (r265979) +++ stable/7/share/zoneinfo/africa Tue May 13 21:29:19 2014 (r265980) @@ -335,11 +335,54 @@ Rule Egypt 2007only- Sep Thu=1 23:00s # http://www.worldtimezone.com/dst_news/dst_news_egypt02.html # /a +# From Ahmad El-Dardiry (2014-05-07): +# Egypt is to change back to Daylight system on May 15 +# http://english.ahram.org.eg/NewsContent/1/64/100735/Egypt/Politics-/Egypts-government-to-reapply-daylight-saving-time-.aspx + +# From Gunther Vermier (2015-05-13): +# our Egypt office confirms that the change will be at 15 May midnight (24:00) + +# From Paul Eggert (2014-05-13): +# Sarah El Deeb and Lee Keath of AP report that the Egyptian government says +# the change is because of blackouts in Cairo, even though Ahram Online (cited +# above) says DST had no affect on electricity consumption. The AP story says +# DST will not be observed during Ramadan. There is no information about when +# DST will end. See: +# http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833 +# +# For now, guess that later transitions will use 2010's rules, and that +# Egypt will agree with Morocco (see below) about the date Ramadan starts and +# ends, though (unlike Morocco) it will switch at 00:00 standard time. In +# Egypt the spring-forward transitions are removed for 2020-2022, when the +# guessed spring-forward date falls during the estimated Ramadan, and all +# transitions removed for 2023-2038, where the estimated Ramadan falls entirely +# outside the guessed daylight-saving time. Ramadan intrudes on the guessed +# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff. + Rule Egypt 2008only- Aug lastThu 23:00s 0 - Rule Egypt 2009only- Aug 20 23:00s 0 - Rule Egypt 2010only- Aug 11 0:000 - Rule Egypt 2010only- Sep 10 0:001:00S Rule Egypt 2010only- Sep lastThu 23:00s 0 - +Rule Egypt 2014only- May 15 24:00 1:00S +Rule Egypt 2014only- Jun 29 0:00s 0 - +Rule Egypt 2014only- Jul 29 0:00s 1:00S +Rule Egypt 2014max - Sep lastThu 23:00s 0 - +Rule Egypt 20152019- Apr lastFri 0:00s 1:00S +Rule Egypt 2015only- Jun 18 0:00s 0 - +Rule Egypt 2015only- Jul 18 0:00s 1:00S +Rule Egypt 2016only- Jun 7 0:00s 0 - +Rule Egypt 2016only- Jul 7 0:00s 1:00S +Rule Egypt 2017only- May 27 0:00s 0 - +Rule Egypt 2017only- Jun 26 0:00s 1:00S +Rule Egypt 2018only- May 16 0:00s 0 - +Rule Egypt 2018only- Jun 15 0:00s 1:00S +Rule Egypt 2019only- May 6 0:00s 0 - +Rule Egypt 2019only- Jun 5 0:00s 1:00S +Rule Egypt 2020only- May 24 0:00s 1:00S +Rule Egypt 2021only- May 13 0:00s 1:00S +Rule Egypt 2022only- May 3 0:00s 1:00S +Rule Egypt 2023max - Apr lastFri 0:00s 1:00S # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Africa/Cairo2:05:09 - LMT 1900 Oct Modified: stable/7/share/zoneinfo/asia == --- stable/7/share/zoneinfo/asiaTue May 13 21:27:18 2014 (r265979) +++ stable/7/share/zoneinfo/asiaTue May 13 21:29:19 2014 (r265980) @@ -1347,22 +1347,6 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 3 # Jordan will switch to winter time on Friday, October 27. # -# From Phil Pizzey (2009-04-02): -# ...I think I may have spotted an error in the timezone data for -# Jordan. -# The current (2009d) asia file shows Jordan going to daylight -# saving -# time on the last Thursday in March. -# -# Rule Jordan 2000 max - Mar lastThu 0:00s 1:00 S -# -# However timeanddate.com, which I usually find reliable, shows Jordan -# going to daylight saving time on the last Friday in
svn commit: r265981 - stable/8/share/zoneinfo
Author: edwin Date: Tue May 13 21:30:09 2014 New Revision: 265981 URL: http://svnweb.freebsd.org/changeset/base/265981 Log: MFC of 265978, tzdata2014c - Egypt will go into DST on 15 May 2014. Modified: stable/8/share/zoneinfo/africa stable/8/share/zoneinfo/asia stable/8/share/zoneinfo/europe Directory Properties: stable/8/share/zoneinfo/ (props changed) Modified: stable/8/share/zoneinfo/africa == --- stable/8/share/zoneinfo/africa Tue May 13 21:29:19 2014 (r265980) +++ stable/8/share/zoneinfo/africa Tue May 13 21:30:09 2014 (r265981) @@ -335,11 +335,54 @@ Rule Egypt 2007only- Sep Thu=1 23:00s # http://www.worldtimezone.com/dst_news/dst_news_egypt02.html # /a +# From Ahmad El-Dardiry (2014-05-07): +# Egypt is to change back to Daylight system on May 15 +# http://english.ahram.org.eg/NewsContent/1/64/100735/Egypt/Politics-/Egypts-government-to-reapply-daylight-saving-time-.aspx + +# From Gunther Vermier (2015-05-13): +# our Egypt office confirms that the change will be at 15 May midnight (24:00) + +# From Paul Eggert (2014-05-13): +# Sarah El Deeb and Lee Keath of AP report that the Egyptian government says +# the change is because of blackouts in Cairo, even though Ahram Online (cited +# above) says DST had no affect on electricity consumption. The AP story says +# DST will not be observed during Ramadan. There is no information about when +# DST will end. See: +# http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833 +# +# For now, guess that later transitions will use 2010's rules, and that +# Egypt will agree with Morocco (see below) about the date Ramadan starts and +# ends, though (unlike Morocco) it will switch at 00:00 standard time. In +# Egypt the spring-forward transitions are removed for 2020-2022, when the +# guessed spring-forward date falls during the estimated Ramadan, and all +# transitions removed for 2023-2038, where the estimated Ramadan falls entirely +# outside the guessed daylight-saving time. Ramadan intrudes on the guessed +# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff. + Rule Egypt 2008only- Aug lastThu 23:00s 0 - Rule Egypt 2009only- Aug 20 23:00s 0 - Rule Egypt 2010only- Aug 11 0:000 - Rule Egypt 2010only- Sep 10 0:001:00S Rule Egypt 2010only- Sep lastThu 23:00s 0 - +Rule Egypt 2014only- May 15 24:00 1:00S +Rule Egypt 2014only- Jun 29 0:00s 0 - +Rule Egypt 2014only- Jul 29 0:00s 1:00S +Rule Egypt 2014max - Sep lastThu 23:00s 0 - +Rule Egypt 20152019- Apr lastFri 0:00s 1:00S +Rule Egypt 2015only- Jun 18 0:00s 0 - +Rule Egypt 2015only- Jul 18 0:00s 1:00S +Rule Egypt 2016only- Jun 7 0:00s 0 - +Rule Egypt 2016only- Jul 7 0:00s 1:00S +Rule Egypt 2017only- May 27 0:00s 0 - +Rule Egypt 2017only- Jun 26 0:00s 1:00S +Rule Egypt 2018only- May 16 0:00s 0 - +Rule Egypt 2018only- Jun 15 0:00s 1:00S +Rule Egypt 2019only- May 6 0:00s 0 - +Rule Egypt 2019only- Jun 5 0:00s 1:00S +Rule Egypt 2020only- May 24 0:00s 1:00S +Rule Egypt 2021only- May 13 0:00s 1:00S +Rule Egypt 2022only- May 3 0:00s 1:00S +Rule Egypt 2023max - Apr lastFri 0:00s 1:00S # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Africa/Cairo2:05:09 - LMT 1900 Oct Modified: stable/8/share/zoneinfo/asia == --- stable/8/share/zoneinfo/asiaTue May 13 21:29:19 2014 (r265980) +++ stable/8/share/zoneinfo/asiaTue May 13 21:30:09 2014 (r265981) @@ -1347,22 +1347,6 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 3 # Jordan will switch to winter time on Friday, October 27. # -# From Phil Pizzey (2009-04-02): -# ...I think I may have spotted an error in the timezone data for -# Jordan. -# The current (2009d) asia file shows Jordan going to daylight -# saving -# time on the last Thursday in March. -# -# Rule Jordan 2000 max - Mar lastThu 0:00s 1:00 S -# -# However timeanddate.com, which I usually find reliable, shows Jordan -# going to daylight saving time on the last Friday in
svn commit: r265982 - stable/9/contrib/tzdata
Author: edwin Date: Tue May 13 21:31:13 2014 New Revision: 265982 URL: http://svnweb.freebsd.org/changeset/base/265982 Log: MFC of 265978, tzdata2014c - Egypt will go into DST on 15 May 2014. Modified: stable/9/contrib/tzdata/africa stable/9/contrib/tzdata/asia stable/9/contrib/tzdata/europe Directory Properties: stable/9/contrib/tzdata/ (props changed) Modified: stable/9/contrib/tzdata/africa == --- stable/9/contrib/tzdata/africa Tue May 13 21:30:09 2014 (r265981) +++ stable/9/contrib/tzdata/africa Tue May 13 21:31:13 2014 (r265982) @@ -335,11 +335,54 @@ Rule Egypt 2007only- Sep Thu=1 23:00s # http://www.worldtimezone.com/dst_news/dst_news_egypt02.html # /a +# From Ahmad El-Dardiry (2014-05-07): +# Egypt is to change back to Daylight system on May 15 +# http://english.ahram.org.eg/NewsContent/1/64/100735/Egypt/Politics-/Egypts-government-to-reapply-daylight-saving-time-.aspx + +# From Gunther Vermier (2015-05-13): +# our Egypt office confirms that the change will be at 15 May midnight (24:00) + +# From Paul Eggert (2014-05-13): +# Sarah El Deeb and Lee Keath of AP report that the Egyptian government says +# the change is because of blackouts in Cairo, even though Ahram Online (cited +# above) says DST had no affect on electricity consumption. The AP story says +# DST will not be observed during Ramadan. There is no information about when +# DST will end. See: +# http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833 +# +# For now, guess that later transitions will use 2010's rules, and that +# Egypt will agree with Morocco (see below) about the date Ramadan starts and +# ends, though (unlike Morocco) it will switch at 00:00 standard time. In +# Egypt the spring-forward transitions are removed for 2020-2022, when the +# guessed spring-forward date falls during the estimated Ramadan, and all +# transitions removed for 2023-2038, where the estimated Ramadan falls entirely +# outside the guessed daylight-saving time. Ramadan intrudes on the guessed +# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff. + Rule Egypt 2008only- Aug lastThu 23:00s 0 - Rule Egypt 2009only- Aug 20 23:00s 0 - Rule Egypt 2010only- Aug 11 0:000 - Rule Egypt 2010only- Sep 10 0:001:00S Rule Egypt 2010only- Sep lastThu 23:00s 0 - +Rule Egypt 2014only- May 15 24:00 1:00S +Rule Egypt 2014only- Jun 29 0:00s 0 - +Rule Egypt 2014only- Jul 29 0:00s 1:00S +Rule Egypt 2014max - Sep lastThu 23:00s 0 - +Rule Egypt 20152019- Apr lastFri 0:00s 1:00S +Rule Egypt 2015only- Jun 18 0:00s 0 - +Rule Egypt 2015only- Jul 18 0:00s 1:00S +Rule Egypt 2016only- Jun 7 0:00s 0 - +Rule Egypt 2016only- Jul 7 0:00s 1:00S +Rule Egypt 2017only- May 27 0:00s 0 - +Rule Egypt 2017only- Jun 26 0:00s 1:00S +Rule Egypt 2018only- May 16 0:00s 0 - +Rule Egypt 2018only- Jun 15 0:00s 1:00S +Rule Egypt 2019only- May 6 0:00s 0 - +Rule Egypt 2019only- Jun 5 0:00s 1:00S +Rule Egypt 2020only- May 24 0:00s 1:00S +Rule Egypt 2021only- May 13 0:00s 1:00S +Rule Egypt 2022only- May 3 0:00s 1:00S +Rule Egypt 2023max - Apr lastFri 0:00s 1:00S # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Africa/Cairo2:05:09 - LMT 1900 Oct Modified: stable/9/contrib/tzdata/asia == --- stable/9/contrib/tzdata/asiaTue May 13 21:30:09 2014 (r265981) +++ stable/9/contrib/tzdata/asiaTue May 13 21:31:13 2014 (r265982) @@ -1347,22 +1347,6 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 3 # Jordan will switch to winter time on Friday, October 27. # -# From Phil Pizzey (2009-04-02): -# ...I think I may have spotted an error in the timezone data for -# Jordan. -# The current (2009d) asia file shows Jordan going to daylight -# saving -# time on the last Thursday in March. -# -# Rule Jordan 2000 max - Mar lastThu 0:00s 1:00 S -# -# However timeanddate.com, which I usually find reliable, shows Jordan -# going to daylight saving time on the last Friday in
svn commit: r265983 - stable/10/contrib/tzdata
Author: edwin Date: Tue May 13 22:35:06 2014 New Revision: 265983 URL: http://svnweb.freebsd.org/changeset/base/265983 Log: MFC of tzdata2014c - Egypt will go into DST in 15 May 2014 Modified: stable/10/contrib/tzdata/africa stable/10/contrib/tzdata/asia stable/10/contrib/tzdata/europe Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/tzdata/africa == --- stable/10/contrib/tzdata/africa Tue May 13 21:31:13 2014 (r265982) +++ stable/10/contrib/tzdata/africa Tue May 13 22:35:06 2014 (r265983) @@ -335,11 +335,54 @@ Rule Egypt 2007only- Sep Thu=1 23:00s # http://www.worldtimezone.com/dst_news/dst_news_egypt02.html # /a +# From Ahmad El-Dardiry (2014-05-07): +# Egypt is to change back to Daylight system on May 15 +# http://english.ahram.org.eg/NewsContent/1/64/100735/Egypt/Politics-/Egypts-government-to-reapply-daylight-saving-time-.aspx + +# From Gunther Vermier (2015-05-13): +# our Egypt office confirms that the change will be at 15 May midnight (24:00) + +# From Paul Eggert (2014-05-13): +# Sarah El Deeb and Lee Keath of AP report that the Egyptian government says +# the change is because of blackouts in Cairo, even though Ahram Online (cited +# above) says DST had no affect on electricity consumption. The AP story says +# DST will not be observed during Ramadan. There is no information about when +# DST will end. See: +# http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833 +# +# For now, guess that later transitions will use 2010's rules, and that +# Egypt will agree with Morocco (see below) about the date Ramadan starts and +# ends, though (unlike Morocco) it will switch at 00:00 standard time. In +# Egypt the spring-forward transitions are removed for 2020-2022, when the +# guessed spring-forward date falls during the estimated Ramadan, and all +# transitions removed for 2023-2038, where the estimated Ramadan falls entirely +# outside the guessed daylight-saving time. Ramadan intrudes on the guessed +# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff. + Rule Egypt 2008only- Aug lastThu 23:00s 0 - Rule Egypt 2009only- Aug 20 23:00s 0 - Rule Egypt 2010only- Aug 11 0:000 - Rule Egypt 2010only- Sep 10 0:001:00S Rule Egypt 2010only- Sep lastThu 23:00s 0 - +Rule Egypt 2014only- May 15 24:00 1:00S +Rule Egypt 2014only- Jun 29 0:00s 0 - +Rule Egypt 2014only- Jul 29 0:00s 1:00S +Rule Egypt 2014max - Sep lastThu 23:00s 0 - +Rule Egypt 20152019- Apr lastFri 0:00s 1:00S +Rule Egypt 2015only- Jun 18 0:00s 0 - +Rule Egypt 2015only- Jul 18 0:00s 1:00S +Rule Egypt 2016only- Jun 7 0:00s 0 - +Rule Egypt 2016only- Jul 7 0:00s 1:00S +Rule Egypt 2017only- May 27 0:00s 0 - +Rule Egypt 2017only- Jun 26 0:00s 1:00S +Rule Egypt 2018only- May 16 0:00s 0 - +Rule Egypt 2018only- Jun 15 0:00s 1:00S +Rule Egypt 2019only- May 6 0:00s 0 - +Rule Egypt 2019only- Jun 5 0:00s 1:00S +Rule Egypt 2020only- May 24 0:00s 1:00S +Rule Egypt 2021only- May 13 0:00s 1:00S +Rule Egypt 2022only- May 3 0:00s 1:00S +Rule Egypt 2023max - Apr lastFri 0:00s 1:00S # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Africa/Cairo2:05:09 - LMT 1900 Oct Modified: stable/10/contrib/tzdata/asia == --- stable/10/contrib/tzdata/asia Tue May 13 21:31:13 2014 (r265982) +++ stable/10/contrib/tzdata/asia Tue May 13 22:35:06 2014 (r265983) @@ -1347,22 +1347,6 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 3 # Jordan will switch to winter time on Friday, October 27. # -# From Phil Pizzey (2009-04-02): -# ...I think I may have spotted an error in the timezone data for -# Jordan. -# The current (2009d) asia file shows Jordan going to daylight -# saving -# time on the last Thursday in March. -# -# Rule Jordan 2000 max - Mar lastThu 0:00s 1:00 S -# -# However timeanddate.com, which I usually find reliable, shows Jordan -# going to daylight saving time on the last Friday in March since 2002.
svn commit: r265984 - stable/10/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Tue May 13 22:43:02 2014 New Revision: 265984 URL: http://svnweb.freebsd.org/changeset/base/265984 Log: Document r265922, mrsas(4) merge. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue May 13 22:35:06 2014(r265983) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue May 13 22:43:02 2014(r265984) @@ -138,6 +138,22 @@ providing support for LSI Fusion-MPT 3 12Gb SCSI/SATA controllers./para +para revision=265922The man.mrsas.4; driver has been added, + providing support for LSI MegaRAID SAS controllers. The + man.mfi.4; driver will attach to the controller, by default. + To enable man.mrsas.4; add + literalhw.mfi.mrsas_enable=1/literal to + filename/boot/loader.conf/filename, which turns off + man.mfi.4; device probing./para + +note + paraAt this time, the man.mfiutil.8; utility and + the os; version of + applicationMegaCLI/application and + applicationStorCli/application do not work with + man.mrsas.4;./para +/note + sect3 xml:id=kernel-virtualization titleVirtualization support/title ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265985 - head/crypto/openssl/ssl
Author: delphij Date: Tue May 13 23:17:24 2014 New Revision: 265985 URL: http://svnweb.freebsd.org/changeset/base/265985 Log: Fix OpenSSL NULL pointer deference vulnerability. Obtained from:OpenBSD Security: FreeBSD-SA-14:09.openssl Security: CVE-2014-0198 Modified: head/crypto/openssl/ssl/s3_pkt.c Modified: head/crypto/openssl/ssl/s3_pkt.c == --- head/crypto/openssl/ssl/s3_pkt.cTue May 13 22:43:02 2014 (r265984) +++ head/crypto/openssl/ssl/s3_pkt.cTue May 13 23:17:24 2014 (r265985) @@ -657,6 +657,10 @@ static int do_ssl3_write(SSL *s, int typ if (i = 0) return(i); /* if it went, fall through and send more stuff */ + /* we may have released our buffer, so get it again */ + if (wb-buf == NULL) + if (!ssl3_setup_write_buffer(s)) + return -1; } if (len == 0 !create_empty_fragment) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265986 - stable/10/crypto/openssl/ssl
Author: delphij Date: Tue May 13 23:19:16 2014 New Revision: 265986 URL: http://svnweb.freebsd.org/changeset/base/265986 Log: Fix OpenSSL NULL pointer deference vulnerability. Obtained from:OpenBSD Security: FreeBSD-SA-14:09.openssl Security: CVE-2014-0198 Modified: stable/10/crypto/openssl/ssl/s3_pkt.c Modified: stable/10/crypto/openssl/ssl/s3_pkt.c == --- stable/10/crypto/openssl/ssl/s3_pkt.c Tue May 13 23:17:24 2014 (r265985) +++ stable/10/crypto/openssl/ssl/s3_pkt.c Tue May 13 23:19:16 2014 (r265986) @@ -657,6 +657,10 @@ static int do_ssl3_write(SSL *s, int typ if (i = 0) return(i); /* if it went, fall through and send more stuff */ + /* we may have released our buffer, so get it again */ + if (wb-buf == NULL) + if (!ssl3_setup_write_buffer(s)) + return -1; } if (len == 0 !create_empty_fragment) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265987 - in releng/10.0: . crypto/openssl/ssl sys/conf sys/dev/ciss
Author: delphij
Date: Tue May 13 23:22:28 2014
New Revision: 265987
URL: http://svnweb.freebsd.org/changeset/base/265987
Log:
Fix OpenSSL NULL pointer deference vulnerability. [SA-14:09]
Security: FreeBSD-SA-14:09.openssl
Security: CVE-2014-0198
Fix data corruption with ciss(4). [EN-14:05]
Errata: FreeBSD-EN-14:05.ciss
Approved by: so
Modified:
releng/10.0/UPDATING
releng/10.0/crypto/openssl/ssl/s3_pkt.c
releng/10.0/sys/conf/newvers.sh
releng/10.0/sys/dev/ciss/ciss.c
Modified: releng/10.0/UPDATING
==
--- releng/10.0/UPDATINGTue May 13 23:19:16 2014(r265986)
+++ releng/10.0/UPDATINGTue May 13 23:22:28 2014(r265987)
@@ -16,6 +16,13 @@ from older versions of FreeBSD, try WITH
stable/10, and then rebuild without this option. The bootstrap process from
older version of current is a bit fragile.
+20140513: p3 FreeBSD-SA-14:10.openssl
+ FreeBSD-EN-14:05.ciss
+
+ Fix OpenSSL NULL pointer deference vulnerability. [SA-14:10]
+
+ Fix data corruption with ciss(4). [EN-14:05]
+
20140430: p2 FreeBSD-SA-14:07.devfs
FreeBSD-SA-14:08.tcp
FreeBSD-SA-14:09.openssl
Modified: releng/10.0/crypto/openssl/ssl/s3_pkt.c
==
--- releng/10.0/crypto/openssl/ssl/s3_pkt.c Tue May 13 23:19:16 2014
(r265986)
+++ releng/10.0/crypto/openssl/ssl/s3_pkt.c Tue May 13 23:22:28 2014
(r265987)
@@ -657,6 +657,10 @@ static int do_ssl3_write(SSL *s, int typ
if (i = 0)
return(i);
/* if it went, fall through and send more stuff */
+ /* we may have released our buffer, so get it again */
+ if (wb-buf == NULL)
+ if (!ssl3_setup_write_buffer(s))
+ return -1;
}
if (len == 0 !create_empty_fragment)
Modified: releng/10.0/sys/conf/newvers.sh
==
--- releng/10.0/sys/conf/newvers.sh Tue May 13 23:19:16 2014
(r265986)
+++ releng/10.0/sys/conf/newvers.sh Tue May 13 23:22:28 2014
(r265987)
@@ -32,7 +32,7 @@
TYPE=FreeBSD
REVISION=10.0
-BRANCH=RELEASE-p2
+BRANCH=RELEASE-p3
if [ X${BRANCH_OVERRIDE} != X ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
Modified: releng/10.0/sys/dev/ciss/ciss.c
==
--- releng/10.0/sys/dev/ciss/ciss.c Tue May 13 23:19:16 2014
(r265986)
+++ releng/10.0/sys/dev/ciss/ciss.c Tue May 13 23:22:28 2014
(r265987)
@@ -180,8 +180,6 @@ static int ciss_cam_emulate(struct ciss_
static voidciss_cam_poll(struct cam_sim *sim);
static voidciss_cam_complete(struct ciss_request *cr);
static voidciss_cam_complete_fixup(struct ciss_softc *sc, struct
ccb_scsiio *csio);
-static struct cam_periph *ciss_find_periph(struct ciss_softc *sc,
- int bus, int target);
static int ciss_name_device(struct ciss_softc *sc, int bus, int target);
/* periodic status monitoring */
@@ -3398,27 +3396,6 @@ ciss_cam_complete_fixup(struct ciss_soft
/
- * Find a peripheral attached at (target)
- */
-static struct cam_periph *
-ciss_find_periph(struct ciss_softc *sc, int bus, int target)
-{
-struct cam_periph *periph;
-struct cam_path*path;
-intstatus;
-
-status = xpt_create_path(path, NULL, cam_sim_path(sc-ciss_cam_sim[bus]),
-target, 0);
-if (status == CAM_REQ_CMP) {
- periph = cam_periph_find(path, NULL);
- xpt_free_path(path);
-} else {
- periph = NULL;
-}
-return(periph);
-}
-
-/
* Name the device at (target)
*
* XXX is this strictly correct?
@@ -3427,12 +3404,22 @@ static int
ciss_name_device(struct ciss_softc *sc, int bus, int target)
{
struct cam_periph *periph;
+struct cam_path*path;
+intstatus;
if (CISS_IS_PHYSICAL(bus))
return (0);
-if ((periph = ciss_find_periph(sc, bus, target)) != NULL) {
+
+status = xpt_create_path(path, NULL, cam_sim_path(sc-ciss_cam_sim[bus]),
+target, 0);
+
+if (status == CAM_REQ_CMP) {
+ mtx_lock(sc-ciss_mtx);
+ periph = cam_periph_find(path, NULL);
sprintf(sc-ciss_logical[bus][target].cl_name, %s%d,
periph-periph_name, periph-unit_number);
+ mtx_unlock(sc-ciss_mtx);
+ xpt_free_path(path);
return(0);
}
sc-ciss_logical[bus
svn commit: r265989 - in releng/8.4: . etc etc/mtree etc/pkg share share/keys share/keys/pkg share/keys/pkg/trusted share/man/man7 sys/conf usr.sbin/kldxref usr.sbin/pkg
Author: delphij
Date: Tue May 13 23:24:32 2014
New Revision: 265989
URL: http://svnweb.freebsd.org/changeset/base/265989
Log:
Add pkg bootstrapping, configuration and public keys. [EN-14:03]
Improve build repeatability for kldxref(8). [EN-14:04]
Approved by: so
Added:
releng/8.4/etc/pkg/
releng/8.4/etc/pkg/FreeBSD.conf (contents, props changed)
releng/8.4/etc/pkg/Makefile (contents, props changed)
releng/8.4/share/keys/
releng/8.4/share/keys/Makefile (contents, props changed)
releng/8.4/share/keys/pkg/
releng/8.4/share/keys/pkg/Makefile (contents, props changed)
releng/8.4/share/keys/pkg/trusted/
releng/8.4/share/keys/pkg/trusted/Makefile (contents, props changed)
releng/8.4/share/keys/pkg/trusted/pkg.freebsd.org.2013102301 (contents,
props changed)
Modified:
releng/8.4/UPDATING
releng/8.4/etc/Makefile
releng/8.4/etc/mtree/BSD.root.dist
releng/8.4/etc/mtree/BSD.usr.dist
releng/8.4/share/Makefile
releng/8.4/share/man/man7/hier.7
releng/8.4/sys/conf/newvers.sh
releng/8.4/usr.sbin/kldxref/kldxref.c
releng/8.4/usr.sbin/pkg/pkg.c
Modified: releng/8.4/UPDATING
==
--- releng/8.4/UPDATING Tue May 13 23:24:14 2014(r265988)
+++ releng/8.4/UPDATING Tue May 13 23:24:32 2014(r265989)
@@ -15,6 +15,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
debugging tools present in HEAD were left in place because
sun4v support still needs work to become production ready.
+20140513: p10 FreeBSD-EN-14:03.pkg
+ FreeBSD-EN-14:04.kldxref
+
+ Add pkg bootstrapping, configuration and public keys. [EN-14:03]
+
+ Improve build repeatability for kldxref(8). [EN-14:04]
+
20140430: p9 FreeBSD-SA-14:08.tcp
Fix TCP reassembly vulnerability. [SA-14:08]
Modified: releng/8.4/etc/Makefile
==
--- releng/8.4/etc/Makefile Tue May 13 23:24:14 2014(r265988)
+++ releng/8.4/etc/Makefile Tue May 13 23:24:32 2014(r265989)
@@ -172,6 +172,7 @@ distribution:
${_+_}cd ${.CURDIR}/devd; ${MAKE} install
${_+_}cd ${.CURDIR}/gss; ${MAKE} install
${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
+ ${_+_}cd ${.CURDIR}/pkg; ${MAKE} install
${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install
${_+_}cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall
${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap
Modified: releng/8.4/etc/mtree/BSD.root.dist
==
--- releng/8.4/etc/mtree/BSD.root.dist Tue May 13 23:24:14 2014
(r265988)
+++ releng/8.4/etc/mtree/BSD.root.dist Tue May 13 23:24:32 2014
(r265989)
@@ -52,6 +52,8 @@
weekly
..
..
+pkg
+..
ppp
..
rc.d
Modified: releng/8.4/etc/mtree/BSD.usr.dist
==
--- releng/8.4/etc/mtree/BSD.usr.dist Tue May 13 23:24:14 2014
(r265988)
+++ releng/8.4/etc/mtree/BSD.usr.dist Tue May 13 23:24:32 2014
(r265989)
@@ -340,6 +340,14 @@
..
info
..
+keys
+pkg
+revoked
+..
+trusted
+..
+..
+..
locale
UTF-8
..
Added: releng/8.4/etc/pkg/FreeBSD.conf
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ releng/8.4/etc/pkg/FreeBSD.conf Tue May 13 23:24:32 2014
(r265989)
@@ -0,0 +1,16 @@
+# $FreeBSD$
+#
+# To disable this repository, instead of modifying or removing this file,
+# create a /usr/local/etc/pkg/repos/FreeBSD.conf file:
+#
+# mkdir -p /usr/local/etc/pkg/repos
+# echo FreeBSD: { enabled: no } /usr/local/etc/pkg/repos/FreeBSD.conf
+#
+
+FreeBSD: {
+ url: pkg+http://pkg.FreeBSD.org/${ABI}/latest;,
+ mirror_type: srv,
+ signature_type: fingerprints,
+ fingerprints: /usr/share/keys/pkg,
+ enabled: yes
+}
Added: releng/8.4/etc/pkg/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ releng/8.4/etc/pkg/Makefile Tue May 13 23:24:32 2014(r265989)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+NO_OBJ=
+
+FILES= FreeBSD.conf
+
+FILESDIR= /etc/pkg
+FILESMODE= 644
+
+.include bsd.prog.mk
Modified: releng/8.4/share/Makefile
==
--- releng/8.4/share/Makefile Tue May 13 23:24:14 2014(r265988)
+++ releng/8.4/share/Makefile Tue May 13 23:24:32 2014(r265989)
@@ -9,6 +9,7 @@ SUBDIR= ${_colldef} \
${_dict
svn commit: r265988 - in releng: 9.1 9.1/etc 9.1/etc/mtree 9.1/etc/pkg 9.1/share 9.1/share/keys 9.1/share/keys/pkg 9.1/share/keys/pkg/trusted 9.1/share/man/man7 9.1/sys/conf 9.1/sys/dev/ciss 9.1/us...
Author: delphij
Date: Tue May 13 23:24:14 2014
New Revision: 265988
URL: http://svnweb.freebsd.org/changeset/base/265988
Log:
Add pkg bootstrapping, configuration and public keys. [EN-14:03]
Improve build repeatability for kldxref(8). [EN-14:04]
Fix data corruption with ciss(4). [EN-14:05]
Approved by: so
Added:
releng/9.1/etc/pkg/
releng/9.1/etc/pkg/FreeBSD.conf (contents, props changed)
releng/9.1/etc/pkg/Makefile (contents, props changed)
releng/9.1/share/keys/
releng/9.1/share/keys/Makefile (contents, props changed)
releng/9.1/share/keys/pkg/
releng/9.1/share/keys/pkg/Makefile (contents, props changed)
releng/9.1/share/keys/pkg/trusted/
releng/9.1/share/keys/pkg/trusted/Makefile (contents, props changed)
releng/9.1/share/keys/pkg/trusted/pkg.freebsd.org.2013102301 (contents,
props changed)
releng/9.2/etc/pkg/
releng/9.2/etc/pkg/FreeBSD.conf (contents, props changed)
releng/9.2/etc/pkg/Makefile (contents, props changed)
releng/9.2/share/keys/
releng/9.2/share/keys/Makefile (contents, props changed)
releng/9.2/share/keys/pkg/
releng/9.2/share/keys/pkg/Makefile (contents, props changed)
releng/9.2/share/keys/pkg/trusted/
releng/9.2/share/keys/pkg/trusted/Makefile (contents, props changed)
releng/9.2/share/keys/pkg/trusted/pkg.freebsd.org.2013102301 (contents,
props changed)
Modified:
releng/9.1/UPDATING
releng/9.1/etc/Makefile
releng/9.1/etc/mtree/BSD.root.dist
releng/9.1/etc/mtree/BSD.usr.dist
releng/9.1/share/Makefile
releng/9.1/share/man/man7/hier.7
releng/9.1/sys/conf/newvers.sh
releng/9.1/sys/dev/ciss/ciss.c
releng/9.1/usr.sbin/kldxref/kldxref.c
releng/9.1/usr.sbin/pkg/pkg.c
releng/9.2/UPDATING
releng/9.2/etc/Makefile
releng/9.2/etc/mtree/BSD.root.dist
releng/9.2/etc/mtree/BSD.usr.dist
releng/9.2/share/Makefile
releng/9.2/share/man/man7/hier.7
releng/9.2/sys/conf/newvers.sh
releng/9.2/sys/dev/ciss/ciss.c
releng/9.2/usr.sbin/kldxref/kldxref.c
releng/9.2/usr.sbin/pkg/pkg.c
Modified: releng/9.1/UPDATING
==
--- releng/9.1/UPDATING Tue May 13 23:22:28 2014(r265987)
+++ releng/9.1/UPDATING Tue May 13 23:24:14 2014(r265988)
@@ -9,6 +9,16 @@ handbook.
Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before running portupgrade.
+20140513: p13 FreeBSD-EN-14:03.pkg
+ FreeBSD-EN-14:04.kldxref
+ FreeBSD-EN-14:05.ciss
+
+ Add pkg bootstrapping, configuration and public keys. [EN-14:03]
+
+ Improve build repeatability for kldxref(8). [EN-14:04]
+
+ Fix data corruption with ciss(4). [EN-14:05]
+
20140430: p12 FreeBSD-SA-14:08.tcp
Fix TCP reassembly vulnerability. [SA-14:08]
Modified: releng/9.1/etc/Makefile
==
--- releng/9.1/etc/Makefile Tue May 13 23:22:28 2014(r265987)
+++ releng/9.1/etc/Makefile Tue May 13 23:24:14 2014(r265988)
@@ -205,6 +205,7 @@ distribution:
${_+_}cd ${.CURDIR}/devd; ${MAKE} install
${_+_}cd ${.CURDIR}/gss; ${MAKE} install
${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
+ ${_+_}cd ${.CURDIR}/pkg; ${MAKE} install
${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install
${_+_}cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall
${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap
Modified: releng/9.1/etc/mtree/BSD.root.dist
==
--- releng/9.1/etc/mtree/BSD.root.dist Tue May 13 23:22:28 2014
(r265987)
+++ releng/9.1/etc/mtree/BSD.root.dist Tue May 13 23:24:14 2014
(r265988)
@@ -52,6 +52,8 @@
weekly
..
..
+pkg
+..
ppp
..
rc.d
Modified: releng/9.1/etc/mtree/BSD.usr.dist
==
--- releng/9.1/etc/mtree/BSD.usr.dist Tue May 13 23:22:28 2014
(r265987)
+++ releng/9.1/etc/mtree/BSD.usr.dist Tue May 13 23:24:14 2014
(r265988)
@@ -398,6 +398,14 @@
..
..
..
+keys
+pkg
+revoked
+..
+trusted
+..
+..
+..
locale
UTF-8
..
Added: releng/9.1/etc/pkg/FreeBSD.conf
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ releng/9.1/etc/pkg/FreeBSD.conf Tue May 13 23:24:14 2014
(r265988)
@@ -0,0 +1,16 @@
+# $FreeBSD$
+#
+# To disable this repository, instead of modifying or removing this file,
+# create a /usr/local/etc/pkg/repos/FreeBSD.conf file:
+#
+# mkdir -p
svn commit: r265990 - stable/8/usr.sbin/kldxref
Author: delphij
Date: Tue May 13 23:35:29 2014
New Revision: 265990
URL: http://svnweb.freebsd.org/changeset/base/265990
Log:
Improve build repeatability for kldxref(8). [EN-14:04]
Modified:
stable/8/usr.sbin/kldxref/kldxref.c
Modified: stable/8/usr.sbin/kldxref/kldxref.c
==
--- stable/8/usr.sbin/kldxref/kldxref.c Tue May 13 23:24:32 2014
(r265989)
+++ stable/8/usr.sbin/kldxref/kldxref.c Tue May 13 23:35:29 2014
(r265990)
@@ -275,6 +275,16 @@ usage(void)
exit(1);
}
+static int
+compare(const FTSENT *const *a, const FTSENT *const *b)
+{
+ if ((*a)-fts_info == FTS_D (*b)-fts_info != FTS_D)
+ return 1;
+ if ((*a)-fts_info != FTS_D (*b)-fts_info == FTS_D)
+ return -1;
+ return strcmp((*a)-fts_name, (*b)-fts_name);
+}
+
int
main(int argc, char *argv[])
{
@@ -316,7 +326,7 @@ main(int argc, char *argv[])
err(1, %s, argv[0]);
}
- ftsp = fts_open(argv, fts_options, 0);
+ ftsp = fts_open(argv, fts_options, compare);
if (ftsp == NULL)
exit(1);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r265986 - stable/10/crypto/openssl/ssl
On 14.05.2014 3:19, Xin LI wrote: Author: delphij Date: Tue May 13 23:19:16 2014 New Revision: 265986 URL: http://svnweb.freebsd.org/changeset/base/265986 Log: Fix OpenSSL NULL pointer deference vulnerability. Obtained from: OpenBSD Security: FreeBSD-SA-14:09.openssl Security: CVE-2014-0198 Official fix is a bit different: https://github.com/openssl/openssl/commit/b107586c0c3447ea22dba8698ebbcd81bb29d48c from https://rt.openssl.org/Ticket/Display.html?user=guestpass=guestid=3321 Do we follow official branch or OpenBSD fixes? Modified: stable/10/crypto/openssl/ssl/s3_pkt.c Modified: stable/10/crypto/openssl/ssl/s3_pkt.c == --- stable/10/crypto/openssl/ssl/s3_pkt.c Tue May 13 23:17:24 2014 (r265985) +++ stable/10/crypto/openssl/ssl/s3_pkt.c Tue May 13 23:19:16 2014 (r265986) @@ -657,6 +657,10 @@ static int do_ssl3_write(SSL *s, int typ if (i = 0) return(i); /* if it went, fall through and send more stuff */ + /* we may have released our buffer, so get it again */ + if (wb-buf == NULL) + if (!ssl3_setup_write_buffer(s)) + return -1; } if (len == 0 !create_empty_fragment) -- http://ache.vniz.net/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265991 - stable/10
Author: ian Date: Tue May 13 23:56:51 2014 New Revision: 265991 URL: http://svnweb.freebsd.org/changeset/base/265991 Log: Record missing merge info caused by an erroneous helper script I wrote. Modified: Directory Properties: stable/10/ (props changed) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265992 - stable/10
Author: ian Date: Wed May 14 00:05:35 2014 New Revision: 265992 URL: http://svnweb.freebsd.org/changeset/base/265992 Log: Record mergeinfo that was eaten by the dog. Yeah, that's my story and I'm sticking to it. Modified: Directory Properties: stable/10/ (props changed) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r265973 - stable/10/sys/dev/uart
On Tue, 2014-05-13 at 23:35 +0400, Sergey Kandaurov wrote: On 13 May 2014 23:09, Ian Lepore i...@freebsd.org wrote: Author: ian Date: Tue May 13 19:09:00 2014 New Revision: 265973 URL: http://svnweb.freebsd.org/changeset/base/265973 Log: MFC r257111, r257144, r257157, r257183 Test UARTs physical address instead of virtual. Be a bit more flexible in how we find the console from the properties on /chosen, following the list of allowed console properties in ePAPR. Also do not require that stdin be defined and equal to stdout: stdin is nonstandard (for ePAPR) and console in an unexpected place is after all better than no console. Modified: stable/10/sys/dev/uart/uart_cpu_fdt.c Taking random commit of your merge series: all of them miss svn:mergeinfo. Thanks. A combo of a misunderstanding on my part and a poorly written helper script caused this. (I wrote another script to help me fix it, I sure hope I got that one right) At least you let me know before it got too out of hand... I have over 400 ARM-related changesets to merge still. -- Ian ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265995 - head/secure/lib/libcrypt
Author: delphij Date: Wed May 14 00:50:31 2014 New Revision: 265995 URL: http://svnweb.freebsd.org/changeset/base/265995 Log: Switch using the new $2b$ format by default, when bcrypt is used. MFC after:2 weeks Relnotes: default Blowfish crypt(3) format have been changed to $2b$. Modified: head/secure/lib/libcrypt/crypt-blowfish.c Modified: head/secure/lib/libcrypt/crypt-blowfish.c == --- head/secure/lib/libcrypt/crypt-blowfish.c Wed May 14 00:39:54 2014 (r265994) +++ head/secure/lib/libcrypt/crypt-blowfish.c Wed May 14 00:50:31 2014 (r265995) @@ -149,7 +149,7 @@ crypt_blowfish(const char *key, const ch char arounds[3]; /* Defaults */ - minr = 'a'; + minr = 'b'; logr = BCRYPT_MINLOGROUNDS; rounds = 1U logr; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265996 - in stable/10/sys/powerpc: aim booke include mpc85xx powerpc
Author: ian
Date: Wed May 14 00:51:26 2014
New Revision: 265996
URL: http://svnweb.freebsd.org/changeset/base/265996
Log:
MFC r257161, r257169, r257178, r257190, r257191
Add pmap_mapdev_attr() and pmap_kenter_attr() interfaces.
Fix concurrency issues with TLB1 updates and make pmap_kextract() search
TLB1 mappings as well
Interrelated improvements to early boot mappings:
- Remove explicit requirement that the SOC registers be found except as an
optimization (although the MPC85XX LAW drivers still require they be found
externally, which should change).
- Remove magic CCSRBAR_VA value.
- Allow bus_machdep.c's early-boot code to handle non 1:1 mappings and
systems not in real-mode or global 1:1 maps in early boot.
- Allow pmap_mapdev() on Book-E to reissue previous addresses if the
area is already mapped. Additionally have it check all mappings, not
just the CCSR area.
Add some extra sanity checking and checks to printf format specifiers.
Bump initial TLB size. The kernel is not necessarily less than 16 MB
Handle (in a slightly ugly way) ePAPR-type loaders that just place a
device tree into r3.
Modified:
stable/10/sys/powerpc/aim/machdep.c
stable/10/sys/powerpc/booke/locore.S
stable/10/sys/powerpc/booke/machdep.c
stable/10/sys/powerpc/booke/machdep_e500.c
stable/10/sys/powerpc/booke/pmap.c
stable/10/sys/powerpc/include/pmap.h
stable/10/sys/powerpc/include/tlb.h
stable/10/sys/powerpc/include/vmparam.h
stable/10/sys/powerpc/mpc85xx/mpc85xx.c
stable/10/sys/powerpc/mpc85xx/mpc85xx.h
stable/10/sys/powerpc/powerpc/bus_machdep.c
Modified: stable/10/sys/powerpc/aim/machdep.c
==
--- stable/10/sys/powerpc/aim/machdep.c Wed May 14 00:50:31 2014
(r265995)
+++ stable/10/sys/powerpc/aim/machdep.c Wed May 14 00:51:26 2014
(r265996)
@@ -777,6 +777,13 @@ va_to_vsid(pmap_t pm, vm_offset_t va)
#endif
+vm_offset_t
+pmap_early_io_map(vm_paddr_t pa, vm_size_t size)
+{
+
+ return (pa);
+}
+
/* From p3-53 of the MPC7450 RISC Microprocessor Family Reference Manual */
void
flush_disable_caches(void)
@@ -944,4 +951,4 @@ cpu_sleep()
if (vectd == curthread)
enable_vec(curthread);
powerpc_sync();
-}
+}
\ No newline at end of file
Modified: stable/10/sys/powerpc/booke/locore.S
==
--- stable/10/sys/powerpc/booke/locore.SWed May 14 00:50:31 2014
(r265995)
+++ stable/10/sys/powerpc/booke/locore.SWed May 14 00:51:26 2014
(r265996)
@@ -158,7 +158,7 @@ __start:
mtspr SPR_MAS0, %r3
isync
- li %r3, (TLB_SIZE_16M MAS1_TSIZE_SHIFT)@l
+ li %r3, (TLB_SIZE_64M MAS1_TSIZE_SHIFT)@l
oris%r3, %r3, (MAS1_VALID | MAS1_IPROT)@h
mtspr SPR_MAS1, %r3 /* note TS was not filled, so it's TS=0
*/
isync
Modified: stable/10/sys/powerpc/booke/machdep.c
==
--- stable/10/sys/powerpc/booke/machdep.c Wed May 14 00:50:31 2014
(r265995)
+++ stable/10/sys/powerpc/booke/machdep.c Wed May 14 00:51:26 2014
(r265996)
@@ -137,6 +137,7 @@ __FBSDID($FreeBSD$);
#include sys/linker.h
#include sys/reboot.h
+#include contrib/libfdt/libfdt.h
#include dev/fdt/fdt_common.h
#include dev/ofw/openfirm.h
@@ -276,6 +277,23 @@ print_kernel_section_addr(void)
debugf( _end = 0x%08x\n, (uint32_t)_end);
}
+static int
+booke_check_for_fdt(uint32_t arg1, vm_offset_t *dtbp)
+{
+ void *ptr;
+
+ if (arg1 % 8 != 0)
+ return (-1);
+
+ ptr = (void *)pmap_early_io_map(arg1, PAGE_SIZE);
+ if (fdt_check_header(ptr) != 0)
+ return (-1);
+
+ *dtbp = (vm_offset_t)ptr;
+
+ return (0);
+}
+
u_int
booke_init(uint32_t arg1, uint32_t arg2)
{
@@ -288,6 +306,10 @@ booke_init(uint32_t arg1, uint32_t arg2)
end = (uintptr_t)_end;
dtbp = (vm_offset_t)NULL;
+ /* Set up TLB initially */
+ bootinfo = NULL;
+ tlb1_init();
+
/*
* Handle the various ways we can get loaded and started:
* - FreeBSD's loader passes the pointer to the metadata
@@ -302,11 +324,21 @@ booke_init(uint32_t arg1, uint32_t arg2)
* in arg1 and arg2 (resp). arg1 is between 1 and some
* relatively small number, such as 64K. arg2 is the
* physical address of the argv vector.
+* - ePAPR loaders pass an FDT blob in r3 (arg1) and the magic hex
+* string 0x45504150 ('ePAP') in r6 (which has been lost by now).
+* r4 (arg2) is supposed to be set to zero, but is not always.
*/
- if (arg1 (uintptr_t)kernel_text) /* FreeBSD loader */
- mdp = (void *)arg1;
-
Re: svn commit: r265986 - stable/10/crypto/openssl/ssl
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 05/13/14 16:36, Andrey Chernov wrote: On 14.05.2014 3:19, Xin LI wrote: Author: delphij Date: Tue May 13 23:19:16 2014 New Revision: 265986 URL: http://svnweb.freebsd.org/changeset/base/265986 Log: Fix OpenSSL NULL pointer deference vulnerability. Obtained from: OpenBSD Security: FreeBSD-SA-14:09.openssl Security:CVE-2014-0198 Official fix is a bit different: https://github.com/openssl/openssl/commit/b107586c0c3447ea22dba8698ebbcd81bb29d48c from https://rt.openssl.org/Ticket/Display.html?user=guestpass=guestid=3321 Do we follow official branch or OpenBSD fixes? Principally we follow the official branch whenever applicable, we didn't do it for this one because the advisory was prepared about two weeks ago. For -HEAD and -STABLE we should probably adopt the upstream version to ease future maintenance. Cheers, - -- Xin LI delp...@delphij.nethttps://www.delphij.net/ FreeBSD - The Power to Serve! Live free or die -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.22 (FreeBSD) iQIcBAEBCgAGBQJTcr7QAAoJEJW2GBstM+nsZSkQAKxb/l+s7TEJadXf3a2pMR1/ DbNBW2WKTCS8QqGRyIqd2z9VPpsa5ECIVpaiekMLUxG85m+mBqV3sTQUXjFTwaU7 HQIGkiCbwnw8/u0+xoFByGzQW822qVvW/+OoylEw90JnDqtrWsoDfLND80H1/IUj LKPJu2lU4rI6EFQ2b6ps01XqaoWKK16MkyB47CiRcDlonqWJ5SvB9TsDsyFJjb5u gnq6RYuZfSFzt8NGL1/9wLXjR9QPtmd/ekp+NOkGRQHPoGjIQ7/Z/mKfEpm11UVs lHm3c89O0+JxNfVzZrlx70xMYrbZCI7oGPlIROjF8jel/RfpypVnDB4L162Nhslw oMlEtD88Kzlb0OWdBmyo811p9wqQ7l2xer774oQzWmfSjo1eZzuNcniYEBwGZ37y hif8tOLEnc4yXZmdKFb5qwpYftyBRfA76bKXEUGXz91b0zdK2M09SuPkgtUiks6Y 6Ame2UHpIwaMULzUA8r98o6C21YuirKM2mD3BGe1zZtWJQ6U2l6a0MCe4d9//6yq aciKsnLgZbaxa1aza3b1gO8fW3Da/9bQ06eeLhcM/F6wEx9dMSo+TAtrjWK95Q9L eNynRxAw3udWAqV+AdVB9U9SGckqe0lLDjMeJq2IV8GCwQb34oAfX5qklyRj2OaI LB21EyspUSw1/hjFrYYI =8DUK -END PGP SIGNATURE- ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265997 - stable/10
Author: ian Date: Wed May 14 00:55:21 2014 New Revision: 265997 URL: http://svnweb.freebsd.org/changeset/base/265997 Log: Record mergeinfo that got run over by a bus. Modified: Directory Properties: stable/10/ (props changed) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265998 - in stable/10/sys: boot/powerpc/ps3 dev/adb dev/uart powerpc/aim powerpc/booke powerpc/include
Author: ian
Date: Wed May 14 01:16:05 2014
New Revision: 265998
URL: http://svnweb.freebsd.org/changeset/base/265998
Log:
MFC r257180, r257195, r257196, r257198, r257209, r257295
Add some extra sanity checking and checks to printf format specifiers.
Try even harder to find a console before giving up.
Make devices with registers into the KVA region work reliably.
Turn on VM_KMEM_SIZE_SCALE on 32-bit as well as 64-bit PowerPC.
Return NOKEY instead of 0 if there are no more key presses queued.
Modified:
stable/10/sys/boot/powerpc/ps3/start.S
stable/10/sys/dev/adb/adb_kbd.c
stable/10/sys/dev/uart/uart_cpu_fdt.c
stable/10/sys/powerpc/aim/mmu_oea64.c
stable/10/sys/powerpc/booke/pmap.c
stable/10/sys/powerpc/include/vmparam.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/boot/powerpc/ps3/start.S
==
--- stable/10/sys/boot/powerpc/ps3/start.S Wed May 14 00:55:21 2014
(r265997)
+++ stable/10/sys/boot/powerpc/ps3/start.S Wed May 14 01:16:05 2014
(r265998)
@@ -27,7 +27,7 @@
#define LOCORE
-#include machine/trap_aim.h
+#include machine/trap.h
/*
* KBoot and simulators will start this program from the _start symbol, with
Modified: stable/10/sys/dev/adb/adb_kbd.c
==
--- stable/10/sys/dev/adb/adb_kbd.c Wed May 14 00:55:21 2014
(r265997)
+++ stable/10/sys/dev/adb/adb_kbd.c Wed May 14 01:16:05 2014
(r265998)
@@ -621,7 +621,7 @@ akbd_read_char(keyboard_t *kbd, int wait
if (!sc-buffers) {
mtx_unlock(sc-sc_mutex);
- return (0);
+ return (NOKEY);
}
adb_code = sc-buffer[0];
Modified: stable/10/sys/dev/uart/uart_cpu_fdt.c
==
--- stable/10/sys/dev/uart/uart_cpu_fdt.c Wed May 14 00:55:21 2014
(r265997)
+++ stable/10/sys/dev/uart/uart_cpu_fdt.c Wed May 14 01:16:05 2014
(r265998)
@@ -142,14 +142,19 @@ uart_cpu_getdev(int devtype, struct uart
/*
* Retrieve /chosen/std{in,out}.
*/
- if ((chosen = OF_finddevice(/chosen)) == -1)
- return (ENXIO);
- for (name = propnames; *name != NULL; name++) {
- if (phandle_chosen_propdev(chosen, *name, node) == 0)
- break;
+ node = -1;
+ if ((chosen = OF_finddevice(/chosen)) != -1) {
+ for (name = propnames; *name != NULL; name++) {
+ if (phandle_chosen_propdev(chosen, *name, node) == 0)
+ break;
+ }
}
- if (*name == NULL)
+ if (chosen == -1 || *name == NULL)
+ node = OF_finddevice(serial0); /* Last ditch */
+
+ if (node == -1) /* Can't find anything */
return (ENXIO);
+
/*
* Retrieve serial attributes.
*/
Modified: stable/10/sys/powerpc/aim/mmu_oea64.c
==
--- stable/10/sys/powerpc/aim/mmu_oea64.c Wed May 14 00:55:21 2014
(r265997)
+++ stable/10/sys/powerpc/aim/mmu_oea64.c Wed May 14 01:16:05 2014
(r265998)
@@ -501,15 +501,7 @@ moea64_add_ofw_mappings(mmu_t mmup, phan
qsort(translations, sz, sizeof (*translations), om_cmp);
for (i = 0; i sz; i++) {
- CTR3(KTR_PMAP, translation: pa=%#x va=%#x len=%#x,
- (uint32_t)(translations[i].om_pa_lo), translations[i].om_va,
- translations[i].om_len);
-
- if (translations[i].om_pa_lo % PAGE_SIZE)
- panic(OFW translation not page-aligned!);
-
pa_base = translations[i].om_pa_lo;
-
#ifdef __powerpc64__
pa_base += (vm_offset_t)translations[i].om_pa_hi 32;
#else
@@ -517,6 +509,14 @@ moea64_add_ofw_mappings(mmu_t mmup, phan
panic(OFW translations above 32-bit boundary!);
#endif
+ if (pa_base % PAGE_SIZE)
+ panic(OFW translation not page-aligned (phys)!);
+ if (translations[i].om_va % PAGE_SIZE)
+ panic(OFW translation not page-aligned (virt)!);
+
+ CTR3(KTR_PMAP, translation: pa=%#zx va=%#x len=%#x,
+ pa_base, translations[i].om_va, translations[i].om_len);
+
/* Now enter the pages for this mapping */
DISABLE_TRANS(msr);
@@ -693,9 +693,9 @@ moea64_early_bootstrap(mmu_t mmup, vm_of
hwphyssz = 0;
TUNABLE_ULONG_FETCH(hw.physmem, (u_long *) hwphyssz);
for (i = 0, j = 0; i regions_sz; i++, j += 2) {
- CTR3(KTR_PMAP, region: %#x - %#x (%#x), regions[i].mr_start,
-
svn commit: r265999 - in stable/10/sys: arm/at91 arm/econa arm/s3c2xx0 arm/sa11x0 arm/xscale/i80321 arm/xscale/pxa dev/acpica dev/altera/atse dev/altera/avgen dev/altera/jtag_uart dev/altera/sdcard...
Author: ian
Date: Wed May 14 01:35:43 2014
New Revision: 265999
URL: http://svnweb.freebsd.org/changeset/base/265999
Log:
MFC r257334, r257336, r257337, r257338, r257341, r257342, r257343, r257370,
r257368, r257416
Hints-only devices should return BUS_PROBE_NOWILDCARD from their probe
methods.
Modified:
stable/10/sys/arm/at91/at91.c
stable/10/sys/arm/econa/econa.c
stable/10/sys/arm/s3c2xx0/s3c24x0.c
stable/10/sys/arm/sa11x0/sa11x0.c
stable/10/sys/arm/xscale/i80321/iq80321.c
stable/10/sys/arm/xscale/pxa/pxa_obio.c
stable/10/sys/dev/acpica/acpi.c
stable/10/sys/dev/altera/atse/if_atse_nexus.c
stable/10/sys/dev/altera/avgen/altera_avgen_nexus.c
stable/10/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c
stable/10/sys/dev/altera/sdcard/altera_sdcard_nexus.c
stable/10/sys/dev/cfe/cfe_resource.c
stable/10/sys/dev/gxemul/disk/gxemul_disk.c
stable/10/sys/dev/gxemul/ether/if_gx.c
stable/10/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
stable/10/sys/dev/rt/if_rt.c
stable/10/sys/dev/terasic/de4led/terasic_de4led_nexus.c
stable/10/sys/dev/terasic/mtl/terasic_mtl_nexus.c
stable/10/sys/dev/xen/console/console.c
stable/10/sys/dev/xen/pcifront/pcifront.c
stable/10/sys/dev/xen/timer/timer.c
stable/10/sys/mips/adm5120/obio.c
stable/10/sys/mips/alchemy/obio.c
stable/10/sys/mips/atheros/apb.c
stable/10/sys/mips/atheros/ar71xx_ehci.c
stable/10/sys/mips/atheros/ar71xx_pci.c
stable/10/sys/mips/atheros/ar71xx_spi.c
stable/10/sys/mips/atheros/ar71xx_wdog.c
stable/10/sys/mips/atheros/ar724x_pci.c
stable/10/sys/mips/atheros/if_arge.c
stable/10/sys/mips/cavium/ciu.c
stable/10/sys/mips/cavium/octeon_ebt3000_cf.c
stable/10/sys/mips/cavium/octeon_pmc.c
stable/10/sys/mips/cavium/octeon_rnd.c
stable/10/sys/mips/cavium/octeon_rtc.c
stable/10/sys/mips/idt/obio.c
stable/10/sys/mips/malta/gt.c
stable/10/sys/mips/mips/tick.c
stable/10/sys/mips/nlm/tick.c
stable/10/sys/mips/nlm/xlp_pci.c
stable/10/sys/mips/rmi/iodi.c
stable/10/sys/mips/rmi/tick.c
stable/10/sys/mips/rt305x/obio.c
stable/10/sys/mips/sibyte/sb_zbbus.c
stable/10/sys/modules/Makefile
stable/10/sys/powerpc/pseries/plpar_iommu.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/arm/at91/at91.c
==
--- stable/10/sys/arm/at91/at91.c Wed May 14 01:16:05 2014
(r265998)
+++ stable/10/sys/arm/at91/at91.c Wed May 14 01:35:43 2014
(r265999)
@@ -232,8 +232,7 @@ at91_probe(device_t dev)
{
device_set_desc(dev, AT91 device bus);
- arm_post_filter = at91_eoi;
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static void
@@ -262,6 +261,8 @@ at91_attach(device_t dev)
const struct arm_devmap_entry *pdevmap;
int i;
+ arm_post_filter = at91_eoi;
+
at91_softc = sc;
sc-sc_st = at91_bs_tag;
sc-sc_sh = AT91_BASE;
Modified: stable/10/sys/arm/econa/econa.c
==
--- stable/10/sys/arm/econa/econa.c Wed May 14 01:16:05 2014
(r265998)
+++ stable/10/sys/arm/econa/econa.c Wed May 14 01:35:43 2014
(r265999)
@@ -172,7 +172,7 @@ econa_probe(device_t dev)
{
device_set_desc(dev, ECONA device bus);
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static void
Modified: stable/10/sys/arm/s3c2xx0/s3c24x0.c
==
--- stable/10/sys/arm/s3c2xx0/s3c24x0.c Wed May 14 01:16:05 2014
(r265998)
+++ stable/10/sys/arm/s3c2xx0/s3c24x0.c Wed May 14 01:35:43 2014
(r265999)
@@ -429,7 +429,7 @@ s3c24x0_identify(driver_t *driver, devic
int
s3c24x0_probe(device_t dev)
{
- return 0;
+ return (BUS_PROBE_NOWILDCARD);
}
int
Modified: stable/10/sys/arm/sa11x0/sa11x0.c
==
--- stable/10/sys/arm/sa11x0/sa11x0.c Wed May 14 01:16:05 2014
(r265998)
+++ stable/10/sys/arm/sa11x0/sa11x0.c Wed May 14 01:35:43 2014
(r265999)
@@ -139,7 +139,7 @@ extern vm_offset_t saipic_base;
int
sa11x0_probe(device_t dev)
{
- return 0;
+ return (BUS_PROBE_NOWILDCARD);
}
void
Modified: stable/10/sys/arm/xscale/i80321/iq80321.c
==
--- stable/10/sys/arm/xscale/i80321/iq80321.c Wed May 14 01:16:05 2014
(r265998)
+++ stable/10/sys/arm/xscale/i80321/iq80321.c Wed May 14 01:35:43 2014
(r265999)
@@ -72,7 +72,7 @@ int
iq80321_probe(device_t dev)
{
device_set_desc(dev, Intel 80321);
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
void
Modified: stable/10/sys/arm/xscale/pxa/pxa_obio.c
==
---
svn commit: r266000 - in stable/10/sys: arm/arm arm/broadcom/bcm2835 arm/freescale/imx arm/mv conf dev/fdt dev/mii dev/ofw mips/mips powerpc/booke powerpc/mpc85xx
Author: ian
Date: Wed May 14 01:53:20 2014
New Revision: 266000
URL: http://svnweb.freebsd.org/changeset/base/266000
Log:
MFC r257702, r257745, r257746, r257747, r257751, r257791, r257793,
r257794, r257795, r257992
Teach nexus(4) about Open Firmware (e.g. FDT) on ARM and MIPS, retiring
fdtbus in most cases.
Make OF_nextprop() work correctly for FDT by using the libfdt
fdt_next_property_offset() API.
Do not panic if pmap_mincore() is called.
An addendum: it is possible, though of questionable utility, for a node
to have no properties at all.
Add definition for the Atheros 8021 gigabit PHY.
Consolidate Apple firmware hacks and improve them by switching on the
presence of mac-io devices in the tree, which uniquely identifies Apple
hardware.
Allow OF_decode_addr() to also be able to map resources on big-endian
devices.
Make tsec work with the device tree present on the RB800.
Be more flexible about which compatible strings to accept. This brings up
the PCI Express bus on the RB800 using the firmware device tree.
Rename the bare platform mpc85xx, which is what it actually is, and
add actual platform probing based on PVR.
Modified:
stable/10/sys/arm/arm/nexus.c
stable/10/sys/arm/broadcom/bcm2835/bcm2835_fb.c
stable/10/sys/arm/freescale/imx/tzic.c
stable/10/sys/arm/mv/mv_localbus.c
stable/10/sys/arm/mv/mv_pci.c
stable/10/sys/conf/files
stable/10/sys/dev/fdt/simplebus.c
stable/10/sys/dev/mii/atphy.c
stable/10/sys/dev/mii/miidevs
stable/10/sys/dev/ofw/ofw_fdt.c
stable/10/sys/mips/mips/nexus.c
stable/10/sys/powerpc/booke/pmap.c
stable/10/sys/powerpc/mpc85xx/lbc.c
stable/10/sys/powerpc/mpc85xx/pci_mpc85xx.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/arm/arm/nexus.c
==
--- stable/10/sys/arm/arm/nexus.c Wed May 14 01:35:43 2014
(r265999)
+++ stable/10/sys/arm/arm/nexus.c Wed May 14 01:53:20 2014
(r266000)
@@ -60,6 +60,12 @@ __FBSDID($FreeBSD$);
#include machine/resource.h
#include machine/intr.h
+#include opt_platform.h
+
+#ifdef FDT
+#include dev/ofw/ofw_nexus.h
+#include machine/fdt.h
+#else
static MALLOC_DEFINE(M_NEXUSDEV, nexusdev, Nexus device);
struct nexus_device {
@@ -76,13 +82,18 @@ static int nexus_print_child(device_t, d
static device_t nexus_add_child(device_t, u_int, const char *, int);
static struct resource *nexus_alloc_resource(device_t, device_t, int, int *,
u_long, u_long, u_long, u_int);
+#endif
static int nexus_activate_resource(device_t, device_t, int, int,
struct resource *);
+static int nexus_deactivate_resource(device_t, device_t, int, int,
+struct resource *);
+
static int nexus_setup_intr(device_t dev, device_t child, struct resource *res,
int flags, driver_filter_t *filt, driver_intr_t *intr, void *arg, void
**cookiep);
static int nexus_teardown_intr(device_t, device_t, struct resource *, void *);
static device_method_t nexus_methods[] = {
+#ifndef FDT
/* Device interface */
DEVMETHOD(device_probe, nexus_probe),
DEVMETHOD(device_attach,nexus_attach),
@@ -90,19 +101,28 @@ static device_method_t nexus_methods[] =
DEVMETHOD(bus_print_child, nexus_print_child),
DEVMETHOD(bus_add_child,nexus_add_child),
DEVMETHOD(bus_alloc_resource, nexus_alloc_resource),
+#endif
DEVMETHOD(bus_activate_resource,nexus_activate_resource),
+ DEVMETHOD(bus_deactivate_resource, nexus_deactivate_resource),
DEVMETHOD(bus_setup_intr, nexus_setup_intr),
DEVMETHOD(bus_teardown_intr,nexus_teardown_intr),
{ 0, 0 }
};
+static devclass_t nexus_devclass;
+#ifndef FDT
static driver_t nexus_driver = {
nexus,
nexus_methods,
1 /* no softc */
};
-static devclass_t nexus_devclass;
+#else
+DEFINE_CLASS_1(nexus, nexus_driver, nexus_methods,
+sizeof(struct ofw_nexus_softc), ofw_nexus_driver);
+#endif
+DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0);
+#ifndef FDT
static int
nexus_probe(device_t dev)
{
@@ -113,30 +133,6 @@ nexus_probe(device_t dev)
}
static int
-nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags,
-driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep)
-{
- int irq;
-
- if ((rman_get_flags(res) RF_SHAREABLE) == 0)
- flags |= INTR_EXCL;
-
- for (irq = rman_get_start(res); irq = rman_get_end(res); irq++) {
- arm_setup_irqhandler(device_get_nameunit(child),
- filt, intr, arg, irq, flags, cookiep);
- arm_unmask_irq(irq);
- }
- return (0);
-}
-
-static int
-nexus_teardown_intr(device_t dev, device_t child, struct resource *r, void *ih)
-{
-
- return
svn commit: r266001 - in stable/10/sys: conf powerpc/aim powerpc/booke powerpc/include powerpc/powerpc
Author: ian Date: Wed May 14 03:09:37 2014 New Revision: 266001 URL: http://svnweb.freebsd.org/changeset/base/266001 Log: MFC r258002, r258024, r258027, r258051, r258052, r258243, r258244, r258002, r258024, r258027, r258051, r258052, r258243, Follow up r223485, which made AIM use the ABI thread pointer instead of PCPU fields for curthread, by doing the same to Book-E. Use the same implementation of copyinout.c for both AIM and Book-E. Actually add IOMMU domain to the list of known mappings. Following the approach with ACPI DMAR on x86, split IOMMU handling into a variant PCI bus instead of trying to shoehorn it into the PCI host bridge adapter. Make sure that TLB1 mappings are aligned correctly. Added: stable/10/sys/powerpc/powerpc/copyinout.c - copied, changed from r258024, head/sys/powerpc/powerpc/copyinout.c stable/10/sys/powerpc/powerpc/swtch32.S - copied unchanged from r258002, head/sys/powerpc/powerpc/swtch32.S stable/10/sys/powerpc/powerpc/swtch64.S - copied unchanged from r258002, head/sys/powerpc/powerpc/swtch64.S Deleted: stable/10/sys/powerpc/aim/copyinout.c stable/10/sys/powerpc/aim/swtch32.S stable/10/sys/powerpc/aim/swtch64.S stable/10/sys/powerpc/booke/copyinout.c stable/10/sys/powerpc/booke/swtch.S Modified: stable/10/sys/conf/files.powerpc stable/10/sys/powerpc/booke/locore.S stable/10/sys/powerpc/booke/machdep.c stable/10/sys/powerpc/booke/mp_cpudep.c stable/10/sys/powerpc/booke/pmap.c stable/10/sys/powerpc/booke/trap_subr.S stable/10/sys/powerpc/include/pcpu.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/conf/files.powerpc == --- stable/10/sys/conf/files.powerpcWed May 14 01:53:20 2014 (r266000) +++ stable/10/sys/conf/files.powerpcWed May 14 03:09:37 2014 (r266001) @@ -89,7 +89,6 @@ libkern/qdivrem.c optionalpowerpc libkern/ucmpdi2.c optionalpowerpc libkern/udivdi3.c optionalpowerpc libkern/umoddi3.c optionalpowerpc -powerpc/aim/copyinout.coptionalaim powerpc/aim/interrupt.coptionalaim powerpc/aim/locore.S optionalaim no-obj powerpc/aim/machdep.c optionalaim @@ -99,11 +98,8 @@ powerpc/aim/moea64_if.m optionalaim powerpc/aim/moea64_native.coptionalaim powerpc/aim/mp_cpudep.coptionalaim powerpc/aim/slb.c optionalaim powerpc64 -powerpc/aim/swtch32.S optionalaim powerpc -powerpc/aim/swtch64.S optionalaim powerpc64 powerpc/aim/trap.c optionalaim powerpc/aim/uma_machdep.c optionalaim -powerpc/booke/copyinout.c optionalbooke powerpc/booke/interrupt.c optionalbooke powerpc/booke/locore.S optionalbooke no-obj powerpc/booke/machdep.coptionalbooke @@ -111,7 +107,6 @@ powerpc/booke/machdep_e500.coptionalbo powerpc/booke/mp_cpudep.c optionalbooke smp powerpc/booke/platform_bare.c optionalmpc85xx powerpc/booke/pmap.c optionalbooke -powerpc/booke/swtch.S optionalbooke powerpc/booke/trap.c optionalbooke powerpc/cpufreq/dfs.c optionalcpufreq powerpc/cpufreq/pcr.c optionalcpufreq aim @@ -179,6 +174,7 @@ powerpc/powerpc/bcopy.c standard powerpc/powerpc/bus_machdep.c standard powerpc/powerpc/busdma_machdep.c standard powerpc/powerpc/clock.cstandard +powerpc/powerpc/copyinout.cstandard powerpc/powerpc/copystr.c standard powerpc/powerpc/cpu.c standard powerpc/powerpc/db_disasm.coptionalddb @@ -208,6 +204,8 @@ powerpc/powerpc/sc_machdep.coptionalsc powerpc/powerpc/setjmp.S standard powerpc/powerpc/sigcode32.Soptionalpowerpc | compat_freebsd32 powerpc/powerpc/sigcode64.Soptionalpowerpc64 +powerpc/powerpc/swtch32.S optionalpowerpc +powerpc/powerpc/swtch64.S optionalpowerpc64 powerpc/powerpc/stack_machdep.coptionalddb | stack powerpc/powerpc/suswintr.c standard powerpc/powerpc/syncicache.c standard Modified: stable/10/sys/powerpc/booke/locore.S == --- stable/10/sys/powerpc/booke/locore.SWed May 14 01:53:20 2014 (r266000) +++ stable/10/sys/powerpc/booke/locore.SWed May 14 03:09:37 2014 (r266001) @@ -738,8 +738,7 @@ ENTRY(icache_enable) setfault: mflr%r0 mfsprg0 %r4 - lwz %r4, PC_CURTHREAD(%r4) - lwz %r4, TD_PCB(%r4) + lwz %r4, TD_PCB(%r2) stw
svn commit: r266003 - in stable/10/sys: conf powerpc/booke powerpc/include powerpc/mpc85xx powerpc/powerpc
Author: ian
Date: Wed May 14 04:14:58 2014
New Revision: 266003
URL: http://svnweb.freebsd.org/changeset/base/266003
Log:
MFC r257995, r258244, r258246,
Rename the bare platform mpc85xx
Also turn bare into a truly bare platform
Move CCSR discovery into the platform module
There is no reason Book-E needs to save XER and CTR on context switches.
Added:
stable/10/sys/powerpc/mpc85xx/platform_mpc85xx.c
- copied, changed from r257995, head/sys/powerpc/mpc85xx/platform_mpc85xx.c
Modified:
stable/10/sys/conf/files.powerpc
stable/10/sys/powerpc/booke/machdep.c
stable/10/sys/powerpc/booke/platform_bare.c
stable/10/sys/powerpc/include/pcb.h
stable/10/sys/powerpc/mpc85xx/mpc85xx.h
stable/10/sys/powerpc/powerpc/genassym.c
stable/10/sys/powerpc/powerpc/swtch32.S
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/conf/files.powerpc
==
--- stable/10/sys/conf/files.powerpcWed May 14 04:02:59 2014
(r266002)
+++ stable/10/sys/conf/files.powerpcWed May 14 04:14:58 2014
(r266003)
@@ -105,7 +105,7 @@ powerpc/booke/locore.S optionalbooke n
powerpc/booke/machdep.coptionalbooke
powerpc/booke/machdep_e500.c optionalbooke_e500
powerpc/booke/mp_cpudep.c optionalbooke smp
-powerpc/booke/platform_bare.c optionalmpc85xx
+powerpc/booke/platform_bare.c optionalbooke
powerpc/booke/pmap.c optionalbooke
powerpc/booke/trap.c optionalbooke
powerpc/cpufreq/dfs.c optionalcpufreq
@@ -131,6 +131,7 @@ powerpc/mpc85xx/i2c.c optionaliicbus f
powerpc/mpc85xx/isa.c optionalmpc85xx isa
powerpc/mpc85xx/lbc.c optionalmpc85xx
powerpc/mpc85xx/mpc85xx.c optionalmpc85xx
+powerpc/mpc85xx/platform_mpc85xx.c optionalmpc85xx
powerpc/mpc85xx/pci_mpc85xx.c optionalpci mpc85xx
powerpc/ofw/ofw_cpu.c optionalaim
powerpc/ofw/ofw_machdep.c standard
Modified: stable/10/sys/powerpc/booke/machdep.c
==
--- stable/10/sys/powerpc/booke/machdep.c Wed May 14 04:02:59 2014
(r266002)
+++ stable/10/sys/powerpc/booke/machdep.c Wed May 14 04:14:58 2014
(r266003)
@@ -387,14 +387,6 @@ booke_init(uint32_t arg1, uint32_t arg2)
/* Reset TLB1 to get rid of temporary mappings */
tlb1_init();
- /* Set up IMMR */
- if (fdt_immr_addr(0) == 0) {
- fdt_immr_va = pmap_early_io_map(fdt_immr_pa, fdt_immr_size);
- } else {
- printf(Warning: SOC base registers could not be found!\n);
- fdt_immr_va = 0;
- }
-
/* Reset Time Base */
mttb(0);
Modified: stable/10/sys/powerpc/booke/platform_bare.c
==
--- stable/10/sys/powerpc/booke/platform_bare.c Wed May 14 04:02:59 2014
(r266002)
+++ stable/10/sys/powerpc/booke/platform_bare.c Wed May 14 04:14:58 2014
(r266003)
@@ -35,65 +35,34 @@ __FBSDID($FreeBSD$);
#include sys/proc.h
#include sys/smp.h
-#include machine/bus.h
-#include machine/cpu.h
-#include machine/hid.h
-#include machine/platform.h
-#include machine/platformvar.h
-#include machine/smp.h
-#include machine/spr.h
-#include machine/vmparam.h
-
-#include dev/fdt/fdt_common.h
-#include dev/ofw/ofw_bus.h
-#include dev/ofw/ofw_bus_subr.h
#include dev/ofw/openfirm.h
-#include powerpc/mpc85xx/mpc85xx.h
+#include machine/platform.h
+#include machine/platformvar.h
#include platform_if.h
-#ifdef SMP
-extern void *ap_pcpu;
-extern vm_paddr_t kernload;/* Kernel physical load address */
-extern uint8_t __boot_page[]; /* Boot page body */
-extern uint32_t bp_ntlb1s;
-extern uint32_t bp_tlb1[];
-extern uint32_t bp_tlb1_end[];
-#endif
-
extern uint32_t *bootinfo;
-static int cpu, maxcpu;
-
static int bare_probe(platform_t);
static void bare_mem_regions(platform_t, struct mem_region **phys, int *physsz,
struct mem_region **avail, int *availsz);
static u_long bare_timebase_freq(platform_t, struct cpuref *cpuref);
-static int bare_smp_first_cpu(platform_t, struct cpuref *cpuref);
-static int bare_smp_next_cpu(platform_t, struct cpuref *cpuref);
-static int bare_smp_get_bsp(platform_t, struct cpuref *cpuref);
-static int bare_smp_start_cpu(platform_t, struct pcpu *cpu);
-static void booke_reset(platform_t);
+static void bare_reset(platform_t);
static platform_method_t bare_methods[] = {
PLATFORMMETHOD(platform_probe, bare_probe),
PLATFORMMETHOD(platform_mem_regions,bare_mem_regions),
PLATFORMMETHOD(platform_timebase_freq, bare_timebase_freq),
- PLATFORMMETHOD(platform_smp_first_cpu,
svn commit: r266004 - in stable/10/sys: conf powerpc/booke powerpc/fpu powerpc/include powerpc/powerpc
Author: ian
Date: Wed May 14 04:42:38 2014
New Revision: 266004
URL: http://svnweb.freebsd.org/changeset/base/266004
Log:
MFC r258247, r258250, r258257
Remove a pointless #ifdef AIM. This is just PPC64 specific, including
64-bit Book-E.
Make single precision floating point arithmetic actually work
Split the function of the PCB_FPU flags into two: PCB_FPU now indicates that
the actual FPU is enabled, while PCB_FPREGS indicates that the FPU state
structure in the PCB is valid.
Modified:
stable/10/sys/conf/files.powerpc
stable/10/sys/powerpc/booke/trap.c
stable/10/sys/powerpc/fpu/fpu_emu.c
stable/10/sys/powerpc/fpu/fpu_explode.c
stable/10/sys/powerpc/include/counter.h
stable/10/sys/powerpc/include/pcb.h
stable/10/sys/powerpc/powerpc/exec_machdep.c
stable/10/sys/powerpc/powerpc/fpu.c
stable/10/sys/powerpc/powerpc/swtch32.S
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/conf/files.powerpc
==
--- stable/10/sys/conf/files.powerpcWed May 14 04:14:58 2014
(r266003)
+++ stable/10/sys/conf/files.powerpcWed May 14 04:42:38 2014
(r266004)
@@ -169,7 +169,7 @@ powerpc/powermac/uninorth.c optionalpow
powerpc/powermac/uninorthpci.c optionalpowermac pci
powerpc/powermac/vcoregpio.c optionalpowermac
powerpc/powermac/windtunnel.c optionalpowermac windtunnel
-powerpc/powerpc/altivec.c optionalaim
+powerpc/powerpc/altivec.c standard
powerpc/powerpc/autoconf.c standard
powerpc/powerpc/bcopy.cstandard
powerpc/powerpc/bus_machdep.c standard
@@ -186,7 +186,7 @@ powerpc/powerpc/dump_machdep.c standard
powerpc/powerpc/elf32_machdep.coptionalpowerpc |
compat_freebsd32
powerpc/powerpc/elf64_machdep.coptionalpowerpc64
powerpc/powerpc/exec_machdep.c standard
-powerpc/powerpc/fpu.c optionalaim
+powerpc/powerpc/fpu.c standard
powerpc/powerpc/fuswintr.c standard
powerpc/powerpc/gdb_machdep.c optionalgdb
powerpc/powerpc/in_cksum.c optionalinet | inet6
Modified: stable/10/sys/powerpc/booke/trap.c
==
--- stable/10/sys/powerpc/booke/trap.c Wed May 14 04:14:58 2014
(r266003)
+++ stable/10/sys/powerpc/booke/trap.c Wed May 14 04:42:38 2014
(r266004)
@@ -194,6 +194,11 @@ trap(struct trapframe *frame)
case EXC_PGM: /* Program exception */
#ifdef FPU_EMU
+ if (!(td-td_pcb-pcb_flags PCB_FPREGS)) {
+ bzero(td-td_pcb-pcb_fpu,
+ sizeof(td-td_pcb-pcb_fpu));
+ td-td_pcb-pcb_flags |= PCB_FPREGS;
+ }
sig = fpu_emulate(frame,
(struct fpreg *)td-td_pcb-pcb_fpu);
#else
Modified: stable/10/sys/powerpc/fpu/fpu_emu.c
==
--- stable/10/sys/powerpc/fpu/fpu_emu.c Wed May 14 04:14:58 2014
(r266003)
+++ stable/10/sys/powerpc/fpu/fpu_emu.c Wed May 14 04:42:38 2014
(r266004)
@@ -606,9 +606,11 @@ fpu_execute(struct trapframe *tf, struct
rb = instr.i_a.i_frb;
rc = instr.i_a.i_frc;
- type = FTYPE_SNG;
- if (instr.i_any.i_opcd 0x4)
- type = FTYPE_DBL;
+ /*
+* All arithmetic operations work on registers, which
+* are stored as doubles.
+*/
+ type = FTYPE_DBL;
switch ((unsigned int)instr.i_a.i_xo) {
caseOPC59_FDIVS:
FPU_EMU_EVCNT_INCR(fdiv);
@@ -725,6 +727,13 @@ fpu_execute(struct trapframe *tf, struct
return (NOTFPU);
break;
}
+
+ /* If the instruction was single precision, round */
+ if (!(instr.i_any.i_opcd 0x4)) {
+ fpu_implode(fe, fp, FTYPE_SNG,
+ (u_int *)fs-fpreg[rt]);
+ fpu_explode(fe, fp = fe-fe_f1, FTYPE_SNG, rt);
+ }
}
} else {
return (NOTFPU);
Modified: stable/10/sys/powerpc/fpu/fpu_explode.c
==
--- stable/10/sys/powerpc/fpu/fpu_explode.c Wed May 14 04:14:58 2014
(r266003)
+++ stable/10/sys/powerpc/fpu/fpu_explode.c Wed May 14 04:42:38 2014
(r266004)
@@ -235,6 +235,7 @@ fpu_explode(struct fpemu *fe, struct fpn
svn commit: r266005 - in stable/10/sys: conf dev/uart powerpc/aim powerpc/booke powerpc/fpu powerpc/include powerpc/powerpc
Author: ian
Date: Wed May 14 04:57:55 2014
New Revision: 266005
URL: http://svnweb.freebsd.org/changeset/base/266005
Log:
MFC r258259, r258798, r259010
Unify handling of illegal instruction faults between AIM and Book-E.
Make uart_cpu_powerpc work on both FDT and OFW systems.
Fix debug printfs in FPU_EMU to compile on powerpc64 and enable it for
powerpc64.
Modified:
stable/10/sys/conf/files.powerpc
stable/10/sys/dev/uart/uart_cpu_powerpc.c
stable/10/sys/powerpc/aim/trap.c
stable/10/sys/powerpc/booke/trap.c
stable/10/sys/powerpc/fpu/fpu_emu.c
stable/10/sys/powerpc/include/trap.h
stable/10/sys/powerpc/powerpc/exec_machdep.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/conf/files.powerpc
==
--- stable/10/sys/conf/files.powerpcWed May 14 04:42:38 2014
(r266004)
+++ stable/10/sys/conf/files.powerpcWed May 14 04:57:55 2014
(r266005)
@@ -65,8 +65,7 @@ dev/syscons/scterm-teken.coptionalsc
dev/syscons/scvtb.coptionalsc
dev/tsec/if_tsec.c optionaltsec
dev/tsec/if_tsec_fdt.c optionaltsec fdt
-dev/uart/uart_cpu_fdt.coptionaluart fdt
-dev/uart/uart_cpu_powerpc.coptionaluart aim
+dev/uart/uart_cpu_powerpc.coptionaluart
dev/usb/controller/ehci_fsl.c optionalehci mpc85xx
dev/vt/hw/ofwfb/ofwfb.coptionalvt aim
kern/kern_clocksource.cstandard
@@ -111,15 +110,15 @@ powerpc/booke/trap.c optionalbooke
powerpc/cpufreq/dfs.c optionalcpufreq
powerpc/cpufreq/pcr.c optionalcpufreq aim
powerpc/cpufreq/pmufreq.c optionalcpufreq aim pmu
-powerpc/fpu/fpu_add.c optionalfpu_emu powerpc
-powerpc/fpu/fpu_compare.c optionalfpu_emu powerpc
-powerpc/fpu/fpu_div.c optionalfpu_emu powerpc
-powerpc/fpu/fpu_emu.c optionalfpu_emu powerpc
-powerpc/fpu/fpu_explode.c optionalfpu_emu powerpc
-powerpc/fpu/fpu_implode.c optionalfpu_emu powerpc
-powerpc/fpu/fpu_mul.c optionalfpu_emu powerpc
-powerpc/fpu/fpu_sqrt.c optionalfpu_emu powerpc
-powerpc/fpu/fpu_subr.c optionalfpu_emu powerpc
+powerpc/fpu/fpu_add.c optionalfpu_emu
+powerpc/fpu/fpu_compare.c optionalfpu_emu
+powerpc/fpu/fpu_div.c optionalfpu_emu
+powerpc/fpu/fpu_emu.c optionalfpu_emu
+powerpc/fpu/fpu_explode.c optionalfpu_emu
+powerpc/fpu/fpu_implode.c optionalfpu_emu
+powerpc/fpu/fpu_mul.c optionalfpu_emu
+powerpc/fpu/fpu_sqrt.c optionalfpu_emu
+powerpc/fpu/fpu_subr.c optionalfpu_emu
powerpc/mambo/mambocall.S optionalmambo
powerpc/mambo/mambo.c optionalmambo
powerpc/mambo/mambo_console.c optionalmambo
Modified: stable/10/sys/dev/uart/uart_cpu_powerpc.c
==
--- stable/10/sys/dev/uart/uart_cpu_powerpc.c Wed May 14 04:42:38 2014
(r266004)
+++ stable/10/sys/dev/uart/uart_cpu_powerpc.c Wed May 14 04:57:55 2014
(r266005)
@@ -61,42 +61,96 @@ ofw_get_uart_console(phandle_t opts, pha
input = OF_finddevice(buf);
if (input == -1)
return (ENXIO);
- if (OF_getprop(opts, outputdev, buf, sizeof(buf)) == -1)
- return (ENXIO);
- if (OF_finddevice(buf) != input)
- return (ENXIO);
+
+ if (outputdev != NULL) {
+ if (OF_getprop(opts, outputdev, buf, sizeof(buf)) == -1)
+ return (ENXIO);
+ if (OF_finddevice(buf) != input)
+ return (ENXIO);
+ }
*result = input;
return (0);
}
+static int
+ofw_get_console_phandle_path(phandle_t node, phandle_t *result,
+const char *prop)
+{
+ union {
+ char buf[64];
+ phandle_t ref;
+ } field;
+ phandle_t output;
+ ssize_t size;
+
+ size = OF_getproplen(node, prop);
+ if (size == -1)
+ return (ENXIO);
+ OF_getprop(node, prop, field, sizeof(field));
+
+ /* This property might be a phandle or might be a path. Hooray. */
+
+ output = -1;
+ if (field.buf[size - 1] == 0)
+ output = OF_finddevice(field.buf);
+ if (output == -1 size == 4)
+ output = OF_xref_phandle(field.ref);
+
+ if (output != -1) {
+ *result = output;
+ return (0);
+ }
+
+ return (ENXIO);
+}
+
int
uart_cpu_getdev(int devtype, struct uart_devinfo *di)
{
char buf[64];
struct uart_class *class;
- phandle_t input, opts;
+
