From owner-svn-src-stable-7@FreeBSD.ORG Sun Feb 12 01:07:15 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 76B8A106564A; Sun, 12 Feb 2012 01:07:15 +0000 (UTC) (envelope-from rodrigc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5EF428FC0C; Sun, 12 Feb 2012 01:07:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1C17FE0058335; Sun, 12 Feb 2012 01:07:15 GMT (envelope-from rodrigc@svn.freebsd.org) Received: (from rodrigc@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1C17FJq058329; Sun, 12 Feb 2012 01:07:15 GMT (envelope-from rodrigc@svn.freebsd.org) Message-Id: <201202120107.q1C17FJq058329@svn.freebsd.org> From: Craig Rodrigues Date: Sun, 12 Feb 2012 01:07:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231541 - stable/7/libexec/tftpd X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Feb 2012 01:07:15 -0000 Author: rodrigc Date: Sun Feb 12 01:07:15 2012 New Revision: 231541 URL: http://svn.freebsd.org/changeset/base/231541 Log: MFC 183243-231540. This records mergeinfo for already merged changesets, but brings in the following changes: MFC 222326 - Fix tftp_log() usage MFC 223137 - Man page updates MFC 223487 - Bring back syncnet() implementation from older tftp implementation. MFC 229780 - Spelling fixes for libexec/ MFC 229904 - Fix warning when compiling with gcc46: error: variable 'bp' set but not used Modified: stable/7/libexec/tftpd/tftp-file.c stable/7/libexec/tftpd/tftp-io.c stable/7/libexec/tftpd/tftp-utils.c stable/7/libexec/tftpd/tftp-utils.h stable/7/libexec/tftpd/tftpd.8 Directory Properties: stable/7/libexec/tftpd/ (props changed) Modified: stable/7/libexec/tftpd/tftp-file.c ============================================================================== --- stable/7/libexec/tftpd/tftp-file.c Sat Feb 11 23:58:07 2012 (r231540) +++ stable/7/libexec/tftpd/tftp-file.c Sun Feb 12 01:07:15 2012 (r231541) @@ -27,6 +27,8 @@ __FBSDID("$FreeBSD$"); #include +#include +#include #include #include @@ -249,9 +251,34 @@ read_close(void) } +/* When an error has occurred, it is possible that the two sides + * are out of synch. Ie: that what I think is the other side's + * response to packet N is really their response to packet N-1. + * + * So, to try to prevent that, we flush all the input queued up + * for us on the network connection on our host. + * + * We return the number of packets we flushed (mostly for reporting + * when trace is active). + */ + int -synchnet(int peer __unused) +synchnet(int peer) /* socket to flush */ { - - return 0; + int i, j = 0; + char rbuf[MAXPKTSIZE]; + struct sockaddr_storage from; + socklen_t fromlen; + + while (1) { + (void) ioctl(peer, FIONREAD, &i); + if (i) { + j++; + fromlen = sizeof from; + (void) recvfrom(peer, rbuf, sizeof (rbuf), 0, + (struct sockaddr *)&from, &fromlen); + } else { + return(j); + } + } } Modified: stable/7/libexec/tftpd/tftp-io.c ============================================================================== --- stable/7/libexec/tftpd/tftp-io.c Sat Feb 11 23:58:07 2012 (r231540) +++ stable/7/libexec/tftpd/tftp-io.c Sun Feb 12 01:07:15 2012 (r231541) @@ -72,13 +72,13 @@ struct errmsg { #define DROPPACKET(s) \ if (packetdroppercentage != 0 && \ random()%100 < packetdroppercentage) { \ - tftp_log(LOG_DEBUG, "Artifical packet drop in %s", s); \ + tftp_log(LOG_DEBUG, "Artificial packet drop in %s", s); \ return; \ } #define DROPPACKETn(s,n) \ if (packetdroppercentage != 0 && \ random()%100 < packetdroppercentage) { \ - tftp_log(LOG_DEBUG, "Artifical packet drop in %s", s); \ + tftp_log(LOG_DEBUG, "Artificial packet drop in %s", s); \ return (n); \ } @@ -262,7 +262,7 @@ send_rrq(int peer, char *filename, char n = sendto(peer, buf, size, 0, (struct sockaddr *)&peer_sock, peer_sock.ss_len); if (n != size) { - tftp_log(LOG_ERR, "send_rrq: %s", n, strerror(errno)); + tftp_log(LOG_ERR, "send_rrq: %d %s", n, strerror(errno)); return (1); } return (0); @@ -323,7 +323,6 @@ send_ack(int fp, uint16_t block) { struct tftphdr *tp; int size; - char *bp; char buf[MAXPKTSIZE]; if (debug&DEBUG_PACKETS) @@ -332,7 +331,6 @@ send_ack(int fp, uint16_t block) DROPPACKETn("send_ack", 0); tp = (struct tftphdr *)buf; - bp = buf + 2; size = sizeof(buf) - 2; tp->th_opcode = htons((u_short)ACK); tp->th_block = htons((u_short)block); Modified: stable/7/libexec/tftpd/tftp-utils.c ============================================================================== --- stable/7/libexec/tftpd/tftp-utils.c Sat Feb 11 23:58:07 2012 (r231540) +++ stable/7/libexec/tftpd/tftp-utils.c Sun Feb 12 01:07:15 2012 (r231541) @@ -100,7 +100,7 @@ unmappedaddr(struct sockaddr_in6 *sin6) sin4->sin_len = sizeof(struct sockaddr_in); } -/* Get a field from a \0 seperated string */ +/* Get a field from a \0 separated string */ ssize_t get_field(int peer, char *buffer, ssize_t size) { Modified: stable/7/libexec/tftpd/tftp-utils.h ============================================================================== --- stable/7/libexec/tftpd/tftp-utils.h Sat Feb 11 23:58:07 2012 (r231540) +++ stable/7/libexec/tftpd/tftp-utils.h Sun Feb 12 01:07:15 2012 (r231541) @@ -36,11 +36,11 @@ __FBSDID("$FreeBSD$"); #define MAXPKTSIZE (MAXSEGSIZE + 4) /* Maximum size of the packet */ /* For the blksize option */ -#define BLKSIZE_MIN 8 /* Minumum size of the data segment */ +#define BLKSIZE_MIN 8 /* Minimum size of the data segment */ #define BLKSIZE_MAX MAXSEGSIZE /* Maximum size of the data segment */ /* For the timeout option */ -#define TIMEOUT_MIN 0 /* Minumum timeout value */ +#define TIMEOUT_MIN 0 /* Minimum timeout value */ #define TIMEOUT_MAX 255 /* Maximum timeout value */ #define MIN_TIMEOUTS 3 Modified: stable/7/libexec/tftpd/tftpd.8 ============================================================================== --- stable/7/libexec/tftpd/tftpd.8 Sat Feb 11 23:58:07 2012 (r231540) +++ stable/7/libexec/tftpd/tftpd.8 Sun Feb 12 01:07:15 2012 (r231541) @@ -32,7 +32,7 @@ .\" @(#)tftpd.8 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd September 14, 2000 +.Dd June 22, 2011 .Dt TFTPD 8 .Os .Sh NAME @@ -150,9 +150,27 @@ compatible format string for the creatio .Fl W is specified. By default the string "%Y%m%d" is used. -.It Fl d +.It Fl d, d Ar [value] Enables debug output. -If specified twice, it will log DATA and ACK packets too. +If +.Ar value +is not specified, then the debug level is increased by one +for each instance of +.Fl d +which is specified. +.Pp +If +.Ar value +is specified, then the debug level is set to +.Ar value . +The debug level is a bitmask implemented in +.Pa src/libexec/tftpd/tftp-utils.h . +Valid values are 0 (DEBUG_NONE), 1 (DEBUG_PACKETS), 2, (DEBUG_SIMPLE), +4 (DEBUG_OPTIONS), and 8 (DEBUG_ACCESS). Multiple debug values can be combined +in the bitmask by logically OR'ing the values. For example, specifying +.Fl d +.Ar 15 +will enable all the debug values. .It Fl l Log all requests using .Xr syslog 3 @@ -217,12 +235,34 @@ option. .Xr services 5 , .Xr syslog.conf 5 , .Xr inetd 8 +.Pp +The following RFC's are supported: .Rs -.%A K. R. Sollins +RFC 1350 .%T The TFTP Protocol (Revision 2) -.%D July 1992 -.%O RFC 1350, STD 33 .Re +.Rs +RFC 2347 +.%T TFTP Option Extension +.Re +.Rs +RFC 2348 +.%T TFTP Blocksize Option +.Re +.Rs +RFC 2349 +.%T TFTP Timeout Interval and Transfer Size Options +.Re +.Pp +The non-standard +.Cm rollover +and +.Cm blksize2 +TFTP options are mentioned here: +.Rs +.%T Extending TFTP +.%U http://www.compuphase.com/tftp.htm +.Re .Sh HISTORY The .Nm @@ -253,8 +293,22 @@ was introduced in support for the TFTP Blocksize Option (RFC2348) and the blksize2 option was introduced in .Fx 7.4 . -.Sh BUGS -Files larger than 33488896 octets (65535 blocks) cannot be transferred -without client and server supporting blocksize negotiation (RFC2348). .Pp -Many tftp clients will not transfer files over 16744448 octets (32767 blocks). +Edwin Groothuis performed a major rewrite of the +.Nm +and +.Xr tftp 1 +code to support RFC2348. +.Sh NOTES +Files larger than 33,553,919 octets (65535 blocks, last one <512 +octets) cannot be correctly transferred without client and server +supporting blocksize negotiation (RFCs 2347 and 2348), +or the non-standard TFTP rollover option. +As a kludge, +.Nm +accepts a sequence of block number which wrap to zero after 65535, +even if the rollover option is not specified. +.Pp +Many tftp clients will not transfer files over 16,776,703 octets +(32767 blocks), as they incorrectly count the block number using +a signed rather than unsigned 16-bit integer. From owner-svn-src-stable-7@FreeBSD.ORG Sun Feb 12 07:53:38 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 560EC106566C; Sun, 12 Feb 2012 07:53:38 +0000 (UTC) (envelope-from trociny@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 442EC8FC1B; Sun, 12 Feb 2012 07:53:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1C7rc2q071481; Sun, 12 Feb 2012 07:53:38 GMT (envelope-from trociny@svn.freebsd.org) Received: (from trociny@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1C7rcfd071479; Sun, 12 Feb 2012 07:53:38 GMT (envelope-from trociny@svn.freebsd.org) Message-Id: <201202120753.q1C7rcfd071479@svn.freebsd.org> From: Mikolaj Golub Date: Sun, 12 Feb 2012 07:53:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231552 - stable/7/lib/libkvm X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Feb 2012 07:53:38 -0000 Author: trociny Date: Sun Feb 12 07:53:37 2012 New Revision: 231552 URL: http://svn.freebsd.org/changeset/base/231552 Log: MFC r230873: Try to avoid ambiguity when sysctl returns ENOMEM additionally checking the returned oldlen: when ENOMEM is due to the supplied buffer being too short the return oldlen is equal to buffer size. Without this additional check kvm_getprocs() gets stuck in loop if the returned ENOMEM was due the exceeded memorylocked limit. This is easily can be observed running `limits -l 1k top'. Submitted by: Andrey Zonov Modified: stable/7/lib/libkvm/kvm_proc.c Directory Properties: stable/7/lib/libkvm/ (props changed) Modified: stable/7/lib/libkvm/kvm_proc.c ============================================================================== --- stable/7/lib/libkvm/kvm_proc.c Sun Feb 12 07:53:02 2012 (r231551) +++ stable/7/lib/libkvm/kvm_proc.c Sun Feb 12 07:53:37 2012 (r231552) @@ -464,7 +464,7 @@ kvm_getprocs(kd, op, arg, cnt) int *cnt; { int mib[4], st, nprocs; - size_t size; + size_t size, osize; int temp_op; if (kd->procbase != 0) { @@ -514,10 +514,11 @@ kvm_getprocs(kd, op, arg, cnt) _kvm_realloc(kd, kd->procbase, size); if (kd->procbase == 0) return (0); + osize = size; st = sysctl(mib, temp_op == KERN_PROC_ALL || temp_op == KERN_PROC_PROC ? 3 : 4, kd->procbase, &size, NULL, 0); - } while (st == -1 && errno == ENOMEM); + } while (st == -1 && errno == ENOMEM && size == osize); if (st == -1) { _kvm_syserr(kd, kd->program, "kvm_getprocs"); return (0); From owner-svn-src-stable-7@FreeBSD.ORG Sun Feb 12 07:56:47 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E51F106567A; Sun, 12 Feb 2012 07:56:47 +0000 (UTC) (envelope-from trociny@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 492F98FC1B; Sun, 12 Feb 2012 07:56:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1C7ulWU071694; Sun, 12 Feb 2012 07:56:47 GMT (envelope-from trociny@svn.freebsd.org) Received: (from trociny@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1C7ulJY071692; Sun, 12 Feb 2012 07:56:47 GMT (envelope-from trociny@svn.freebsd.org) Message-Id: <201202120756.q1C7ulJY071692@svn.freebsd.org> From: Mikolaj Golub Date: Sun, 12 Feb 2012 07:56:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231555 - stable/7/usr.bin/sockstat X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Feb 2012 07:56:47 -0000 Author: trociny Date: Sun Feb 12 07:56:46 2012 New Revision: 231555 URL: http://svn.freebsd.org/changeset/base/231555 Log: MFC r230874: Try to avoid ambiguity when sysctl returns ENOMEM additionally checking the returned oldlen: when ENOMEM is due to the supplied buffer being too short the return oldlen is equal to buffer size. Without this additional check sockstat gets stuck in loop leaking the memory if the returned ENOMEM was due the exceeded memorylocked limit. This is easily can be observed running `limits -l 1k sockstat'. Submitted by: Andrey Zonov Modified: stable/7/usr.bin/sockstat/sockstat.c Directory Properties: stable/7/usr.bin/sockstat/ (props changed) Modified: stable/7/usr.bin/sockstat/sockstat.c ============================================================================== --- stable/7/usr.bin/sockstat/sockstat.c Sun Feb 12 07:56:07 2012 (r231554) +++ stable/7/usr.bin/sockstat/sockstat.c Sun Feb 12 07:56:46 2012 (r231555) @@ -294,7 +294,7 @@ gather_inet(int proto) break; if (errno == ENOENT) goto out; - if (errno != ENOMEM) + if (errno != ENOMEM || len != bufsize) err(1, "sysctlbyname()"); bufsize *= 2; } @@ -411,7 +411,7 @@ gather_unix(int proto) len = bufsize; if (sysctlbyname(varname, buf, &len, NULL, 0) == 0) break; - if (errno != ENOMEM) + if (errno != ENOMEM || len != bufsize) err(1, "sysctlbyname()"); bufsize *= 2; } @@ -463,14 +463,15 @@ out: static void getfiles(void) { - size_t len; + size_t len, olen; - if ((xfiles = malloc(len = sizeof *xfiles)) == NULL) + olen = len = sizeof *xfiles; + if ((xfiles = malloc(len)) == NULL) err(1, "malloc()"); while (sysctlbyname("kern.file", xfiles, &len, 0, 0) == -1) { - if (errno != ENOMEM) + if (errno != ENOMEM || len != olen) err(1, "sysctlbyname()"); - len *= 2; + olen = len *= 2; if ((xfiles = realloc(xfiles, len)) == NULL) err(1, "realloc()"); } From owner-svn-src-stable-7@FreeBSD.ORG Sun Feb 12 14:56:50 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AABF4106564A; Sun, 12 Feb 2012 14:56:50 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 991548FC1E; Sun, 12 Feb 2012 14:56:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1CEuoDP089202; Sun, 12 Feb 2012 14:56:50 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1CEuoOs089200; Sun, 12 Feb 2012 14:56:50 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201202121456.q1CEuoOs089200@svn.freebsd.org> From: Dimitry Andric Date: Sun, 12 Feb 2012 14:56:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231562 - stable/7/usr.bin/rpcgen X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Feb 2012 14:56:50 -0000 Author: dim Date: Sun Feb 12 14:56:50 2012 New Revision: 231562 URL: http://svn.freebsd.org/changeset/base/231562 Log: MFC r231054: In usr.bin/rpcgen/rpc_main.c, properly check the return value of strlcpy(), in addition to checking that of strlcat(). Modified: stable/7/usr.bin/rpcgen/rpc_main.c Directory Properties: stable/7/usr.bin/rpcgen/ (props changed) Modified: stable/7/usr.bin/rpcgen/rpc_main.c ============================================================================== --- stable/7/usr.bin/rpcgen/rpc_main.c Sun Feb 12 14:56:40 2012 (r231561) +++ stable/7/usr.bin/rpcgen/rpc_main.c Sun Feb 12 14:56:50 2012 (r231562) @@ -1129,9 +1129,11 @@ parseargs(int argc, const char *argv[], if (++i == argc) { return (0); } - (void) strlcpy(pathbuf, argv[i], sizeof(pathbuf)); - if (strlcat(pathbuf, "/cpp", sizeof(pathbuf)) - >= sizeof(pathbuf)) { + if (strlcpy(pathbuf, argv[i], + sizeof(pathbuf)) >= sizeof(pathbuf) + || strlcat(pathbuf, "/cpp", + sizeof(pathbuf)) >= + sizeof(pathbuf)) { warnx("argument too long"); return (0); } From owner-svn-src-stable-7@FreeBSD.ORG Mon Feb 13 21:07:48 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D0E67106566B; Mon, 13 Feb 2012 21:07:48 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BA8BF8FC15; Mon, 13 Feb 2012 21:07:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1DL7miI062040; Mon, 13 Feb 2012 21:07:48 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1DL7mlc062037; Mon, 13 Feb 2012 21:07:48 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201202132107.q1DL7mlc062037@svn.freebsd.org> From: Dimitry Andric Date: Mon, 13 Feb 2012 21:07:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231614 - stable/7/usr.bin/rpcgen X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2012 21:07:48 -0000 Author: dim Date: Mon Feb 13 21:07:48 2012 New Revision: 231614 URL: http://svn.freebsd.org/changeset/base/231614 Log: MFC r231079: Let rpcgen(1) support an environment variable RPCGEN_CPP to find the C preprocessor to run. Previously, it always ran /usr/bin/cpp, unless you used the -Y option, and even then you could not set the basename. It also attempted to run /usr/ccs/lib/cpp for SVR4 compatibility, but this is obsolete, and has been removed. Note that setting RPCGEN_CPP to a command with arguments is supported, though the command line parsing is simplistic. However, setting it to e.g. "gcc46 -E" or "clang -E" will lead to problems, because both gcc and clang in -E mode will consider files with unknown extensions (such as .x) as object files, and attempt to link them. This could be worked around by also adding "-x c", but it is much safer to set RPCGEN_CPP to e.g. "cpp46" or "clang-cpp" instead. MFC r231080: Amend r231079 by properly shifting up the existing arguments in rpc_main.c's insarg() function. I had forgotten to put this in my patch queue, sorry. Pointy hat to: me MFC r231101: In usr.bin/rpcgen/rpc_main.c, use execvp(3) instead of execv(3), so rpcgen will search the current PATH for the preprocessor. This makes it possible to run a preprocessor built during the cross-tools stage of buildworld. Modified: stable/7/usr.bin/rpcgen/rpc_main.c stable/7/usr.bin/rpcgen/rpcgen.1 Directory Properties: stable/7/usr.bin/rpcgen/ (props changed) Modified: stable/7/usr.bin/rpcgen/rpc_main.c ============================================================================== --- stable/7/usr.bin/rpcgen/rpc_main.c Mon Feb 13 20:59:58 2012 (r231613) +++ stable/7/usr.bin/rpcgen/rpc_main.c Mon Feb 13 21:07:48 2012 (r231614) @@ -79,13 +79,8 @@ static void s_output(int, const char **, #define EXTEND 1 /* alias for TRUE */ #define DONT_EXTEND 0 /* alias for FALSE */ -#define SVR4_CPP "/usr/ccs/lib/cpp" -#define SUNOS_CPP "/usr/bin/cpp" - -static int cppDefined = 0; /* explicit path for C preprocessor */ - static const char *svcclosetime = "120"; -static const char *CPP = SVR4_CPP; +static const char *CPP = NULL; static const char CPPFLAGS[] = "-C"; static char pathbuf[MAXPATHLEN + 1]; static const char *allv[] = { @@ -101,7 +96,7 @@ static int allnc = sizeof (allnv)/sizeof * machinations for handling expanding argument list */ static void addarg(const char *); /* add another argument to the list */ -static void putarg(int, const char *); /* put argument at specified location */ +static void insarg(int, const char *); /* insert arg at specified location */ static void clear_args(void); /* clear argument list */ static void checkfiles(const char *, const char *); /* check if out file already exists */ @@ -109,7 +104,7 @@ static void checkfiles(const char *, con #define ARGLISTLEN 20 -#define FIXEDARGS 2 +#define FIXEDARGS 0 static char *arglist[ARGLISTLEN]; static int argcount = FIXEDARGS; @@ -292,24 +287,29 @@ clear_args(void) argcount = FIXEDARGS; } -/* make sure that a CPP exists */ +/* prepend C-preprocessor and flags before arguments */ static void -find_cpp(void) +prepend_cpp(void) { - struct stat buf; - - if (stat(CPP, &buf) < 0) { /* SVR4 or explicit cpp does not exist */ - if (cppDefined) { - warnx("cannot find C preprocessor: %s", CPP); - crash(); - } else { /* try the other one */ - CPP = SUNOS_CPP; - if (stat(CPP, &buf) < 0) { /* can't find any cpp */ - warnx("cannot find C preprocessor: %s", CPP); - crash(); - } + int idx = 1; + const char *var; + char *dupvar, *s, *t; + + if (CPP != NULL) + insarg(0, CPP); + else if ((var = getenv("RPCGEN_CPP")) == NULL) + insarg(0, "/usr/bin/cpp"); + else { + /* Parse command line in a rudimentary way */ + dupvar = xstrdup(var); + for (s = dupvar, idx = 0; (t = strsep(&s, " \t")) != NULL; ) { + if (t[0]) + insarg(idx++, t); } + free(dupvar); } + + insarg(idx, CPPFLAGS); } /* @@ -324,9 +324,7 @@ open_input(const char *infile, const cha (void) pipe(pd); switch (childpid = fork()) { case 0: - find_cpp(); - putarg(0, CPP); - putarg(1, CPPFLAGS); + prepend_cpp(); addarg(define); if (infile) addarg(infile); @@ -334,8 +332,8 @@ open_input(const char *infile, const cha (void) close(1); (void) dup2(pd[1], 1); (void) close(pd[0]); - execv(arglist[0], arglist); - err(1, "execv"); + execvp(arglist[0], arglist); + err(1, "execvp %s", arglist[0]); case -1: err(1, "fork"); } @@ -938,18 +936,26 @@ addarg(const char *cp) } +/* + * Insert an argument at the specified location + */ static void -putarg(int place, const char *cp) +insarg(int place, const char *cp) { - if (place >= ARGLISTLEN) { - warnx("arglist coding error"); + int i; + + if (argcount >= ARGLISTLEN) { + warnx("too many defines"); crash(); /*NOTREACHED*/ } - if (cp != NULL) - arglist[place] = xstrdup(cp); - else - arglist[place] = NULL; + + /* Move up existing arguments */ + for (i = argcount - 1; i >= place; i--) + arglist[i + 1] = arglist[i]; + + arglist[place] = xstrdup(cp); + argcount++; } /* @@ -1138,7 +1144,6 @@ parseargs(int argc, const char *argv[], return (0); } CPP = pathbuf; - cppDefined = 1; goto nextarg; Modified: stable/7/usr.bin/rpcgen/rpcgen.1 ============================================================================== --- stable/7/usr.bin/rpcgen/rpcgen.1 Mon Feb 13 20:59:58 2012 (r231613) +++ stable/7/usr.bin/rpcgen/rpcgen.1 Mon Feb 13 21:07:48 2012 (r231614) @@ -490,6 +490,11 @@ Give the name of the directory where .Nm will start looking for the C-preprocessor. .El +.Sh ENVIRONMENT +If the +.Ev RPCGEN_CPP +environment variable is set, its value is used as the command line of the +C preprocessor to be run on the input file. .Sh EXAMPLES The following example: .Dl example% rpcgen -T prot.x From owner-svn-src-stable-7@FreeBSD.ORG Tue Feb 14 00:56:02 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 27ADC1065686; Tue, 14 Feb 2012 00:56:02 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 10B8E8FC17; Tue, 14 Feb 2012 00:56:02 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1E0u1mn070395; Tue, 14 Feb 2012 00:56:01 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1E0u1wU070389; Tue, 14 Feb 2012 00:56:01 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201202140056.q1E0u1wU070389@svn.freebsd.org> From: Marius Strobl Date: Tue, 14 Feb 2012 00:56:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231625 - stable/7/sys/dev/mpt X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2012 00:56:02 -0000 Author: marius Date: Tue Feb 14 00:56:01 2012 New Revision: 231625 URL: http://svn.freebsd.org/changeset/base/231625 Log: MFC: r231518 Remove extra newlines from panic messages. Modified: stable/7/sys/dev/mpt/mpt.c stable/7/sys/dev/mpt/mpt.h stable/7/sys/dev/mpt/mpt_cam.c stable/7/sys/dev/mpt/mpt_pci.c stable/7/sys/dev/mpt/mpt_reg.h Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/mpt/mpt.c ============================================================================== --- stable/7/sys/dev/mpt/mpt.c Tue Feb 14 00:54:59 2012 (r231624) +++ stable/7/sys/dev/mpt/mpt.c Tue Feb 14 00:56:01 2012 (r231625) @@ -1053,6 +1053,12 @@ mpt_hard_reset(struct mpt_softc *mpt) mpt_lprt(mpt, MPT_PRT_DEBUG, "hard reset\n"); + if (mpt->is_1078) { + mpt_write(mpt, MPT_OFFSET_RESET_1078, 0x07); + DELAY(1000); + return; + } + error = mpt_enable_diag_mode(mpt); if (error) { mpt_prt(mpt, "WARNING - Could not enter diagnostic mode !\n"); @@ -2451,6 +2457,11 @@ mpt_download_fw(struct mpt_softc *mpt) uint32_t ext_offset; uint32_t data; + if (mpt->pci_pio_reg == NULL) { + mpt_prt(mpt, "No PIO resource!\n"); + return (ENXIO); + } + mpt_prt(mpt, "Downloading Firmware - Image Size %d\n", mpt->fw_image_size); Modified: stable/7/sys/dev/mpt/mpt.h ============================================================================== --- stable/7/sys/dev/mpt/mpt.h Tue Feb 14 00:54:59 2012 (r231624) +++ stable/7/sys/dev/mpt/mpt.h Tue Feb 14 00:56:01 2012 (r231625) @@ -608,7 +608,7 @@ struct mpt_softc { #endif uint32_t mpt_pers_mask; uint32_t - : 8, + : 7, unit : 8, ready : 1, fw_uploaded : 1, @@ -625,7 +625,8 @@ struct mpt_softc { disabled : 1, is_spi : 1, is_sas : 1, - is_fc : 1; + is_fc : 1, + is_1078 : 1; u_int cfg_role; u_int role; /* role: none, ini, target, both */ @@ -982,12 +983,14 @@ mpt_read(struct mpt_softc *mpt, int offs static __inline void mpt_pio_write(struct mpt_softc *mpt, size_t offset, uint32_t val) { + KASSERT(mpt->pci_pio_reg != NULL, ("no PIO resource")); bus_space_write_4(mpt->pci_pio_st, mpt->pci_pio_sh, offset, val); } static __inline uint32_t mpt_pio_read(struct mpt_softc *mpt, int offset) { + KASSERT(mpt->pci_pio_reg != NULL, ("no PIO resource")); return (bus_space_read_4(mpt->pci_pio_st, mpt->pci_pio_sh, offset)); } /*********************** Reply Frame/Request Management ***********************/ Modified: stable/7/sys/dev/mpt/mpt_cam.c ============================================================================== --- stable/7/sys/dev/mpt/mpt_cam.c Tue Feb 14 00:54:59 2012 (r231624) +++ stable/7/sys/dev/mpt/mpt_cam.c Tue Feb 14 00:56:01 2012 (r231625) @@ -1279,8 +1279,9 @@ mpt_execute_req_a64(void *arg, bus_dma_s char *mpt_off; union ccb *ccb; struct mpt_softc *mpt; - int seg, first_lim; - uint32_t flags, nxt_off; + bus_addr_t chain_list_addr; + int first_lim, seg, this_seg_lim; + uint32_t addr, cur_off, flags, nxt_off, tf; void *sglp = NULL; MSG_REQUEST_HEADER *hdrp; SGE_SIMPLE64 *se; @@ -1434,16 +1435,20 @@ bad: se = (SGE_SIMPLE64 *) sglp; for (seg = 0; seg < first_lim; seg++, se++, dm_segs++) { - uint32_t tf; - + tf = flags; memset(se, 0, sizeof (*se)); + MPI_pSGE_SET_LENGTH(se, dm_segs->ds_len); se->Address.Low = htole32(dm_segs->ds_addr & 0xffffffff); if (sizeof(bus_addr_t) > 4) { - se->Address.High = - htole32(((uint64_t)dm_segs->ds_addr) >> 32); + addr = ((uint64_t)dm_segs->ds_addr) >> 32; + /* SAS1078 36GB limitation WAR */ + if (mpt->is_1078 && (((uint64_t)dm_segs->ds_addr + + MPI_SGE_LENGTH(se->FlagsLength)) >> 32) == 9) { + addr |= (1 << 31); + tf |= MPI_SGE_FLAGS_LOCAL_ADDRESS; + } + se->Address.High = htole32(addr); } - MPI_pSGE_SET_LENGTH(se, dm_segs->ds_len); - tf = flags; if (seg == first_lim - 1) { tf |= MPI_SGE_FLAGS_LAST_ELEMENT; } @@ -1468,15 +1473,11 @@ bad: /* * Make up the rest of the data segments out of a chain element - * (contiained in the current request frame) which points to + * (contained in the current request frame) which points to * SIMPLE64 elements in the next request frame, possibly ending * with *another* chain element (if there's more). */ while (seg < nseg) { - int this_seg_lim; - uint32_t tf, cur_off; - bus_addr_t chain_list_addr; - /* * Point to the chain descriptor. Note that the chain * descriptor is at the end of the *previous* list (whether @@ -1504,7 +1505,7 @@ bad: nxt_off += MPT_RQSL(mpt); /* - * Now initialized the chain descriptor. + * Now initialize the chain descriptor. */ memset(ce, 0, sizeof (*ce)); @@ -1554,16 +1555,24 @@ bad: * set the end of list and end of buffer flags. */ while (seg < this_seg_lim) { + tf = flags; memset(se, 0, sizeof (*se)); + MPI_pSGE_SET_LENGTH(se, dm_segs->ds_len); se->Address.Low = htole32(dm_segs->ds_addr & 0xffffffff); if (sizeof (bus_addr_t) > 4) { - se->Address.High = - htole32(((uint64_t)dm_segs->ds_addr) >> 32); + addr = ((uint64_t)dm_segs->ds_addr) >> 32; + /* SAS1078 36GB limitation WAR */ + if (mpt->is_1078 && + (((uint64_t)dm_segs->ds_addr + + MPI_SGE_LENGTH(se->FlagsLength)) >> + 32) == 9) { + addr |= (1 << 31); + tf |= MPI_SGE_FLAGS_LOCAL_ADDRESS; + } + se->Address.High = htole32(addr); } - MPI_pSGE_SET_LENGTH(se, dm_segs->ds_len); - tf = flags; - if (seg == this_seg_lim - 1) { + if (seg == this_seg_lim - 1) { tf |= MPI_SGE_FLAGS_LAST_ELEMENT; } if (seg == nseg - 1) { @@ -1868,7 +1877,7 @@ bad: /* * Make up the rest of the data segments out of a chain element - * (contiained in the current request frame) which points to + * (contained in the current request frame) which points to * SIMPLE32 elements in the next request frame, possibly ending * with *another* chain element (if there's more). */ @@ -1904,7 +1913,7 @@ bad: nxt_off += MPT_RQSL(mpt); /* - * Now initialized the chain descriptor. + * Now initialize the chain descriptor. */ memset(ce, 0, sizeof (*ce)); @@ -1958,7 +1967,7 @@ bad: MPI_pSGE_SET_LENGTH(se, dm_segs->ds_len); tf = flags; - if (seg == this_seg_lim - 1) { + if (seg == this_seg_lim - 1) { tf |= MPI_SGE_FLAGS_LAST_ELEMENT; } if (seg == nseg - 1) { Modified: stable/7/sys/dev/mpt/mpt_pci.c ============================================================================== --- stable/7/sys/dev/mpt/mpt_pci.c Tue Feb 14 00:54:59 2012 (r231624) +++ stable/7/sys/dev/mpt/mpt_pci.c Tue Feb 14 00:56:01 2012 (r231625) @@ -438,6 +438,10 @@ mpt_pci_attach(device_t dev) case PCI_PRODUCT_LSI_FC7X04X: mpt->is_fc = 1; break; + case PCI_PRODUCT_LSI_SAS1078: + case PCI_PRODUCT_LSI_SAS1078DE: + mpt->is_1078 = 1; + /* FALLTHROUGH */ case PCI_PRODUCT_LSI_SAS1064: case PCI_PRODUCT_LSI_SAS1064A: case PCI_PRODUCT_LSI_SAS1064E: @@ -445,8 +449,6 @@ mpt_pci_attach(device_t dev) case PCI_PRODUCT_LSI_SAS1066E: case PCI_PRODUCT_LSI_SAS1068: case PCI_PRODUCT_LSI_SAS1068E: - case PCI_PRODUCT_LSI_SAS1078: - case PCI_PRODUCT_LSI_SAS1078DE: mpt->is_sas = 1; break; default: @@ -527,23 +529,31 @@ mpt_pci_attach(device_t dev) mpt->pci_pio_reg = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &mpt_io_bar, RF_ACTIVE); if (mpt->pci_pio_reg == NULL) { - device_printf(dev, "unable to map registers in PIO mode\n"); - goto bad; + if (bootverbose) { + device_printf(dev, + "unable to map registers in PIO mode\n"); + } + } else { + mpt->pci_pio_st = rman_get_bustag(mpt->pci_pio_reg); + mpt->pci_pio_sh = rman_get_bushandle(mpt->pci_pio_reg); } - mpt->pci_pio_st = rman_get_bustag(mpt->pci_pio_reg); - mpt->pci_pio_sh = rman_get_bushandle(mpt->pci_pio_reg); /* Allocate kernel virtual memory for the 9x9's Mem0 region */ mpt_mem_bar = PCIR_BAR(mpt_mem_bar); mpt->pci_reg = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &mpt_mem_bar, RF_ACTIVE); if (mpt->pci_reg == NULL) { - device_printf(dev, "Unable to memory map registers.\n"); - if (mpt->is_sas) { + if (bootverbose || mpt->is_sas || mpt->pci_pio_reg == NULL) { + device_printf(dev, + "Unable to memory map registers.\n"); + } + if (mpt->is_sas || mpt->pci_pio_reg == NULL) { device_printf(dev, "Giving Up.\n"); goto bad; } - device_printf(dev, "Falling back to PIO mode.\n"); + if (bootverbose) { + device_printf(dev, "Falling back to PIO mode.\n"); + } mpt->pci_st = mpt->pci_pio_st; mpt->pci_sh = mpt->pci_pio_sh; } else { Modified: stable/7/sys/dev/mpt/mpt_reg.h ============================================================================== --- stable/7/sys/dev/mpt/mpt_reg.h Tue Feb 14 00:54:59 2012 (r231624) +++ stable/7/sys/dev/mpt/mpt_reg.h Tue Feb 14 00:56:01 2012 (r231625) @@ -77,6 +77,7 @@ #define MPT_OFFSET_REPLY_Q 0x44 #define MPT_OFFSET_HOST_INDEX 0x50 #define MPT_OFFSET_FUBAR 0x90 +#define MPT_OFFSET_RESET_1078 0x10fc /* Bit Maps for DOORBELL register */ enum DB_STATE_BITS { From owner-svn-src-stable-7@FreeBSD.ORG Tue Feb 14 01:09:10 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 909391065673; Tue, 14 Feb 2012 01:09:10 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7A9148FC16; Tue, 14 Feb 2012 01:09:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1E19Aah070977; Tue, 14 Feb 2012 01:09:10 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1E19AWs070971; Tue, 14 Feb 2012 01:09:10 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201202140109.q1E19AWs070971@svn.freebsd.org> From: Marius Strobl Date: Tue, 14 Feb 2012 01:09:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231628 - stable/7/sys/dev/mpt X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2012 01:09:10 -0000 Author: marius Date: Tue Feb 14 01:09:10 2012 New Revision: 231628 URL: http://svn.freebsd.org/changeset/base/231628 Log: Forced commit to denote that the commit message of r231625 actually should have read: MFC: r231518 Flesh out support for SAS1078 and SAS1078DE (which are said to actually be the same chip): - The I/O port resource may not be available with these. However, given that we actually only need this resource for some controllers that require their firmware to be up- and downloaded (which excludes the SAS1078{,DE}) just handle failure to allocate this resource gracefully when possible. While at it, generally put non-fatal resource allocation failures under bootverbose. - SAS1078{,DE} use a different hard reset protocol. - Add workarounds for the 36GB physical address limitation of scatter/ gather elements of these controllers. Tested by: Slawa Olhovchenkov PR: 149220 (remaining part) Modified: stable/7/sys/dev/mpt/mpt.c stable/7/sys/dev/mpt/mpt.h stable/7/sys/dev/mpt/mpt_cam.c stable/7/sys/dev/mpt/mpt_pci.c stable/7/sys/dev/mpt/mpt_reg.h Modified: stable/7/sys/dev/mpt/mpt.c ============================================================================== Modified: stable/7/sys/dev/mpt/mpt.h ============================================================================== Modified: stable/7/sys/dev/mpt/mpt_cam.c ============================================================================== Modified: stable/7/sys/dev/mpt/mpt_pci.c ============================================================================== Modified: stable/7/sys/dev/mpt/mpt_reg.h ============================================================================== From owner-svn-src-stable-7@FreeBSD.ORG Tue Feb 14 01:15:46 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EC352106566C; Tue, 14 Feb 2012 01:15:46 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D60B78FC13; Tue, 14 Feb 2012 01:15:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1E1Fk0U071376; Tue, 14 Feb 2012 01:15:46 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1E1FkPK071372; Tue, 14 Feb 2012 01:15:46 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201202140115.q1E1FkPK071372@svn.freebsd.org> From: Marius Strobl Date: Tue, 14 Feb 2012 01:15:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231631 - stable/7/sys/dev/mpt X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2012 01:15:47 -0000 Author: marius Date: Tue Feb 14 01:15:46 2012 New Revision: 231631 URL: http://svn.freebsd.org/changeset/base/231631 Log: MFC: r231228 Remove extra newlines from panic messages. Modified: stable/7/sys/dev/mpt/mpt.c stable/7/sys/dev/mpt/mpt.h stable/7/sys/dev/mpt/mpt_cam.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/mpt/mpt.c ============================================================================== --- stable/7/sys/dev/mpt/mpt.c Tue Feb 14 01:15:26 2012 (r231630) +++ stable/7/sys/dev/mpt/mpt.c Tue Feb 14 01:15:46 2012 (r231631) @@ -148,7 +148,7 @@ static __inline struct mpt_personality * mpt_pers_find(struct mpt_softc *mpt, u_int start_at) { KASSERT(start_at <= MPT_MAX_PERSONALITIES, - ("mpt_pers_find: starting position out of range\n")); + ("mpt_pers_find: starting position out of range")); while (start_at < MPT_MAX_PERSONALITIES && (mpt->mpt_pers_mask & (0x1 << start_at)) == 0) { @@ -1203,8 +1203,7 @@ mpt_free_request(struct mpt_softc *mpt, uint32_t offset, reply_baddr; if (req == NULL || req != &mpt->request_pool[req->index]) { - panic("mpt_free_request bad req ptr\n"); - return; + panic("mpt_free_request: bad req ptr"); } if ((nxt = req->chain) != NULL) { req->chain = NULL; @@ -1267,7 +1266,7 @@ retry: req = TAILQ_FIRST(&mpt->request_free_list); if (req != NULL) { KASSERT(req == &mpt->request_pool[req->index], - ("mpt_get_request: corrupted request free list\n")); + ("mpt_get_request: corrupted request free list")); KASSERT(req->state == REQ_STATE_FREE, ("req %p:%u not free on free list %x index %d function %x", req, req->serno, req->state, req->index, Modified: stable/7/sys/dev/mpt/mpt.h ============================================================================== --- stable/7/sys/dev/mpt/mpt.h Tue Feb 14 01:15:26 2012 (r231630) +++ stable/7/sys/dev/mpt/mpt.h Tue Feb 14 01:15:46 2012 (r231631) @@ -852,7 +852,7 @@ mpt_lockspl(struct mpt_softc *mpt) mpt->mpt_splsaved = s; } else { splx(s); - panic("Recursed lock with mask: 0x%x\n", s); + panic("Recursed lock with mask: 0x%x", s); } } @@ -864,7 +864,7 @@ mpt_unlockspl(struct mpt_softc *mpt) splx(mpt->mpt_splsaved); } } else - panic("Negative lock count\n"); + panic("Negative lock count"); } static __inline int @@ -1147,7 +1147,7 @@ static __inline request_t * mpt_tag_2_req(struct mpt_softc *mpt, uint32_t tag) { uint16_t rtg = (tag >> 18); - KASSERT(rtg < mpt->tgt_cmds_allocated, ("bad tag %d\n", tag)); + KASSERT(rtg < mpt->tgt_cmds_allocated, ("bad tag %d", tag)); KASSERT(mpt->tgt_cmd_ptrs, ("no cmd backpointer array")); KASSERT(mpt->tgt_cmd_ptrs[rtg], ("no cmd backpointer")); return (mpt->tgt_cmd_ptrs[rtg]); @@ -1214,7 +1214,7 @@ mpt_req_spcl(struct mpt_softc *mpt, requ return; } } - panic("%s(%d): req %p:%u function %x not in els or tgt ptrs\n", + panic("%s(%d): req %p:%u function %x not in els or tgt ptrs", s, line, req, req->serno, ((PTR_MSG_REQUEST_HEADER)req->req_vbuf)->Function); } @@ -1228,13 +1228,13 @@ mpt_req_not_spcl(struct mpt_softc *mpt, int i; for (i = 0; i < mpt->els_cmds_allocated; i++) { KASSERT(req != mpt->els_cmd_ptrs[i], - ("%s(%d): req %p:%u func %x in els ptrs at ioindex %d\n", + ("%s(%d): req %p:%u func %x in els ptrs at ioindex %d", s, line, req, req->serno, ((PTR_MSG_REQUEST_HEADER)req->req_vbuf)->Function, i)); } for (i = 0; i < mpt->tgt_cmds_allocated; i++) { KASSERT(req != mpt->tgt_cmd_ptrs[i], - ("%s(%d): req %p:%u func %x in tgt ptrs at ioindex %d\n", + ("%s(%d): req %p:%u func %x in tgt ptrs at ioindex %d", s, line, req, req->serno, ((PTR_MSG_REQUEST_HEADER)req->req_vbuf)->Function, i)); } Modified: stable/7/sys/dev/mpt/mpt_cam.c ============================================================================== --- stable/7/sys/dev/mpt/mpt_cam.c Tue Feb 14 01:15:26 2012 (r231630) +++ stable/7/sys/dev/mpt/mpt_cam.c Tue Feb 14 01:15:46 2012 (r231631) @@ -1357,7 +1357,7 @@ bad: MPT_TGT_STATE(mpt, cmd_req)->req = NULL; } ccb->ccb_h.status &= ~CAM_SIM_QUEUED; - KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d\n", __LINE__)); + KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d", __LINE__)); xpt_done(ccb); CAMLOCK_2_MPTLOCK(mpt); mpt_free_request(mpt, req); @@ -1643,7 +1643,7 @@ out: bus_dmamap_unload(mpt->buffer_dmat, req->dmap); } ccb->ccb_h.status &= ~CAM_SIM_QUEUED; - KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d\n", __LINE__)); + KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d", __LINE__)); xpt_done(ccb); CAMLOCK_2_MPTLOCK(mpt); mpt_free_request(mpt, req); @@ -1768,7 +1768,7 @@ bad: MPT_TGT_STATE(mpt, cmd_req)->req = NULL; } ccb->ccb_h.status &= ~CAM_SIM_QUEUED; - KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d\n", __LINE__)); + KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d", __LINE__)); xpt_done(ccb); CAMLOCK_2_MPTLOCK(mpt); mpt_free_request(mpt, req); @@ -2038,7 +2038,7 @@ out: bus_dmamap_unload(mpt->buffer_dmat, req->dmap); } ccb->ccb_h.status &= ~CAM_SIM_QUEUED; - KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d\n", __LINE__)); + KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d", __LINE__)); xpt_done(ccb); CAMLOCK_2_MPTLOCK(mpt); mpt_free_request(mpt, req); @@ -2746,7 +2746,7 @@ mpt_scsi_reply_handler(struct mpt_softc mpt_prt(mpt, "mpt_scsi_reply_handler: %p:%u complete\n", req, req->serno); } - KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d\n", __LINE__)); + KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d", __LINE__)); MPTLOCK_2_CAMLOCK(mpt); xpt_done(ccb); CAMLOCK_2_MPTLOCK(mpt); @@ -3653,7 +3653,7 @@ mpt_action(struct cam_sim *sim, union cc break; } mpt_calc_geometry(ccg, /*extended*/1); - KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d\n", __LINE__)); + KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d", __LINE__)); break; } case XPT_PATH_INQ: /* Path routing inquiry */ @@ -4554,7 +4554,7 @@ mpt_target_start_io(struct mpt_softc *mp request_t *req; KASSERT((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE, - ("dxfer_len %u but direction is NONE\n", csio->dxfer_len)); + ("dxfer_len %u but direction is NONE", csio->dxfer_len)); if ((req = mpt_get_request(mpt, FALSE)) == NULL) { if (mpt->outofbeer == 0) { @@ -5458,7 +5458,7 @@ mpt_scsi_tgt_reply_handler(struct mpt_so mpt_set_ccb_status(ccb, CAM_REQ_CMP); ccb->ccb_h.status &= ~CAM_SIM_QUEUED; KASSERT(ccb->ccb_h.status, - ("zero ccb sts at %d\n", __LINE__)); + ("zero ccb sts at %d", __LINE__)); tgt->state = TGT_STATE_IN_CAM; if (mpt->outofbeer) { ccb->ccb_h.status |= CAM_RELEASE_SIMQ; @@ -5520,7 +5520,7 @@ mpt_scsi_tgt_reply_handler(struct mpt_so mpt_set_ccb_status(ccb, CAM_REQ_CMP); ccb->ccb_h.status &= ~CAM_SIM_QUEUED; KASSERT(ccb->ccb_h.status, - ("ZERO ccb sts at %d\n", __LINE__)); + ("ZERO ccb sts at %d", __LINE__)); tgt->ccb = NULL; } else { mpt_lprt(mpt, MPT_PRT_DEBUG, @@ -5592,7 +5592,7 @@ mpt_scsi_tgt_reply_handler(struct mpt_so } tgt = MPT_TGT_STATE(mpt, req); KASSERT(tgt->state == TGT_STATE_LOADING, - ("bad state 0x%x on reply to buffer post\n", tgt->state)); + ("bad state 0x%x on reply to buffer post", tgt->state)); mpt_assign_serno(mpt, req); tgt->state = TGT_STATE_LOADED; break; From owner-svn-src-stable-7@FreeBSD.ORG Tue Feb 14 10:17:31 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E3ACA106566B; Tue, 14 Feb 2012 10:17:31 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CB6E78FC17; Tue, 14 Feb 2012 10:17:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1EAHVlp092644; Tue, 14 Feb 2012 10:17:31 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1EAHVoC092581; Tue, 14 Feb 2012 10:17:31 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201202141017.q1EAHVoC092581@svn.freebsd.org> From: Doug Barton Date: Tue, 14 Feb 2012 10:17:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231656 - stable/7/etc/rc.d X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2012 10:17:32 -0000 Author: dougb Date: Tue Feb 14 10:17:30 2012 New Revision: 231656 URL: http://svn.freebsd.org/changeset/base/231656 Log: MFC r230099: Change rcvar= assignments to the literal values set_rcvar would have returned. This will slightly reduce boot time, and help in diff reduction to HEAD. Modified: stable/7/etc/rc.d/accounting stable/7/etc/rc.d/amd stable/7/etc/rc.d/apm stable/7/etc/rc.d/apmd stable/7/etc/rc.d/bootparams stable/7/etc/rc.d/bsnmpd stable/7/etc/rc.d/bthidd stable/7/etc/rc.d/cleanvar stable/7/etc/rc.d/cleartmp stable/7/etc/rc.d/cron stable/7/etc/rc.d/ddb stable/7/etc/rc.d/devd stable/7/etc/rc.d/dmesg stable/7/etc/rc.d/ftp-proxy stable/7/etc/rc.d/ftpd stable/7/etc/rc.d/hcsecd stable/7/etc/rc.d/hostapd stable/7/etc/rc.d/inetd stable/7/etc/rc.d/ip6addrctl stable/7/etc/rc.d/ip6fw stable/7/etc/rc.d/ipfilter stable/7/etc/rc.d/ipfs stable/7/etc/rc.d/ipmon stable/7/etc/rc.d/ipnat stable/7/etc/rc.d/ipsec stable/7/etc/rc.d/ipxrouted stable/7/etc/rc.d/isdnd stable/7/etc/rc.d/jail stable/7/etc/rc.d/keyserv stable/7/etc/rc.d/lpd stable/7/etc/rc.d/mountd stable/7/etc/rc.d/moused stable/7/etc/rc.d/mroute6d stable/7/etc/rc.d/mrouted stable/7/etc/rc.d/natd stable/7/etc/rc.d/netwait stable/7/etc/rc.d/network_ipv6 stable/7/etc/rc.d/newsyslog stable/7/etc/rc.d/nfsd stable/7/etc/rc.d/nscd stable/7/etc/rc.d/ntpd stable/7/etc/rc.d/ntpdate stable/7/etc/rc.d/pf stable/7/etc/rc.d/pflog stable/7/etc/rc.d/pfsync stable/7/etc/rc.d/powerd stable/7/etc/rc.d/ppp stable/7/etc/rc.d/pppoed stable/7/etc/rc.d/rarpd stable/7/etc/rc.d/rfcomm_pppd_server stable/7/etc/rc.d/route6d stable/7/etc/rc.d/routed stable/7/etc/rc.d/rpcbind stable/7/etc/rc.d/rtadvd stable/7/etc/rc.d/rwho stable/7/etc/rc.d/sdpd stable/7/etc/rc.d/sendmail stable/7/etc/rc.d/sshd stable/7/etc/rc.d/syslogd stable/7/etc/rc.d/timed stable/7/etc/rc.d/virecover stable/7/etc/rc.d/watchdogd Directory Properties: stable/7/etc/ (props changed) Modified: stable/7/etc/rc.d/accounting ============================================================================== --- stable/7/etc/rc.d/accounting Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/accounting Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ . /etc/rc.subr name="accounting" -rcvar=`set_rcvar` +rcvar="accounting_enable" accounting_command="/usr/sbin/accton" accounting_file="/var/account/acct" Modified: stable/7/etc/rc.d/amd ============================================================================== --- stable/7/etc/rc.d/amd Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/amd Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ . /etc/rc.subr name="amd" -rcvar=`set_rcvar` +rcvar="amd_enable" command="/usr/sbin/${name}" start_precmd="amd_precmd" command_args="&" Modified: stable/7/etc/rc.d/apm ============================================================================== --- stable/7/etc/rc.d/apm Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/apm Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ . /etc/rc.subr name="apm" -rcvar=`set_rcvar` +rcvar="apm_enable" start_precmd="apm_precmd" command="/usr/sbin/${name}" start_cmd="${command} -e enable" Modified: stable/7/etc/rc.d/apmd ============================================================================== --- stable/7/etc/rc.d/apmd Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/apmd Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ . /etc/rc.subr name="apmd" -rcvar=`set_rcvar` +rcvar="apmd_enable" command="/usr/sbin/${name}" start_precmd="apmd_prestart" Modified: stable/7/etc/rc.d/bootparams ============================================================================== --- stable/7/etc/rc.d/bootparams Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/bootparams Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ . /etc/rc.subr name="bootparamd" -rcvar=`set_rcvar` +rcvar="bootparamd_enable" required_files="/etc/bootparams" command="/usr/sbin/${name}" Modified: stable/7/etc/rc.d/bsnmpd ============================================================================== --- stable/7/etc/rc.d/bsnmpd Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/bsnmpd Tue Feb 14 10:17:30 2012 (r231656) @@ -10,7 +10,7 @@ . /etc/rc.subr name="bsnmpd" -rcvar=`set_rcvar` +rcvar="bsnmpd_enable" command="/usr/sbin/${name}" pidfile="/var/run/snmpd.pid" Modified: stable/7/etc/rc.d/bthidd ============================================================================== --- stable/7/etc/rc.d/bthidd Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/bthidd Tue Feb 14 10:17:30 2012 (r231656) @@ -11,9 +11,9 @@ . /etc/rc.subr name="bthidd" +rcvar="bthidd_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" -rcvar=`set_rcvar` start_precmd="bthidd_prestart" bthidd_prestart() Modified: stable/7/etc/rc.d/cleanvar ============================================================================== --- stable/7/etc/rc.d/cleanvar Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/cleanvar Tue Feb 14 10:17:30 2012 (r231656) @@ -9,7 +9,7 @@ . /etc/rc.subr name="cleanvar" -rcvar=`set_rcvar` +rcvar="cleanvar_enable" start_precmd="${name}_prestart" start_cmd="${name}_start" Modified: stable/7/etc/rc.d/cleartmp ============================================================================== --- stable/7/etc/rc.d/cleartmp Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/cleartmp Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ name="cleartmp" # Disguise rcvar for the start method to run irrespective of its setting. -rcvar1=`set_rcvar clear_tmp` +rcvar1="clear_tmp_enable" start_cmd="${name}_start" stop_cmd=":" Modified: stable/7/etc/rc.d/cron ============================================================================== --- stable/7/etc/rc.d/cron Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/cron Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ . /etc/rc.subr name="cron" -rcvar="`set_rcvar`" +rcvar="cron_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" Modified: stable/7/etc/rc.d/ddb ============================================================================== --- stable/7/etc/rc.d/ddb Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/ddb Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ . /etc/rc.subr name="ddb" -rcvar=`set_rcvar` +rcvar="ddb_enable" command="/sbin/${name}" start_precmd="ddb_prestart" stop_cmd=":" Modified: stable/7/etc/rc.d/devd ============================================================================== --- stable/7/etc/rc.d/devd Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/devd Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ . /etc/rc.subr name="devd" -rcvar=`set_rcvar` +rcvar="devd_enable" command="/sbin/${name}" start_precmd=${name}_prestart Modified: stable/7/etc/rc.d/dmesg ============================================================================== --- stable/7/etc/rc.d/dmesg Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/dmesg Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ . /etc/rc.subr name="dmesg" -rcvar=`set_rcvar` +rcvar="dmesg_enable" dmesg_file="/var/run/dmesg.boot" start_cmd="do_dmesg" stop_cmd=":" Modified: stable/7/etc/rc.d/ftp-proxy ============================================================================== --- stable/7/etc/rc.d/ftp-proxy Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/ftp-proxy Tue Feb 14 10:17:30 2012 (r231656) @@ -10,7 +10,7 @@ . /etc/rc.subr name="ftpproxy" -rcvar=`set_rcvar` +rcvar="ftpproxy_enable" command="/usr/sbin/ftp-proxy" load_rc_config $name Modified: stable/7/etc/rc.d/ftpd ============================================================================== --- stable/7/etc/rc.d/ftpd Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/ftpd Tue Feb 14 10:17:30 2012 (r231656) @@ -10,7 +10,7 @@ . /etc/rc.subr name="ftpd" -rcvar=`set_rcvar` +rcvar="ftpd_enable" command="/usr/libexec/${name}" pidfile="/var/run/${name}.pid" start_precmd=ftpd_prestart Modified: stable/7/etc/rc.d/hcsecd ============================================================================== --- stable/7/etc/rc.d/hcsecd Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/hcsecd Tue Feb 14 10:17:30 2012 (r231656) @@ -11,9 +11,9 @@ . /etc/rc.subr name="hcsecd" +rcvar="hcsecd_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" -rcvar=`set_rcvar` required_modules="ng_btsocket" load_rc_config $name Modified: stable/7/etc/rc.d/hostapd ============================================================================== --- stable/7/etc/rc.d/hostapd Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/hostapd Tue Feb 14 10:17:30 2012 (r231656) @@ -10,8 +10,8 @@ . /etc/rc.subr name="hostapd" +rcvar="hostapd_enable" command="/usr/sbin/${name}" -rcvar=`set_rcvar` conf_file="/etc/${name}.conf" pidfile="/var/run/${name}.pid" Modified: stable/7/etc/rc.d/inetd ============================================================================== --- stable/7/etc/rc.d/inetd Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/inetd Tue Feb 14 10:17:30 2012 (r231656) @@ -10,7 +10,7 @@ . /etc/rc.subr name="inetd" -rcvar=`set_rcvar` +rcvar="inetd_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" required_files="/etc/${name}.conf" Modified: stable/7/etc/rc.d/ip6addrctl ============================================================================== --- stable/7/etc/rc.d/ip6addrctl Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/ip6addrctl Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ . /etc/rc.subr name="ip6addrctl" -rcvar=`set_rcvar` +rcvar="ip6addrctl_enable" start_cmd="ip6addrctl_start" stop_cmd="ip6addrctl_stop" extra_commands="status prefer_ipv6 prefer_ipv4" Modified: stable/7/etc/rc.d/ip6fw ============================================================================== --- stable/7/etc/rc.d/ip6fw Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/ip6fw Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ . /etc/rc.subr name="ip6fw" -rcvar=`set_rcvar ipv6_firewall` +rcvar="ipv6_firewall_enable" start_cmd="ip6fw_start" stop_cmd="${SYSCTL_W} net.inet6.ip6.fw.enable=0" required_modules="ipfw" Modified: stable/7/etc/rc.d/ipfilter ============================================================================== --- stable/7/etc/rc.d/ipfilter Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/ipfilter Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ . /etc/rc.subr name="ipfilter" -rcvar=`set_rcvar` +rcvar="ipfilter_enable" load_rc_config $name stop_precmd="test -f ${ipfilter_rules} -o -f ${ipv6_ipfilter_rules}" Modified: stable/7/etc/rc.d/ipfs ============================================================================== --- stable/7/etc/rc.d/ipfs Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/ipfs Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ . /etc/rc.subr name="ipfs" -rcvar=`set_rcvar` +rcvar="ipfs_enable" start_cmd="ipfs_start" stop_cmd="ipfs_stop" start_precmd="ipfs_prestart" Modified: stable/7/etc/rc.d/ipmon ============================================================================== --- stable/7/etc/rc.d/ipmon Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/ipmon Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ . /etc/rc.subr name="ipmon" -rcvar=`set_rcvar` +rcvar="ipmon_enable" command="/sbin/${name}" start_precmd="ipmon_precmd" Modified: stable/7/etc/rc.d/ipnat ============================================================================== --- stable/7/etc/rc.d/ipnat Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/ipnat Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ . /etc/rc.subr name="ipnat" -rcvar=`set_rcvar` +rcvar="ipnat_enable" load_rc_config $name start_cmd="ipnat_start" stop_cmd="${ipnat_program} -F -C" Modified: stable/7/etc/rc.d/ipsec ============================================================================== --- stable/7/etc/rc.d/ipsec Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/ipsec Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ . /etc/rc.subr name="ipsec" -rcvar=`set_rcvar` +rcvar="ipsec_enable" start_precmd="ipsec_prestart" start_cmd="ipsec_start" stop_precmd="test -f $ipsec_file" Modified: stable/7/etc/rc.d/ipxrouted ============================================================================== --- stable/7/etc/rc.d/ipxrouted Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/ipxrouted Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ . /etc/rc.subr name="ipxrouted" -rcvar=`set_rcvar` +rcvar="ipxrouted_enable" command="/usr/sbin/IPXrouted" command_args="> /dev/null 2>&1" Modified: stable/7/etc/rc.d/isdnd ============================================================================== --- stable/7/etc/rc.d/isdnd Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/isdnd Tue Feb 14 10:17:30 2012 (r231656) @@ -12,7 +12,7 @@ . /etc/rc.subr name="isdnd" -rcvar=`set_rcvar isdn` +rcvar="isdn_enable" pidfile="/var/run/${name}.pid" command="/usr/sbin/isdnd" start_cmd="isdnd_start" Modified: stable/7/etc/rc.d/jail ============================================================================== --- stable/7/etc/rc.d/jail Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/jail Tue Feb 14 10:17:30 2012 (r231656) @@ -17,7 +17,7 @@ . /etc/rc.subr name="jail" -rcvar=`set_rcvar` +rcvar="jail_enable" start_cmd="jail_start" stop_cmd="jail_stop" Modified: stable/7/etc/rc.d/keyserv ============================================================================== --- stable/7/etc/rc.d/keyserv Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/keyserv Tue Feb 14 10:17:30 2012 (r231656) @@ -13,7 +13,7 @@ . /etc/rc.subr name="keyserv" -rcvar=`set_rcvar` +rcvar="keyserv_enable" command="/usr/sbin/${name}" start_precmd="keyserv_prestart" Modified: stable/7/etc/rc.d/lpd ============================================================================== --- stable/7/etc/rc.d/lpd Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/lpd Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ . /etc/rc.subr name="lpd" -rcvar=`set_rcvar` +rcvar="lpd_enable" command="/usr/sbin/${name}" required_files="/etc/printcap" start_precmd="chkprintcap" Modified: stable/7/etc/rc.d/mountd ============================================================================== --- stable/7/etc/rc.d/mountd Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/mountd Tue Feb 14 10:17:30 2012 (r231656) @@ -10,7 +10,7 @@ . /etc/rc.subr name="mountd" -rcvar=`set_rcvar` +rcvar="mountd_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" required_files="/etc/exports" Modified: stable/7/etc/rc.d/moused ============================================================================== --- stable/7/etc/rc.d/moused Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/moused Tue Feb 14 10:17:30 2012 (r231656) @@ -10,7 +10,7 @@ . /etc/rc.subr name="moused" -rcvar=`set_rcvar` +rcvar="moused_enable" command="/usr/sbin/${name}" start_cmd="moused_start" pidprefix="/var/run/moused" @@ -23,7 +23,7 @@ load_rc_config $name # if [ -n "$2" ]; then eval moused_$2_enable=\${moused_$2_enable-${moused_nondefault_enable}} - rcvar=`set_rcvar moused_$2` + rcvar="moused_${2}_enable" pidfile="${pidprefix}.$2.pid" pidarg="-I $pidfile" fi Modified: stable/7/etc/rc.d/mroute6d ============================================================================== --- stable/7/etc/rc.d/mroute6d Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/mroute6d Tue Feb 14 10:17:30 2012 (r231656) @@ -10,7 +10,7 @@ . /etc/rc.subr name="mroute6d" -rcvar=`set_rcvar` +rcvar="mroute6d_enable" command="/usr/local/sbin/pim6dd" load_rc_config $name Modified: stable/7/etc/rc.d/mrouted ============================================================================== --- stable/7/etc/rc.d/mrouted Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/mrouted Tue Feb 14 10:17:30 2012 (r231656) @@ -10,7 +10,7 @@ . /etc/rc.subr name="mrouted" -rcvar=`set_rcvar` +rcvar="mrouted_enable" command="/usr/local/sbin/${name}" pidfile="/var/run/${name}.pid" required_files="/etc/${name}.conf" Modified: stable/7/etc/rc.d/natd ============================================================================== --- stable/7/etc/rc.d/natd Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/natd Tue Feb 14 10:17:30 2012 (r231656) @@ -10,7 +10,7 @@ . /etc/network.subr name="natd" -rcvar=`set_rcvar` +rcvar="natd_enable" command="/sbin/${name}" pidfile="/var/run/${name}.pid" start_precmd="natd_precmd" Modified: stable/7/etc/rc.d/netwait ============================================================================== --- stable/7/etc/rc.d/netwait Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/netwait Tue Feb 14 10:17:30 2012 (r231656) @@ -14,7 +14,7 @@ . /etc/rc.subr name="netwait" -rcvar=`set_rcvar` +rcvar="netwait_enable" start_cmd="${name}_start" stop_cmd=":" Modified: stable/7/etc/rc.d/network_ipv6 ============================================================================== --- stable/7/etc/rc.d/network_ipv6 Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/network_ipv6 Tue Feb 14 10:17:30 2012 (r231656) @@ -36,7 +36,7 @@ . /etc/network.subr name="network_ipv6" -rcvar=`set_rcvar ipv6` +rcvar="ipv6_enable" start_cmd="network_ipv6_start" network_ipv6_start() Modified: stable/7/etc/rc.d/newsyslog ============================================================================== --- stable/7/etc/rc.d/newsyslog Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/newsyslog Tue Feb 14 10:17:30 2012 (r231656) @@ -9,7 +9,7 @@ . /etc/rc.subr name="newsyslog" -rcvar=`set_rcvar` +rcvar="newsyslog_enable" required_files="/etc/newsyslog.conf" command="/usr/sbin/${name}" start_cmd="newsyslog_start" Modified: stable/7/etc/rc.d/nfsd ============================================================================== --- stable/7/etc/rc.d/nfsd Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/nfsd Tue Feb 14 10:17:30 2012 (r231656) @@ -10,7 +10,7 @@ . /etc/rc.subr name="nfsd" -rcvar=`set_rcvar nfs_server` +rcvar="nfs_server_enable" command="/usr/sbin/${name}" load_rc_config $name Modified: stable/7/etc/rc.d/nscd ============================================================================== --- stable/7/etc/rc.d/nscd Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/nscd Tue Feb 14 10:17:30 2012 (r231656) @@ -19,7 +19,7 @@ . /etc/rc.subr name="nscd" -rcvar=`set_rcvar` +rcvar="nscd_enable" command=/usr/sbin/nscd extra_commands="flush" Modified: stable/7/etc/rc.d/ntpd ============================================================================== --- stable/7/etc/rc.d/ntpd Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/ntpd Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ . /etc/rc.subr name="ntpd" -rcvar=`set_rcvar` +rcvar="ntpd_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" start_precmd="ntpd_precmd" Modified: stable/7/etc/rc.d/ntpdate ============================================================================== --- stable/7/etc/rc.d/ntpdate Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/ntpdate Tue Feb 14 10:17:30 2012 (r231656) @@ -10,7 +10,7 @@ . /etc/rc.subr name="ntpdate" -rcvar=`set_rcvar` +rcvar="ntpdate_enable" stop_cmd=":" start_cmd="ntpdate_start" Modified: stable/7/etc/rc.d/pf ============================================================================== --- stable/7/etc/rc.d/pf Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/pf Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ . /etc/rc.subr name="pf" -rcvar=`set_rcvar` +rcvar="pf_enable" load_rc_config $name start_cmd="pf_start" stop_cmd="pf_stop" Modified: stable/7/etc/rc.d/pflog ============================================================================== --- stable/7/etc/rc.d/pflog Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/pflog Tue Feb 14 10:17:30 2012 (r231656) @@ -10,7 +10,7 @@ . /etc/rc.subr name="pflog" -rcvar=`set_rcvar` +rcvar="pflog_enable" command="/sbin/pflogd" pidfile="/var/run/pflogd.pid" start_precmd="pflog_prestart" Modified: stable/7/etc/rc.d/pfsync ============================================================================== --- stable/7/etc/rc.d/pfsync Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/pfsync Tue Feb 14 10:17:30 2012 (r231656) @@ -10,7 +10,7 @@ . /etc/rc.subr name="pfsync" -rcvar=`set_rcvar` +rcvar="pfsync_enable" start_precmd="pfsync_prestart" start_cmd="pfsync_start" stop_cmd="pfsync_stop" Modified: stable/7/etc/rc.d/powerd ============================================================================== --- stable/7/etc/rc.d/powerd Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/powerd Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ . /etc/rc.subr name="powerd" -rcvar=`set_rcvar` +rcvar="powerd_enable" command="/usr/sbin/${name}" stop_postcmd=powerd_poststop Modified: stable/7/etc/rc.d/ppp ============================================================================== --- stable/7/etc/rc.d/ppp Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/ppp Tue Feb 14 10:17:30 2012 (r231656) @@ -10,7 +10,7 @@ . /etc/rc.subr name="ppp" -rcvar=`set_rcvar` +rcvar="ppp_enable" command="/usr/sbin/${name}" start_cmd="ppp_start" stop_cmd="ppp_stop" Modified: stable/7/etc/rc.d/pppoed ============================================================================== --- stable/7/etc/rc.d/pppoed Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/pppoed Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ . /etc/rc.subr name="pppoed" -rcvar="`set_rcvar`" +rcvar="pppoed_enable" start_cmd="pppoed_start" # XXX stop_cmd will not be straightforward stop_cmd=":" Modified: stable/7/etc/rc.d/rarpd ============================================================================== --- stable/7/etc/rc.d/rarpd Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/rarpd Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ . /etc/rc.subr name="rarpd" -rcvar=`set_rcvar` +rcvar="rarpd_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" required_files="/etc/ethers" Modified: stable/7/etc/rc.d/rfcomm_pppd_server ============================================================================== --- stable/7/etc/rc.d/rfcomm_pppd_server Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/rfcomm_pppd_server Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ . /etc/rc.subr name="rfcomm_pppd_server" -rcvar=`set_rcvar` +rcvar="rfcomm_pppd_server_enable" command="/usr/sbin/rfcomm_pppd" start_cmd="rfcomm_pppd_server_start" stop_cmd="rfcomm_pppd_server_stop" Modified: stable/7/etc/rc.d/route6d ============================================================================== --- stable/7/etc/rc.d/route6d Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/route6d Tue Feb 14 10:17:30 2012 (r231656) @@ -10,6 +10,7 @@ . /etc/rc.subr name="route6d" +rcvar="ipv6_router_enable" # XXX - Executable may be in a different location. The $name variable # is different from the variable in rc.conf(5) so the @@ -18,7 +19,6 @@ name="route6d" # load_rc_config $name -rcvar="ipv6_router_enable" command="${ipv6_router:-/usr/sbin/${name}}" eval ${name}_flags=\"${ipv6_router_flags}\" Modified: stable/7/etc/rc.d/routed ============================================================================== --- stable/7/etc/rc.d/routed Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/routed Tue Feb 14 10:17:30 2012 (r231656) @@ -10,13 +10,13 @@ . /etc/rc.subr name="routed" +rcvar="router_enable" # XXX - Executable may be in a different location. The $name variable # is different from the variable in rc.conf(5) so the # subroutines in rc.subr won't catch it. # load_rc_config $name -rcvar="router_enable" command="${router:-/sbin/${name}}" eval ${name}_flags=\"${router_flags}\" run_rc_command "$1" Modified: stable/7/etc/rc.d/rpcbind ============================================================================== --- stable/7/etc/rc.d/rpcbind Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/rpcbind Tue Feb 14 10:17:30 2012 (r231656) @@ -10,7 +10,7 @@ . /etc/rc.subr name="rpcbind" -rcvar=`set_rcvar` +rcvar="rpcbind_enable" command="/usr/sbin/${name}" stop_postcmd='/bin/rm -f /var/run/rpcbind.*' Modified: stable/7/etc/rc.d/rtadvd ============================================================================== --- stable/7/etc/rc.d/rtadvd Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/rtadvd Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ . /etc/rc.subr name="rtadvd" -rcvar=`set_rcvar` +rcvar="rtadvd_enable" command="/usr/sbin/${name}" start_precmd="rtadvd_precmd" Modified: stable/7/etc/rc.d/rwho ============================================================================== --- stable/7/etc/rc.d/rwho Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/rwho Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ . /etc/rc.subr name="rwhod" -rcvar="`set_rcvar`" +rcvar="rwhod_enable" command="/usr/sbin/${name}" load_rc_config $name Modified: stable/7/etc/rc.d/sdpd ============================================================================== --- stable/7/etc/rc.d/sdpd Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/sdpd Tue Feb 14 10:17:30 2012 (r231656) @@ -12,7 +12,7 @@ name="sdpd" command="/usr/sbin/${name}" -rcvar=`set_rcvar` +rcvar="sdpd_enable" required_modules="ng_btsocket" load_rc_config $name Modified: stable/7/etc/rc.d/sendmail ============================================================================== --- stable/7/etc/rc.d/sendmail Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/sendmail Tue Feb 14 10:17:30 2012 (r231656) @@ -15,7 +15,7 @@ . /etc/rc.subr name="sendmail" -rcvar=`set_rcvar` +rcvar="sendmail_enable" required_files="/etc/mail/${name}.cf" start_precmd="sendmail_precmd" @@ -79,14 +79,14 @@ required_files= if checkyesno sendmail_submit_enable; then name="sendmail_submit" - rcvar=`set_rcvar` + rcvar="sendmail_submit_enable" start_cmd="${command} ${sendmail_submit_flags}" run_rc_command "$1" fi if checkyesno sendmail_outbound_enable; then name="sendmail_outbound" - rcvar=`set_rcvar` + rcvar="sendmail_outbound_enable" start_cmd="${command} ${sendmail_outbound_flags}" run_rc_command "$1" fi Modified: stable/7/etc/rc.d/sshd ============================================================================== --- stable/7/etc/rc.d/sshd Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/sshd Tue Feb 14 10:17:30 2012 (r231656) @@ -10,7 +10,7 @@ . /etc/rc.subr name="sshd" -rcvar=`set_rcvar` +rcvar="sshd_enable" command="/usr/sbin/${name}" keygen_cmd="sshd_keygen" start_precmd="sshd_precmd" Modified: stable/7/etc/rc.d/syslogd ============================================================================== --- stable/7/etc/rc.d/syslogd Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/syslogd Tue Feb 14 10:17:30 2012 (r231656) @@ -10,7 +10,7 @@ . /etc/rc.subr name="syslogd" -rcvar=`set_rcvar` +rcvar="syslogd_enable" pidfile="/var/run/syslog.pid" command="/usr/sbin/${name}" required_files="/etc/syslog.conf" @@ -41,7 +41,7 @@ syslogd_precmd() # for _l in $altlog_proglist; do eval _ldir=\$${_l}_chrootdir - if checkyesno `set_rcvar $_l` && [ -n "$_ldir" ]; then + if checkyesno ${_l}_enable && [ -n "$_ldir" ]; then echo "${_ldir}/var/run/log" >> $sockfile fi done Modified: stable/7/etc/rc.d/timed ============================================================================== --- stable/7/etc/rc.d/timed Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/timed Tue Feb 14 10:17:30 2012 (r231656) @@ -11,7 +11,7 @@ . /etc/rc.subr name="timed" -rcvar=`set_rcvar` +rcvar="timed_enable" command="/usr/sbin/${name}" load_rc_config $name Modified: stable/7/etc/rc.d/virecover ============================================================================== --- stable/7/etc/rc.d/virecover Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/virecover Tue Feb 14 10:17:30 2012 (r231656) @@ -12,7 +12,7 @@ . /etc/rc.subr name="virecover" -rcvar="`set_rcvar`" +rcvar="virecover_enable" stop_cmd=":" start_cmd="virecover_start" Modified: stable/7/etc/rc.d/watchdogd ============================================================================== --- stable/7/etc/rc.d/watchdogd Tue Feb 14 10:17:14 2012 (r231655) +++ stable/7/etc/rc.d/watchdogd Tue Feb 14 10:17:30 2012 (r231656) @@ -34,7 +34,7 @@ . /etc/rc.subr name="watchdogd" -rcvar="`set_rcvar`" +rcvar="watchdogd_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" From owner-svn-src-stable-7@FreeBSD.ORG Tue Feb 14 10:19:59 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4F098106566C; Tue, 14 Feb 2012 10:19:59 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 393008FC1A; Tue, 14 Feb 2012 10:19:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1EAJxmM092877; Tue, 14 Feb 2012 10:19:59 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1EAJx8E092875; Tue, 14 Feb 2012 10:19:59 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201202141019.q1EAJx8E092875@svn.freebsd.org> From: Doug Barton Date: Tue, 14 Feb 2012 10:19:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231659 - stable/7/etc X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2012 10:19:59 -0000 Author: dougb Date: Tue Feb 14 10:19:58 2012 New Revision: 231659 URL: http://svn.freebsd.org/changeset/base/231659 Log: MFC r230374: If we're booting there is no need to waste time determining if the service is running or not. Modified: stable/7/etc/rc.subr Directory Properties: stable/7/etc/ (props changed) Modified: stable/7/etc/rc.subr ============================================================================== --- stable/7/etc/rc.subr Tue Feb 14 10:19:27 2012 (r231658) +++ stable/7/etc/rc.subr Tue Feb 14 10:19:58 2012 (r231659) @@ -654,7 +654,7 @@ run_rc_command() fi fi - eval $_pidcmd # determine the pid if necessary + [ -z "$autoboot" ] && eval $_pidcmd # determine the pid if necessary for _elem in $_keywords; do if [ "$_elem" != "$rc_arg" ]; then From owner-svn-src-stable-7@FreeBSD.ORG Tue Feb 14 10:30:13 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B945810656D2; Tue, 14 Feb 2012 10:30:13 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8A7468FC1A; Tue, 14 Feb 2012 10:30:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1EAUDAk093467; Tue, 14 Feb 2012 10:30:13 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1EAUDQt093462; Tue, 14 Feb 2012 10:30:13 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201202141030.q1EAUDQt093462@svn.freebsd.org> From: Doug Barton Date: Tue, 14 Feb 2012 10:30:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231662 - in stable/7: etc/defaults etc/rc.d share/man/man5 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2012 10:30:13 -0000 Author: dougb Date: Tue Feb 14 10:30:12 2012 New Revision: 231662 URL: http://svn.freebsd.org/changeset/base/231662 Log: MFC r231194: Add a knob to always load the default rulesets. While I'm here document the other devfs_ knobs in rc.conf.5. Modified: stable/7/etc/defaults/rc.conf stable/7/etc/rc.d/devfs stable/7/share/man/man5/rc.conf.5 Directory Properties: stable/7/etc/ (props changed) stable/7/share/man/man5/ (props changed) Modified: stable/7/etc/defaults/rc.conf ============================================================================== --- stable/7/etc/defaults/rc.conf Tue Feb 14 10:29:48 2012 (r231661) +++ stable/7/etc/defaults/rc.conf Tue Feb 14 10:30:12 2012 (r231662) @@ -610,6 +610,7 @@ devfs_rulesets="/etc/defaults/devfs.rule devfs_system_ruleset="" # The name (NOT number) of a ruleset to apply to /dev devfs_set_rulesets="" # A list of /mount/dev=ruleset_name settings to # apply (must be mounted already, i.e. fstab(5)) +devfs_load_rulesets="NO" # Enable to always load the default rulesets performance_cx_lowest="HIGH" # Online CPU idle state performance_cpu_freq="NONE" # Online CPU frequency economy_cx_lowest="HIGH" # Offline CPU idle state Modified: stable/7/etc/rc.d/devfs ============================================================================== --- stable/7/etc/rc.d/devfs Tue Feb 14 10:29:48 2012 (r231661) +++ stable/7/etc/rc.d/devfs Tue Feb 14 10:30:12 2012 (r231662) @@ -16,7 +16,8 @@ stop_cmd=':' devfs_start() { - if [ -n "$devfs_system_ruleset" -o -n "$devfs_set_rulesets" ]; then + if [ -n "$devfs_system_ruleset" -o -n "$devfs_set_rulesets" ] || + checkyesno devfs_load_rulesets; then devfs_init_rulesets if [ -n "$devfs_system_ruleset" ]; then devfs_set_ruleset $devfs_system_ruleset /dev Modified: stable/7/share/man/man5/rc.conf.5 ============================================================================== --- stable/7/share/man/man5/rc.conf.5 Tue Feb 14 10:29:48 2012 (r231661) +++ stable/7/share/man/man5/rc.conf.5 Tue Feb 14 10:30:12 2012 (r231662) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 19, 2011 +.Dd February 8, 2012 .Dt RC.CONF 5 .Os .Sh NAME @@ -3338,6 +3338,25 @@ is set to these are the flags passed to the .Xr watchdogd 8 daemon. +.It Va devfs_rulesets +.Pq Vt str +List of files containing sets of rules for +.Xr devfs 8 . +.It Va devfs_system_ruleset +.Pq Vt str +Rule name(s) to apply to the system +.Pa /dev +itself. +.It Va devfs_set_rulesets +.Pq Vt str +Pairs of already-mounted +.Pa dev +directories and rulesets that should be applied to them. +For example: /mount/dev=ruleset_name +.It Va devfs_load_rulesets +.Pq Vt bool +If set, always load the default rulesets listed in +.Va devfs_rulesets . .It Va performance_cx_lowest .Pq Vt str CPU idle state to use while on AC power. @@ -4240,6 +4259,7 @@ The default is 30. .Xr chkprintcap 8 , .Xr chown 8 , .Xr cron 8 , +.Xr devfs 8 , .Xr dhclient 8 , .Xr ftpd 8 , .Xr geli 8 , From owner-svn-src-stable-7@FreeBSD.ORG Tue Feb 14 10:34:28 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6BCE010656E8; Tue, 14 Feb 2012 10:34:28 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 55AA38FC20; Tue, 14 Feb 2012 10:34:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1EAYS7v093822; Tue, 14 Feb 2012 10:34:28 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1EAYSUw093819; Tue, 14 Feb 2012 10:34:28 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201202141034.q1EAYSUw093819@svn.freebsd.org> From: Doug Barton Date: Tue, 14 Feb 2012 10:34:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231666 - stable/7/etc/rc.d X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2012 10:34:28 -0000 Author: dougb Date: Tue Feb 14 10:34:27 2012 New Revision: 231666 URL: http://svn.freebsd.org/changeset/base/231666 Log: MFC r231507: Move addswap to run right after kld (aka early in the second stage), as it did previously. Modified: stable/7/etc/rc.d/addswap stable/7/etc/rc.d/var Directory Properties: stable/7/etc/ (props changed) Modified: stable/7/etc/rc.d/addswap ============================================================================== --- stable/7/etc/rc.d/addswap Tue Feb 14 10:34:15 2012 (r231665) +++ stable/7/etc/rc.d/addswap Tue Feb 14 10:34:27 2012 (r231666) @@ -6,7 +6,7 @@ # # PROVIDE: addswap -# REQUIRE: FILESYSTEMS +# REQUIRE: FILESYSTEMS kld # BEFORE: sysctl # KEYWORD: nojail Modified: stable/7/etc/rc.d/var ============================================================================== --- stable/7/etc/rc.d/var Tue Feb 14 10:34:15 2012 (r231665) +++ stable/7/etc/rc.d/var Tue Feb 14 10:34:27 2012 (r231666) @@ -28,7 +28,7 @@ # # PROVIDE: var -# REQUIRE: FILESYSTEMS kld +# REQUIRE: FILESYSTEMS kld addswap . /etc/rc.subr From owner-svn-src-stable-7@FreeBSD.ORG Tue Feb 14 15:18:09 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0AFCA1065675; Tue, 14 Feb 2012 15:18:09 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D35788FC1F; Tue, 14 Feb 2012 15:18:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1EFI8h7005220; Tue, 14 Feb 2012 15:18:08 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1EFI8OV005217; Tue, 14 Feb 2012 15:18:08 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <201202141518.q1EFI8OV005217@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Tue, 14 Feb 2012 15:18:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231686 - stable/7/sys/netinet6 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2012 15:18:09 -0000 Author: bz Date: Tue Feb 14 15:18:08 2012 New Revision: 231686 URL: http://svn.freebsd.org/changeset/base/231686 Log: MFC 229547: Mark a couple of file local functions static and stop exporting them. Discussed with: rwatson Modified: stable/7/sys/netinet6/nd6.h stable/7/sys/netinet6/nd6_rtr.c Directory Properties: stable/7/sys/ (props changed) Modified: stable/7/sys/netinet6/nd6.h ============================================================================== --- stable/7/sys/netinet6/nd6.h Tue Feb 14 15:17:58 2012 (r231685) +++ stable/7/sys/netinet6/nd6.h Tue Feb 14 15:18:08 2012 (r231686) @@ -420,15 +420,12 @@ void nd6_dad_duplicated __P((struct ifad void nd6_rs_input __P((struct mbuf *, int, int)); void nd6_ra_input __P((struct mbuf *, int, int)); void prelist_del __P((struct nd_prefix *)); -void defrouter_addreq __P((struct nd_defrouter *)); void defrouter_reset __P((void)); void defrouter_select __P((void)); void defrtrlist_del __P((struct nd_defrouter *)); void prelist_remove __P((struct nd_prefix *)); int nd6_prelist_add __P((struct nd_prefixctl *, struct nd_defrouter *, struct nd_prefix **)); -int nd6_prefix_onlink __P((struct nd_prefix *)); -int nd6_prefix_offlink __P((struct nd_prefix *)); void pfxlist_onlink_check __P((void)); struct nd_defrouter *defrouter_lookup __P((struct in6_addr *, struct ifnet *)); struct nd_prefix *nd6_prefix_lookup __P((struct nd_prefixctl *)); Modified: stable/7/sys/netinet6/nd6_rtr.c ============================================================================== --- stable/7/sys/netinet6/nd6_rtr.c Tue Feb 14 15:17:58 2012 (r231685) +++ stable/7/sys/netinet6/nd6_rtr.c Tue Feb 14 15:18:08 2012 (r231686) @@ -82,6 +82,9 @@ static int in6_init_prefix_ltimes(struct static void in6_init_address_ltimes __P((struct nd_prefix *, struct in6_addrlifetime *)); +static int nd6_prefix_onlink(struct nd_prefix *); +static int nd6_prefix_offlink(struct nd_prefix *); + static int rt6_deleteroute(struct radix_node *, void *); extern int nd6_recalc_reachtm_interval; @@ -446,7 +449,7 @@ nd6_rtmsg(int cmd, struct rtentry *rt) rt_missmsg(cmd, &info, rt->rt_flags, 0); } -void +static void defrouter_addreq(struct nd_defrouter *new) { struct sockaddr_in6 def, mask, gate; @@ -1517,7 +1520,7 @@ pfxlist_onlink_check() } } -int +static int nd6_prefix_onlink(struct nd_prefix *pr) { struct ifaddr *ifa; @@ -1630,7 +1633,7 @@ nd6_prefix_onlink(struct nd_prefix *pr) return (error); } -int +static int nd6_prefix_offlink(struct nd_prefix *pr) { int error = 0; From owner-svn-src-stable-7@FreeBSD.ORG Tue Feb 14 19:49:37 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8F4B61065674; Tue, 14 Feb 2012 19:49:37 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7A1C28FC15; Tue, 14 Feb 2012 19:49:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1EJnb6k015288; Tue, 14 Feb 2012 19:49:37 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1EJnbE4015268; Tue, 14 Feb 2012 19:49:37 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201202141949.q1EJnbE4015268@svn.freebsd.org> From: Dimitry Andric Date: Tue, 14 Feb 2012 19:49:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231705 - in stable/7: include/rpc include/rpcsvc lib/libc/rpc lib/libc/yp lib/librpcsvc lib/libypclnt libexec/ypxfr release/picobsd/tinyware/passwd usr.sbin/amd usr.sbin/bootparamd/boo... X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2012 19:49:37 -0000 Author: dim Date: Tue Feb 14 19:49:36 2012 New Revision: 231705 URL: http://svn.freebsd.org/changeset/base/231705 Log: MFC r231118: Consistently set RPCGEN_CPP when running rpcgen, so the C preprocessor set via ${CPP} is used, instead of always using hardcoded /usr/bin/cpp. Modified: stable/7/include/rpc/Makefile stable/7/include/rpcsvc/Makefile stable/7/lib/libc/rpc/Makefile.inc stable/7/lib/libc/yp/Makefile.inc stable/7/lib/librpcsvc/Makefile stable/7/lib/libypclnt/Makefile stable/7/libexec/ypxfr/Makefile stable/7/release/picobsd/tinyware/passwd/Makefile stable/7/usr.sbin/amd/Makefile.inc stable/7/usr.sbin/bootparamd/bootparamd/Makefile stable/7/usr.sbin/bootparamd/callbootd/Makefile stable/7/usr.sbin/keyserv/Makefile stable/7/usr.sbin/rpc.lockd/Makefile stable/7/usr.sbin/rpc.statd/Makefile stable/7/usr.sbin/rpc.yppasswdd/Makefile stable/7/usr.sbin/rpc.ypupdated/Makefile stable/7/usr.sbin/rpc.ypxfrd/Makefile stable/7/usr.sbin/yppush/Makefile stable/7/usr.sbin/ypserv/Makefile Directory Properties: stable/7/include/ (props changed) stable/7/lib/libc/ (props changed) stable/7/lib/librpcsvc/ (props changed) stable/7/lib/libypclnt/ (props changed) stable/7/libexec/ypxfr/ (props changed) stable/7/release/picobsd/tinyware/passwd/ (props changed) stable/7/usr.sbin/amd/ (props changed) stable/7/usr.sbin/bootparamd/ (props changed) stable/7/usr.sbin/keyserv/ (props changed) stable/7/usr.sbin/rpc.lockd/ (props changed) stable/7/usr.sbin/rpc.statd/ (props changed) stable/7/usr.sbin/rpc.yppasswdd/ (props changed) stable/7/usr.sbin/rpc.ypupdated/ (props changed) stable/7/usr.sbin/rpc.ypxfrd/ (props changed) stable/7/usr.sbin/yppush/ (props changed) stable/7/usr.sbin/ypserv/ (props changed) Modified: stable/7/include/rpc/Makefile ============================================================================== --- stable/7/include/rpc/Makefile Tue Feb 14 19:49:06 2012 (r231704) +++ stable/7/include/rpc/Makefile Tue Feb 14 19:49:36 2012 (r231705) @@ -3,7 +3,7 @@ .SUFFIXES: .x -RPCCOM = rpcgen -C +RPCCOM= RPCGEN_CPP=${CPP:Q} rpcgen -C HDRS= rpcb_prot.h Modified: stable/7/include/rpcsvc/Makefile ============================================================================== --- stable/7/include/rpcsvc/Makefile Tue Feb 14 19:49:06 2012 (r231704) +++ stable/7/include/rpcsvc/Makefile Tue Feb 14 19:49:36 2012 (r231705) @@ -3,7 +3,7 @@ .SUFFIXES: .x -RPCCOM = rpcgen -C +RPCCOM= RPCGEN_CPP=${CPP:Q} rpcgen -C HDRS= key_prot.h klm_prot.h mount.h nfs_prot.h nlm_prot.h rex.h rnusers.h \ rquota.h rstat.h rwall.h sm_inter.h spray.h yppasswd.h yp.h \ Modified: stable/7/lib/libc/rpc/Makefile.inc ============================================================================== --- stable/7/lib/libc/rpc/Makefile.inc Tue Feb 14 19:49:06 2012 (r231704) +++ stable/7/lib/libc/rpc/Makefile.inc Tue Feb 14 19:49:36 2012 (r231705) @@ -33,7 +33,7 @@ CFLAGS+= -I${.CURDIR}/rpc CLEANFILES+= crypt_clnt.c crypt_xdr.c crypt.h RPCDIR= ${DESTDIR}/usr/include/rpcsvc -RPCGEN= rpcgen -C +RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -C crypt_clnt.c: ${RPCDIR}/crypt.x crypt.h ${RPCGEN} -l -o ${.TARGET} ${RPCDIR}/crypt.x Modified: stable/7/lib/libc/yp/Makefile.inc ============================================================================== --- stable/7/lib/libc/yp/Makefile.inc Tue Feb 14 19:49:06 2012 (r231704) +++ stable/7/lib/libc/yp/Makefile.inc Tue Feb 14 19:49:36 2012 (r231705) @@ -10,7 +10,7 @@ CLEANFILES+= yp.h yp_xdr.c SYM_MAPS+= ${.CURDIR}/yp/Symbol.map RPCSRC= ${DESTDIR}/usr/include/rpcsvc/yp.x -RPCGEN= rpcgen -C +RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -C yp_xdr.c: ${RPCSRC} ${RPCGEN} -c -o ${.TARGET} ${RPCSRC} Modified: stable/7/lib/librpcsvc/Makefile ============================================================================== --- stable/7/lib/librpcsvc/Makefile Tue Feb 14 19:49:06 2012 (r231704) +++ stable/7/lib/librpcsvc/Makefile Tue Feb 14 19:49:36 2012 (r231705) @@ -18,7 +18,7 @@ SECRPCSRCS= secretkey.c xcrypt.c OTHERSRCS+= yp_passwd.c yp_update.c .endif -RPCCOM = rpcgen -C +RPCCOM= RPCGEN_CPP=${CPP:Q} rpcgen -C INCDIRS= -I${DESTDIR}/usr/include/rpcsvc Modified: stable/7/lib/libypclnt/Makefile ============================================================================== --- stable/7/lib/libypclnt/Makefile Tue Feb 14 19:49:06 2012 (r231704) +++ stable/7/lib/libypclnt/Makefile Tue Feb 14 19:49:36 2012 (r231705) @@ -23,7 +23,7 @@ GENSRCS=yp.h \ yppasswd_private_clnt.c \ yppasswd_private_xdr.c -RPCGEN= rpcgen -C +RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -C RPCSRC= ${.CURDIR}/../../include/rpcsvc/yp.x RPCSRC_PW= ${.CURDIR}/../../include/rpcsvc/yppasswd.x RPCSRC_PRIV= ${.CURDIR}/../../usr.sbin/rpc.yppasswdd/yppasswd_private.x Modified: stable/7/libexec/ypxfr/Makefile ============================================================================== --- stable/7/libexec/ypxfr/Makefile Tue Feb 14 19:49:06 2012 (r231704) +++ stable/7/libexec/ypxfr/Makefile Tue Feb 14 19:49:36 2012 (r231705) @@ -19,7 +19,7 @@ LDADD= -lrpcsvc CLEANFILES= ${GENSRCS} RPCDIR= ${.CURDIR}/../../include/rpcsvc -RPCGEN= rpcgen -I -C +RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C ypxfr_clnt.c: ${RPCDIR}/yp.x rm -f ${.TARGET} Modified: stable/7/release/picobsd/tinyware/passwd/Makefile ============================================================================== --- stable/7/release/picobsd/tinyware/passwd/Makefile Tue Feb 14 19:49:06 2012 (r231704) +++ stable/7/release/picobsd/tinyware/passwd/Makefile Tue Feb 14 19:49:36 2012 (r231705) @@ -26,7 +26,7 @@ CFLAGS+= -DLOGIN_CAP -DCRYPT -I. -I${.CU CLEANFILES= ${GENSRCS} -RPCGEN= rpcgen -C +RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -C RPCSRC= ${DESTDIR}/usr/include/rpcsvc/yp.x RPCSRC_PW= ${DESTDIR}/usr/include/rpcsvc/yppasswd.x RPCSRC_PRIV= ${.CURDIR}/../../usr.sbin/rpc.yppasswdd/yppasswd_private.x Modified: stable/7/usr.sbin/amd/Makefile.inc ============================================================================== --- stable/7/usr.sbin/amd/Makefile.inc Tue Feb 14 19:49:06 2012 (r231704) +++ stable/7/usr.sbin/amd/Makefile.inc Tue Feb 14 19:49:36 2012 (r231705) @@ -36,7 +36,7 @@ LIBAMUDIR= ${.CURDIR}/../libamu .endif LIBAMU= ${LIBAMUDIR}/libamu.a -RPCCOM= rpcgen +RPCCOM= RPCGEN_CPP=${CPP:Q} rpcgen MOUNT_X= ${DESTDIR}/usr/include/rpcsvc/mount.x NFS_PROT_X= ${DESTDIR}/usr/include/rpcsvc/nfs_prot.x Modified: stable/7/usr.sbin/bootparamd/bootparamd/Makefile ============================================================================== --- stable/7/usr.sbin/bootparamd/bootparamd/Makefile Tue Feb 14 19:49:06 2012 (r231704) +++ stable/7/usr.sbin/bootparamd/bootparamd/Makefile Tue Feb 14 19:49:36 2012 (r231705) @@ -18,12 +18,12 @@ CLEANFILES= ${GENSRCS} RPCSRC= ${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x bootparam_prot_svc.c: ${RPCSRC} - rpcgen -C -m -o ${.TARGET} ${RPCSRC} + RPCGEN_CPP=${CPP:Q} rpcgen -C -m -o ${.TARGET} ${RPCSRC} bootparam_prot_xdr.c: ${RPCSRC} - rpcgen -C -c -o ${.TARGET} ${RPCSRC} + RPCGEN_CPP=${CPP:Q} rpcgen -C -c -o ${.TARGET} ${RPCSRC} bootparam_prot.h: ${RPCSRC} - rpcgen -C -h -o ${.TARGET} ${RPCSRC} + RPCGEN_CPP=${CPP:Q} rpcgen -C -h -o ${.TARGET} ${RPCSRC} .include Modified: stable/7/usr.sbin/bootparamd/callbootd/Makefile ============================================================================== --- stable/7/usr.sbin/bootparamd/callbootd/Makefile Tue Feb 14 19:49:06 2012 (r231704) +++ stable/7/usr.sbin/bootparamd/callbootd/Makefile Tue Feb 14 19:49:36 2012 (r231705) @@ -13,12 +13,12 @@ CLEANFILES= ${GENSRCS} RPCSRC= ${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x bootparam_prot_clnt.c: ${RPCSRC} - rpcgen -C -l -o ${.TARGET} ${RPCSRC} + RPCGEN_CPP=${CPP:Q} rpcgen -C -l -o ${.TARGET} ${RPCSRC} bootparam_prot_xdr.c: ${RPCSRC} - rpcgen -C -c -o ${.TARGET} ${RPCSRC} + RPCGEN_CPP=${CPP:Q} rpcgen -C -c -o ${.TARGET} ${RPCSRC} bootparam_prot.h: ${RPCSRC} - rpcgen -C -h -o ${.TARGET} ${RPCSRC} + RPCGEN_CPP=${CPP:Q} rpcgen -C -h -o ${.TARGET} ${RPCSRC} .include Modified: stable/7/usr.sbin/keyserv/Makefile ============================================================================== --- stable/7/usr.sbin/keyserv/Makefile Tue Feb 14 19:49:06 2012 (r231704) +++ stable/7/usr.sbin/keyserv/Makefile Tue Feb 14 19:49:36 2012 (r231705) @@ -13,7 +13,7 @@ RPCDIR= ${DESTDIR}/usr/include/rpcsvc CLEANFILES= crypt_svc.c crypt.h -RPCGEN= rpcgen -C +RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -C crypt_svc.c: ${RPCDIR}/crypt.x ${RPCGEN} -m -o ${.TARGET} ${RPCDIR}/crypt.x Modified: stable/7/usr.sbin/rpc.lockd/Makefile ============================================================================== --- stable/7/usr.sbin/rpc.lockd/Makefile Tue Feb 14 19:49:06 2012 (r231704) +++ stable/7/usr.sbin/rpc.lockd/Makefile Tue Feb 14 19:49:36 2012 (r231705) @@ -15,7 +15,7 @@ LDADD= -lrpcsvc -lutil CLEANFILES= nlm_prot_svc.c nlm_prot.h test RPCSRC= ${DESTDIR}/usr/include/rpcsvc/nlm_prot.x -RPCGEN= rpcgen -L -C +RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -L -C nlm_prot_svc.c: ${RPCSRC} ${RPCGEN} -m -o ${.TARGET} ${RPCSRC} Modified: stable/7/usr.sbin/rpc.statd/Makefile ============================================================================== --- stable/7/usr.sbin/rpc.statd/Makefile Tue Feb 14 19:49:06 2012 (r231704) +++ stable/7/usr.sbin/rpc.statd/Makefile Tue Feb 14 19:49:36 2012 (r231705) @@ -13,7 +13,7 @@ LDADD= -lrpcsvc CLEANFILES= sm_inter_svc.c sm_inter.h RPCSRC= ${DESTDIR}/usr/include/rpcsvc/sm_inter.x -RPCGEN= rpcgen -L -C +RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -L -C sm_inter_svc.c: ${RPCSRC} ${RPCGEN} -m -o ${.TARGET} ${RPCSRC} Modified: stable/7/usr.sbin/rpc.yppasswdd/Makefile ============================================================================== --- stable/7/usr.sbin/rpc.yppasswdd/Makefile Tue Feb 14 19:49:06 2012 (r231704) +++ stable/7/usr.sbin/rpc.yppasswdd/Makefile Tue Feb 14 19:49:36 2012 (r231705) @@ -24,7 +24,7 @@ LDADD= -lrpcsvc -lcrypt -lutil CLEANFILES= ${GENSRCS} -RPCGEN= rpcgen -I -C +RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C # We need to remove the 'static' keyword from _rpcsvcstate so that # yppasswdd_main.c can see it. Modified: stable/7/usr.sbin/rpc.ypupdated/Makefile ============================================================================== --- stable/7/usr.sbin/rpc.ypupdated/Makefile Tue Feb 14 19:49:06 2012 (r231704) +++ stable/7/usr.sbin/rpc.ypupdated/Makefile Tue Feb 14 19:49:36 2012 (r231705) @@ -17,7 +17,7 @@ LDADD= -lrpcsvc CLEANFILES= ypupdate_prot_svc.c ypupdate_prot.h RPCDIR= ${DESTDIR}/usr/include/rpcsvc -RPCGEN= rpcgen -I -C +RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C # We need to remove the 'static' keyword from _rpcsvcstate so that # ypupdated_main.c can see it. Modified: stable/7/usr.sbin/rpc.ypxfrd/Makefile ============================================================================== --- stable/7/usr.sbin/rpc.ypxfrd/Makefile Tue Feb 14 19:49:06 2012 (r231704) +++ stable/7/usr.sbin/rpc.ypxfrd/Makefile Tue Feb 14 19:49:36 2012 (r231705) @@ -15,7 +15,7 @@ LDADD= -lrpcsvc CLEANFILES= ypxfrd_svc.c ypxfrd.h RPCDIR= ${.CURDIR}/../../include/rpcsvc -RPCGEN= rpcgen -I -C +RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C # We need to remove the 'static' keyword from _rpcsvcstate so that # ypxfrd_main.c can see it. Modified: stable/7/usr.sbin/yppush/Makefile ============================================================================== --- stable/7/usr.sbin/yppush/Makefile Tue Feb 14 19:49:06 2012 (r231704) +++ stable/7/usr.sbin/yppush/Makefile Tue Feb 14 19:49:36 2012 (r231705) @@ -12,7 +12,7 @@ GENSRCS=yp.h yp_clnt.c yppush_svc.c CFLAGS+= -I. -I${.CURDIR}/../../libexec/ypxfr -RPCGEN= rpcgen -C +RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -C CLEANFILES= ${GENSRCS} Modified: stable/7/usr.sbin/ypserv/Makefile ============================================================================== --- stable/7/usr.sbin/ypserv/Makefile Tue Feb 14 19:49:06 2012 (r231704) +++ stable/7/usr.sbin/ypserv/Makefile Tue Feb 14 19:49:36 2012 (r231705) @@ -15,7 +15,7 @@ LDADD= -lwrap CLEANFILES= yp_svc.c ypxfr_clnt.c yp.h -RPCGEN= rpcgen -I -C +RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C # We need to remove the 'static' keyword from _rpcsvcstate so that # yp_main.c can see it. From owner-svn-src-stable-7@FreeBSD.ORG Wed Feb 15 01:41:00 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A72AF106566C; Wed, 15 Feb 2012 01:41:00 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 905B58FC0A; Wed, 15 Feb 2012 01:41:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1F1f0vJ028968; Wed, 15 Feb 2012 01:41:00 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1F1f0AT028963; Wed, 15 Feb 2012 01:41:00 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201202150141.q1F1f0AT028963@svn.freebsd.org> From: Glen Barber Date: Wed, 15 Feb 2012 01:41:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231720 - in stable/7/share/man: man4 man5 man7 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2012 01:41:00 -0000 Author: gjb (doc committer) Date: Wed Feb 15 01:41:00 2012 New Revision: 231720 URL: http://svn.freebsd.org/changeset/base/231720 Log: MFC r231244: - Fix some Xr references: - - lmc(4): Netgraph(4) -> netgraph(4) - - security(7): rc.conf(8) -> rc.conf(5) - - sbp(4): sysctl(1) -> sysctl(8) - - portindex(5): build(1) -> build(7) Modified: stable/7/share/man/man4/lmc.4 stable/7/share/man/man4/sbp.4 stable/7/share/man/man5/portindex.5 stable/7/share/man/man7/security.7 Directory Properties: stable/7/share/man/man4/ (props changed) stable/7/share/man/man5/ (props changed) stable/7/share/man/man7/ (props changed) Modified: stable/7/share/man/man4/lmc.4 ============================================================================== --- stable/7/share/man/man4/lmc.4 Wed Feb 15 01:40:14 2012 (r231719) +++ stable/7/share/man/man4/lmc.4 Wed Feb 15 01:41:00 2012 (r231720) @@ -43,7 +43,7 @@ .\" this program; if not, write to the Free Software Foundation, Inc., 59 .\" Temple Place - Suite 330, Boston, MA 02111-1307, USA. .\" -.Dd July 23, 2011 +.Dd February 8, 2012 .Dt LMC 4 .Os .\" @@ -179,7 +179,7 @@ higher-level issues like protocol multip This driver is compatible with several line protocol packages: .Bl -tag -width "Generic HDLC" .It Sy "Netgraph" -.Xr Netgraph 4 +.Xr netgraph 4 implements many basic packet-handling functions as kernel loadable modules. They can be interconnected in a graph to implement many protocols. Configuration is done from userland without rebuilding the kernel. Modified: stable/7/share/man/man4/sbp.4 ============================================================================== --- stable/7/share/man/man4/sbp.4 Wed Feb 15 01:40:14 2012 (r231719) +++ stable/7/share/man/man4/sbp.4 Wed Feb 15 01:41:00 2012 (r231720) @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 20, 2002 +.Dd February 8, 2012 .Dt SBP 4 .Os .Sh NAME @@ -71,7 +71,7 @@ topology. If you want to force to detach the device, run .Dq Nm fwcontrol Fl r several times or set hw.firewire.hold_count=0 by -.Xr sysctl 1 . +.Xr sysctl 8 . .Pp Some (broken) HDDs do not work well with tagged queuing. If you have problems with such drives, try Modified: stable/7/share/man/man5/portindex.5 ============================================================================== --- stable/7/share/man/man5/portindex.5 Wed Feb 15 01:40:14 2012 (r231719) +++ stable/7/share/man/man5/portindex.5 Wed Feb 15 01:41:00 2012 (r231720) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 28, 2009 +.Dd February 8, 2012 .Dt PORTINDEX 5 .Os .Sh NAME @@ -90,7 +90,7 @@ branch. vim-6.3.15|/usr/ports/editors/vim|/usr/local|Vi "workalike", with many additional features|/usr/ports/editors/vim/pkg-descr|obrien@FreeBSD.org|editors|libiconv-1.9.2_1|libiconv-1.9.2_1|http://www.vim.org/||| .Ed .Sh SEE ALSO -.Xr build 1 , +.Xr build 7 , .Xr csup 1 , .Xr ports 7 .Sh AUTHORS Modified: stable/7/share/man/man7/security.7 ============================================================================== --- stable/7/share/man/man7/security.7 Wed Feb 15 01:40:14 2012 (r231719) +++ stable/7/share/man/man7/security.7 Wed Feb 15 01:41:00 2012 (r231720) @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 8, 2006 +.Dd February 8, 2012 .Dt SECURITY 7 .Os .Sh NAME @@ -573,7 +573,7 @@ configuration cannot be adjusted. .El .Pp The security level can be configured with variables documented in -.Xr rc.conf 8 . +.Xr rc.conf 5 . .Sh CHECKING FILE INTEGRITY: BINARIES, CONFIG FILES, ETC When it comes right down to it, you can only protect your core system configuration and control files so much before the convenience factor From owner-svn-src-stable-7@FreeBSD.ORG Wed Feb 15 03:35:39 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C78431065676; Wed, 15 Feb 2012 03:35:39 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B10018FC19; Wed, 15 Feb 2012 03:35:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1F3Zd15033447; Wed, 15 Feb 2012 03:35:39 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1F3ZdOH033445; Wed, 15 Feb 2012 03:35:39 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201202150335.q1F3ZdOH033445@svn.freebsd.org> From: Pyun YongHyeon Date: Wed, 15 Feb 2012 03:35:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231727 - stable/7/sys/dev/et X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2012 03:35:40 -0000 Author: yongari Date: Wed Feb 15 03:35:39 2012 New Revision: 231727 URL: http://svn.freebsd.org/changeset/base/231727 Log: MFC r229940: style. No functional changes. Modified: stable/7/sys/dev/et/if_et.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/et/if_et.c ============================================================================== --- stable/7/sys/dev/et/if_et.c Wed Feb 15 03:34:44 2012 (r231726) +++ stable/7/sys/dev/et/if_et.c Wed Feb 15 03:35:39 2012 (r231727) @@ -367,8 +367,9 @@ fail: static int et_detach(device_t dev) { - struct et_softc *sc = device_get_softc(dev); + struct et_softc *sc; + sc = device_get_softc(dev); if (device_is_attached(dev)) { ether_ifdetach(sc->ifp); ET_LOCK(sc); @@ -405,8 +406,9 @@ et_detach(device_t dev) static int et_shutdown(device_t dev) { - struct et_softc *sc = device_get_softc(dev); + struct et_softc *sc; + sc = device_get_softc(dev); ET_LOCK(sc); et_stop(sc); ET_UNLOCK(sc); @@ -416,10 +418,11 @@ et_shutdown(device_t dev) static int et_miibus_readreg(device_t dev, int phy, int reg) { - struct et_softc *sc = device_get_softc(dev); + struct et_softc *sc; uint32_t val; int i, ret; + sc = device_get_softc(dev); /* Stop any pending operations */ CSR_WRITE_4(sc, ET_MII_CMD, 0); @@ -459,10 +462,11 @@ back: static int et_miibus_writereg(device_t dev, int phy, int reg, int val0) { - struct et_softc *sc = device_get_softc(dev); + struct et_softc *sc; uint32_t val; int i; + sc = device_get_softc(dev); /* Stop any pending operations */ CSR_WRITE_4(sc, ET_MII_CMD, 0); @@ -597,10 +601,12 @@ et_miibus_statchg(device_t dev) static int et_ifmedia_upd_locked(struct ifnet *ifp) { - struct et_softc *sc = ifp->if_softc; - struct mii_data *mii = device_get_softc(sc->sc_miibus); + struct et_softc *sc; + struct mii_data *mii; struct mii_softc *miisc; + sc = ifp->if_softc; + mii = device_get_softc(sc->sc_miibus); LIST_FOREACH(miisc, &mii->mii_phys, mii_list) mii_phy_reset(miisc); return (mii_mediachg(mii)); @@ -609,9 +615,10 @@ et_ifmedia_upd_locked(struct ifnet *ifp) static int et_ifmedia_upd(struct ifnet *ifp) { - struct et_softc *sc = ifp->if_softc; + struct et_softc *sc; int res; + sc = ifp->if_softc; ET_LOCK(sc); res = et_ifmedia_upd_locked(ifp); ET_UNLOCK(sc); @@ -642,10 +649,11 @@ et_ifmedia_sts(struct ifnet *ifp, struct static void et_stop(struct et_softc *sc) { - struct ifnet *ifp = sc->ifp; + struct ifnet *ifp; ET_LOCK_ASSERT(sc); + ifp = sc->ifp; callout_stop(&sc->sc_tick); /* Disable interrupts. */ CSR_WRITE_4(sc, ET_INTR_MASK, 0xffffffff); @@ -761,6 +769,7 @@ et_get_eaddr(device_t dev, uint8_t eaddr static void et_reset(struct et_softc *sc) { + CSR_WRITE_4(sc, ET_MAC_CFG1, ET_MAC_CFG1_RST_TXFUNC | ET_MAC_CFG1_RST_RXFUNC | ET_MAC_CFG1_RST_TXMC | ET_MAC_CFG1_RST_RXMC | @@ -1167,10 +1176,11 @@ et_chip_attach(struct et_softc *sc) static void et_intr(void *xsc) { - struct et_softc *sc = xsc; + struct et_softc *sc; struct ifnet *ifp; uint32_t status; + sc = xsc; ET_LOCK(sc); ifp = sc->ifp; if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) @@ -1272,10 +1282,14 @@ et_init(void *xsc) static int et_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { - struct et_softc *sc = ifp->if_softc; - struct mii_data *mii = device_get_softc(sc->sc_miibus); - struct ifreq *ifr = (struct ifreq *)data; - int error = 0, mask, max_framelen; + struct et_softc *sc; + struct mii_data *mii; + struct ifreq *ifr; + int error, mask, max_framelen; + + sc = ifp->if_softc; + ifr = (struct ifreq *)data; + error = 0; /* XXX LOCKSUSED */ switch (cmd) { @@ -1299,6 +1313,7 @@ et_ioctl(struct ifnet *ifp, u_long cmd, case SIOCSIFMEDIA: case SIOCGIFMEDIA: + mii = device_get_softc(sc->sc_miibus); error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, cmd); break; @@ -1428,8 +1443,9 @@ et_start_locked(struct ifnet *ifp) static void et_start(struct ifnet *ifp) { - struct et_softc *sc = ifp->if_softc; + struct et_softc *sc; + sc = ifp->if_softc; ET_LOCK(sc); et_start_locked(ifp); ET_UNLOCK(sc); @@ -1460,6 +1476,7 @@ et_watchdog(struct et_softc *sc) static int et_stop_rxdma(struct et_softc *sc) { + CSR_WRITE_4(sc, ET_RXDMA_CTRL, ET_RXDMA_CTRL_HALT | ET_RXDMA_CTRL_RING1_ENABLE); @@ -1474,6 +1491,7 @@ et_stop_rxdma(struct et_softc *sc) static int et_stop_txdma(struct et_softc *sc) { + CSR_WRITE_4(sc, ET_TXDMA_CTRL, ET_TXDMA_CTRL_HALT | ET_TXDMA_CTRL_SINGLE_EPKT); return (0); @@ -1602,10 +1620,11 @@ back: static int et_chip_init(struct et_softc *sc) { - struct ifnet *ifp = sc->ifp; + struct ifnet *ifp; uint32_t rxq_end; int error, frame_len, rxmem_size; + ifp = sc->ifp; /* * Split 16Kbytes internal memory between TX and RX * according to frame length. @@ -1720,8 +1739,8 @@ et_init_rx_ring(struct et_softc *sc) static int et_init_rxdma(struct et_softc *sc) { - struct et_rxstatus_data *rxsd = &sc->sc_rx_status; - struct et_rxstat_ring *rxst_ring = &sc->sc_rxstat_ring; + struct et_rxstatus_data *rxsd; + struct et_rxstat_ring *rxst_ring; struct et_rxdesc_ring *rx_ring; int error; @@ -1734,12 +1753,14 @@ et_init_rxdma(struct et_softc *sc) /* * Install RX status */ + rxsd = &sc->sc_rx_status; CSR_WRITE_4(sc, ET_RX_STATUS_HI, ET_ADDR_HI(rxsd->rxsd_paddr)); CSR_WRITE_4(sc, ET_RX_STATUS_LO, ET_ADDR_LO(rxsd->rxsd_paddr)); /* * Install RX stat ring */ + rxst_ring = &sc->sc_rxstat_ring; CSR_WRITE_4(sc, ET_RXSTAT_HI, ET_ADDR_HI(rxst_ring->rsr_paddr)); CSR_WRITE_4(sc, ET_RXSTAT_LO, ET_ADDR_LO(rxst_ring->rsr_paddr)); CSR_WRITE_4(sc, ET_RXSTAT_CNT, ET_RX_NSTAT - 1); @@ -1790,8 +1811,8 @@ et_init_rxdma(struct et_softc *sc) static int et_init_txdma(struct et_softc *sc) { - struct et_txdesc_ring *tx_ring = &sc->sc_tx_ring; - struct et_txstatus_data *txsd = &sc->sc_tx_status; + struct et_txdesc_ring *tx_ring; + struct et_txstatus_data *txsd; int error; error = et_stop_txdma(sc); @@ -1803,6 +1824,7 @@ et_init_txdma(struct et_softc *sc) /* * Install TX descriptor ring */ + tx_ring = &sc->sc_tx_ring; CSR_WRITE_4(sc, ET_TX_RING_HI, ET_ADDR_HI(tx_ring->tr_paddr)); CSR_WRITE_4(sc, ET_TX_RING_LO, ET_ADDR_LO(tx_ring->tr_paddr)); CSR_WRITE_4(sc, ET_TX_RING_CNT, ET_TX_NDESC - 1); @@ -1810,6 +1832,7 @@ et_init_txdma(struct et_softc *sc) /* * Install TX status */ + txsd = &sc->sc_tx_status; CSR_WRITE_4(sc, ET_TX_STATUS_HI, ET_ADDR_HI(txsd->txsd_paddr)); CSR_WRITE_4(sc, ET_TX_STATUS_LO, ET_ADDR_LO(txsd->txsd_paddr)); @@ -1825,8 +1848,8 @@ et_init_txdma(struct et_softc *sc) static void et_init_mac(struct et_softc *sc) { - struct ifnet *ifp = sc->ifp; - const uint8_t *eaddr = IF_LLADDR(ifp); + struct ifnet *ifp; + const uint8_t *eaddr; uint32_t val; /* Reset MAC */ @@ -1862,6 +1885,8 @@ et_init_mac(struct et_softc *sc) /* * Set MAC address */ + ifp = sc->ifp; + eaddr = IF_LLADDR(ifp); val = eaddr[2] | (eaddr[3] << 8) | (eaddr[4] << 16) | (eaddr[5] << 24); CSR_WRITE_4(sc, ET_MAC_ADDR1, val); val = (eaddr[0] << 16) | (eaddr[1] << 24); @@ -1877,8 +1902,8 @@ et_init_mac(struct et_softc *sc) static void et_init_rxmac(struct et_softc *sc) { - struct ifnet *ifp = sc->ifp; - const uint8_t *eaddr = IF_LLADDR(ifp); + struct ifnet *ifp; + const uint8_t *eaddr; uint32_t val; int i; @@ -1896,6 +1921,8 @@ et_init_rxmac(struct et_softc *sc) /* * Set WOL source address. XXX is this necessary? */ + ifp = sc->ifp; + eaddr = IF_LLADDR(ifp); val = (eaddr[2] << 24) | (eaddr[3] << 16) | (eaddr[4] << 8) | eaddr[5]; CSR_WRITE_4(sc, ET_WOL_SA_LO, val); val = (eaddr[0] << 8) | eaddr[1]; @@ -1962,6 +1989,7 @@ et_init_rxmac(struct et_softc *sc) static void et_init_txmac(struct et_softc *sc) { + /* Disable TX MAC and FC(?) */ CSR_WRITE_4(sc, ET_TXMAC_CTRL, ET_TXMAC_CTRL_FC_DISABLE); @@ -1980,12 +2008,12 @@ et_init_txmac(struct et_softc *sc) static int et_start_rxdma(struct et_softc *sc) { - uint32_t val = 0; + uint32_t val; - val |= (sc->sc_rx_data[0].rbd_bufsize & ET_RXDMA_CTRL_RING0_SIZE_MASK) | - ET_RXDMA_CTRL_RING0_ENABLE; + val = (sc->sc_rx_data[0].rbd_bufsize & ET_RXDMA_CTRL_RING0_SIZE_MASK) | + ET_RXDMA_CTRL_RING0_ENABLE; val |= (sc->sc_rx_data[1].rbd_bufsize & ET_RXDMA_CTRL_RING1_SIZE_MASK) | - ET_RXDMA_CTRL_RING1_ENABLE; + ET_RXDMA_CTRL_RING1_ENABLE; CSR_WRITE_4(sc, ET_RXDMA_CTRL, val); @@ -2001,6 +2029,7 @@ et_start_rxdma(struct et_softc *sc) static int et_start_txdma(struct et_softc *sc) { + CSR_WRITE_4(sc, ET_TXDMA_CTRL, ET_TXDMA_CTRL_SINGLE_EPKT); return (0); } @@ -2278,10 +2307,11 @@ et_txeof(struct et_softc *sc) static void et_tick(void *xsc) { - struct et_softc *sc = xsc; + struct et_softc *sc; struct ifnet *ifp; struct mii_data *mii; + sc = xsc; ET_LOCK_ASSERT(sc); ifp = sc->ifp; mii = device_get_softc(sc->sc_miibus); @@ -2543,10 +2573,12 @@ et_add_sysctls(struct et_softc * sc) static int et_sysctl_rx_intr_npkts(SYSCTL_HANDLER_ARGS) { - struct et_softc *sc = arg1; - struct ifnet *ifp = sc->ifp; - int error = 0, v; + struct et_softc *sc; + struct ifnet *ifp; + int error, v; + sc = arg1; + ifp = sc->ifp; v = sc->sc_rx_intr_npkts; error = sysctl_handle_int(oidp, &v, 0, req); if (error || req->newptr == NULL) @@ -2568,10 +2600,12 @@ back: static int et_sysctl_rx_intr_delay(SYSCTL_HANDLER_ARGS) { - struct et_softc *sc = arg1; - struct ifnet *ifp = sc->ifp; - int error = 0, v; + struct et_softc *sc; + struct ifnet *ifp; + int error, v; + sc = arg1; + ifp = sc->ifp; v = sc->sc_rx_intr_delay; error = sysctl_handle_int(oidp, &v, 0, req); if (error || req->newptr == NULL) From owner-svn-src-stable-7@FreeBSD.ORG Wed Feb 15 03:43:46 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9F21F1065674; Wed, 15 Feb 2012 03:43:46 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 89EAE8FC08; Wed, 15 Feb 2012 03:43:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1F3hkKU033866; Wed, 15 Feb 2012 03:43:46 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1F3hkt5033864; Wed, 15 Feb 2012 03:43:46 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201202150343.q1F3hkt5033864@svn.freebsd.org> From: Pyun YongHyeon Date: Wed, 15 Feb 2012 03:43:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231730 - stable/7/sys/dev/re X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2012 03:43:46 -0000 Author: yongari Date: Wed Feb 15 03:43:46 2012 New Revision: 231730 URL: http://svn.freebsd.org/changeset/base/231730 Log: MFC r230575-230576: r230275: Use a RX DMA tag to free loaded RX DMA maps. Previously it used a TX DMA tag. r230276: Free allocated jumbo buffers when controller is stopped. Modified: stable/7/sys/dev/re/if_re.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/re/if_re.c ============================================================================== --- stable/7/sys/dev/re/if_re.c Wed Feb 15 03:43:03 2012 (r231729) +++ stable/7/sys/dev/re/if_re.c Wed Feb 15 03:43:46 2012 (r231730) @@ -3513,7 +3513,6 @@ re_stop(struct rl_softc *sc) } /* Free the TX list buffers. */ - for (i = 0; i < sc->rl_ldata.rl_tx_desc_cnt; i++) { txd = &sc->rl_ldata.rl_tx_desc[i]; if (txd->tx_m != NULL) { @@ -3527,11 +3526,10 @@ re_stop(struct rl_softc *sc) } /* Free the RX list buffers. */ - for (i = 0; i < sc->rl_ldata.rl_rx_desc_cnt; i++) { rxd = &sc->rl_ldata.rl_rx_desc[i]; if (rxd->rx_m != NULL) { - bus_dmamap_sync(sc->rl_ldata.rl_tx_mtag, + bus_dmamap_sync(sc->rl_ldata.rl_rx_mtag, rxd->rx_dmamap, BUS_DMASYNC_POSTREAD); bus_dmamap_unload(sc->rl_ldata.rl_rx_mtag, rxd->rx_dmamap); @@ -3539,6 +3537,20 @@ re_stop(struct rl_softc *sc) rxd->rx_m = NULL; } } + + if ((sc->rl_flags & RL_FLAG_JUMBOV2) != 0) { + for (i = 0; i < sc->rl_ldata.rl_rx_desc_cnt; i++) { + rxd = &sc->rl_ldata.rl_jrx_desc[i]; + if (rxd->rx_m != NULL) { + bus_dmamap_sync(sc->rl_ldata.rl_jrx_mtag, + rxd->rx_dmamap, BUS_DMASYNC_POSTREAD); + bus_dmamap_unload(sc->rl_ldata.rl_jrx_mtag, + rxd->rx_dmamap); + m_freem(rxd->rx_m); + rxd->rx_m = NULL; + } + } + } } /* From owner-svn-src-stable-7@FreeBSD.ORG Wed Feb 15 03:51:10 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1C03B106567A; Wed, 15 Feb 2012 03:51:10 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0626C8FC08; Wed, 15 Feb 2012 03:51:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1F3p9Fp034262; Wed, 15 Feb 2012 03:51:09 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1F3p9Aj034260; Wed, 15 Feb 2012 03:51:09 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201202150351.q1F3p9Aj034260@svn.freebsd.org> From: Pyun YongHyeon Date: Wed, 15 Feb 2012 03:51:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231733 - stable/7/sys/dev/re X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2012 03:51:10 -0000 Author: yongari Date: Wed Feb 15 03:51:09 2012 New Revision: 231733 URL: http://svn.freebsd.org/changeset/base/231733 Log: MFC r230336: Fix a logic error which resulted in putting PHY into sleep when WOL is active. If WOL is active driver should not put PHY into sleep. This change makes WOL work on RTL8168E. Modified: stable/7/sys/dev/re/if_re.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/re/if_re.c ============================================================================== --- stable/7/sys/dev/re/if_re.c Wed Feb 15 03:49:50 2012 (r231732) +++ stable/7/sys/dev/re/if_re.c Wed Feb 15 03:51:09 2012 (r231733) @@ -3763,7 +3763,7 @@ re_setwol(struct rl_softc *sc) /* Config register write done. */ CSR_WRITE_1(sc, RL_EECMD, RL_EEMODE_OFF); - if ((ifp->if_capenable & IFCAP_WOL) != 0 && + if ((ifp->if_capenable & IFCAP_WOL) == 0 && (sc->rl_flags & RL_FLAG_PHYWAKE_PM) != 0) CSR_WRITE_1(sc, RL_PMCH, CSR_READ_1(sc, RL_PMCH) & ~0x80); /* From owner-svn-src-stable-7@FreeBSD.ORG Wed Feb 15 04:04:37 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B6A181065674; Wed, 15 Feb 2012 04:04:37 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8683E8FC1F; Wed, 15 Feb 2012 04:04:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1F44bl0034988; Wed, 15 Feb 2012 04:04:37 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1F44b26034985; Wed, 15 Feb 2012 04:04:37 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201202150404.q1F44b26034985@svn.freebsd.org> From: Pyun YongHyeon Date: Wed, 15 Feb 2012 04:04:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231736 - stable/7/sys/dev/bge X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2012 04:04:37 -0000 Author: yongari Date: Wed Feb 15 04:04:36 2012 New Revision: 231736 URL: http://svn.freebsd.org/changeset/base/231736 Log: MFC r230286,230337-230338,231159: r230286: Introduce a tunable that disables use of MSI. Non-zero value will use INTx. r230337-230338: Rename dev.bge.%d.msi_disable to dev.bge.%d.msi which matches enable/disable and default it to on. r231159: Call bge_add_sysctls() early and especially before bge_can_use_msi() so r230337 actually has a chance of working and doesn't always unconditionally disable the use of MSIs. Modified: stable/7/sys/dev/bge/if_bge.c stable/7/sys/dev/bge/if_bgereg.h Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/bge/if_bge.c ============================================================================== --- stable/7/sys/dev/bge/if_bge.c Wed Feb 15 04:03:41 2012 (r231735) +++ stable/7/sys/dev/bge/if_bge.c Wed Feb 15 04:04:36 2012 (r231736) @@ -2749,6 +2749,9 @@ bge_can_use_msi(struct bge_softc *sc) { int can_use_msi = 0; + if (sc->bge_msi == 0) + return (0); + /* Disable MSI for polling(4). */ #ifdef DEVICE_POLLING return (0); @@ -2787,6 +2790,8 @@ bge_attach(device_t dev) sc = device_get_softc(dev); sc->bge_dev = dev; + bge_add_sysctls(sc); + TASK_INIT(&sc->bge_intr_task, 0, bge_intr_task, sc); /* @@ -3199,8 +3204,6 @@ bge_attach(device_t dev) goto fail; } - bge_add_sysctls(sc); - /* Set default tuneable values. */ sc->bge_stat_ticks = BGE_TICKS_PER_SEC; sc->bge_rx_coal_ticks = 150; @@ -5627,6 +5630,12 @@ bge_add_sysctls(struct bge_softc *sc) "Number of fragmented TX buffers of a frame allowed before " "forced collapsing"); + sc->bge_msi = 1; + snprintf(tn, sizeof(tn), "dev.bge.%d.msi", unit); + TUNABLE_INT_FETCH(tn, &sc->bge_msi); + SYSCTL_ADD_INT(ctx, children, OID_AUTO, "msi", + CTLFLAG_RD, &sc->bge_msi, 0, "Enable MSI"); + /* * It seems all Broadcom controllers have a bug that can generate UDP * datagrams with checksum value 0 when TX UDP checksum offloading is Modified: stable/7/sys/dev/bge/if_bgereg.h ============================================================================== --- stable/7/sys/dev/bge/if_bgereg.h Wed Feb 15 04:03:41 2012 (r231735) +++ stable/7/sys/dev/bge/if_bgereg.h Wed Feb 15 04:04:36 2012 (r231736) @@ -2864,6 +2864,7 @@ struct bge_softc { int bge_timer; int bge_forced_collapse; int bge_forced_udpcsum; + int bge_msi; int bge_csum_features; struct callout bge_stat_ch; uint32_t bge_rx_discards; From owner-svn-src-stable-7@FreeBSD.ORG Wed Feb 15 04:09:43 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E95481065686; Wed, 15 Feb 2012 04:09:43 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D3C888FC1B; Wed, 15 Feb 2012 04:09:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1F49h85035330; Wed, 15 Feb 2012 04:09:43 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1F49hiD035328; Wed, 15 Feb 2012 04:09:43 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201202150409.q1F49hiD035328@svn.freebsd.org> From: Pyun YongHyeon Date: Wed, 15 Feb 2012 04:09:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231739 - stable/7/share/man/man4 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2012 04:09:44 -0000 Author: yongari Date: Wed Feb 15 04:09:43 2012 New Revision: 231739 URL: http://svn.freebsd.org/changeset/base/231739 Log: MFC r230288,230339: r230288: Document dev.bge.%d.msi_disable tunable. r230339: Reflect tunable name change made in r230337. Modified: stable/7/share/man/man4/bge.4 Directory Properties: stable/7/share/man/man4/ (props changed) Modified: stable/7/share/man/man4/bge.4 ============================================================================== --- stable/7/share/man/man4/bge.4 Wed Feb 15 04:09:23 2012 (r231738) +++ stable/7/share/man/man4/bge.4 Wed Feb 15 04:09:43 2012 (r231739) @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 2, 2011 +.Dd January 19, 2012 .Dt BGE 4 .Os .Sh NAME @@ -184,7 +184,7 @@ SysKonnect SK-9D21 (10/100/1000baseTX) SysKonnect SK-9D41 (1000baseSX) .El .Sh LOADER TUNABLES -The following tunable can be set at the +The following tunables can be set at the .Xr loader 8 prompt before booting the kernel, or stored in .Xr loader.conf 5 . @@ -193,6 +193,9 @@ prompt before booting the kernel, or sto Allow the ASF feature for cooperating with IPMI. Can cause system lockup problems on a small number of systems. Disabled by default. +.It Va dev.bge.%d.msi +Non-zero value enables MSI support on the Ethernet hardware. +The default value is 1. .El .Sh SYSCTL VARIABLES The following variables are available as both From owner-svn-src-stable-7@FreeBSD.ORG Wed Feb 15 09:32:51 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E0DD810656AB; Wed, 15 Feb 2012 09:32:51 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CB1958FC16; Wed, 15 Feb 2012 09:32:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1F9Wp9E047361; Wed, 15 Feb 2012 09:32:51 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1F9WpVW047359; Wed, 15 Feb 2012 09:32:51 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <201202150932.q1F9WpVW047359@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Wed, 15 Feb 2012 09:32:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231748 - stable/7/lib/libipsec X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2012 09:32:52 -0000 Author: bz Date: Wed Feb 15 09:32:51 2012 New Revision: 231748 URL: http://svn.freebsd.org/changeset/base/231748 Log: MFC r231515: Use the correct constant (with same value) for comparying the SA type. PR: kern/142741 Submitted by: Matthijs Kooiman (matthijs stdin.nl) Modified: stable/7/lib/libipsec/pfkey.c Directory Properties: stable/7/lib/libipsec/ (props changed) Modified: stable/7/lib/libipsec/pfkey.c ============================================================================== --- stable/7/lib/libipsec/pfkey.c Wed Feb 15 09:32:40 2012 (r231747) +++ stable/7/lib/libipsec/pfkey.c Wed Feb 15 09:32:51 2012 (r231748) @@ -662,7 +662,7 @@ pfkey_send_register(so, satype) { int len, algno; - if (satype == PF_UNSPEC) { + if (satype == SADB_SATYPE_UNSPEC) { for (algno = 0; algno < sizeof(supported_map)/sizeof(supported_map[0]); algno++) { From owner-svn-src-stable-7@FreeBSD.ORG Thu Feb 16 05:00:41 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C1B74106564A; Thu, 16 Feb 2012 05:00:41 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A551C8FC0A; Thu, 16 Feb 2012 05:00:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1G50fDh099320; Thu, 16 Feb 2012 05:00:41 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1G50f3b099314; Thu, 16 Feb 2012 05:00:41 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201202160500.q1G50f3b099314@svn.freebsd.org> From: Eitan Adler Date: Thu, 16 Feb 2012 05:00:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231811 - in stable/7/usr.bin: brandelf bsdiff/bsdiff ncplist netstat split X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Feb 2012 05:00:41 -0000 Author: eadler Date: Thu Feb 16 05:00:41 2012 New Revision: 231811 URL: http://svn.freebsd.org/changeset/base/231811 Log: MFC r22990[45] and r229907-r229919: - fix a variety of warnings produced by gcc46 when compiling world Approved by (cperciva) Modified: stable/7/usr.bin/brandelf/brandelf.c stable/7/usr.bin/bsdiff/bsdiff/bsdiff.c stable/7/usr.bin/ncplist/ncplist.c stable/7/usr.bin/netstat/if.c stable/7/usr.bin/split/split.c Directory Properties: stable/7/sbin/tunefs/ (props changed) stable/7/usr.bin/brandelf/ (props changed) stable/7/usr.bin/bsdiff/ (props changed) stable/7/usr.bin/ncplist/ (props changed) stable/7/usr.bin/netstat/ (props changed) stable/7/usr.bin/split/ (props changed) Modified: stable/7/usr.bin/brandelf/brandelf.c ============================================================================== --- stable/7/usr.bin/brandelf/brandelf.c Thu Feb 16 03:27:38 2012 (r231810) +++ stable/7/usr.bin/brandelf/brandelf.c Thu Feb 16 05:00:41 2012 (r231811) @@ -64,7 +64,7 @@ main(int argc, char **argv) const char *strtype = "FreeBSD"; int type = ELFOSABI_FREEBSD; int retval = 0; - int ch, change = 0, verbose = 0, force = 0, listed = 0; + int ch, change = 0, force = 0, listed = 0; while ((ch = getopt(argc, argv, "f:lt:v")) != -1) switch (ch) { @@ -84,7 +84,7 @@ main(int argc, char **argv) listed = 1; break; case 'v': - verbose = 1; + /* does nothing */ break; case 't': if (force) Modified: stable/7/usr.bin/bsdiff/bsdiff/bsdiff.c ============================================================================== --- stable/7/usr.bin/bsdiff/bsdiff/bsdiff.c Thu Feb 16 03:27:38 2012 (r231810) +++ stable/7/usr.bin/bsdiff/bsdiff/bsdiff.c Thu Feb 16 05:00:41 2012 (r231811) @@ -272,7 +272,7 @@ int main(int argc,char *argv[]) /* Compute the differences, writing ctrl as we go */ if ((pfbz2 = BZ2_bzWriteOpen(&bz2err, pf, 9, 0, 0)) == NULL) errx(1, "BZ2_bzWriteOpen, bz2err = %d", bz2err); - scan=0;len=0; + scan=0;len=0;pos=0; lastscan=0;lastpos=0;lastoffset=0; while(scan Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B207C106566C; Thu, 16 Feb 2012 19:40:17 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 86E378FC08; Thu, 16 Feb 2012 19:40:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1GJeHLx031390; Thu, 16 Feb 2012 19:40:17 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1GJeHJs031386; Thu, 16 Feb 2012 19:40:17 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201202161940.q1GJeHJs031386@svn.freebsd.org> From: Eitan Adler Date: Thu, 16 Feb 2012 19:40:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231833 - stable/7/tools/regression/pipe X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Feb 2012 19:40:17 -0000 Author: eadler Date: Thu Feb 16 19:40:17 2012 New Revision: 231833 URL: http://svn.freebsd.org/changeset/base/231833 Log: MFC r228274: - Fix some uninitialized variables in pipe regression tests that result in failure. PR: misc/161175 Approved by: cperciva Modified: stable/7/tools/regression/pipe/pipe-fstatbug.c stable/7/tools/regression/pipe/pipe-reverse.c stable/7/tools/regression/pipe/pipe-wraparound.c Directory Properties: stable/7/tools/regression/pipe/ (props changed) Modified: stable/7/tools/regression/pipe/pipe-fstatbug.c ============================================================================== --- stable/7/tools/regression/pipe/pipe-fstatbug.c Thu Feb 16 19:39:49 2012 (r231832) +++ stable/7/tools/regression/pipe/pipe-fstatbug.c Thu Feb 16 19:40:17 2012 (r231833) @@ -41,7 +41,7 @@ int main (void) { char buffer[32768], buffer2[32768]; int desc[2]; -int error, successes; +int error, successes = 0; struct stat status; pid_t new_pid; Modified: stable/7/tools/regression/pipe/pipe-reverse.c ============================================================================== --- stable/7/tools/regression/pipe/pipe-reverse.c Thu Feb 16 19:39:49 2012 (r231832) +++ stable/7/tools/regression/pipe/pipe-reverse.c Thu Feb 16 19:40:17 2012 (r231833) @@ -44,6 +44,7 @@ struct stat status; pid_t new_pid; buggy = 0; +total = 0; error = pipe(desc); @@ -52,7 +53,7 @@ if (error) buffer[0] = 'A'; -for (i = 0; i < 65535; i++) { +for (i = 1; i < 65535; i++) { buffer[i] = buffer[i - 1] + 1; if (buffer[i] > 'Z') buffer[i] = 'A'; Modified: stable/7/tools/regression/pipe/pipe-wraparound.c ============================================================================== --- stable/7/tools/regression/pipe/pipe-wraparound.c Thu Feb 16 19:39:49 2012 (r231832) +++ stable/7/tools/regression/pipe/pipe-wraparound.c Thu Feb 16 19:40:17 2012 (r231833) @@ -44,6 +44,7 @@ struct stat status; pid_t new_pid; buggy = 0; +total = 0; error = pipe(desc); @@ -52,7 +53,7 @@ if (error) buffer[0] = 'A'; -for (i = 0; i < 32768; i++) { +for (i = 1; i < 32768; i++) { buffer[i] = buffer[i - 1] + 1; if (buffer[i] > 'Z') buffer[i] = 'A'; From owner-svn-src-stable-7@FreeBSD.ORG Fri Feb 17 00:56:18 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7843E1065679; Fri, 17 Feb 2012 00:56:18 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 671718FC0A; Fri, 17 Feb 2012 00:56:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1H0uIgo042485; Fri, 17 Feb 2012 00:56:18 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1H0uIxR042483; Fri, 17 Feb 2012 00:56:18 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201202170056.q1H0uIxR042483@svn.freebsd.org> From: Eitan Adler Date: Fri, 17 Feb 2012 00:56:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231848 - stable/7/lib/libc/gen X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Feb 2012 00:56:18 -0000 Author: eadler Date: Fri Feb 17 00:56:17 2012 New Revision: 231848 URL: http://svn.freebsd.org/changeset/base/231848 Log: MFC r231299: - More accurately document what happens on error. PR: docs/127908 Approved by: cperciva Modified: stable/7/lib/libc/gen/directory.3 Directory Properties: stable/7/lib/libc/ (props changed) Modified: stable/7/lib/libc/gen/directory.3 ============================================================================== --- stable/7/lib/libc/gen/directory.3 Fri Feb 17 00:55:26 2012 (r231847) +++ stable/7/lib/libc/gen/directory.3 Fri Feb 17 00:56:17 2012 (r231848) @@ -122,9 +122,12 @@ function returns a pointer to the next directory entry. It returns .Dv NULL -upon reaching the end of the directory or detecting an invalid -.Fn seekdir -operation. +upon reaching the end of the directory or on error. +In the event of an error, +.Va errno +may be set to any of the values documented for the +.Xr getdirentries 2 +system call. .Pp The .Fn readdir_r From owner-svn-src-stable-7@FreeBSD.ORG Fri Feb 17 06:58:41 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 90752106566B; Fri, 17 Feb 2012 06:58:41 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7AC388FC18; Fri, 17 Feb 2012 06:58:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1H6wfb0054711; Fri, 17 Feb 2012 06:58:41 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1H6wegj054680; Fri, 17 Feb 2012 06:58:40 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <201202170658.q1H6wegj054680@svn.freebsd.org> From: Sean Bruno Date: Fri, 17 Feb 2012 06:58:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231861 - in stable/7: . share/man/man4 sys/amd64/conf sys/conf sys/dev/isci sys/dev/isci/scil sys/i386/conf sys/modules sys/modules/isci X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Feb 2012 06:58:41 -0000 Author: sbruno Date: Fri Feb 17 06:58:40 2012 New Revision: 231861 URL: http://svn.freebsd.org/changeset/base/231861 Log: MFC isci(4) SAS driver r230843, 231134, 231136, 231296, 231615, 231693, 231860 Obtained from: Intel (Jim Harris jimharris@) Added: stable/7/share/man/man4/isci.4 (contents, props changed) - copied, changed from r230843, head/share/man/man4/isci.4 stable/7/sys/dev/isci/ - copied from r230843, head/sys/dev/isci/ stable/7/sys/modules/isci/ - copied from r230843, head/sys/modules/isci/ Modified: stable/7/MAINTAINERS (contents, props changed) stable/7/share/man/man4/Makefile stable/7/sys/amd64/conf/GENERIC stable/7/sys/amd64/conf/NOTES stable/7/sys/conf/files.amd64 stable/7/sys/conf/files.i386 stable/7/sys/conf/options.amd64 stable/7/sys/conf/options.i386 stable/7/sys/dev/isci/isci.h (contents, props changed) stable/7/sys/dev/isci/isci_controller.c (contents, props changed) stable/7/sys/dev/isci/isci_io_request.c (contents, props changed) stable/7/sys/dev/isci/isci_remote_device.c (contents, props changed) stable/7/sys/dev/isci/scil/sati_abort_task_set.c (contents, props changed) stable/7/sys/dev/isci/scil/scic_sds_controller.c (contents, props changed) stable/7/sys/dev/isci/scil/scic_sds_stp_request.c (contents, props changed) stable/7/sys/dev/isci/scil/scif_sas_controller.c (contents, props changed) stable/7/sys/dev/isci/scil/scif_sas_controller_state_handlers.c (contents, props changed) stable/7/sys/dev/isci/scil/scif_sas_domain.c (contents, props changed) stable/7/sys/dev/isci/scil/scif_sas_io_request.c (contents, props changed) stable/7/sys/dev/isci/scil/scif_sas_remote_device.c (contents, props changed) stable/7/sys/dev/isci/scil/scif_sas_remote_device_ready_substates.c (contents, props changed) stable/7/sys/dev/isci/scil/scif_sas_smp_io_request.c (contents, props changed) stable/7/sys/dev/isci/scil/scif_sas_smp_remote_device.c (contents, props changed) stable/7/sys/dev/isci/scil/scif_sas_stp_io_request.c (contents, props changed) stable/7/sys/dev/isci/scil/scif_sas_stp_task_request.c (contents, props changed) stable/7/sys/i386/conf/GENERIC stable/7/sys/i386/conf/NOTES stable/7/sys/modules/Makefile stable/7/sys/modules/isci/Makefile (contents, props changed) Directory Properties: stable/7/ (props changed) stable/7/share/man/man4/ (props changed) stable/7/sys/ (props changed) stable/7/sys/dev/isci/README (props changed) stable/7/sys/dev/isci/environment.h (props changed) stable/7/sys/dev/isci/isci.c (props changed) stable/7/sys/dev/isci/isci_domain.c (props changed) stable/7/sys/dev/isci/isci_interrupt.c (props changed) stable/7/sys/dev/isci/isci_logger.c (props changed) stable/7/sys/dev/isci/isci_oem_parameters.c (props changed) stable/7/sys/dev/isci/isci_sysctl.c (props changed) stable/7/sys/dev/isci/isci_task_request.c (props changed) stable/7/sys/dev/isci/isci_timer.c (props changed) stable/7/sys/dev/isci/sci_environment.h (props changed) stable/7/sys/dev/isci/scil/intel_ata.h (props changed) stable/7/sys/dev/isci/scil/intel_pci.h (props changed) stable/7/sys/dev/isci/scil/intel_sas.h (props changed) stable/7/sys/dev/isci/scil/intel_sat.h (props changed) stable/7/sys/dev/isci/scil/intel_sata.h (props changed) stable/7/sys/dev/isci/scil/intel_scsi.h (props changed) stable/7/sys/dev/isci/scil/sati.c (props changed) stable/7/sys/dev/isci/scil/sati.h (props changed) stable/7/sys/dev/isci/scil/sati_abort_task_set.h (props changed) stable/7/sys/dev/isci/scil/sati_atapi.c (props changed) stable/7/sys/dev/isci/scil/sati_atapi.h (props changed) stable/7/sys/dev/isci/scil/sati_callbacks.h (props changed) stable/7/sys/dev/isci/scil/sati_design.h (props changed) stable/7/sys/dev/isci/scil/sati_device.c (props changed) stable/7/sys/dev/isci/scil/sati_device.h (props changed) stable/7/sys/dev/isci/scil/sati_inquiry.c (props changed) stable/7/sys/dev/isci/scil/sati_inquiry.h (props changed) stable/7/sys/dev/isci/scil/sati_log_sense.c (props changed) stable/7/sys/dev/isci/scil/sati_log_sense.h (props changed) stable/7/sys/dev/isci/scil/sati_lun_reset.c (props changed) stable/7/sys/dev/isci/scil/sati_lun_reset.h (props changed) stable/7/sys/dev/isci/scil/sati_mode_pages.c (props changed) stable/7/sys/dev/isci/scil/sati_mode_pages.h (props changed) stable/7/sys/dev/isci/scil/sati_mode_select.c (props changed) stable/7/sys/dev/isci/scil/sati_mode_select.h (props changed) stable/7/sys/dev/isci/scil/sati_mode_sense.c (props changed) stable/7/sys/dev/isci/scil/sati_mode_sense.h (props changed) stable/7/sys/dev/isci/scil/sati_mode_sense_10.c (props changed) stable/7/sys/dev/isci/scil/sati_mode_sense_10.h (props changed) stable/7/sys/dev/isci/scil/sati_mode_sense_6.c (props changed) stable/7/sys/dev/isci/scil/sati_mode_sense_6.h (props changed) stable/7/sys/dev/isci/scil/sati_move.c (props changed) stable/7/sys/dev/isci/scil/sati_move.h (props changed) stable/7/sys/dev/isci/scil/sati_passthrough.c (props changed) stable/7/sys/dev/isci/scil/sati_passthrough.h (props changed) stable/7/sys/dev/isci/scil/sati_read.c (props changed) stable/7/sys/dev/isci/scil/sati_read.h (props changed) stable/7/sys/dev/isci/scil/sati_read_buffer.c (props changed) stable/7/sys/dev/isci/scil/sati_read_buffer.h (props changed) stable/7/sys/dev/isci/scil/sati_read_capacity.c (props changed) stable/7/sys/dev/isci/scil/sati_read_capacity.h (props changed) stable/7/sys/dev/isci/scil/sati_reassign_blocks.c (props changed) stable/7/sys/dev/isci/scil/sati_reassign_blocks.h (props changed) stable/7/sys/dev/isci/scil/sati_report_luns.c (props changed) stable/7/sys/dev/isci/scil/sati_report_luns.h (props changed) stable/7/sys/dev/isci/scil/sati_request_sense.c (props changed) stable/7/sys/dev/isci/scil/sati_request_sense.h (props changed) stable/7/sys/dev/isci/scil/sati_start_stop_unit.c (props changed) stable/7/sys/dev/isci/scil/sati_start_stop_unit.h (props changed) stable/7/sys/dev/isci/scil/sati_synchronize_cache.c (props changed) stable/7/sys/dev/isci/scil/sati_synchronize_cache.h (props changed) stable/7/sys/dev/isci/scil/sati_test_unit_ready.c (props changed) stable/7/sys/dev/isci/scil/sati_test_unit_ready.h (props changed) stable/7/sys/dev/isci/scil/sati_translator_sequence.h (props changed) stable/7/sys/dev/isci/scil/sati_types.h (props changed) stable/7/sys/dev/isci/scil/sati_unmap.c (props changed) stable/7/sys/dev/isci/scil/sati_unmap.h (props changed) stable/7/sys/dev/isci/scil/sati_util.c (props changed) stable/7/sys/dev/isci/scil/sati_util.h (props changed) stable/7/sys/dev/isci/scil/sati_verify.c (props changed) stable/7/sys/dev/isci/scil/sati_verify.h (props changed) stable/7/sys/dev/isci/scil/sati_write.c (props changed) stable/7/sys/dev/isci/scil/sati_write.h (props changed) stable/7/sys/dev/isci/scil/sati_write_and_verify.c (props changed) stable/7/sys/dev/isci/scil/sati_write_and_verify.h (props changed) stable/7/sys/dev/isci/scil/sati_write_buffer.c (props changed) stable/7/sys/dev/isci/scil/sati_write_buffer.h (props changed) stable/7/sys/dev/isci/scil/sati_write_long.c (props changed) stable/7/sys/dev/isci/scil/sati_write_long.h (props changed) stable/7/sys/dev/isci/scil/sci_abstract_list.c (props changed) stable/7/sys/dev/isci/scil/sci_abstract_list.h (props changed) stable/7/sys/dev/isci/scil/sci_base_controller.c (props changed) stable/7/sys/dev/isci/scil/sci_base_controller.h (props changed) stable/7/sys/dev/isci/scil/sci_base_domain.c (props changed) stable/7/sys/dev/isci/scil/sci_base_domain.h (props changed) stable/7/sys/dev/isci/scil/sci_base_iterator.c (props changed) stable/7/sys/dev/isci/scil/sci_base_iterator.h (props changed) stable/7/sys/dev/isci/scil/sci_base_library.c (props changed) stable/7/sys/dev/isci/scil/sci_base_library.h (props changed) stable/7/sys/dev/isci/scil/sci_base_logger.c (props changed) stable/7/sys/dev/isci/scil/sci_base_logger.h (props changed) stable/7/sys/dev/isci/scil/sci_base_memory_descriptor_list.c (props changed) stable/7/sys/dev/isci/scil/sci_base_memory_descriptor_list.h (props changed) stable/7/sys/dev/isci/scil/sci_base_memory_descriptor_list_decorator.c (props changed) stable/7/sys/dev/isci/scil/sci_base_object.c (props changed) stable/7/sys/dev/isci/scil/sci_base_object.h (props changed) stable/7/sys/dev/isci/scil/sci_base_observer.c (props changed) stable/7/sys/dev/isci/scil/sci_base_observer.h (props changed) stable/7/sys/dev/isci/scil/sci_base_phy.c (props changed) stable/7/sys/dev/isci/scil/sci_base_phy.h (props changed) stable/7/sys/dev/isci/scil/sci_base_port.c (props changed) stable/7/sys/dev/isci/scil/sci_base_port.h (props changed) stable/7/sys/dev/isci/scil/sci_base_remote_device.c (props changed) stable/7/sys/dev/isci/scil/sci_base_remote_device.h (props changed) stable/7/sys/dev/isci/scil/sci_base_request.c (props changed) stable/7/sys/dev/isci/scil/sci_base_request.h (props changed) stable/7/sys/dev/isci/scil/sci_base_state.h (props changed) stable/7/sys/dev/isci/scil/sci_base_state_machine.c (props changed) stable/7/sys/dev/isci/scil/sci_base_state_machine.h (props changed) stable/7/sys/dev/isci/scil/sci_base_state_machine_logger.c (props changed) stable/7/sys/dev/isci/scil/sci_base_state_machine_logger.h (props changed) stable/7/sys/dev/isci/scil/sci_base_state_machine_observer.c (props changed) stable/7/sys/dev/isci/scil/sci_base_state_machine_observer.h (props changed) stable/7/sys/dev/isci/scil/sci_base_subject.c (props changed) stable/7/sys/dev/isci/scil/sci_base_subject.h (props changed) stable/7/sys/dev/isci/scil/sci_controller.h (props changed) stable/7/sys/dev/isci/scil/sci_controller_constants.h (props changed) stable/7/sys/dev/isci/scil/sci_fast_list.h (props changed) stable/7/sys/dev/isci/scil/sci_iterator.h (props changed) stable/7/sys/dev/isci/scil/sci_library.h (props changed) stable/7/sys/dev/isci/scil/sci_logger.h (props changed) stable/7/sys/dev/isci/scil/sci_memory_descriptor_list.h (props changed) stable/7/sys/dev/isci/scil/sci_memory_descriptor_list_decorator.h (props changed) stable/7/sys/dev/isci/scil/sci_object.h (props changed) stable/7/sys/dev/isci/scil/sci_overview.h (props changed) stable/7/sys/dev/isci/scil/sci_pool.h (props changed) stable/7/sys/dev/isci/scil/sci_simple_list.h (props changed) stable/7/sys/dev/isci/scil/sci_status.h (props changed) stable/7/sys/dev/isci/scil/sci_types.h (props changed) stable/7/sys/dev/isci/scil/sci_util.c (props changed) stable/7/sys/dev/isci/scil/sci_util.h (props changed) stable/7/sys/dev/isci/scil/scic_config_parameters.h (props changed) stable/7/sys/dev/isci/scil/scic_controller.h (props changed) stable/7/sys/dev/isci/scil/scic_io_request.h (props changed) stable/7/sys/dev/isci/scil/scic_library.h (props changed) stable/7/sys/dev/isci/scil/scic_logger.h (props changed) stable/7/sys/dev/isci/scil/scic_overview.h (props changed) stable/7/sys/dev/isci/scil/scic_phy.h (props changed) stable/7/sys/dev/isci/scil/scic_port.h (props changed) stable/7/sys/dev/isci/scil/scic_remote_device.h (props changed) stable/7/sys/dev/isci/scil/scic_sds_controller.h (props changed) stable/7/sys/dev/isci/scil/scic_sds_controller_registers.h (props changed) stable/7/sys/dev/isci/scil/scic_sds_library.c (props changed) stable/7/sys/dev/isci/scil/scic_sds_library.h (props changed) stable/7/sys/dev/isci/scil/scic_sds_logger.h (props changed) stable/7/sys/dev/isci/scil/scic_sds_pci.c (props changed) stable/7/sys/dev/isci/scil/scic_sds_pci.h (props changed) stable/7/sys/dev/isci/scil/scic_sds_phy.c (props changed) stable/7/sys/dev/isci/scil/scic_sds_phy.h (props changed) stable/7/sys/dev/isci/scil/scic_sds_phy_registers.h (props changed) stable/7/sys/dev/isci/scil/scic_sds_port.c (props changed) stable/7/sys/dev/isci/scil/scic_sds_port.h (props changed) stable/7/sys/dev/isci/scil/scic_sds_port_configuration_agent.c (props changed) stable/7/sys/dev/isci/scil/scic_sds_port_configuration_agent.h (props changed) stable/7/sys/dev/isci/scil/scic_sds_port_registers.h (props changed) stable/7/sys/dev/isci/scil/scic_sds_remote_device.c (props changed) stable/7/sys/dev/isci/scil/scic_sds_remote_device.h (props changed) stable/7/sys/dev/isci/scil/scic_sds_remote_node_context.c (props changed) stable/7/sys/dev/isci/scil/scic_sds_remote_node_context.h (props changed) stable/7/sys/dev/isci/scil/scic_sds_remote_node_table.c (props changed) stable/7/sys/dev/isci/scil/scic_sds_remote_node_table.h (props changed) stable/7/sys/dev/isci/scil/scic_sds_request.c (props changed) stable/7/sys/dev/isci/scil/scic_sds_request.h (props changed) stable/7/sys/dev/isci/scil/scic_sds_sgpio.c (props changed) stable/7/sys/dev/isci/scil/scic_sds_smp_remote_device.c (props changed) stable/7/sys/dev/isci/scil/scic_sds_smp_request.c (props changed) stable/7/sys/dev/isci/scil/scic_sds_smp_request.h (props changed) stable/7/sys/dev/isci/scil/scic_sds_ssp_request.c (props changed) stable/7/sys/dev/isci/scil/scic_sds_stp_packet_request.c (props changed) stable/7/sys/dev/isci/scil/scic_sds_stp_packet_request.h (props changed) stable/7/sys/dev/isci/scil/scic_sds_stp_pio_request.h (props changed) stable/7/sys/dev/isci/scil/scic_sds_stp_remote_device.c (props changed) stable/7/sys/dev/isci/scil/scic_sds_stp_request.h (props changed) stable/7/sys/dev/isci/scil/scic_sds_unsolicited_frame_control.c (props changed) stable/7/sys/dev/isci/scil/scic_sds_unsolicited_frame_control.h (props changed) stable/7/sys/dev/isci/scil/scic_sgpio.h (props changed) stable/7/sys/dev/isci/scil/scic_task_request.h (props changed) stable/7/sys/dev/isci/scil/scic_user_callback.h (props changed) stable/7/sys/dev/isci/scil/scif_config_parameters.h (props changed) stable/7/sys/dev/isci/scil/scif_controller.h (props changed) stable/7/sys/dev/isci/scil/scif_domain.h (props changed) stable/7/sys/dev/isci/scil/scif_io_request.h (props changed) stable/7/sys/dev/isci/scil/scif_library.h (props changed) stable/7/sys/dev/isci/scil/scif_logger.h (props changed) stable/7/sys/dev/isci/scil/scif_overview.h (props changed) stable/7/sys/dev/isci/scil/scif_remote_device.h (props changed) stable/7/sys/dev/isci/scil/scif_sas_constants.h (props changed) stable/7/sys/dev/isci/scil/scif_sas_controller.h (props changed) stable/7/sys/dev/isci/scil/scif_sas_controller_states.c (props changed) stable/7/sys/dev/isci/scil/scif_sas_design.h (props changed) stable/7/sys/dev/isci/scil/scif_sas_domain.h (props changed) stable/7/sys/dev/isci/scil/scif_sas_domain_state_handlers.c (props changed) stable/7/sys/dev/isci/scil/scif_sas_domain_states.c (props changed) stable/7/sys/dev/isci/scil/scif_sas_high_priority_request_queue.c (props changed) stable/7/sys/dev/isci/scil/scif_sas_high_priority_request_queue.h (props changed) stable/7/sys/dev/isci/scil/scif_sas_internal_io_request.c (props changed) stable/7/sys/dev/isci/scil/scif_sas_internal_io_request.h (props changed) stable/7/sys/dev/isci/scil/scif_sas_io_request.h (props changed) stable/7/sys/dev/isci/scil/scif_sas_io_request_state_handlers.c (props changed) stable/7/sys/dev/isci/scil/scif_sas_io_request_states.c (props changed) stable/7/sys/dev/isci/scil/scif_sas_library.c (props changed) stable/7/sys/dev/isci/scil/scif_sas_library.h (props changed) stable/7/sys/dev/isci/scil/scif_sas_logger.h (props changed) stable/7/sys/dev/isci/scil/scif_sas_remote_device.h (props changed) stable/7/sys/dev/isci/scil/scif_sas_remote_device_ready_substate_handlers.c (props changed) stable/7/sys/dev/isci/scil/scif_sas_remote_device_starting_substate_handlers.c (props changed) stable/7/sys/dev/isci/scil/scif_sas_remote_device_starting_substates.c (props changed) stable/7/sys/dev/isci/scil/scif_sas_remote_device_state_handlers.c (props changed) stable/7/sys/dev/isci/scil/scif_sas_remote_device_states.c (props changed) stable/7/sys/dev/isci/scil/scif_sas_request.c (props changed) stable/7/sys/dev/isci/scil/scif_sas_request.h (props changed) stable/7/sys/dev/isci/scil/scif_sas_sati_binding.h (props changed) stable/7/sys/dev/isci/scil/scif_sas_smp_activity_clear_affiliation.c (props changed) stable/7/sys/dev/isci/scil/scif_sas_smp_io_request.h (props changed) stable/7/sys/dev/isci/scil/scif_sas_smp_phy.c (props changed) stable/7/sys/dev/isci/scil/scif_sas_smp_phy.h (props changed) stable/7/sys/dev/isci/scil/scif_sas_smp_remote_device.h (props changed) stable/7/sys/dev/isci/scil/scif_sas_stp_io_request.h (props changed) stable/7/sys/dev/isci/scil/scif_sas_stp_remote_device.c (props changed) stable/7/sys/dev/isci/scil/scif_sas_stp_remote_device.h (props changed) stable/7/sys/dev/isci/scil/scif_sas_stp_task_request.h (props changed) stable/7/sys/dev/isci/scil/scif_sas_task_request.c (props changed) stable/7/sys/dev/isci/scil/scif_sas_task_request.h (props changed) stable/7/sys/dev/isci/scil/scif_sas_task_request_state_handlers.c (props changed) stable/7/sys/dev/isci/scil/scif_sas_task_request_states.c (props changed) stable/7/sys/dev/isci/scil/scif_sas_timer.c (props changed) stable/7/sys/dev/isci/scil/scif_task_request.h (props changed) stable/7/sys/dev/isci/scil/scif_user_callback.h (props changed) stable/7/sys/dev/isci/scil/scu_bios_definitions.h (props changed) stable/7/sys/dev/isci/scil/scu_completion_codes.h (props changed) stable/7/sys/dev/isci/scil/scu_constants.h (props changed) stable/7/sys/dev/isci/scil/scu_event_codes.h (props changed) stable/7/sys/dev/isci/scil/scu_registers.h (props changed) stable/7/sys/dev/isci/scil/scu_remote_node_context.h (props changed) stable/7/sys/dev/isci/scil/scu_task_context.h (props changed) stable/7/sys/dev/isci/scil/scu_unsolicited_frame.h (props changed) stable/7/sys/dev/isci/scil/scu_viit_data.h (props changed) stable/7/sys/dev/isci/types.h (props changed) Modified: stable/7/MAINTAINERS ============================================================================== --- stable/7/MAINTAINERS Fri Feb 17 06:47:16 2012 (r231860) +++ stable/7/MAINTAINERS Fri Feb 17 06:58:40 2012 (r231861) @@ -129,6 +129,7 @@ gnu/usr.bin/send-pr bugmaster Pre-commit BSD.{local,x11*}.dist portmgr Pre-commit review requested, since these files interface with ports. usb core Please contact core@ before any major changes ncurses rafan Heads-up appreciated, try not to break it. +isci(4) jimharris Pre-commit review requested. Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. Modified: stable/7/share/man/man4/Makefile ============================================================================== --- stable/7/share/man/man4/Makefile Fri Feb 17 06:47:16 2012 (r231860) +++ stable/7/share/man/man4/Makefile Fri Feb 17 06:58:40 2012 (r231861) @@ -142,6 +142,7 @@ MAN= aac.4 \ ips.4 \ ipsec.4 \ ipw.4 \ + isci.4 \ iscsi_initiator.4 \ isp.4 \ ispfw.4 \ Copied and modified: stable/7/share/man/man4/isci.4 (from r230843, head/share/man/man4/isci.4) ============================================================================== --- head/share/man/man4/isci.4 Tue Jan 31 19:38:18 2012 (r230843, copy source) +++ stable/7/share/man/man4/isci.4 Fri Feb 17 06:58:40 2012 (r231861) @@ -57,7 +57,7 @@ The .Nm driver provides support for Intel C600 .Tn SAS -controller. +controllers. .Sh CONFIGURATION To force legacy interrupts for all .Nm @@ -77,9 +77,11 @@ hw.isci.debug_level variable to a value between 1 and 4 in .Xr loader.conf 5 . .Pp -The hardware layer in the isci driver has extensive logging capabilities -which are disabled by default for performance reasons. These can be enabled -by adding +The hardware layer in the +.Nm +driver has extensive logging capabilities +which are disabled by default for performance reasons. +These can be enabled by adding .Bd -literal -offset indent options ISCI_LOGGING .Ed @@ -91,12 +93,12 @@ to the kernel configuration file. .Xr da 4 , .Xr pci 4 , .Xr sa 4 , -.Xr scsi 4 . +.Xr scsi 4 .Sh HISTORY The .Nm driver first appeared in -.Fx 10.0 . +.Fx 8.3 and 9.1 . .Sh AUTHORS .An -nosplit The Modified: stable/7/sys/amd64/conf/GENERIC ============================================================================== --- stable/7/sys/amd64/conf/GENERIC Fri Feb 17 06:47:16 2012 (r231860) +++ stable/7/sys/amd64/conf/GENERIC Fri Feb 17 06:58:40 2012 (r231861) @@ -110,6 +110,7 @@ device adv # Advansys SCSI adapters device adw # Advansys wide SCSI adapters device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60. device bt # Buslogic/Mylex MultiMaster SCSI adapters +device isci # Intel C600 SAS controller # SCSI peripherals Modified: stable/7/sys/amd64/conf/NOTES ============================================================================== --- stable/7/sys/amd64/conf/NOTES Fri Feb 17 06:47:16 2012 (r231860) +++ stable/7/sys/amd64/conf/NOTES Fri Feb 17 06:58:40 2012 (r231861) @@ -391,6 +391,11 @@ device hptiop device ips # +# Intel C600 (Patsburg) integrated SAS controller +device isci +options ISCI_LOGGING # enable debugging in isci HAL + +# # SafeNet crypto driver: can be moved to the MI NOTES as soon as # it's tested on a big-endian machine # Modified: stable/7/sys/conf/files.amd64 ============================================================================== --- stable/7/sys/conf/files.amd64 Fri Feb 17 06:47:16 2012 (r231860) +++ stable/7/sys/conf/files.amd64 Fri Feb 17 06:58:40 2012 (r231861) @@ -207,6 +207,115 @@ dev/syscons/scvgarndr.c optional sc vga dev/syscons/scvtb.c optional sc dev/uart/uart_cpu_amd64.c optional uart dev/wpi/if_wpi.c optional wpi +dev/isci/isci.c optional isci +dev/isci/isci_controller.c optional isci +dev/isci/isci_domain.c optional isci +dev/isci/isci_interrupt.c optional isci +dev/isci/isci_io_request.c optional isci +dev/isci/isci_logger.c optional isci +dev/isci/isci_oem_parameters.c optional isci +dev/isci/isci_remote_device.c optional isci +dev/isci/isci_sysctl.c optional isci +dev/isci/isci_task_request.c optional isci +dev/isci/isci_timer.c optional isci +dev/isci/scil/sati.c optional isci +dev/isci/scil/sati_abort_task_set.c optional isci +dev/isci/scil/sati_atapi.c optional isci +dev/isci/scil/sati_device.c optional isci +dev/isci/scil/sati_inquiry.c optional isci +dev/isci/scil/sati_log_sense.c optional isci +dev/isci/scil/sati_lun_reset.c optional isci +dev/isci/scil/sati_mode_pages.c optional isci +dev/isci/scil/sati_mode_select.c optional isci +dev/isci/scil/sati_mode_sense.c optional isci +dev/isci/scil/sati_mode_sense_10.c optional isci +dev/isci/scil/sati_mode_sense_6.c optional isci +dev/isci/scil/sati_move.c optional isci +dev/isci/scil/sati_passthrough.c optional isci +dev/isci/scil/sati_read.c optional isci +dev/isci/scil/sati_read_buffer.c optional isci +dev/isci/scil/sati_read_capacity.c optional isci +dev/isci/scil/sati_reassign_blocks.c optional isci +dev/isci/scil/sati_report_luns.c optional isci +dev/isci/scil/sati_request_sense.c optional isci +dev/isci/scil/sati_start_stop_unit.c optional isci +dev/isci/scil/sati_synchronize_cache.c optional isci +dev/isci/scil/sati_test_unit_ready.c optional isci +dev/isci/scil/sati_unmap.c optional isci +dev/isci/scil/sati_util.c optional isci +dev/isci/scil/sati_verify.c optional isci +dev/isci/scil/sati_write.c optional isci +dev/isci/scil/sati_write_and_verify.c optional isci +dev/isci/scil/sati_write_buffer.c optional isci +dev/isci/scil/sati_write_long.c optional isci +dev/isci/scil/sci_abstract_list.c optional isci +dev/isci/scil/sci_base_controller.c optional isci +dev/isci/scil/sci_base_domain.c optional isci +dev/isci/scil/sci_base_iterator.c optional isci +dev/isci/scil/sci_base_library.c optional isci +dev/isci/scil/sci_base_logger.c optional isci +dev/isci/scil/sci_base_memory_descriptor_list.c optional isci +dev/isci/scil/sci_base_memory_descriptor_list_decorator.c optional isci +dev/isci/scil/sci_base_object.c optional isci +dev/isci/scil/sci_base_observer.c optional isci +dev/isci/scil/sci_base_phy.c optional isci +dev/isci/scil/sci_base_port.c optional isci +dev/isci/scil/sci_base_remote_device.c optional isci +dev/isci/scil/sci_base_request.c optional isci +dev/isci/scil/sci_base_state_machine.c optional isci +dev/isci/scil/sci_base_state_machine_logger.c optional isci +dev/isci/scil/sci_base_state_machine_observer.c optional isci +dev/isci/scil/sci_base_subject.c optional isci +dev/isci/scil/sci_util.c optional isci +dev/isci/scil/scic_sds_controller.c optional isci +dev/isci/scil/scic_sds_library.c optional isci +dev/isci/scil/scic_sds_pci.c optional isci +dev/isci/scil/scic_sds_phy.c optional isci +dev/isci/scil/scic_sds_port.c optional isci +dev/isci/scil/scic_sds_port_configuration_agent.c optional isci +dev/isci/scil/scic_sds_remote_device.c optional isci +dev/isci/scil/scic_sds_remote_node_context.c optional isci +dev/isci/scil/scic_sds_remote_node_table.c optional isci +dev/isci/scil/scic_sds_request.c optional isci +dev/isci/scil/scic_sds_sgpio.c optional isci +dev/isci/scil/scic_sds_smp_remote_device.c optional isci +dev/isci/scil/scic_sds_smp_request.c optional isci +dev/isci/scil/scic_sds_ssp_request.c optional isci +dev/isci/scil/scic_sds_stp_packet_request.c optional isci +dev/isci/scil/scic_sds_stp_remote_device.c optional isci +dev/isci/scil/scic_sds_stp_request.c optional isci +dev/isci/scil/scic_sds_unsolicited_frame_control.c optional isci +dev/isci/scil/scif_sas_controller.c optional isci +dev/isci/scil/scif_sas_controller_state_handlers.c optional isci +dev/isci/scil/scif_sas_controller_states.c optional isci +dev/isci/scil/scif_sas_domain.c optional isci +dev/isci/scil/scif_sas_domain_state_handlers.c optional isci +dev/isci/scil/scif_sas_domain_states.c optional isci +dev/isci/scil/scif_sas_high_priority_request_queue.c optional isci +dev/isci/scil/scif_sas_internal_io_request.c optional isci +dev/isci/scil/scif_sas_io_request.c optional isci +dev/isci/scil/scif_sas_io_request_state_handlers.c optional isci +dev/isci/scil/scif_sas_io_request_states.c optional isci +dev/isci/scil/scif_sas_library.c optional isci +dev/isci/scil/scif_sas_remote_device.c optional isci +dev/isci/scil/scif_sas_remote_device_ready_substate_handlers.c optional isci +dev/isci/scil/scif_sas_remote_device_ready_substates.c optional isci +dev/isci/scil/scif_sas_remote_device_starting_substate_handlers.c optional isci +dev/isci/scil/scif_sas_remote_device_starting_substates.c optional isci +dev/isci/scil/scif_sas_remote_device_state_handlers.c optional isci +dev/isci/scil/scif_sas_remote_device_states.c optional isci +dev/isci/scil/scif_sas_request.c optional isci +dev/isci/scil/scif_sas_smp_activity_clear_affiliation.c optional isci +dev/isci/scil/scif_sas_smp_io_request.c optional isci +dev/isci/scil/scif_sas_smp_phy.c optional isci +dev/isci/scil/scif_sas_smp_remote_device.c optional isci +dev/isci/scil/scif_sas_stp_io_request.c optional isci +dev/isci/scil/scif_sas_stp_remote_device.c optional isci +dev/isci/scil/scif_sas_stp_task_request.c optional isci +dev/isci/scil/scif_sas_task_request.c optional isci +dev/isci/scil/scif_sas_task_request_state_handlers.c optional isci +dev/isci/scil/scif_sas_task_request_states.c optional isci +dev/isci/scil/scif_sas_timer.c optional isci isa/syscons_isa.c optional sc isa/vga_isa.c optional vga kern/link_elf_obj.c standard Modified: stable/7/sys/conf/files.i386 ============================================================================== --- stable/7/sys/conf/files.i386 Fri Feb 17 06:47:16 2012 (r231860) +++ stable/7/sys/conf/files.i386 Fri Feb 17 06:58:40 2012 (r231861) @@ -235,6 +235,115 @@ dev/syscons/scvtb.c optional sc dev/uart/uart_cpu_i386.c optional uart dev/acpica/acpi_if.m standard dev/wpi/if_wpi.c optional wpi +dev/isci/isci.c optional isci +dev/isci/isci_controller.c optional isci +dev/isci/isci_domain.c optional isci +dev/isci/isci_interrupt.c optional isci +dev/isci/isci_io_request.c optional isci +dev/isci/isci_logger.c optional isci +dev/isci/isci_oem_parameters.c optional isci +dev/isci/isci_remote_device.c optional isci +dev/isci/isci_sysctl.c optional isci +dev/isci/isci_task_request.c optional isci +dev/isci/isci_timer.c optional isci +dev/isci/scil/sati.c optional isci +dev/isci/scil/sati_abort_task_set.c optional isci +dev/isci/scil/sati_atapi.c optional isci +dev/isci/scil/sati_device.c optional isci +dev/isci/scil/sati_inquiry.c optional isci +dev/isci/scil/sati_log_sense.c optional isci +dev/isci/scil/sati_lun_reset.c optional isci +dev/isci/scil/sati_mode_pages.c optional isci +dev/isci/scil/sati_mode_select.c optional isci +dev/isci/scil/sati_mode_sense.c optional isci +dev/isci/scil/sati_mode_sense_10.c optional isci +dev/isci/scil/sati_mode_sense_6.c optional isci +dev/isci/scil/sati_move.c optional isci +dev/isci/scil/sati_passthrough.c optional isci +dev/isci/scil/sati_read.c optional isci +dev/isci/scil/sati_read_buffer.c optional isci +dev/isci/scil/sati_read_capacity.c optional isci +dev/isci/scil/sati_reassign_blocks.c optional isci +dev/isci/scil/sati_report_luns.c optional isci +dev/isci/scil/sati_request_sense.c optional isci +dev/isci/scil/sati_start_stop_unit.c optional isci +dev/isci/scil/sati_synchronize_cache.c optional isci +dev/isci/scil/sati_test_unit_ready.c optional isci +dev/isci/scil/sati_unmap.c optional isci +dev/isci/scil/sati_util.c optional isci +dev/isci/scil/sati_verify.c optional isci +dev/isci/scil/sati_write.c optional isci +dev/isci/scil/sati_write_and_verify.c optional isci +dev/isci/scil/sati_write_buffer.c optional isci +dev/isci/scil/sati_write_long.c optional isci +dev/isci/scil/sci_abstract_list.c optional isci +dev/isci/scil/sci_base_controller.c optional isci +dev/isci/scil/sci_base_domain.c optional isci +dev/isci/scil/sci_base_iterator.c optional isci +dev/isci/scil/sci_base_library.c optional isci +dev/isci/scil/sci_base_logger.c optional isci +dev/isci/scil/sci_base_memory_descriptor_list.c optional isci +dev/isci/scil/sci_base_memory_descriptor_list_decorator.c optional isci +dev/isci/scil/sci_base_object.c optional isci +dev/isci/scil/sci_base_observer.c optional isci +dev/isci/scil/sci_base_phy.c optional isci +dev/isci/scil/sci_base_port.c optional isci +dev/isci/scil/sci_base_remote_device.c optional isci +dev/isci/scil/sci_base_request.c optional isci +dev/isci/scil/sci_base_state_machine.c optional isci +dev/isci/scil/sci_base_state_machine_logger.c optional isci +dev/isci/scil/sci_base_state_machine_observer.c optional isci +dev/isci/scil/sci_base_subject.c optional isci +dev/isci/scil/sci_util.c optional isci +dev/isci/scil/scic_sds_controller.c optional isci +dev/isci/scil/scic_sds_library.c optional isci +dev/isci/scil/scic_sds_pci.c optional isci +dev/isci/scil/scic_sds_phy.c optional isci +dev/isci/scil/scic_sds_port.c optional isci +dev/isci/scil/scic_sds_port_configuration_agent.c optional isci +dev/isci/scil/scic_sds_remote_device.c optional isci +dev/isci/scil/scic_sds_remote_node_context.c optional isci +dev/isci/scil/scic_sds_remote_node_table.c optional isci +dev/isci/scil/scic_sds_request.c optional isci +dev/isci/scil/scic_sds_sgpio.c optional isci +dev/isci/scil/scic_sds_smp_remote_device.c optional isci +dev/isci/scil/scic_sds_smp_request.c optional isci +dev/isci/scil/scic_sds_ssp_request.c optional isci +dev/isci/scil/scic_sds_stp_packet_request.c optional isci +dev/isci/scil/scic_sds_stp_remote_device.c optional isci +dev/isci/scil/scic_sds_stp_request.c optional isci +dev/isci/scil/scic_sds_unsolicited_frame_control.c optional isci +dev/isci/scil/scif_sas_controller.c optional isci +dev/isci/scil/scif_sas_controller_state_handlers.c optional isci +dev/isci/scil/scif_sas_controller_states.c optional isci +dev/isci/scil/scif_sas_domain.c optional isci +dev/isci/scil/scif_sas_domain_state_handlers.c optional isci +dev/isci/scil/scif_sas_domain_states.c optional isci +dev/isci/scil/scif_sas_high_priority_request_queue.c optional isci +dev/isci/scil/scif_sas_internal_io_request.c optional isci +dev/isci/scil/scif_sas_io_request.c optional isci +dev/isci/scil/scif_sas_io_request_state_handlers.c optional isci +dev/isci/scil/scif_sas_io_request_states.c optional isci +dev/isci/scil/scif_sas_library.c optional isci +dev/isci/scil/scif_sas_remote_device.c optional isci +dev/isci/scil/scif_sas_remote_device_ready_substate_handlers.c optional isci +dev/isci/scil/scif_sas_remote_device_ready_substates.c optional isci +dev/isci/scil/scif_sas_remote_device_starting_substate_handlers.c optional isci +dev/isci/scil/scif_sas_remote_device_starting_substates.c optional isci +dev/isci/scil/scif_sas_remote_device_state_handlers.c optional isci +dev/isci/scil/scif_sas_remote_device_states.c optional isci +dev/isci/scil/scif_sas_request.c optional isci +dev/isci/scil/scif_sas_smp_activity_clear_affiliation.c optional isci +dev/isci/scil/scif_sas_smp_io_request.c optional isci +dev/isci/scil/scif_sas_smp_phy.c optional isci +dev/isci/scil/scif_sas_smp_remote_device.c optional isci +dev/isci/scil/scif_sas_stp_io_request.c optional isci +dev/isci/scil/scif_sas_stp_remote_device.c optional isci +dev/isci/scil/scif_sas_stp_task_request.c optional isci +dev/isci/scil/scif_sas_task_request.c optional isci +dev/isci/scil/scif_sas_task_request_state_handlers.c optional isci +dev/isci/scil/scif_sas_task_request_states.c optional isci +dev/isci/scil/scif_sas_timer.c optional isci i386/acpica/OsdEnvironment.c optional acpi i386/acpica/acpi_machdep.c optional acpi i386/acpica/acpi_wakeup.c optional acpi Modified: stable/7/sys/conf/options.amd64 ============================================================================== --- stable/7/sys/conf/options.amd64 Fri Feb 17 06:47:16 2012 (r231860) +++ stable/7/sys/conf/options.amd64 Fri Feb 17 06:58:40 2012 (r231861) @@ -68,3 +68,6 @@ KDTRACE_FRAME opt_kdtrace.h # BPF just-in-time compiler BPF_JITTER opt_bpf.h + +# options for the Intel C600 SAS driver (isci) +ISCI_LOGGING opt_isci.h Modified: stable/7/sys/conf/options.i386 ============================================================================== --- stable/7/sys/conf/options.i386 Fri Feb 17 06:47:16 2012 (r231860) +++ stable/7/sys/conf/options.i386 Fri Feb 17 06:58:40 2012 (r231861) @@ -149,3 +149,6 @@ STOP_NMI opt_cpu.h # BPF just-in-time compiler BPF_JITTER opt_bpf.h + +# options for the Intel C600 SAS driver (isci) +ISCI_LOGGING opt_isci.h Modified: stable/7/sys/dev/isci/isci.h ============================================================================== --- head/sys/dev/isci/isci.h Tue Jan 31 19:38:18 2012 (r230843) +++ stable/7/sys/dev/isci/isci.h Fri Feb 17 06:58:40 2012 (r231861) @@ -160,7 +160,6 @@ struct ISCI_REQUEST struct ISCI_IO_REQUEST { struct ISCI_REQUEST parent; - SCI_STATUS status; SCI_IO_REQUEST_HANDLE_T sci_object; union ccb *ccb; uint32_t num_segments; Modified: stable/7/sys/dev/isci/isci_controller.c ============================================================================== --- head/sys/dev/isci/isci_controller.c Tue Jan 31 19:38:18 2012 (r230843) +++ stable/7/sys/dev/isci/isci_controller.c Fri Feb 17 06:58:40 2012 (r231861) @@ -549,7 +549,7 @@ void isci_action(struct cam_sim *sim, un cpi->hba_eng_cnt = 0; cpi->max_target = SCI_MAX_REMOTE_DEVICES - 1; cpi->max_lun = ISCI_MAX_LUN; -#if __FreeBSD_version >= 704100 +#if __FreeBSD_version >= 800102 cpi->maxio = isci_io_request_get_max_io_size(); #endif cpi->unit_number = cam_sim_unit(sim); Modified: stable/7/sys/dev/isci/isci_io_request.c ============================================================================== --- head/sys/dev/isci/isci_io_request.c Tue Jan 31 19:38:18 2012 (r230843) +++ stable/7/sys/dev/isci/isci_io_request.c Fri Feb 17 06:58:40 2012 (r231861) @@ -626,16 +626,16 @@ isci_io_request_construct(void *arg, bus return; } - io_request->status = scif_io_request_construct( + status = scif_io_request_construct( io_request->parent.controller_handle, io_request->parent.remote_device_handle, SCI_CONTROLLER_INVALID_IO_TAG, (void *)io_request, (void *)((char*)io_request + sizeof(struct ISCI_IO_REQUEST)), &io_request->sci_object); - if (io_request->status != SCI_SUCCESS) { + if (status != SCI_SUCCESS) { isci_io_request_complete(io_request->parent.controller_handle, - device, io_request, io_request->status); + device, io_request, (SCI_IO_STATUS)status); return; } @@ -650,7 +650,7 @@ isci_io_request_construct(void *arg, bus if (status != SCI_SUCCESS) { isci_io_request_complete(io_request->parent.controller_handle, - device, io_request, status); + device, io_request, (SCI_IO_STATUS)status); return; } @@ -900,7 +900,7 @@ isci_io_request_execute_smp_io(union ccb if (status != SCI_SUCCESS) { isci_io_request_complete(controller->scif_controller_handle, - smp_device_handle, io_request, status); + smp_device_handle, io_request, (SCI_IO_STATUS)status); return; } @@ -912,7 +912,7 @@ isci_io_request_execute_smp_io(union ccb if (status != SCI_SUCCESS) { isci_io_request_complete(controller->scif_controller_handle, - smp_device_handle, io_request, status); + smp_device_handle, io_request, (SCI_IO_STATUS)status); return; } Modified: stable/7/sys/dev/isci/isci_remote_device.c ============================================================================== --- head/sys/dev/isci/isci_remote_device.c Tue Jan 31 19:38:18 2012 (r230843) +++ stable/7/sys/dev/isci/isci_remote_device.c Fri Feb 17 06:58:40 2012 (r231861) @@ -195,7 +195,7 @@ isci_remote_device_reset(struct ISCI_REM if (status != SCI_SUCCESS) { isci_task_request_complete(controller->scif_controller_handle, remote_device->sci_object, task_request->sci_object, - status); + (SCI_TASK_STATUS)status); return; } @@ -207,7 +207,7 @@ isci_remote_device_reset(struct ISCI_REM isci_task_request_complete( controller->scif_controller_handle, remote_device->sci_object, task_request->sci_object, - status); + (SCI_TASK_STATUS)status); return; } } Modified: stable/7/sys/dev/isci/scil/sati_abort_task_set.c ============================================================================== --- head/sys/dev/isci/scil/sati_abort_task_set.c Tue Jan 31 19:38:18 2012 (r230843) +++ stable/7/sys/dev/isci/scil/sati_abort_task_set.c Fri Feb 17 06:58:40 2012 (r231861) @@ -124,8 +124,8 @@ SATI_STATUS sati_abort_task_set_translat for (tag_index = 0; tag_index < 32; tag_index++) { - void * matching_command; - SCI_STATUS completion_status; + void * matching_command; + SCI_IO_STATUS completion_status; sati_cb_device_get_request_by_ncq_tag( scsi_task, tag_index, @@ -141,7 +141,7 @@ SATI_STATUS sati_abort_task_set_translat ) { sati_translate_error(sequence, matching_command, log->error); - completion_status = SCI_FAILURE_IO_RESPONSE_VALID; + completion_status = SCI_IO_FAILURE_RESPONSE_VALID; if(sequence->state == SATI_SEQUENCE_STATE_READ_ERROR) { @@ -159,7 +159,7 @@ SATI_STATUS sati_abort_task_set_translat } else { - completion_status = SCI_FAILURE_IO_TERMINATED; + completion_status = SCI_IO_FAILURE_TERMINATED; } sati_cb_io_request_complete(matching_command, completion_status); Modified: stable/7/sys/dev/isci/scil/scic_sds_controller.c ============================================================================== --- head/sys/dev/isci/scil/scic_sds_controller.c Tue Jan 31 19:38:18 2012 (r230843) +++ stable/7/sys/dev/isci/scil/scic_sds_controller.c Fri Feb 17 06:58:40 2012 (r231861) @@ -4165,7 +4165,7 @@ SCI_IO_STATUS scic_controller_start_io( U16 io_tag ) { - SCI_IO_STATUS status; + SCI_STATUS status; SCIC_SDS_CONTROLLER_T *this_controller; this_controller = (SCIC_SDS_CONTROLLER_T *)controller; @@ -4183,7 +4183,7 @@ SCI_IO_STATUS scic_controller_start_io( io_tag ); - return status; + return (SCI_IO_STATUS)status; } // --------------------------------------------------------------------------- @@ -4253,7 +4253,7 @@ SCI_TASK_STATUS scic_controller_start_ta U16 task_tag ) { - SCI_TASK_STATUS status = SCI_FAILURE_INVALID_STATE; + SCI_STATUS status = SCI_FAILURE_INVALID_STATE; SCIC_SDS_CONTROLLER_T *this_controller; this_controller = (SCIC_SDS_CONTROLLER_T *)controller; @@ -4282,7 +4282,7 @@ SCI_TASK_STATUS scic_controller_start_ta )); } - return status; + return (SCI_TASK_STATUS)status; } // --------------------------------------------------------------------------- Modified: stable/7/sys/dev/isci/scil/scic_sds_stp_request.c ============================================================================== --- head/sys/dev/isci/scil/scic_sds_stp_request.c Tue Jan 31 19:38:18 2012 (r230843) +++ stable/7/sys/dev/isci/scil/scic_sds_stp_request.c Fri Feb 17 06:58:40 2012 (r231861) @@ -1124,9 +1124,6 @@ SCI_STATUS scic_sds_stp_request_pio_data if (status == SCI_SUCCESS) { this_sds_stp_request->type.pio.pio_transfer_bytes -= remaining_bytes_in_current_sgl; - - //update the current sgl, sgl_offset and save for future - current_sgl = scic_sds_stp_request_pio_get_next_sgl(this_sds_stp_request); sgl_offset = 0; } } Modified: stable/7/sys/dev/isci/scil/scif_sas_controller.c ============================================================================== --- head/sys/dev/isci/scil/scif_sas_controller.c Tue Jan 31 19:38:18 2012 (r230843) +++ stable/7/sys/dev/isci/scil/scif_sas_controller.c Fri Feb 17 06:58:40 2012 (r231861) @@ -87,6 +87,10 @@ SCI_STATUS scif_controller_construct( SCIF_SAS_LIBRARY_T * fw_library = (SCIF_SAS_LIBRARY_T*) library; SCIF_SAS_CONTROLLER_T * fw_controller = (SCIF_SAS_CONTROLLER_T*) controller; + // Validate the user supplied parameters. + if ((library == SCI_INVALID_HANDLE) || (controller == SCI_INVALID_HANDLE)) + return SCI_FAILURE_INVALID_PARAMETER_VALUE; + SCIF_LOG_TRACE(( sci_base_object_get_logger(library), SCIF_LOG_OBJECT_CONTROLLER | SCIF_LOG_OBJECT_INITIALIZATION, @@ -94,10 +98,6 @@ SCI_STATUS scif_controller_construct( library, controller )); - // Validate the user supplied parameters. - if ((library == SCI_INVALID_HANDLE) || (controller == SCI_INVALID_HANDLE)) - return SCI_FAILURE_INVALID_PARAMETER_VALUE; - // Construct the base controller. As part of constructing the base // controller we ask it to also manage the MDL iteration for the Core. sci_base_controller_construct( @@ -144,6 +144,10 @@ SCI_STATUS scif_controller_initialize( { SCIF_SAS_CONTROLLER_T * fw_controller = (SCIF_SAS_CONTROLLER_T*) controller; + // Validate the user supplied parameters. + if (controller == SCI_INVALID_HANDLE) + return SCI_FAILURE_INVALID_PARAMETER_VALUE; + SCIF_LOG_TRACE(( sci_base_object_get_logger(controller), SCIF_LOG_OBJECT_CONTROLLER | SCIF_LOG_OBJECT_INITIALIZATION, @@ -151,10 +155,6 @@ SCI_STATUS scif_controller_initialize( controller )); - // Validate the user supplied parameters. - if (controller == SCI_INVALID_HANDLE) - return SCI_FAILURE_INVALID_PARAMETER_VALUE; - return fw_controller->state_handlers->initialize_handler( &fw_controller->parent ); @@ -187,6 +187,10 @@ SCI_STATUS scif_controller_start( { SCIF_SAS_CONTROLLER_T * fw_controller = (SCIF_SAS_CONTROLLER_T*) controller; + // Validate the user supplied parameters. + if (controller == SCI_INVALID_HANDLE) + return SCI_FAILURE_INVALID_PARAMETER_VALUE; + SCIF_LOG_TRACE(( sci_base_object_get_logger(controller), SCIF_LOG_OBJECT_CONTROLLER | SCIF_LOG_OBJECT_INITIALIZATION, @@ -194,10 +198,6 @@ SCI_STATUS scif_controller_start( controller, timeout )); - // Validate the user supplied parameters. - if (controller == SCI_INVALID_HANDLE) - return SCI_FAILURE_INVALID_PARAMETER_VALUE; - return fw_controller->state_handlers-> start_handler(&fw_controller->parent, timeout); } @@ -211,6 +211,10 @@ SCI_STATUS scif_controller_stop( { SCIF_SAS_CONTROLLER_T * fw_controller = (SCIF_SAS_CONTROLLER_T*) controller; + // Validate the user supplied parameters. + if (controller == SCI_INVALID_HANDLE) + return SCI_FAILURE_INVALID_PARAMETER_VALUE; + SCIF_LOG_TRACE(( sci_base_object_get_logger(controller), SCIF_LOG_OBJECT_CONTROLLER | SCIF_LOG_OBJECT_SHUTDOWN, @@ -218,10 +222,6 @@ SCI_STATUS scif_controller_stop( controller, timeout )); - // Validate the user supplied parameters. - if (controller == SCI_INVALID_HANDLE) - return SCI_FAILURE_INVALID_PARAMETER_VALUE; - return fw_controller->state_handlers-> stop_handler(&fw_controller->parent, timeout); @@ -235,6 +235,10 @@ SCI_STATUS scif_controller_reset( { SCIF_SAS_CONTROLLER_T * fw_controller = (SCIF_SAS_CONTROLLER_T*) controller; + // Validate the user supplied parameters. + if (controller == SCI_INVALID_HANDLE) + return SCI_FAILURE_INVALID_PARAMETER_VALUE; + SCIF_LOG_TRACE(( sci_base_object_get_logger(controller), SCIF_LOG_OBJECT_CONTROLLER | SCIF_LOG_OBJECT_CONTROLLER_RESET, @@ -242,10 +246,6 @@ SCI_STATUS scif_controller_reset( controller )); - // Validate the user supplied parameters. - if (controller == SCI_INVALID_HANDLE) - return SCI_FAILURE_INVALID_PARAMETER_VALUE; - return fw_controller->state_handlers-> reset_handler(&fw_controller->parent); } @@ -271,6 +271,7 @@ SCI_IO_STATUS scif_controller_start_io( ) { SCIF_SAS_CONTROLLER_T * fw_controller = (SCIF_SAS_CONTROLLER_T*) controller; + SCI_STATUS status; SCIF_LOG_TRACE(( sci_base_object_get_logger(controller), @@ -284,7 +285,7 @@ SCI_IO_STATUS scif_controller_start_io( || scif_sas_controller_sufficient_resource(controller) ) { - return fw_controller->state_handlers->start_io_handler( + status = fw_controller->state_handlers->start_io_handler( (SCI_BASE_CONTROLLER_T*) controller, (SCI_BASE_REMOTE_DEVICE_T*) remote_device, (SCI_BASE_REQUEST_T*) io_request, @@ -292,7 +293,9 @@ SCI_IO_STATUS scif_controller_start_io( ); } else - return SCI_FAILURE_INSUFFICIENT_RESOURCES; + status = SCI_FAILURE_INSUFFICIENT_RESOURCES; + + return (SCI_IO_STATUS)status; } // --------------------------------------------------------------------------- @@ -305,25 +308,26 @@ SCI_TASK_STATUS scif_controller_start_ta ) { SCIF_SAS_CONTROLLER_T * fw_controller = (SCIF_SAS_CONTROLLER_T*) controller; - - SCIF_LOG_TRACE(( - sci_base_object_get_logger(controller), - SCIF_LOG_OBJECT_CONTROLLER | SCIF_LOG_OBJECT_TASK_MANAGEMENT, - "scif_controller_start_task(0x%x, 0x%x, 0x%x, 0x%x) enter\n", - controller, remote_device, task_request, io_tag - )); + SCI_STATUS status; // Validate the user supplied parameters. if ( (controller == SCI_INVALID_HANDLE) || (remote_device == SCI_INVALID_HANDLE) || (task_request == SCI_INVALID_HANDLE) ) { - return SCI_FAILURE_INVALID_PARAMETER_VALUE; + return SCI_TASK_FAILURE_INVALID_PARAMETER_VALUE; } + SCIF_LOG_TRACE(( + sci_base_object_get_logger(controller), + SCIF_LOG_OBJECT_CONTROLLER | SCIF_LOG_OBJECT_TASK_MANAGEMENT, + "scif_controller_start_task(0x%x, 0x%x, 0x%x, 0x%x) enter\n", + controller, remote_device, task_request, io_tag + )); + if (scif_sas_controller_sufficient_resource(controller)) { - return fw_controller->state_handlers->start_task_handler( + status = fw_controller->state_handlers->start_task_handler( (SCI_BASE_CONTROLLER_T*) controller, (SCI_BASE_REMOTE_DEVICE_T*) remote_device, (SCI_BASE_REQUEST_T*) task_request, @@ -331,7 +335,9 @@ SCI_TASK_STATUS scif_controller_start_ta ); } else - return SCI_FAILURE_INSUFFICIENT_RESOURCES; + status = SCI_FAILURE_INSUFFICIENT_RESOURCES; + + return (SCI_TASK_STATUS)status; } // --------------------------------------------------------------------------- @@ -368,13 +374,6 @@ SCI_STATUS scif_controller_complete_task { SCIF_SAS_CONTROLLER_T * fw_controller = (SCIF_SAS_CONTROLLER_T*) controller; - SCIF_LOG_TRACE(( - sci_base_object_get_logger(controller), - SCIF_LOG_OBJECT_CONTROLLER | SCIF_LOG_OBJECT_TASK_MANAGEMENT, - "scif_controller_complete_task(0x%x, 0x%x, 0x%x) enter\n", - controller, remote_device, task_request - )); - // Validate the user supplied parameters. if ( (controller == SCI_INVALID_HANDLE) || (remote_device == SCI_INVALID_HANDLE) @@ -383,6 +382,13 @@ SCI_STATUS scif_controller_complete_task return SCI_FAILURE_INVALID_PARAMETER_VALUE; } + SCIF_LOG_TRACE(( + sci_base_object_get_logger(controller), + SCIF_LOG_OBJECT_CONTROLLER | SCIF_LOG_OBJECT_TASK_MANAGEMENT, + "scif_controller_complete_task(0x%x, 0x%x, 0x%x) enter\n", + controller, remote_device, task_request + )); + return fw_controller->state_handlers->complete_task_handler( (SCI_BASE_CONTROLLER_T*) controller, (SCI_BASE_REMOTE_DEVICE_T*) remote_device, Modified: stable/7/sys/dev/isci/scil/scif_sas_controller_state_handlers.c ============================================================================== --- head/sys/dev/isci/scil/scif_sas_controller_state_handlers.c Tue Jan 31 19:38:18 2012 (r230843) +++ stable/7/sys/dev/isci/scil/scif_sas_controller_state_handlers.c Fri Feb 17 06:58:40 2012 (r231861) @@ -586,7 +586,7 @@ SCI_STATUS scif_sas_controller_ready_sta if (status == SCI_SUCCESS) { // Ask the core to start processing for this IO request. - status = scic_controller_start_io( + status = (SCI_STATUS)scic_controller_start_io( fw_controller->core_object, fw_device->core_object, fw_io->parent.core_object, @@ -903,7 +903,7 @@ SCI_STATUS scif_sas_controller_ready_sta } // Ask the core to start processing for this task request. - status = scic_controller_start_task( + status = (SCI_STATUS)scic_controller_start_task( fw_controller->core_object, fw_device->core_object, fw_task->parent.core_object, @@ -1072,7 +1072,7 @@ SCI_STATUS scif_sas_controller_common_st if (status == SCI_SUCCESS) { // Ask the core to start processing for this IO request. - status = scic_controller_start_io( + status = (SCI_STATUS)scic_controller_start_io( fw_controller->core_object, fw_device->core_object, fw_io->parent.core_object, @@ -1683,7 +1683,7 @@ SCI_STATUS scif_sas_controller_failed_st &((SCIF_SAS_CONTROLLER_T *)controller)->parent.state_machine) )); - return SCI_IO_FAILURE; + return SCI_FAILURE; } #define scif_sas_controller_stopping_complete_io_handler \ Modified: stable/7/sys/dev/isci/scil/scif_sas_domain.c ============================================================================== --- head/sys/dev/isci/scil/scif_sas_domain.c Tue Jan 31 19:38:18 2012 (r230843) +++ stable/7/sys/dev/isci/scil/scif_sas_domain.c Fri Feb 17 06:58:40 2012 (r231861) @@ -142,8 +142,8 @@ SCI_PORT_HANDLE_T scif_domain_get_scic_p { SCIF_SAS_DOMAIN_T * fw_domain = (SCIF_SAS_DOMAIN_T*) domain; - if ( (fw_domain != NULL) && (fw_domain->core_object != SCI_INVALID_HANDLE) ) - return fw_domain->core_object; + if ( (fw_domain == NULL) || (fw_domain->core_object == SCI_INVALID_HANDLE) ) + return SCI_INVALID_HANDLE; SCIF_LOG_WARNING(( sci_base_object_get_logger(fw_domain), @@ -152,7 +152,7 @@ SCI_PORT_HANDLE_T scif_domain_get_scic_p fw_domain )); - return SCI_INVALID_HANDLE; + return fw_domain->core_object; } // --------------------------------------------------------------------------- Modified: stable/7/sys/dev/isci/scil/scif_sas_io_request.c ============================================================================== --- head/sys/dev/isci/scil/scif_sas_io_request.c Tue Jan 31 19:38:18 2012 (r230843) +++ stable/7/sys/dev/isci/scil/scif_sas_io_request.c Fri Feb 17 06:58:40 2012 (r231861) @@ -811,7 +811,7 @@ SCI_STATUS scif_sas_io_request_continue( ); //start the new constructed IO. - return scif_controller_start_io( + return (SCI_STATUS)scif_controller_start_io( (SCI_CONTROLLER_HANDLE_T) fw_controller, (SCI_REMOTE_DEVICE_HANDLE_T) fw_device, (SCI_IO_REQUEST_HANDLE_T) fw_request, Modified: stable/7/sys/dev/isci/scil/scif_sas_remote_device.c ============================================================================== --- head/sys/dev/isci/scil/scif_sas_remote_device.c Tue Jan 31 19:38:18 2012 (r230843) +++ stable/7/sys/dev/isci/scil/scif_sas_remote_device.c Fri Feb 17 06:58:40 2012 (r231861) @@ -362,8 +362,8 @@ SCI_REMOTE_DEVICE_HANDLE_T scif_remote_d SCIF_SAS_REMOTE_DEVICE_T * fw_device = (SCIF_SAS_REMOTE_DEVICE_T*) scif_remote_device; - if ( (fw_device != NULL) && (fw_device->core_object != SCI_INVALID_HANDLE) ) - return fw_device->core_object; + if ( (fw_device == NULL) || (fw_device->core_object == SCI_INVALID_HANDLE) ) + return SCI_INVALID_HANDLE; SCIF_LOG_WARNING(( sci_base_object_get_logger(fw_device), @@ -372,7 +372,7 @@ SCI_REMOTE_DEVICE_HANDLE_T scif_remote_d fw_device )); - return SCI_INVALID_HANDLE; + return fw_device->core_object; } // --------------------------------------------------------------------------- Modified: stable/7/sys/dev/isci/scil/scif_sas_remote_device_ready_substates.c ============================================================================== --- head/sys/dev/isci/scil/scif_sas_remote_device_ready_substates.c Tue Jan 31 19:38:18 2012 (r230843) +++ stable/7/sys/dev/isci/scil/scif_sas_remote_device_ready_substates.c Fri Feb 17 06:58:40 2012 (r231861) @@ -255,7 +255,7 @@ void scif_sas_remote_device_ready_ncq_er } } - status = scif_controller_start_task( + scif_controller_start_task( fw_controller, fw_device, fw_request, Modified: stable/7/sys/dev/isci/scil/scif_sas_smp_io_request.c ============================================================================== --- head/sys/dev/isci/scil/scif_sas_smp_io_request.c Tue Jan 31 19:38:18 2012 (r230843) +++ stable/7/sys/dev/isci/scil/scif_sas_smp_io_request.c Fri Feb 17 06:58:40 2012 (r231861) @@ -580,7 +580,7 @@ SCI_STATUS scif_sas_smp_external_request default: //unsupported case, TBD - break; + return SCI_FAILURE; } //end of switch //set the retry count to new built smp request. Modified: stable/7/sys/dev/isci/scil/scif_sas_smp_remote_device.c ============================================================================== --- head/sys/dev/isci/scil/scif_sas_smp_remote_device.c Tue Jan 31 19:38:18 2012 (r230843) +++ stable/7/sys/dev/isci/scil/scif_sas_smp_remote_device.c Fri Feb 17 06:58:40 2012 (r231861) @@ -748,7 +748,6 @@ SCI_STATUS scif_sas_smp_remote_device_de { SCIF_SAS_DOMAIN_T * fw_domain; SCI_SAS_ADDRESS_T attached_device_address; - SCIF_SAS_REMOTE_DEVICE_T * attached_remote_device; SMP_RESPONSE_DISCOVER_T * discover_response = &smp_response->response.discover; @@ -782,13 +781,11 @@ SCI_STATUS scif_sas_smp_remote_device_de fw_domain = fw_device->domain; attached_device_address = discover_response->attached_sas_address; - attached_remote_device = (SCIF_SAS_REMOTE_DEVICE_T *) - scif_domain_get_device_by_sas_address( - fw_domain, &attached_device_address - ); - // the device should have already existed in the domian. - ASSERT (attached_remote_device != SCI_INVALID_HANDLE); + ASSERT(scif_domain_get_device_by_sas_address( + fw_domain, + &attached_device_address + ) != SCI_INVALID_HANDLE); return SCI_SUCCESS; } else @@ -1774,6 +1771,8 @@ SCIF_SAS_SMP_PHY_T * scif_sas_smp_remote SCI_FAST_LIST_ELEMENT_T * element = smp_remote_device->smp_phy_list.list_head; SCIF_SAS_SMP_PHY_T * curr_smp_phy = NULL; + ASSERT(phy_identifier < smp_remote_device->smp_phy_list.number_of_phys); + while (element != NULL) { curr_smp_phy = (SCIF_SAS_SMP_PHY_T*) sci_fast_list_get_object(element); @@ -1854,7 +1853,7 @@ void scif_sas_smp_remote_device_terminat )); scif_sas_smp_remote_device_decode_smp_response( - fw_device, fw_request, NULL, SCI_FAILURE_RETRY_REQUIRED + fw_device, fw_request, NULL, SCI_IO_FAILURE_RETRY_REQUIRED ); } @@ -1934,11 +1933,8 @@ SCI_STATUS scif_sas_smp_remote_device_sa scif_domain_get_device_by_sas_address( fw_device->domain, &discover_response->attached_sas_address); - if (smp_phy != NULL) - { - scif_sas_smp_phy_save_information( - smp_phy, attached_device, discover_response); - } + scif_sas_smp_phy_save_information( + smp_phy, attached_device, discover_response); //handle the special case of smp phys between expanders. if ( discover_response->protocols.u.bits.attached_smp_target ) @@ -2372,11 +2368,7 @@ void scif_sas_smp_remote_device_clean_ro SCIF_SAS_REMOTE_DEVICE_T * fw_device ) { - SCIF_SAS_SMP_PHY_T * smp_phy_being_config = - scif_sas_smp_remote_device_find_smp_phy_by_id( - fw_device->protocol_device.smp_device.current_activity_phy_index, - &(fw_device->protocol_device.smp_device) - ); + SCIF_SAS_SMP_PHY_T * smp_phy_being_config; SCIF_LOG_TRACE(( sci_base_object_get_logger(fw_device), Modified: stable/7/sys/dev/isci/scil/scif_sas_stp_io_request.c ============================================================================== --- head/sys/dev/isci/scil/scif_sas_stp_io_request.c Tue Jan 31 19:38:18 2012 (r230843) +++ stable/7/sys/dev/isci/scil/scif_sas_stp_io_request.c Fri Feb 17 06:58:40 2012 (r231861) @@ -396,7 +396,7 @@ SCI_STATUS scif_sas_stp_io_request_const fw_io->parent.protocol_complete_handler = scif_sas_stp_core_cb_io_request_complete_handler; // Done with translation - sci_status = SATI_SUCCESS; + sci_status = SCI_SUCCESS; } else if (sati_status == SATI_COMPLETE) sci_status = SCI_SUCCESS_IO_COMPLETE_BEFORE_START; Modified: stable/7/sys/dev/isci/scil/scif_sas_stp_task_request.c ============================================================================== --- head/sys/dev/isci/scil/scif_sas_stp_task_request.c Tue Jan 31 19:38:18 2012 (r230843) +++ stable/7/sys/dev/isci/scil/scif_sas_stp_task_request.c Fri Feb 17 06:58:40 2012 (r231861) @@ -254,7 +254,7 @@ void scif_sas_stp_task_request_abort_tas fw_domain->controller, fw_device, pending_request, - SCI_FAILURE_IO_TERMINATED + SCI_IO_FAILURE_TERMINATED ); } //otherwise, the abort succeeded. Since the waiting flag is cleared, Modified: stable/7/sys/i386/conf/GENERIC ============================================================================== --- stable/7/sys/i386/conf/GENERIC Fri Feb 17 06:47:16 2012 (r231860) +++ stable/7/sys/i386/conf/GENERIC Fri Feb 17 06:58:40 2012 (r231861) @@ -117,6 +117,7 @@ device bt # Buslogic/Mylex MultiMaster device ncv # NCR 53C500 device nsp # Workbit Ninja SCSI-3 device stg # TMC 18C30/18C50 +device isci # Intel C600 SAS controller # SCSI peripherals device scbus # SCSI bus (required for SCSI) Modified: stable/7/sys/i386/conf/NOTES ============================================================================== --- stable/7/sys/i386/conf/NOTES Fri Feb 17 06:47:16 2012 (r231860) +++ stable/7/sys/i386/conf/NOTES Fri Feb 17 06:58:40 2012 (r231861) @@ -746,6 +746,11 @@ device hptiop device ips # +# Intel C600 (Patsburg) integrated SAS controller +device isci +options ISCI_LOGGING # enable debugging in isci HAL + +# # SafeNet crypto driver: can be moved to the MI NOTES as soon as # it's tested on a big-endian machine # Modified: stable/7/sys/modules/Makefile ============================================================================== --- stable/7/sys/modules/Makefile Fri Feb 17 06:47:16 2012 (r231860) +++ stable/7/sys/modules/Makefile Fri Feb 17 06:58:40 2012 (r231861) @@ -142,6 +142,7 @@ SUBDIR= ${_3dfx} \ ${_ips} \ ${_ipw} \ ${_ipwfw} \ + ${_isci} \ iscsi \ isp \ ispfw \ @@ -497,6 +498,7 @@ _ipmi= ipmi _ips= ips _ipw= ipw _ipwfw= ipwfw +_isci= isci _iwi= iwi _iwifw= iwifw _ixgb= ixgb @@ -565,6 +567,7 @@ _ipmi= ipmi _ips= ips _ipw= ipw _ipwfw= ipwfw +_isci= isci _iwi= iwi _iwifw= iwifw _ixgb= ixgb Modified: stable/7/sys/modules/isci/Makefile ============================================================================== --- head/sys/modules/isci/Makefile Tue Jan 31 19:38:18 2012 (r230843) +++ stable/7/sys/modules/isci/Makefile Fri Feb 17 06:58:40 2012 (r231861) @@ -87,6 +87,4 @@ SRCS += \ SRCS += opt_scsi.h opt_cam.h opt_isci.h SRCS += device_if.h bus_if.h pci_if.h -CC = gcc - .include