From owner-svn-src-stable-8@FreeBSD.ORG Sun Jul 29 18:52:19 2012 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6AE001065788; Sun, 29 Jul 2012 18:52:19 +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 54D848FC0C; Sun, 29 Jul 2012 18:52:19 +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 q6TIqJNM086629; Sun, 29 Jul 2012 18:52:19 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6TIqJ3Q086627; Sun, 29 Jul 2012 18:52:19 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201207291852.q6TIqJ3Q086627@svn.freebsd.org> From: Glen Barber Date: Sun, 29 Jul 2012 18:52:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r238891 - stable/8/share/man/man5 X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jul 2012 18:52:19 -0000 Author: gjb (doc,ports committer) Date: Sun Jul 29 18:52:18 2012 New Revision: 238891 URL: http://svn.freebsd.org/changeset/base/238891 Log: MFC r238707: Document the following in rc.conf.5: - rtsold_enable - rtsold_flags - rtsol_flags Modified: stable/8/share/man/man5/rc.conf.5 Directory Properties: stable/8/share/man/man5/ (props changed) Modified: stable/8/share/man/man5/rc.conf.5 ============================================================================== --- stable/8/share/man/man5/rc.conf.5 Sun Jul 29 18:52:01 2012 (r238890) +++ stable/8/share/man/man5/rc.conf.5 Sun Jul 29 18:52:18 2012 (r238891) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 11, 2012 +.Dd July 22, 2012 .Dt RC.CONF 5 .Os .Sh NAME @@ -2622,6 +2622,34 @@ If set to .Dq Li YES this enables IPv4 mapped IPv6 address communication (like .Li ::ffff:a.b.c.d ) . +.It Va rtsold_enable +.Pq Vt bool +Set to +.Dq Li YES +to enable the +.Xr rtsold 8 +daemon to send ICMPv6 Router Solicitation messages. +.It Va rtsold_flags +.Pq Vt str +If +.Va rtsold_enable +is set to +.Dq Li YES , +these are the flags to pass to +.Xr rtsold 8 . +.It Va rtsol_flags +.Pq Vt str +For interfaces configured with the +.Dq Li inet6 accept_rtadv +keyword, these are the flags to pass to +.Xr rtsol 8 . +.Pp +Note that +.Va rtsold_enable +is mutually exclusive to +.Va rtsol_flags ; +.Va rtsold_enable +takes precedence. .It Va atm_enable .Pq Vt bool Set to From owner-svn-src-stable-8@FreeBSD.ORG Mon Jul 30 11:29:06 2012 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 49D0D1065672; Mon, 30 Jul 2012 11:29:06 +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 2A5808FC0C; Mon, 30 Jul 2012 11:29:06 +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 q6UBT6fN087724; Mon, 30 Jul 2012 11:29:06 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6UBT5H9087721; Mon, 30 Jul 2012 11:29:05 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201207301129.q6UBT5H9087721@svn.freebsd.org> From: Marius Strobl Date: Mon, 30 Jul 2012 11:29:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r238905 - in stable/8: . sys/boot/sparc64/loader X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jul 2012 11:29:06 -0000 Author: marius Date: Mon Jul 30 11:29:05 2012 New Revision: 238905 URL: http://svn.freebsd.org/changeset/base/238905 Log: Pull the tier-2 card and change the sparc64 ZFS loader to no longer probe all diskN aliases for providers (which more or less corresponds to how the x86 version behaves) but instead probe only those listed in the boot-device OFW environment variable. This has the following advantages: - avoids otherwise unavoidable OFW warnings about failures to open disks for which aliases exist but no actual hardware is connected - avoids issues due to different diskN naming schemes - aligns us with Solaris Modified: stable/8/UPDATING (contents, props changed) stable/8/sys/boot/sparc64/loader/main.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/boot/ (props changed) stable/8/sys/cddl/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/ (props changed) stable/8/sys/dev/e1000/ (props changed) stable/8/sys/dev/sound/ (props changed) stable/8/sys/dev/sound/pci/ (props changed) Modified: stable/8/UPDATING ============================================================================== --- stable/8/UPDATING Mon Jul 30 11:11:05 2012 (r238904) +++ stable/8/UPDATING Mon Jul 30 11:29:05 2012 (r238905) @@ -15,6 +15,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. debugging tools present in HEAD were left in place because sun4v support still needs work to become production ready. +20120727: + The sparc64 ZFS loader has been changed to no longer try to auto- + detect ZFS providers based on diskN aliases but now requires these + to be explicitly listed in the OFW boot-device environment variable. + 20120411: 8.3-RELEASE. Modified: stable/8/sys/boot/sparc64/loader/main.c ============================================================================== --- stable/8/sys/boot/sparc64/loader/main.c Mon Jul 30 11:11:05 2012 (r238904) +++ stable/8/sys/boot/sparc64/loader/main.c Mon Jul 30 11:29:05 2012 (r238905) @@ -7,7 +7,7 @@ * unchanged, you can do what ever you want with this file. */ /*- - * Copyright (c) 2008 Marius Strobl + * Copyright (c) 2008 - 2012 Marius Strobl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -75,8 +75,6 @@ __FBSDID("$FreeBSD$"); #include "libofw.h" #include "dev_net.h" -#define MAXDEV 31 - extern char bootprog_name[], bootprog_rev[], bootprog_date[], bootprog_maker[]; enum { @@ -842,18 +840,52 @@ sparc64_zfs_probe(void) { struct vtoc8 vtoc; struct zfs_devdesc zfs_currdev; - char devname[32]; + char alias[64], devname[sizeof(alias) + sizeof(":x") - 1]; + char type[sizeof("device_type")]; + char *bdev, *dev, *odev; uint64_t guid; - int fd, part, unit; + int fd, len, part; + phandle_t aliases, options; /* Get the GUID of the ZFS pool on the boot device. */ guid = 0; zfs_probe_dev(bootpath, &guid); - for (unit = 0; unit < MAXDEV; unit++) { + /* + * Get the GUIDs of the ZFS pools on any additional disks listed in + * the boot-device environment variable. + */ + if ((aliases = OF_finddevice("/aliases")) == -1) + goto out; + options = OF_finddevice("/options"); + len = OF_getproplen(options, "boot-device"); + if (len <= 0) + goto out; + bdev = odev = malloc(len + 1); + if (bdev == NULL) + goto out; + if (OF_getprop(options, "boot-device", bdev, len) <= 0) + goto out; + bdev[len] = '\0'; + while ((dev = strsep(&bdev, " ")) != NULL) { + if (*dev == '\0') + continue; + strcpy(alias, dev); + (void)OF_getprop(aliases, dev, alias, sizeof(alias)); + /* + * Don't probe the boot disk twice. Note that bootpath + * includes the partition specifier. + */ + if (strncmp(alias, bootpath, strlen(alias)) == 0) + continue; + if (OF_getprop(OF_finddevice(alias), "device_type", type, + sizeof(type)) == -1) + continue; + if (strcmp(type, "block") != 0) + continue; + /* Find freebsd-zfs slices in the VTOC. */ - sprintf(devname, "disk%d:", unit); - fd = open(devname, O_RDONLY); + fd = open(alias, O_RDONLY); if (fd == -1) continue; lseek(fd, 0, SEEK_SET); @@ -867,12 +899,14 @@ sparc64_zfs_probe(void) if (part == 2 || vtoc.part[part].tag != VTOC_TAG_FREEBSD_ZFS) continue; - sprintf(devname, "disk%d:%c", unit, part + 'a'); + (void)sprintf(devname, "%s:%c", alias, part + 'a'); if (zfs_probe_dev(devname, NULL) == ENXIO) break; } } + free(odev); + out: if (guid != 0) { zfs_currdev.pool_guid = guid; zfs_currdev.root_guid = 0; From owner-svn-src-stable-8@FreeBSD.ORG Mon Jul 30 18:04:41 2012 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D81501065674; Mon, 30 Jul 2012 18:04:41 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from bigwig.baldwin.cx (bigknife-pt.tunnel.tserv9.chi1.ipv6.he.net [IPv6:2001:470:1f10:75::2]) by mx1.freebsd.org (Postfix) with ESMTP id 87F9D8FC1A; Mon, 30 Jul 2012 18:04:41 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id DA3B3B984; Mon, 30 Jul 2012 14:04:40 -0400 (EDT) From: John Baldwin To: Max Khon Date: Mon, 30 Jul 2012 11:32:34 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p17; KDE/4.5.5; amd64; ; ) References: <201207251742.q6PHgvDj083177@svn.freebsd.org> In-Reply-To: <201207251742.q6PHgvDj083177@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201207301132.34524.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Mon, 30 Jul 2012 14:04:40 -0400 (EDT) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org Subject: Re: svn commit: r238775 - stable/8/sys/dev/puc X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jul 2012 18:04:42 -0000 On Wednesday, July 25, 2012 1:42:57 pm Max Khon wrote: > Author: fjoe > Date: Wed Jul 25 17:42:57 2012 > New Revision: 238775 > URL: http://svn.freebsd.org/changeset/base/238775 > > Log: > MFC: r227457, r237350, r237357 > > Add support for the following Moxa PCIe multiport serial boards: > - CP102E > - CP102EL > - CP104EL-A > - CP104JU > - CP114EL > - CP118EL-A > - CP168EL-A You ignored the comments from Marcel when you committed this to HEAD it seems. You need to revert d_ofs back to a int8_t and add a config_function for these adapters instead that use an offset of 0x200. -- John Baldwin From owner-svn-src-stable-8@FreeBSD.ORG Tue Jul 31 05:39:08 2012 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C2DC51065675 for ; Tue, 31 Jul 2012 05:39:08 +0000 (UTC) (envelope-from fjoe@samodelkin.net) Received: from mail-ob0-f182.google.com (mail-ob0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id 1E2868FC15 for ; Tue, 31 Jul 2012 05:39:08 +0000 (UTC) Received: by obbun3 with SMTP id un3so12970596obb.13 for ; Mon, 30 Jul 2012 22:39:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:sender:x-originating-ip:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :x-gm-message-state; bh=M00B8Um8C+YCZM5RXHYFkwIhAW5uVVQ9xwsIvcGJa3M=; b=n1jPtxikq0t1mrbYmYFGJs4XHRsiK3Nbowvs0eQqC+TS2dtd1i46sc3WAHOrfVOde9 zkoKQ+oDe5nD88bPeGaHwWjqLow/N286Mquh7asaocGN9Bn4n3ejDZ5v4ICslyZIBKqX mTS0ilGrvFVKp3rmSCuYKo7UypLmmRBUd+DPPGT+DIdQO2qtFCxxCCBi0IOx9Htv9lkz Zvwrf7uyhUoG3Oj54vMtxbac+n9LnQjMufwPzy79GjrlhUXg/vOUoQIxJ/8QZ/8S/APZ tuy+xiTcmyUAfLuIqD+YE9aKKo5SenrKTy8s96nuQyWf40IfmfWzUT2FSi4NIBwJcymW fS4A== MIME-Version: 1.0 Received: by 10.182.14.36 with SMTP id m4mr21273754obc.71.1343713147693; Mon, 30 Jul 2012 22:39:07 -0700 (PDT) Sender: fjoe@samodelkin.net Received: by 10.182.240.49 with HTTP; Mon, 30 Jul 2012 22:39:07 -0700 (PDT) X-Originating-IP: [93.92.220.179] In-Reply-To: <201207301132.34524.jhb@freebsd.org> References: <201207251742.q6PHgvDj083177@svn.freebsd.org> <201207301132.34524.jhb@freebsd.org> Date: Tue, 31 Jul 2012 12:39:07 +0700 X-Google-Sender-Auth: xRh4sdD3vzeKIMoexCFKE_0ZXoM Message-ID: From: Max Khon To: John Baldwin Content-Type: text/plain; charset=UTF-8 X-Gm-Message-State: ALoCoQkxuIawGsTcZJV0l1gpc4zb1xV511MbIab7eCxRbCwbUS79eoavjrcnXQiQL6d3YiJ/iAKL Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org Subject: Re: svn commit: r238775 - stable/8/sys/dev/puc X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jul 2012 05:39:08 -0000 John, On Mon, Jul 30, 2012 at 10:32 PM, John Baldwin wrote: > On Wednesday, July 25, 2012 1:42:57 pm Max Khon wrote: >> Author: fjoe >> Date: Wed Jul 25 17:42:57 2012 >> New Revision: 238775 >> URL: http://svn.freebsd.org/changeset/base/238775 >> >> Log: >> MFC: r227457, r237350, r237357 >> >> Add support for the following Moxa PCIe multiport serial boards: >> - CP102E >> - CP102EL >> - CP104EL-A >> - CP104JU >> - CP114EL >> - CP118EL-A >> - CP168EL-A > > You ignored the comments from Marcel when you committed this to HEAD it seems. > You need to revert d_ofs back to a int8_t and add a config_function for these > adapters instead that use an offset of 0x200. Well, I did not ignore comments from Marcel - his e-mail got lost in my inbox. Sorry about that. I was notified about the issue off the list several days ago and fixed it today. Max From owner-svn-src-stable-8@FreeBSD.ORG Fri Aug 3 11:22:09 2012 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E3E5B106568C; Fri, 3 Aug 2012 11:22:09 +0000 (UTC) (envelope-from fjoe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B4CB88FC1E; Fri, 3 Aug 2012 11:22:09 +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 q73BM9m7014116; Fri, 3 Aug 2012 11:22:09 GMT (envelope-from fjoe@svn.freebsd.org) Received: (from fjoe@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q73BM911014113; Fri, 3 Aug 2012 11:22:09 GMT (envelope-from fjoe@svn.freebsd.org) Message-Id: <201208031122.q73BM911014113@svn.freebsd.org> From: Max Khon Date: Fri, 3 Aug 2012 11:22:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r239006 - stable/8/sys/dev/puc X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Aug 2012 11:22:10 -0000 Author: fjoe Date: Fri Aug 3 11:22:09 2012 New Revision: 239006 URL: http://svn.freebsd.org/changeset/base/239006 Log: MFC: r238933 - Change back "d_ofs" to int8_t to not pessimize padding and size of "struct puc_cfg" - Use "puc_config_moxa" for Moxa boards that need d_ofs greater than 0x7f Modified: stable/8/sys/dev/puc/puc_cfg.h stable/8/sys/dev/puc/pucdata.c Directory Properties: stable/8/ (props changed) stable/8/sys/ (props changed) stable/8/sys/dev/ (props changed) Modified: stable/8/sys/dev/puc/puc_cfg.h ============================================================================== --- stable/8/sys/dev/puc/puc_cfg.h Fri Aug 3 09:08:20 2012 (r239005) +++ stable/8/sys/dev/puc/puc_cfg.h Fri Aug 3 11:22:09 2012 (r239006) @@ -79,7 +79,7 @@ struct puc_cfg { int8_t ports; int8_t rid; /* Rid of first port */ int8_t d_rid; /* Delta rid of next ports */ - int16_t d_ofs; /* Delta offset of next ports */ + int8_t d_ofs; /* Delta offset of next ports */ puc_config_f *config_function; }; Modified: stable/8/sys/dev/puc/pucdata.c ============================================================================== --- stable/8/sys/dev/puc/pucdata.c Fri Aug 3 09:08:20 2012 (r239005) +++ stable/8/sys/dev/puc/pucdata.c Fri Aug 3 11:22:09 2012 (r239006) @@ -510,13 +510,15 @@ const struct puc_cfg puc_pci_devices[] = { 0x1393, 0x1024, 0xffff, 0, "Moxa Technologies, Smartio CP-102E/PCIe", DEFAULT_RCLK * 8, - PUC_PORT_2S, 0x14, 0, 0x200 + PUC_PORT_2S, 0x14, 0, -1, + .config_function = puc_config_moxa }, { 0x1393, 0x1025, 0xffff, 0, "Moxa Technologies, Smartio CP-102EL/PCIe", DEFAULT_RCLK * 8, - PUC_PORT_2S, 0x14, 0, 0x200, + PUC_PORT_2S, 0x14, 0, -1, + .config_function = puc_config_moxa }, { 0x1393, 0x1040, 0xffff, 0, @@ -572,7 +574,8 @@ const struct puc_cfg puc_pci_devices[] = { 0x1393, 0x1182, 0xffff, 0, "Moxa Technologies, Smartio CP-118EL-A/PCIe", DEFAULT_RCLK * 8, - PUC_PORT_8S, 0x14, 0, 0x200, + PUC_PORT_8S, 0x14, 0, -1, + .config_function = puc_config_moxa }, { 0x1393, 0x1680, 0xffff, 0, @@ -596,7 +599,8 @@ const struct puc_cfg puc_pci_devices[] = { 0x1393, 0x1683, 0xffff, 0, "Moxa Technologies, Smartio CP-168EL-A/PCIe", DEFAULT_RCLK * 8, - PUC_PORT_8S, 0x14, 0, 0x200, + PUC_PORT_8S, 0x14, 0, -1, + .config_function = puc_config_moxa }, { 0x13a8, 0x0152, 0xffff, 0, @@ -1153,7 +1157,12 @@ puc_config_moxa(struct puc_softc *sc, en intptr_t *res) { if (cmd == PUC_CFG_GET_OFS) { - *res = ((port == 3) ? 7 : port) * 0x200; + const struct puc_cfg *cfg = sc->sc_cfg; + + if (port == 3 && (cfg->device == 0x1045 || cfg->device == 0x1144)) + port = 7; + *res = port * 0x200; + return 0; } return (ENXIO);