From owner-svn-src-projects@FreeBSD.ORG Sun Nov 8 07:26:02 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id CA5B9106566C;
Sun, 8 Nov 2009 07:26:02 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id B97758FC08;
Sun, 8 Nov 2009 07:26:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA87Q2HD077341;
Sun, 8 Nov 2009 07:26:02 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA87Q2LJ077337;
Sun, 8 Nov 2009 07:26:02 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <200911080726.nA87Q2LJ077337@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Sun, 8 Nov 2009 07:26:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199038 - projects/mips/sys/mips/atheros
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Nov 2009 07:26:03 -0000
Author: gonzo
Date: Sun Nov 8 07:26:02 2009
New Revision: 199038
URL: http://svn.freebsd.org/changeset/base/199038
Log:
- Access to all 5 PHYs goes through registers in MAC0 memory
space, rewrite miibus accessors respectively
Modified:
projects/mips/sys/mips/atheros/ar71xxreg.h
projects/mips/sys/mips/atheros/if_arge.c
projects/mips/sys/mips/atheros/if_argevar.h
Modified: projects/mips/sys/mips/atheros/ar71xxreg.h
==============================================================================
--- projects/mips/sys/mips/atheros/ar71xxreg.h Sun Nov 8 02:33:33 2009 (r199037)
+++ projects/mips/sys/mips/atheros/ar71xxreg.h Sun Nov 8 07:26:02 2009 (r199038)
@@ -214,6 +214,10 @@
*/
#define AR71XX_MAC0_BASE 0x19000000
#define AR71XX_MAC1_BASE 0x1A000000
+/*
+ * All 5 PHYs accessible only through MAC0 register space
+ */
+#define AR71XX_MII_BASE 0x19000000
#define AR71XX_MAC_CFG1 0x00
#define MAC_CFG1_SOFT_RESET (1 << 31)
Modified: projects/mips/sys/mips/atheros/if_arge.c
==============================================================================
--- projects/mips/sys/mips/atheros/if_arge.c Sun Nov 8 02:33:33 2009 (r199037)
+++ projects/mips/sys/mips/atheros/if_arge.c Sun Nov 8 07:26:02 2009 (r199038)
@@ -162,6 +162,11 @@ DRIVER_MODULE(miibus, arge, miibus_drive
*/
extern uint32_t ar711_base_mac[ETHER_ADDR_LEN];
+static struct mtx miibus_mtx;
+
+MTX_SYSINIT(miibus_mtx, &miibus_mtx, "arge mii lock", MTX_SPIN);
+
+
/*
* Flushes all
*/
@@ -488,23 +493,27 @@ arge_miibus_readreg(device_t dev, int ph
if (phy != sc->arge_phy_num)
return (0);
- ARGE_WRITE(sc, AR71XX_MAC_MII_CMD, MAC_MII_CMD_WRITE);
- ARGE_WRITE(sc, AR71XX_MAC_MII_ADDR, addr);
- ARGE_WRITE(sc, AR71XX_MAC_MII_CMD, MAC_MII_CMD_READ);
+ mtx_lock(&miibus_mtx);
+ ARGE_MII_WRITE(AR71XX_MAC_MII_CMD, MAC_MII_CMD_WRITE);
+ ARGE_MII_WRITE(AR71XX_MAC_MII_ADDR, addr);
+ ARGE_MII_WRITE(AR71XX_MAC_MII_CMD, MAC_MII_CMD_READ);
i = ARGE_MII_TIMEOUT;
- while ((ARGE_READ(sc, AR71XX_MAC_MII_INDICATOR) &
+ while ((ARGE_MII_READ(AR71XX_MAC_MII_INDICATOR) &
MAC_MII_INDICATOR_BUSY) && (i--))
DELAY(5);
if (i < 0) {
+ mtx_unlock(&miibus_mtx);
dprintf("%s timedout\n", __func__);
/* XXX: return ERRNO istead? */
return (-1);
}
- result = ARGE_READ(sc, AR71XX_MAC_MII_STATUS) & MAC_MII_STATUS_MASK;
- ARGE_WRITE(sc, AR71XX_MAC_MII_CMD, MAC_MII_CMD_WRITE);
+ result = ARGE_MII_READ(AR71XX_MAC_MII_STATUS) & MAC_MII_STATUS_MASK;
+ ARGE_MII_WRITE(AR71XX_MAC_MII_CMD, MAC_MII_CMD_WRITE);
+ mtx_unlock(&miibus_mtx);
+
dprintf("%s: phy=%d, reg=%02x, value[%08x]=%04x\n", __func__,
phy, reg, addr, result);
@@ -519,17 +528,24 @@ arge_miibus_writereg(device_t dev, int p
uint32_t addr =
(phy << MAC_MII_PHY_ADDR_SHIFT) | (reg & MAC_MII_REG_MASK);
+
+ if (phy != sc->arge_phy_num)
+ return (-1);
+
dprintf("%s: phy=%d, reg=%02x, value=%04x\n", __func__,
phy, reg, data);
- ARGE_WRITE(sc, AR71XX_MAC_MII_ADDR, addr);
- ARGE_WRITE(sc, AR71XX_MAC_MII_CONTROL, data);
+ mtx_lock(&miibus_mtx);
+ ARGE_MII_WRITE(AR71XX_MAC_MII_ADDR, addr);
+ ARGE_MII_WRITE(AR71XX_MAC_MII_CONTROL, data);
i = ARGE_MII_TIMEOUT;
- while ((ARGE_READ(sc, AR71XX_MAC_MII_INDICATOR) &
+ while ((ARGE_MII_READ(AR71XX_MAC_MII_INDICATOR) &
MAC_MII_INDICATOR_BUSY) && (i--))
DELAY(5);
+ mtx_unlock(&miibus_mtx);
+
if (i < 0) {
dprintf("%s timedout\n", __func__);
/* XXX: return ERRNO istead? */
Modified: projects/mips/sys/mips/atheros/if_argevar.h
==============================================================================
--- projects/mips/sys/mips/atheros/if_argevar.h Sun Nov 8 02:33:33 2009 (r199037)
+++ projects/mips/sys/mips/atheros/if_argevar.h Sun Nov 8 07:26:02 2009 (r199038)
@@ -64,6 +64,16 @@
#define ARGE_CLEAR_BITS(sc, reg, bits) \
ARGE_WRITE(sc, reg, ARGE_READ(sc, (reg)) & ~(bits))
+/*
+ * MII registers access macros
+ */
+#define ARGE_MII_READ(reg) \
+ *((volatile uint32_t *)MIPS_PHYS_TO_KSEG1((AR71XX_MII_BASE + reg)))
+
+#define ARGE_MII_WRITE(reg, val) \
+ *((volatile uint32_t *)MIPS_PHYS_TO_KSEG1((AR71XX_MII_BASE + reg))) = (val)
+
+
#define ARGE_DESC_EMPTY (1 << 31)
#define ARGE_DESC_MORE (1 << 24)
#define ARGE_DESC_SIZE_MASK ((1 << 12) - 1)
From owner-svn-src-projects@FreeBSD.ORG Sun Nov 8 07:31:43 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 34A23106566B;
Sun, 8 Nov 2009 07:31:43 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 2455F8FC21;
Sun, 8 Nov 2009 07:31:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA87VheK077490;
Sun, 8 Nov 2009 07:31:43 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA87Vhs9077488;
Sun, 8 Nov 2009 07:31:43 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <200911080731.nA87Vhs9077488@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Sun, 8 Nov 2009 07:31:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199039 - projects/mips/sys/mips/conf
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Nov 2009 07:31:43 -0000
Author: gonzo
Date: Sun Nov 8 07:31:42 2009
New Revision: 199039
URL: http://svn.freebsd.org/changeset/base/199039
Log:
- Add arge1 to hints files, only one port is supported so far
Modified:
projects/mips/sys/mips/conf/AR71XX.hints
Modified: projects/mips/sys/mips/conf/AR71XX.hints
==============================================================================
--- projects/mips/sys/mips/conf/AR71XX.hints Sun Nov 8 07:26:02 2009 (r199038)
+++ projects/mips/sys/mips/conf/AR71XX.hints Sun Nov 8 07:31:42 2009 (r199039)
@@ -32,10 +32,13 @@ hint.arge.0.irq=2
# Uncomment this hint for RS (not PRO)
# hint.arge.0.phy=20
-# hint.arge.1.at="nexus0"
-# hint.arge.1.maddr=0x1A000000
-# hint.arge.1.msize=0x1000
-# hint.arge.1.irq=3
+hint.arge.1.at="nexus0"
+hint.arge.1.maddr=0x1a000000
+hint.arge.1.msize=0x1000
+hint.arge.1.irq=3
+hint.arge.1.phy=3
+# Uncomment this hint for RS (not PRO)
+# hint.arge.1.phy=19
# SPI flash
hint.spi.0.at="nexus0"
From owner-svn-src-projects@FreeBSD.ORG Mon Nov 9 16:42:08 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id EFBE91065698;
Mon, 9 Nov 2009 16:42:08 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id DF4D98FC1E;
Mon, 9 Nov 2009 16:42:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA9Gg8La027201;
Mon, 9 Nov 2009 16:42:08 GMT (envelope-from rrs@svn.freebsd.org)
Received: (from rrs@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA9Gg8Ph027199;
Mon, 9 Nov 2009 16:42:08 GMT (envelope-from rrs@svn.freebsd.org)
Message-Id: <200911091642.nA9Gg8Ph027199@svn.freebsd.org>
From: Randall Stewart <rrs@FreeBSD.org>
Date: Mon, 9 Nov 2009 16:42:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199089 - projects/mips/sys/mips/rmi
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Nov 2009 16:42:09 -0000
Author: rrs
Date: Mon Nov 9 16:42:08 2009
New Revision: 199089
URL: http://svn.freebsd.org/changeset/base/199089
Log:
- Comment out recrusive call to setup interrupt.
- Change the way we pass the irq.
Modified:
projects/mips/sys/mips/rmi/iodi.c
Modified: projects/mips/sys/mips/rmi/iodi.c
==============================================================================
--- projects/mips/sys/mips/rmi/iodi.c Mon Nov 9 16:32:48 2009 (r199088)
+++ projects/mips/sys/mips/rmi/iodi.c Mon Nov 9 16:42:08 2009 (r199089)
@@ -124,9 +124,9 @@ iodi_setup_intr(device_t dev, device_t c
} else if (strcmp(device_get_name(child), "rge") == 0) {
int irq;
-
- irq = rman_get_rid(ires);
- if (rmi_spin_mutex_safe)
+ /* This is a hack to pass in the irq */
+ irq = (int)ires->__r_i;
+ if (rmi_spin_mutex_safe)
mtx_lock_spin(&xlr_pic_lock);
reg = xlr_read_reg(mmio, PIC_IRT_1_BASE + irq - PIC_IRQ_BASE);
xlr_write_reg(mmio, PIC_IRT_1_BASE + irq - PIC_IRQ_BASE, reg | (1 << 6) | (1 << 30) | (1 << 31));
@@ -143,9 +143,10 @@ iodi_setup_intr(device_t dev, device_t c
mtx_unlock_spin(&xlr_pic_lock);
cpu_establish_hardintr("ehci", NULL, (driver_intr_t *) intr, (void *)arg, PIC_USB_IRQ, flags, cookiep);
}
+ /* This causes a panic and looks recursive to me (RRS).
BUS_SETUP_INTR(device_get_parent(dev),
child, ires, flags, filt, intr, arg, cookiep);
-
+ */
return (0);
}
From owner-svn-src-projects@FreeBSD.ORG Mon Nov 9 16:43:02 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 64C54106568B;
Mon, 9 Nov 2009 16:43:02 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 497D38FC12;
Mon, 9 Nov 2009 16:43:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA9Gh23t027252;
Mon, 9 Nov 2009 16:43:02 GMT (envelope-from rrs@svn.freebsd.org)
Received: (from rrs@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA9Gh2PN027250;
Mon, 9 Nov 2009 16:43:02 GMT (envelope-from rrs@svn.freebsd.org)
Message-Id: <200911091643.nA9Gh2PN027250@svn.freebsd.org>
From: Randall Stewart <rrs@FreeBSD.org>
Date: Mon, 9 Nov 2009 16:43:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199090 - projects/mips/sys/mips/rmi
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Nov 2009 16:43:02 -0000
Author: rrs
Date: Mon Nov 9 16:43:02 2009
New Revision: 199090
URL: http://svn.freebsd.org/changeset/base/199090
Log:
White space changes.
Modified:
projects/mips/sys/mips/rmi/iodi.c
Modified: projects/mips/sys/mips/rmi/iodi.c
==============================================================================
--- projects/mips/sys/mips/rmi/iodi.c Mon Nov 9 16:42:08 2009 (r199089)
+++ projects/mips/sys/mips/rmi/iodi.c Mon Nov 9 16:43:02 2009 (r199090)
@@ -78,10 +78,10 @@ static struct resource *
iodi_alloc_resource(device_t, device_t, int, int *,
u_long, u_long, u_long, u_int);
-static int
+static int
iodi_activate_resource(device_t, device_t, int, int,
struct resource *);
-static int
+static int
iodi_setup_intr(device_t, device_t, struct resource *, int,
driver_filter_t *, driver_intr_t *, void *, void **);
@@ -112,41 +112,43 @@ iodi_setup_intr(device_t dev, device_t c
/* FIXME is this the right place to fiddle with PIC? */
if (strcmp(device_get_name(child), "uart") == 0) {
/* FIXME uart 1? */
- if (rmi_spin_mutex_safe)
- mtx_lock_spin(&xlr_pic_lock);
+ if (rmi_spin_mutex_safe)
+ mtx_lock_spin(&xlr_pic_lock);
level = PIC_IRQ_IS_EDGE_TRIGGERED(PIC_IRT_UART_0_INDEX);
xlr_write_reg(mmio, PIC_IRT_0_UART_0, 0x01);
xlr_write_reg(mmio, PIC_IRT_1_UART_0, ((1 << 31) | (level << 30) | (1 << 6) | (PIC_UART_0_IRQ)));
- if (rmi_spin_mutex_safe)
- mtx_unlock_spin(&xlr_pic_lock);
+ if (rmi_spin_mutex_safe)
+ mtx_unlock_spin(&xlr_pic_lock);
cpu_establish_hardintr("uart", NULL,
(driver_intr_t *) intr, (void *)arg, PIC_UART_0_IRQ, flags, cookiep);
} else if (strcmp(device_get_name(child), "rge") == 0) {
int irq;
+
/* This is a hack to pass in the irq */
irq = (int)ires->__r_i;
if (rmi_spin_mutex_safe)
- mtx_lock_spin(&xlr_pic_lock);
+ mtx_lock_spin(&xlr_pic_lock);
reg = xlr_read_reg(mmio, PIC_IRT_1_BASE + irq - PIC_IRQ_BASE);
xlr_write_reg(mmio, PIC_IRT_1_BASE + irq - PIC_IRQ_BASE, reg | (1 << 6) | (1 << 30) | (1 << 31));
- if (rmi_spin_mutex_safe)
- mtx_unlock_spin(&xlr_pic_lock);
+ if (rmi_spin_mutex_safe)
+ mtx_unlock_spin(&xlr_pic_lock);
cpu_establish_hardintr("rge", NULL, (driver_intr_t *) intr, (void *)arg, irq, flags, cookiep);
} else if (strcmp(device_get_name(child), "ehci") == 0) {
- if (rmi_spin_mutex_safe)
- mtx_lock_spin(&xlr_pic_lock);
+ if (rmi_spin_mutex_safe)
+ mtx_lock_spin(&xlr_pic_lock);
reg = xlr_read_reg(mmio, PIC_IRT_1_BASE + PIC_USB_IRQ - PIC_IRQ_BASE);
xlr_write_reg(mmio, PIC_IRT_1_BASE + PIC_USB_IRQ - PIC_IRQ_BASE, reg | (1 << 6) | (1 << 30) | (1 << 31));
- if (rmi_spin_mutex_safe)
- mtx_unlock_spin(&xlr_pic_lock);
+ if (rmi_spin_mutex_safe)
+ mtx_unlock_spin(&xlr_pic_lock);
cpu_establish_hardintr("ehci", NULL, (driver_intr_t *) intr, (void *)arg, PIC_USB_IRQ, flags, cookiep);
}
- /* This causes a panic and looks recursive to me (RRS).
- BUS_SETUP_INTR(device_get_parent(dev),
- child, ires, flags, filt, intr, arg, cookiep);
- */
+ /*
+ * This causes a panic and looks recursive to me (RRS).
+ * BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt,
+ * intr, arg, cookiep);
+ */
return (0);
}
From owner-svn-src-projects@FreeBSD.ORG Mon Nov 9 16:43:50 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id EBC451065694;
Mon, 9 Nov 2009 16:43:50 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id DBC1B8FC22;
Mon, 9 Nov 2009 16:43:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA9GhoSs027313;
Mon, 9 Nov 2009 16:43:50 GMT (envelope-from rrs@svn.freebsd.org)
Received: (from rrs@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA9GhoxX027311;
Mon, 9 Nov 2009 16:43:50 GMT (envelope-from rrs@svn.freebsd.org)
Message-Id: <200911091643.nA9GhoxX027311@svn.freebsd.org>
From: Randall Stewart <rrs@FreeBSD.org>
Date: Mon, 9 Nov 2009 16:43:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199091 - projects/mips/sys/dev/rmi/xlr
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Nov 2009 16:43:51 -0000
Author: rrs
Date: Mon Nov 9 16:43:50 2009
New Revision: 199091
URL: http://svn.freebsd.org/changeset/base/199091
Log:
Cooresponding hack to pass in the irq
Modified:
projects/mips/sys/dev/rmi/xlr/rge.c
Modified: projects/mips/sys/dev/rmi/xlr/rge.c
==============================================================================
--- projects/mips/sys/dev/rmi/xlr/rge.c Mon Nov 9 16:43:02 2009 (r199090)
+++ projects/mips/sys/dev/rmi/xlr/rge.c Mon Nov 9 16:43:50 2009 (r199091)
@@ -1925,7 +1925,8 @@ rge_attach(device_t dev)
sc->irq = gmac_conf->baseirq + priv->instance % 4;
/* Set the IRQ into the rid field */
- rman_set_rid(&sc->rge_irq, sc->irq);
+ /* note this is a hack to pass the irq to the iodi interrupt setup routines */
+ sc->rge_irq.__r_i = (struct resource_i *)sc->irq;
ret = bus_setup_intr(dev, &sc->rge_irq, INTR_FAST | INTR_TYPE_NET | INTR_MPSAFE,
NULL, rge_intr, sc, &sc->rge_intrhand);
From owner-svn-src-projects@FreeBSD.ORG Mon Nov 9 19:22:57 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id A8C401065676;
Mon, 9 Nov 2009 19:22:57 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 990898FC16;
Mon, 9 Nov 2009 19:22:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA9JMvv2031460;
Mon, 9 Nov 2009 19:22:57 GMT (envelope-from rrs@svn.freebsd.org)
Received: (from rrs@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA9JMvsV031458;
Mon, 9 Nov 2009 19:22:57 GMT (envelope-from rrs@svn.freebsd.org)
Message-Id: <200911091922.nA9JMvsV031458@svn.freebsd.org>
From: Randall Stewart <rrs@FreeBSD.org>
Date: Mon, 9 Nov 2009 19:22:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199098 - projects/mips/sys/mips/rmi
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Nov 2009 19:22:57 -0000
Author: rrs
Date: Mon Nov 9 19:22:57 2009
New Revision: 199098
URL: http://svn.freebsd.org/changeset/base/199098
Log:
a little more paran's
Modified:
projects/mips/sys/mips/rmi/intr_machdep.c
Modified: projects/mips/sys/mips/rmi/intr_machdep.c
==============================================================================
--- projects/mips/sys/mips/rmi/intr_machdep.c Mon Nov 9 18:56:47 2009 (r199097)
+++ projects/mips/sys/mips/rmi/intr_machdep.c Mon Nov 9 19:22:57 2009 (r199098)
@@ -137,9 +137,10 @@ cpu_intr(struct trapframe *tf)
critical_exit();
return;
}
+
/* FIXME sched pin >? LOCK>? */
for (i = sizeof(eirr) * 8 - 1; i >= 0; i--) {
- if ((eirr & 1ULL << i) == 0)
+ if ((eirr & (1ULL << i)) == 0)
continue;
#ifdef SMP
/* These are reserved interrupts */
From owner-svn-src-projects@FreeBSD.ORG Mon Nov 9 19:25:30 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 79D4A106568B;
Mon, 9 Nov 2009 19:25:30 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 69EAC8FC17;
Mon, 9 Nov 2009 19:25:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA9JPUX0031562;
Mon, 9 Nov 2009 19:25:30 GMT (envelope-from rrs@svn.freebsd.org)
Received: (from rrs@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA9JPUux031559;
Mon, 9 Nov 2009 19:25:30 GMT (envelope-from rrs@svn.freebsd.org)
Message-Id: <200911091925.nA9JPUux031559@svn.freebsd.org>
From: Randall Stewart <rrs@FreeBSD.org>
Date: Mon, 9 Nov 2009 19:25:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199099 - projects/mips/sys/mips/rmi
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Nov 2009 19:25:30 -0000
Author: rrs
Date: Mon Nov 9 19:25:30 2009
New Revision: 199099
URL: http://svn.freebsd.org/changeset/base/199099
Log:
Ok we need to have the clock handlers has filters. This
gets us up to a mount request :-)
Modified:
projects/mips/sys/mips/rmi/clock.c
projects/mips/sys/mips/rmi/clock.h
Modified: projects/mips/sys/mips/rmi/clock.c
==============================================================================
--- projects/mips/sys/mips/rmi/clock.c Mon Nov 9 19:22:57 2009 (r199098)
+++ projects/mips/sys/mips/rmi/clock.c Mon Nov 9 19:25:30 2009 (r199099)
@@ -77,7 +77,7 @@ u_int32_t counter_lower_last = 0;
static int scale_factor;
static int count_scale_factor[32];
-uint64_t
+uint64_t
platform_get_frequency()
{
return XLR_PIC_HZ;
@@ -98,7 +98,7 @@ mips_timer_early_init(uint64_t clock_hz)
* Handle the clock interrupt when count becomes equal to
* compare.
*/
-void
+int
count_compare_clockhandler(struct trapframe *tf)
{
int cpu = PCPU_GET(cpuid);
@@ -126,9 +126,10 @@ count_compare_clockhandler(struct trapfr
}
critical_exit();
+ return (FILTER_HANDLED);
}
-void
+int
pic_hardclockhandler(struct trapframe *tf)
{
int cpu = PCPU_GET(cpuid);
@@ -154,6 +155,7 @@ pic_hardclockhandler(struct trapframe *t
/* If needed , handle count compare tick skew here */
}
critical_exit();
+ return (FILTER_HANDLED);
}
int
@@ -168,9 +170,10 @@ rmi_early_counter_init()
int cpu = PCPU_GET(cpuid);
xlr_reg_t *mmio = xlr_io_mmio(XLR_IO_PIC_OFFSET);
- /* We do this to get the PIC time counter running right
- * after system start. Otherwise the DELAY() function will
- * not be able to work since it won't have a TC to read.
+ /*
+ * We do this to get the PIC time counter running right after system
+ * start. Otherwise the DELAY() function will not be able to work
+ * since it won't have a TC to read.
*/
xlr_write_reg(mmio, PIC_TIMER_6_MAXVAL_0, (0xffffffff & 0xffffffff));
xlr_write_reg(mmio, PIC_TIMER_6_MAXVAL_1, (0xffffffff & 0xffffffff));
@@ -193,16 +196,16 @@ platform_initclocks(void)
*/
/* profiling/process accounting timer interrupt for non-zero cpus */
cpu_establish_hardintr("compare",
+ (driver_filter_t *) count_compare_clockhandler,
NULL,
- (driver_intr_t *) count_compare_clockhandler,
NULL,
IRQ_TIMER,
INTR_TYPE_CLK | INTR_FAST, &cookie);
/* timekeeping timer interrupt for cpu 0 */
cpu_establish_hardintr("hardclk",
+ (driver_filter_t *) pic_hardclockhandler,
NULL,
- (driver_intr_t *) pic_hardclockhandler,
NULL,
PIC_TIMER_7_IRQ,
INTR_TYPE_CLK | INTR_FAST,
@@ -224,7 +227,7 @@ platform_initclocks(void)
/* Setup PIC Interrupt */
if (rmi_spin_mutex_safe)
- mtx_lock_spin(&xlr_pic_lock);
+ mtx_lock_spin(&xlr_pic_lock);
xlr_write_reg(mmio, PIC_TIMER_7_MAXVAL_0, (maxval & 0xffffffff)); /* 0x100 + 7 */
xlr_write_reg(mmio, PIC_TIMER_7_MAXVAL_1, (maxval >> 32) & 0xffffffff); /* 0x110 + 7 */
/* 0x40 + 8 */
@@ -242,7 +245,7 @@ platform_initclocks(void)
xlr_write_reg(mmio, PIC_IRT_1_TIMER_6, (1 << 31) | (0 << 30) | (1 << 6) | (PIC_TIMER_6_IRQ));
pic_update_control(1 << (8 + 6));
if (rmi_spin_mutex_safe)
- mtx_unlock_spin(&xlr_pic_lock);
+ mtx_unlock_spin(&xlr_pic_lock);
} else {
/* Setup count-compare interrupt for vcpu[1-31] */
mips_wr_compare((xlr_boot1_info.cpu_frequency) / hz);
@@ -250,7 +253,7 @@ platform_initclocks(void)
tick_init();
}
-unsigned
+unsigned
__attribute__((no_instrument_function))
platform_get_timecount(struct timecounter *tc __unused)
{
@@ -290,7 +293,7 @@ DELAY(int n)
}
static
-uint64_t
+uint64_t
read_pic_counter(void)
{
xlr_reg_t *mmio = xlr_io_mmio(XLR_IO_PIC_OFFSET);
Modified: projects/mips/sys/mips/rmi/clock.h
==============================================================================
--- projects/mips/sys/mips/rmi/clock.h Mon Nov 9 19:22:57 2009 (r199098)
+++ projects/mips/sys/mips/rmi/clock.h Mon Nov 9 19:25:30 2009 (r199099)
@@ -33,8 +33,9 @@
#define XLR_PIC_HZ 66000000U
#define XLR_CPU_HZ (xlr_boot1_info.cpu_frequency)
-void count_compare_clockhandler(struct trapframe *);
-void pic_hardclockhandler(struct trapframe *);
+int count_compare_clockhandler(struct trapframe *);
+int pic_hardclockhandler(struct trapframe *);
int pic_timecounthandler(struct trapframe *);
void rmi_early_counter_init(void);
+
#endif /* _RMI_CLOCK_H_ */
From owner-svn-src-projects@FreeBSD.ORG Mon Nov 9 19:26:28 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 8BB1B1065698;
Mon, 9 Nov 2009 19:26:28 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 7BFBF8FC29;
Mon, 9 Nov 2009 19:26:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA9JQSB9031626;
Mon, 9 Nov 2009 19:26:28 GMT (envelope-from rrs@svn.freebsd.org)
Received: (from rrs@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA9JQST5031624;
Mon, 9 Nov 2009 19:26:28 GMT (envelope-from rrs@svn.freebsd.org)
Message-Id: <200911091926.nA9JQST5031624@svn.freebsd.org>
From: Randall Stewart <rrs@FreeBSD.org>
Date: Mon, 9 Nov 2009 19:26:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199100 - projects/mips/sys/mips/conf
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Nov 2009 19:26:28 -0000
Author: rrs
Date: Mon Nov 9 19:26:28 2009
New Revision: 199100
URL: http://svn.freebsd.org/changeset/base/199100
Log:
Try moving to NFS mount of entire root
Modified:
projects/mips/sys/mips/conf/XLR
Modified: projects/mips/sys/mips/conf/XLR
==============================================================================
--- projects/mips/sys/mips/conf/XLR Mon Nov 9 19:25:30 2009 (r199099)
+++ projects/mips/sys/mips/conf/XLR Mon Nov 9 19:26:28 2009 (r199100)
@@ -61,7 +61,7 @@ makeoptions DEBUG=-g # Build kernel wit
#profile 2
#options SCHED_ULE # ULE scheduler
-options VERBOSE_SYSINIT
+#options VERBOSE_SYSINIT
options SCHED_4BSD # 4BSD scheduler
#options PREEMPTION # Enable kernel thread preemption
#options FULL_PREEMPTION # Enable kernel thread preemption
@@ -71,8 +71,11 @@ options FFS # Berkeley Fast Filesyste
#options SOFTUPDATES # Enable FFS soft updates support
options UFS_ACL # Support for access control lists
options UFS_DIRHASH # Improve performance on big directories
-options MD_ROOT # MD is a potential root device
-options MD_ROOT_SIZE=14288
+options NFSCLIENT
+options NFS_ROOT
+options ROOTDEVNAME=\"nfs:10.1.1.15:/extra/nfsroot\"
+#options MD_ROOT # MD is a potential root device
+#options MD_ROOT_SIZE=21264
#options MD_ROOT_SIZE=5120
options ROOTDEVNAME=\"ufs:md0\"
options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
From owner-svn-src-projects@FreeBSD.ORG Mon Nov 9 19:56:53 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id A7C3E106566B;
Mon, 9 Nov 2009 19:56:53 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 97E3E8FC16;
Mon, 9 Nov 2009 19:56:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA9JurJD032438;
Mon, 9 Nov 2009 19:56:53 GMT (envelope-from rrs@svn.freebsd.org)
Received: (from rrs@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA9Jurju032437;
Mon, 9 Nov 2009 19:56:53 GMT (envelope-from rrs@svn.freebsd.org)
Message-Id: <200911091956.nA9Jurju032437@svn.freebsd.org>
From: Randall Stewart <rrs@FreeBSD.org>
Date: Mon, 9 Nov 2009 19:56:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199103 - projects/mips/sys/mips/conf
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Nov 2009 19:56:53 -0000
Author: rrs
Date: Mon Nov 9 19:56:53 2009
New Revision: 199103
URL: http://svn.freebsd.org/changeset/base/199103
Log:
Ok it helps if you add the bootp options too
so that you can get an address ;-)
Modified:
projects/mips/sys/mips/conf/XLR
Modified: projects/mips/sys/mips/conf/XLR
==============================================================================
--- projects/mips/sys/mips/conf/XLR Mon Nov 9 19:53:34 2009 (r199102)
+++ projects/mips/sys/mips/conf/XLR Mon Nov 9 19:56:53 2009 (r199103)
@@ -74,10 +74,16 @@ options UFS_DIRHASH # Improve performa
options NFSCLIENT
options NFS_ROOT
options ROOTDEVNAME=\"nfs:10.1.1.15:/extra/nfsroot\"
+options BOOTP
+options BOOTP_NFSROOT
+options BOOTP_NFSV3
+options BOOTP_WIRED_TO=rge0
+options BOOTP_COMPAT
+#
#options MD_ROOT # MD is a potential root device
#options MD_ROOT_SIZE=21264
#options MD_ROOT_SIZE=5120
-options ROOTDEVNAME=\"ufs:md0\"
+#options ROOTDEVNAME=\"ufs:md0\"
options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
options HZ=1000
options PHYS_ADDR_64BIT
From owner-svn-src-projects@FreeBSD.ORG Mon Nov 9 21:31:50 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id D6C771065696;
Mon, 9 Nov 2009 21:31:50 +0000 (UTC)
(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 6F0878FC18;
Mon, 9 Nov 2009 21:31:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA9LVoZX035122;
Mon, 9 Nov 2009 21:31:50 GMT (envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA9LVohT035120;
Mon, 9 Nov 2009 21:31:50 GMT (envelope-from rdivacky@svn.freebsd.org)
Message-Id: <200911092131.nA9LVohT035120@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Mon, 9 Nov 2009 21:31:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199111 -
projects/clangbsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Nov 2009 21:31:50 -0000
Author: rdivacky
Date: Mon Nov 9 21:31:50 2009
New Revision: 199111
URL: http://svn.freebsd.org/changeset/base/199111
Log:
Revert back to what HEAD provides. Clang can compile it just fine.
Modified:
projects/clangbsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
Modified: projects/clangbsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
==============================================================================
--- projects/clangbsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c Mon Nov 9 21:30:45 2009 (r199110)
+++ projects/clangbsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c Mon Nov 9 21:31:50 2009 (r199111)
@@ -1232,6 +1232,7 @@ dbuf_undirty(dmu_buf_impl_t *db, dmu_tx_
return (0);
}
+#pragma weak dmu_buf_will_dirty = dbuf_will_dirty
void
dbuf_will_dirty(dmu_buf_impl_t *db, dmu_tx_t *tx)
{
@@ -1245,7 +1246,6 @@ dbuf_will_dirty(dmu_buf_impl_t *db, dmu_
(void) dbuf_read(db, NULL, rf);
(void) dbuf_dirty(db, tx);
}
-__weak_reference(dbuf_will_dirty, dmu_buf_will_dirty);
void
dmu_buf_will_fill(dmu_buf_t *db_fake, dmu_tx_t *tx)
@@ -1264,6 +1264,7 @@ dmu_buf_will_fill(dmu_buf_t *db_fake, dm
(void) dbuf_dirty(db, tx);
}
+#pragma weak dmu_buf_fill_done = dbuf_fill_done
/* ARGSUSED */
void
dbuf_fill_done(dmu_buf_impl_t *db, dmu_tx_t *tx)
@@ -1284,7 +1285,6 @@ dbuf_fill_done(dmu_buf_impl_t *db, dmu_t
}
mutex_exit(&db->db_mtx);
}
-__weak_reference(dbuf_fill_done, dmu_buf_fill_done);
/*
* "Clear" the contents of this dbuf. This will mark the dbuf
@@ -1707,14 +1707,15 @@ dbuf_create_bonus(dnode_t *dn)
dn->dn_bonus = dbuf_create(dn, 0, DB_BONUS_BLKID, dn->dn_dbuf, NULL);
}
+#pragma weak dmu_buf_add_ref = dbuf_add_ref
void
dbuf_add_ref(dmu_buf_impl_t *db, void *tag)
{
int64_t holds = refcount_add(&db->db_holds, tag);
ASSERT(holds > 1);
}
-__weak_reference(dbuf_add_ref, dmu_buf_add_ref);
+#pragma weak dmu_buf_rele = dbuf_rele
void
dbuf_rele(dmu_buf_impl_t *db, void *tag)
{
@@ -1767,14 +1768,13 @@ dbuf_rele(dmu_buf_impl_t *db, void *tag)
mutex_exit(&db->db_mtx);
}
}
-__weak_reference(dbuf_rele, dmu_buf_rele);
+#pragma weak dmu_buf_refcount = dbuf_refcount
uint64_t
dbuf_refcount(dmu_buf_impl_t *db)
{
return (refcount_count(&db->db_holds));
}
-__weak_reference(dbuf_refcount, dmu_buf_refcount);
void *
dmu_buf_set_user(dmu_buf_t *db_fake, void *user_ptr, void *user_data_ptr_ptr,
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 10 13:35:36 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 4CB841065676;
Tue, 10 Nov 2009 13:35:36 +0000 (UTC)
(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 3BAF88FC1B;
Tue, 10 Nov 2009 13:35:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAADZYWg060675;
Tue, 10 Nov 2009 13:35:34 GMT
(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAADZYj6060673;
Tue, 10 Nov 2009 13:35:34 GMT
(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <200911101335.nAADZYj6060673@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Tue, 10 Nov 2009 13:35:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199138 -
projects/clangbsd/cddl/contrib/opensolaris/lib/libzfs/common
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Nov 2009 13:35:36 -0000
Author: rdivacky
Date: Tue Nov 10 13:35:34 2009
New Revision: 199138
URL: http://svn.freebsd.org/changeset/base/199138
Log:
Revert to HEAD state, clang can compile this.
Modified:
projects/clangbsd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
Modified: projects/clangbsd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
==============================================================================
--- projects/clangbsd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c Tue Nov 10 11:50:37 2009 (r199137)
+++ projects/clangbsd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c Tue Nov 10 13:35:34 2009 (r199138)
@@ -1176,6 +1176,7 @@ dataset_cmp(const void *a, const void *b
* we have the list of all filesystems, we iterate over them in order and mount
* and/or share each one.
*/
+#pragma weak zpool_mount_datasets = zpool_enable_datasets
int
zpool_enable_datasets(zpool_handle_t *zhp, const char *mntopts, int flags)
{
@@ -1279,6 +1280,7 @@ mountpoint_compare(const void *a, const
* arbitrarily (on I/O error, for example). Instead, we walk /etc/mnttab and
* gather all the filesystems that are currently mounted.
*/
+#pragma weak zpool_unmount_datasets = zpool_disable_datasets
int
zpool_disable_datasets(zpool_handle_t *zhp, boolean_t force)
{
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 10 13:41:01 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 52AEB106566B;
Tue, 10 Nov 2009 13:41:01 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 420AC8FC24;
Tue, 10 Nov 2009 13:41:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAADf17m060818;
Tue, 10 Nov 2009 13:41:01 GMT (envelope-from rrs@svn.freebsd.org)
Received: (from rrs@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAADf1O2060816;
Tue, 10 Nov 2009 13:41:01 GMT (envelope-from rrs@svn.freebsd.org)
Message-Id: <200911101341.nAADf1O2060816@svn.freebsd.org>
From: Randall Stewart <rrs@FreeBSD.org>
Date: Tue, 10 Nov 2009 13:41:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199139 - projects/mips/sys/dev/rmi/xlr
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Nov 2009 13:41:01 -0000
Author: rrs
Date: Tue Nov 10 13:41:00 2009
New Revision: 199139
URL: http://svn.freebsd.org/changeset/base/199139
Log:
Ok, the 40bit reads were causing crashes
when they did their thing i.e. enabling SX mode
and then trying to load in. Since we are o32 this
is all un-needed. So I have re-structured the code
to work without doing this special set of code.
Packets now flow in and out.. however for some
reason dhcp/bootp response comes in and the kernel
does not proceed. Not sure if we have a UDP checksum error
or ?? The packets look all there by comparing wireshark
and the first 64 bytes of the TX and RX packets.
Modified:
projects/mips/sys/dev/rmi/xlr/rge.c
Modified: projects/mips/sys/dev/rmi/xlr/rge.c
==============================================================================
--- projects/mips/sys/dev/rmi/xlr/rge.c Tue Nov 10 13:35:34 2009 (r199138)
+++ projects/mips/sys/dev/rmi/xlr/rge.c Tue Nov 10 13:41:00 2009 (r199139)
@@ -332,7 +332,7 @@ DRIVER_MODULE(miibus, rge, miibus_driver
#endif
#define XKPHYS 0x8000000000000000
-
+/* -- No longer needed RRS
static __inline__ uint32_t
lw_40bit_phys(uint64_t phys, int cca)
{
@@ -355,8 +355,8 @@ lw_40bit_phys(uint64_t phys, int cca)
disable_KX(flags);
return value;
}
-
-
+*/
+/* -- No longer used RRS
static __inline__ uint64_t
ld_40bit_phys(uint64_t phys, int cca)
{
@@ -379,7 +379,7 @@ ld_40bit_phys(uint64_t phys, int cca)
disable_KX(flags);
return value;
}
-
+*/
void *xlr_tx_ring_mem;
@@ -411,7 +411,7 @@ TAILQ_HEAD(, tx_desc_node) tx_frag_desc[
};
/* This contains a list of free tx frag node descriptors */
-static
+static
TAILQ_HEAD(, tx_desc_node) free_tx_frag_desc[XLR_MAX_CORE] =
{
TAILQ_HEAD_INITIALIZER(free_tx_frag_desc[0]),
@@ -617,23 +617,33 @@ build_frag_list(struct mbuf *m_head, str
static void
release_tx_desc(struct msgrng_msg *msg, int rel_buf)
{
- vm_paddr_t paddr = msg->msg0 & 0xffffffffffULL;
- uint64_t temp;
- struct p2d_tx_desc *tx_desc;
+ /*
+ * OLD code: vm_paddr_t paddr = msg->msg0 & 0xffffffffffULL;
+ * uint64_t temp; struct p2d_tx_desc *tx_desc; struct mbuf *m;
+ *
+ * paddr += (XLR_MAX_TX_FRAGS * sizeof(uint64_t)); *** In o32 we will
+ * crash here ****** temp = ld_40bit_phys(paddr, 3); tx_desc =
+ * (struct p2d_tx_desc *)((vm_offset_t)temp);
+ *
+ * if (rel_buf) { paddr += sizeof(uint64_t);
+ *
+ * temp = ld_40bit_phys(paddr, 3);
+ *
+ * m = (struct mbuf *)((vm_offset_t)temp); m_freem(m); } printf("Call
+ * fre_p2d_desc\n"); free_p2d_desc(tx_desc);
+ */
+ struct p2d_tx_desc *tx_desc, *chk_addr;
struct mbuf *m;
- paddr += (XLR_MAX_TX_FRAGS * sizeof(uint64_t));
-
- temp = ld_40bit_phys(paddr, 3);
-
- tx_desc = (struct p2d_tx_desc *)((vm_offset_t)temp);
-
+ tx_desc = (struct p2d_tx_desc *)MIPS_PHYS_TO_KSEG0(msg->msg0);
+ chk_addr = (struct p2d_tx_desc *)(uint32_t) (tx_desc->frag[XLR_MAX_TX_FRAGS] & 0x00000000ffffffff);
+ if (tx_desc != chk_addr) {
+ printf("Address %p does not match with stored addr %p - we leaked a descriptor\n",
+ tx_desc, chk_addr);
+ return;
+ }
if (rel_buf) {
- paddr += sizeof(uint64_t);
-
- temp = ld_40bit_phys(paddr, 3);
-
- m = (struct mbuf *)((vm_offset_t)temp);
+ m = (struct mbuf *)(uint32_t) (tx_desc->frag[XLR_MAX_TX_FRAGS + 1] & 0x00000000ffffffff);
m_freem(m);
}
free_p2d_desc(tx_desc);
@@ -703,10 +713,26 @@ static void
free_buf(vm_paddr_t paddr)
{
struct mbuf *m;
- vm_offset_t temp;
+ uint32_t *temp;
+ uint32_t mag, um;
- temp = lw_40bit_phys((paddr - XLR_CACHELINE_SIZE), 3);
- m = (struct mbuf *)temp;
+ /*
+ * This will crash I think. RRS temp = lw_40bit_phys((paddr -
+ * XLR_CACHELINE_SIZE), 3); m = (struct mbuf *)temp;
+ */
+ /*
+ * This gets us a kseg0 address for the mbuf/magic on the ring but
+ * we need to get the va to free the mbuf. This is stored at *temp;
+ */
+ temp = (uint32_t *) MIPS_PHYS_TO_KSEG0(paddr - XLR_CACHELINE_SIZE);
+ um = temp[0];
+ mag = temp[1];
+ if (mag != 0xf00bad) {
+ printf("Something is wrong kseg:%p found mag:%x not 0xf00bad\n",
+ temp, mag);
+ return;
+ }
+ m = (struct mbuf *)um;
if (m != NULL)
m_freem(m);
}
@@ -1015,7 +1041,7 @@ serdes_regs_init(struct driver_data *pri
return;
}
-static void
+static void
serdes_autoconfig(struct driver_data *priv)
{
int delay = 100000;
@@ -1742,7 +1768,6 @@ rmi_xlr_mac_msgring_handler(int bucket,
/* int logical_cpu = 0; */
dbg_msg("Received packet, port = %d\n", port);
-
/*
* if num frins to be sent exceeds threshold, wake up the
* helper thread
@@ -1753,7 +1778,6 @@ rmi_xlr_mac_msgring_handler(int bucket,
}
dbg_msg("gmac_%d: rx packet: phys_addr = %llx, length = %x\n",
priv->instance, phys_addr, length);
-
mac_stats_add(priv->stats.rx_packets, 1);
mac_stats_add(priv->stats.rx_bytes, length);
xlr_inc_counter(NETIF_RX);
@@ -1779,7 +1803,7 @@ rge_probe(dev)
volatile unsigned long xlr_debug_enabled;
struct callout rge_dbg_count;
-static void
+static void
xlr_debug_count(void *addr)
{
struct driver_data *priv = &dev_mac[0]->priv;
@@ -1792,7 +1816,7 @@ xlr_debug_count(void *addr)
}
-static void
+static void
xlr_tx_q_wakeup(void *addr)
{
int i = 0;
@@ -1925,7 +1949,10 @@ rge_attach(device_t dev)
sc->irq = gmac_conf->baseirq + priv->instance % 4;
/* Set the IRQ into the rid field */
- /* note this is a hack to pass the irq to the iodi interrupt setup routines */
+ /*
+ * note this is a hack to pass the irq to the iodi interrupt setup
+ * routines
+ */
sc->rge_irq.__r_i = (struct resource_i *)sc->irq;
ret = bus_setup_intr(dev, &sc->rge_irq, INTR_FAST | INTR_TYPE_NET | INTR_MPSAFE,
@@ -2077,13 +2104,14 @@ rge_rx(struct rge_softc *sc, vm_paddr_t
*/
struct mbuf *m;
void *ptr;
- vm_offset_t temp;
+ uint32_t *temp;
struct ifnet *ifp = sc->rge_ifp;
unsigned long msgrng_flags;
int cpu = PCPU_GET(cpuid);
- temp = lw_40bit_phys((paddr - XLR_CACHELINE_SIZE), 3);
+ temp = (uint32_t *) MIPS_PHYS_TO_KSEG0(paddr - XLR_CACHELINE_SIZE);
+
ptr = (void *)(temp + XLR_CACHELINE_SIZE);
m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
if (m != NULL) {
@@ -2132,15 +2160,15 @@ rge_rx(struct rge_softc *sc, vm_paddr_t
* XLR_CACHELINE_SIZE);
*/
struct mbuf *m;
- vm_offset_t temp;
- unsigned int mag;
- struct ifnet *ifp = sc->rge_ifp;
+ uint32_t *temp, tm, mag;
- temp = lw_40bit_phys((paddr - XLR_CACHELINE_SIZE), 3);
- mag = lw_40bit_phys((paddr - XLR_CACHELINE_SIZE + 4), 3);
+ struct ifnet *ifp = sc->rge_ifp;
- m = (struct mbuf *)temp;
+ temp = (uint32_t *) MIPS_PHYS_TO_KSEG0(paddr - XLR_CACHELINE_SIZE);
+ tm = temp[0];
+ mag = temp[1];
+ m = (struct mbuf *)tm;
if (mag != 0xf00bad) {
/* somebody else packet Error - FIXME in intialization */
printf("cpu %d: *ERROR* Not my packet paddr %p\n", xlr_cpu_id(), (void *)paddr);
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 10 13:41:40 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id ADEB31065670;
Tue, 10 Nov 2009 13:41:40 +0000 (UTC)
(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 9D90A8FC1F;
Tue, 10 Nov 2009 13:41:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAADfe98060881;
Tue, 10 Nov 2009 13:41:40 GMT
(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAADfeBb060879;
Tue, 10 Nov 2009 13:41:40 GMT
(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <200911101341.nAADfeBb060879@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Tue, 10 Nov 2009 13:41:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199140 - projects/clangbsd/sys/boot/i386/gptboot
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Nov 2009 13:41:40 -0000
Author: rdivacky
Date: Tue Nov 10 13:41:40 2009
New Revision: 199140
URL: http://svn.freebsd.org/changeset/base/199140
Log:
remove the unused bsd.own.mk inclusion
Modified:
projects/clangbsd/sys/boot/i386/gptboot/Makefile
Modified: projects/clangbsd/sys/boot/i386/gptboot/Makefile
==============================================================================
--- projects/clangbsd/sys/boot/i386/gptboot/Makefile Tue Nov 10 13:41:00 2009 (r199139)
+++ projects/clangbsd/sys/boot/i386/gptboot/Makefile Tue Nov 10 13:41:40 2009 (r199140)
@@ -1,7 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
.PATH: ${.CURDIR}/../boot2
FILES= gptboot
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 10 16:47:49 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 16341106566B;
Tue, 10 Nov 2009 16:47:49 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 04D628FC14;
Tue, 10 Nov 2009 16:47:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAAGlmBu065652;
Tue, 10 Nov 2009 16:47:48 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAAGlm6p065651;
Tue, 10 Nov 2009 16:47:48 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <200911101647.nAAGlm6p065651@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Tue, 10 Nov 2009 16:47:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199142 - projects/stress2/misc
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Nov 2009 16:47:49 -0000
Author: pho
Date: Tue Nov 10 16:47:48 2009
New Revision: 199142
URL: http://svn.freebsd.org/changeset/base/199142
Log:
Regression test scenario for sendfile livelock.
Added:
projects/stress2/misc/sendfile.sh (contents, props changed)
Added: projects/stress2/misc/sendfile.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/stress2/misc/sendfile.sh Tue Nov 10 16:47:48 2009 (r199142)
@@ -0,0 +1,215 @@
+#!/bin/sh
+
+#
+# Copyright (c) 2009 Peter Holm <pho@FreeBSD.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+#
+
+# Test scenario for sendfile livelock seen on 7.2-STABLE for non SMP
+
+# Scenario by kib@
+
+. ../default.cfg
+
+odir=`pwd`
+
+cd /tmp
+sed '1,/^EOF/d' < $odir/$0 > sendfile.c
+cc -o sendfile -Wall sendfile.c -pthread
+rm -f sendfile.c
+[ -d "$RUNDIR" ] || mkdir -p $RUNDIR
+cd $RUNDIR
+
+in=/tmp/inputFile
+out=/tmp/outputFile
+
+for i in 1 2 3 4 8 16 1k 2k 3k 4k 5k 1m 2m 3m 4m 5m ; do
+ rm -f $in $out
+ dd if=/dev/random of=$in bs=$i count=1 2>&1 | \
+ egrep -v "records|transferred"
+ /tmp/sendfile $in $out 12345
+ cmp $in $out || ls -l $in $out
+ rm -f $in $out
+done
+rm -f /tmp/sendfile
+exit
+EOF
+#include <err.h>
+#include <fcntl.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+int port;
+char *inputFile;
+char *outputFile;
+int bufsize = 4096;
+
+static void
+reader(void) {
+ int tcpsock, msgsock;
+ int on;
+ socklen_t len;
+ struct sockaddr_in inetaddr, inetpeer;
+ int n, t, *buf, fd;
+
+ on = 1;
+ if ((tcpsock = socket(AF_INET, SOCK_STREAM, 0)) < 0)
+ err(1, "socket(), %s:%d", __FILE__, __LINE__);
+
+ if (setsockopt(tcpsock,
+ SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof(on)) < 0)
+ err(1, "setsockopt(), %s:%d", __FILE__, __LINE__);
+
+ inetaddr.sin_family = AF_INET;
+ inetaddr.sin_addr.s_addr = INADDR_ANY;
+ inetaddr.sin_port = htons(port);
+ inetaddr.sin_len = sizeof(inetaddr);
+
+ if (bind(tcpsock,
+ (struct sockaddr *)&inetaddr, sizeof (inetaddr)) < 0)
+ err(1, "bind(), %s:%d", __FILE__, __LINE__);
+
+ if (listen(tcpsock, 5) < 0)
+ err(1, "listen(), %s:%d", __FILE__, __LINE__);
+
+ len = sizeof(inetpeer);
+ if ((msgsock = accept(tcpsock,
+ (struct sockaddr *)&inetpeer, &len)) < 0)
+ err(1, "accept(), %s:%d", __FILE__, __LINE__);
+
+ t = 0;
+ if ((buf = malloc(bufsize)) == NULL)
+ err(1, "malloc(%d), %s:%d", bufsize, __FILE__, __LINE__);
+
+ if ((fd = open(outputFile, O_RDWR | O_CREAT | O_TRUNC, 0640)) == -1)
+ err(1, "open(%s)", outputFile);
+
+ for (;;) {
+ if ((n = read(msgsock, buf, bufsize)) < 0)
+ err(1, "read(), %s:%d", __FILE__, __LINE__);
+ t += n;
+ if (n == 0) break;
+
+ if ((write(fd, buf, n)) != n)
+ err(1, "write");
+ }
+ close(msgsock);
+ close(fd);
+ return;
+}
+
+static void
+writer(void) {
+ int tcpsock, on;
+ struct sockaddr_in inetaddr;
+ struct hostent *hostent;
+ struct stat statb;
+ int i, r, fd;
+ off_t off = 0;
+#if 1
+ size_t size;
+#endif
+
+ on = 1;
+ for (i = 1; i < 5; i++) {
+ if ((tcpsock = socket(AF_INET, SOCK_STREAM, 0)) < 0)
+ err(1, "socket(), %s:%d", __FILE__, __LINE__);
+
+ if (setsockopt(tcpsock,
+ SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof(on)) < 0)
+ err(1, "setsockopt(), %s:%d", __FILE__, __LINE__);
+
+#if 1 /* livelock trigger */
+ size = getpagesize() -4;
+ if (setsockopt(tcpsock,
+ SOL_SOCKET, SO_SNDBUF, (void *)&size, sizeof(size)) < 0)
+ err(1, "setsockopt(SO_SNDBUF), %s:%d", __FILE__, __LINE__);
+#endif
+
+ hostent = gethostbyname ("localhost");
+ memcpy (&inetaddr.sin_addr.s_addr, hostent->h_addr,
+ sizeof (struct in_addr));
+
+ inetaddr.sin_family = AF_INET;
+ inetaddr.sin_addr.s_addr = INADDR_ANY;
+ inetaddr.sin_port = htons(port);
+ inetaddr.sin_len = sizeof(inetaddr);
+
+ r = connect(tcpsock, (struct sockaddr *) &inetaddr,
+ sizeof(inetaddr));
+ if (r == 0)
+ break;
+ sleep(1);
+ close(tcpsock);
+ }
+ if (r < 0)
+ err(1, "connect(), %s:%d", __FILE__, __LINE__);
+
+ if (stat(inputFile, &statb) != 0)
+ err(1, "stat(%s)", inputFile);
+
+ if ((fd = open(inputFile, O_RDONLY)) == -1)
+ err(1, "open(%s)", inputFile);
+
+ if (sendfile(fd, tcpsock, 0, statb.st_size, NULL, &off, 0) == -1)
+ err(1, "sendfile");
+
+ return;
+}
+
+int
+main(int argc, char **argv)
+{
+ pid_t pid;
+
+ if (argc != 4) {
+ fprintf(stderr, "Usage: %s <inputFile outputFile portNumber\n", argv[0]);
+ return (1);
+ }
+ inputFile = argv[1];
+ outputFile = argv[2];
+ port = atoi(argv[3]);
+
+ if ((pid = fork()) == 0) {
+ writer();
+ exit(EXIT_SUCCESS);
+
+ } else if (pid > 0) {
+ reader();
+ kill(pid, SIGINT);
+ } else
+ err(1, "fork(), %s:%d", __FILE__, __LINE__);
+
+ return (0);
+}
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 10 16:51:16 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 47F911065676;
Tue, 10 Nov 2009 16:51:16 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 1D5828FC0A;
Tue, 10 Nov 2009 16:51:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAAGpF33065752;
Tue, 10 Nov 2009 16:51:15 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAAGpFch065751;
Tue, 10 Nov 2009 16:51:15 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <200911101651.nAAGpFch065751@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Tue, 10 Nov 2009 16:51:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199143 - projects/stress2/misc
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Nov 2009 16:51:16 -0000
Author: pho
Date: Tue Nov 10 16:51:15 2009
New Revision: 199143
URL: http://svn.freebsd.org/changeset/base/199143
Log:
Added regression test scenario for rename(2).
Added:
projects/stress2/misc/rename4.sh (contents, props changed)
Added: projects/stress2/misc/rename4.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/stress2/misc/rename4.sh Tue Nov 10 16:51:15 2009 (r199143)
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+#
+# Copyright (c) 2009 Peter Holm <pho@FreeBSD.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+#
+
+# lookup() does not return error when lookup of path ending on "/." is done
+# for RENAME operation.
+
+# Tets scenario by Jim Meyering <jim meyering net>
+
+. ../default.cfg
+
+odir=`pwd`
+
+cd /tmp
+sed '1,/^EOF/d' < $odir/$0 > rename4.c
+cc -o rename4 -Wall rename4.c
+rm -f rename4.c
+cd $RUNDIR
+
+rm -rf 1 2
+mkdir 1 2
+
+/tmp/rename4 1 2/.
+
+rm -rf 1 2 /tmp/rename4
+exit
+EOF
+#include <stdio.h>
+#include <err.h>
+
+int
+main(int argc, char **argv)
+{
+ if (rename(argv[1], argv[2]) == -1)
+ err(1, "rename(%s, %s)", argv[1], argv[2]);
+
+ return (0);
+}
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 10 17:37:01 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id E1CB1106568B;
Tue, 10 Nov 2009 17:37:01 +0000 (UTC)
(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id D0A9D8FC0A;
Tue, 10 Nov 2009 17:37:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAAHb1pW066761;
Tue, 10 Nov 2009 17:37:01 GMT
(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAAHb1MX066759;
Tue, 10 Nov 2009 17:37:01 GMT
(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <200911101737.nAAHb1MX066759@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Tue, 10 Nov 2009 17:37:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199145 - projects/clangbsd/usr.bin/clang/bin/clang
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Nov 2009 17:37:02 -0000
Author: rdivacky
Date: Tue Nov 10 17:37:01 2009
New Revision: 199145
URL: http://svn.freebsd.org/changeset/base/199145
Log:
install clang as c++ and clang++
Modified:
projects/clangbsd/usr.bin/clang/bin/clang/Makefile
Modified: projects/clangbsd/usr.bin/clang/bin/clang/Makefile
==============================================================================
--- projects/clangbsd/usr.bin/clang/bin/clang/Makefile Tue Nov 10 17:35:19 2009 (r199144)
+++ projects/clangbsd/usr.bin/clang/bin/clang/Makefile Tue Nov 10 17:37:01 2009 (r199145)
@@ -10,7 +10,9 @@ MAN=
.if ${MK_CLANG_IS_CC} != "no"
LINKS= ${BINDIR}/clang ${BINDIR}/cc \
- ${BINDIR}/clang ${BINDIR}/CC
+ ${BINDIR}/clang ${BINDIR}/CC \
+ ${BINDIR}/clang ${BINDIR}/c++ \
+ ${BINDIR}/clang ${BINDIR}/clang++
.endif
TGHDRS= DiagnosticCommonKinds
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 10 17:37:48 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 2C830106566B;
Tue, 10 Nov 2009 17:37:48 +0000 (UTC)
(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 1B5898FC0A;
Tue, 10 Nov 2009 17:37:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAAHbmAT066808;
Tue, 10 Nov 2009 17:37:48 GMT
(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAAHbl1G066806;
Tue, 10 Nov 2009 17:37:47 GMT
(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <200911101737.nAAHbl1G066806@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Tue, 10 Nov 2009 17:37:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199146 -
projects/clangbsd/contrib/llvm/tools/clang/lib/Driver
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Nov 2009 17:37:48 -0000
Author: rdivacky
Date: Tue Nov 10 17:37:47 2009
New Revision: 199146
URL: http://svn.freebsd.org/changeset/base/199146
Log:
Enter C++ mode in the driver when called as c++ or clang++.
Modified:
projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Driver.cpp
Modified: projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Driver.cpp
==============================================================================
--- projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Driver.cpp Tue Nov 10 17:37:01 2009 (r199145)
+++ projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Driver.cpp Tue Nov 10 17:37:47 2009 (r199146)
@@ -126,6 +126,10 @@ Compilation *Driver::BuildCompilation(in
// FIXME: This stuff needs to go into the Compilation, not the driver.
bool CCCPrintOptions = false, CCCPrintActions = false;
+ if (!strcmp(argv[0], "c++") || !strcmp(argv[0], "clang++")) {
+ CCCIsCXX = true;
+ }
+
const char **Start = argv + 1, **End = argv + argc;
const char *HostTriple = DefaultHostTriple.c_str();
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 10 17:38:54 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id BF407106566B;
Tue, 10 Nov 2009 17:38:54 +0000 (UTC)
(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id ADCCA8FC0A;
Tue, 10 Nov 2009 17:38:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAAHcssx066883;
Tue, 10 Nov 2009 17:38:54 GMT
(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAAHcsTR066879;
Tue, 10 Nov 2009 17:38:54 GMT
(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <200911101738.nAAHcsTR066879@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Tue, 10 Nov 2009 17:38:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199147 - in projects/clangbsd: contrib/gperf/src
gnu/usr.bin/gperf
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Nov 2009 17:38:54 -0000
Author: rdivacky
Date: Tue Nov 10 17:38:54 2009
New Revision: 199147
URL: http://svn.freebsd.org/changeset/base/199147
Log:
Switch to using LARGE_STACK_ARRAYS.
Modified:
projects/clangbsd/contrib/gperf/src/gen-perf.cc
projects/clangbsd/contrib/gperf/src/key-list.cc
projects/clangbsd/gnu/usr.bin/gperf/config.h
Modified: projects/clangbsd/contrib/gperf/src/gen-perf.cc
==============================================================================
--- projects/clangbsd/contrib/gperf/src/gen-perf.cc Tue Nov 10 17:37:47 2009 (r199146)
+++ projects/clangbsd/contrib/gperf/src/gen-perf.cc Tue Nov 10 17:38:54 2009 (r199147)
@@ -22,6 +22,7 @@ Software Foundation, 59 Temple Place - S
#include <stdio.h>
#include <stdlib.h> /* declares rand(), srand() */
#include <time.h> /* declares time() */
+#include "config.h"
#include "options.h"
#include "gen-perf.h"
#include "trace.h"
Modified: projects/clangbsd/contrib/gperf/src/key-list.cc
==============================================================================
--- projects/clangbsd/contrib/gperf/src/key-list.cc Tue Nov 10 17:37:47 2009 (r199146)
+++ projects/clangbsd/contrib/gperf/src/key-list.cc Tue Nov 10 17:38:54 2009 (r199147)
@@ -24,6 +24,7 @@ Software Foundation, 59 Temple Place - S
#include <ctype.h> /* declares isprint() */
#include <assert.h> /* defines assert() */
#include <limits.h> /* defines SCHAR_MAX etc. */
+#include "config.h"
#include "options.h"
#include "read-line.h"
#include "hash-table.h"
Modified: projects/clangbsd/gnu/usr.bin/gperf/config.h
==============================================================================
--- projects/clangbsd/gnu/usr.bin/gperf/config.h Tue Nov 10 17:37:47 2009 (r199146)
+++ projects/clangbsd/gnu/usr.bin/gperf/config.h Tue Nov 10 17:38:54 2009 (r199147)
@@ -19,3 +19,7 @@
/* Define if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
+
+#define LARGE_STACK_ARRAYS 0
+
+#define LARGE_STACK_ARRAYS 0
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 10 17:39:25 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id C6FBD106568D;
Tue, 10 Nov 2009 17:39:25 +0000 (UTC)
(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id B61438FC08;
Tue, 10 Nov 2009 17:39:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAAHdPqj066932;
Tue, 10 Nov 2009 17:39:25 GMT
(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAAHdP3k066930;
Tue, 10 Nov 2009 17:39:25 GMT
(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <200911101739.nAAHdP3k066930@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Tue, 10 Nov 2009 17:39:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199148 - projects/clangbsd/gnu/usr.bin/gperf
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Nov 2009 17:39:25 -0000
Author: rdivacky
Date: Tue Nov 10 17:39:25 2009
New Revision: 199148
URL: http://svn.freebsd.org/changeset/base/199148
Log:
Clang++ can build gperf just fine.
Modified:
projects/clangbsd/gnu/usr.bin/gperf/Makefile
Modified: projects/clangbsd/gnu/usr.bin/gperf/Makefile
==============================================================================
--- projects/clangbsd/gnu/usr.bin/gperf/Makefile Tue Nov 10 17:38:54 2009 (r199147)
+++ projects/clangbsd/gnu/usr.bin/gperf/Makefile Tue Nov 10 17:39:25 2009 (r199148)
@@ -12,8 +12,6 @@ SRCS= bool-array.cc gen-perf.cc hash-tab
vectors.cc version.cc
SRCS+= hash.cc
-CXX:=${CXX:C/^c\+\+|^clang/g++/}
-
CXXFLAGS+= -I${GPROFDIR}/lib -I${.CURDIR}
.include <bsd.prog.mk>
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 10 17:41:50 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 0F1EF1065672;
Tue, 10 Nov 2009 17:41:50 +0000 (UTC)
(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id D80678FC0A;
Tue, 10 Nov 2009 17:41:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAAHfnLo067017;
Tue, 10 Nov 2009 17:41:49 GMT
(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAAHfn60067016;
Tue, 10 Nov 2009 17:41:49 GMT
(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <200911101741.nAAHfn60067016@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Tue, 10 Nov 2009 17:41:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199149 - projects/clangbsd/usr.bin/clang
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Nov 2009 17:41:50 -0000
Author: rdivacky
Date: Tue Nov 10 17:41:49 2009
New Revision: 199149
URL: http://svn.freebsd.org/changeset/base/199149
Log:
Reset CXX to g++ for now.
Added:
projects/clangbsd/usr.bin/clang/Makefile.inc
Added: projects/clangbsd/usr.bin/clang/Makefile.inc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/clangbsd/usr.bin/clang/Makefile.inc Tue Nov 10 17:41:49 2009 (r199149)
@@ -0,0 +1 @@
+CXX:=${CXX:C/^c\+\+|^clang/g++/}
From owner-svn-src-projects@FreeBSD.ORG Wed Nov 11 22:36:19 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 9CD081065676;
Wed, 11 Nov 2009 22:36:19 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 8C75B8FC13;
Wed, 11 Nov 2009 22:36:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nABMaJnH009449;
Wed, 11 Nov 2009 22:36:19 GMT (envelope-from rrs@svn.freebsd.org)
Received: (from rrs@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nABMaJY9009448;
Wed, 11 Nov 2009 22:36:19 GMT (envelope-from rrs@svn.freebsd.org)
Message-Id: <200911112236.nABMaJY9009448@svn.freebsd.org>
From: Randall Stewart <rrs@FreeBSD.org>
Date: Wed, 11 Nov 2009 22:36:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199203 - projects/mips/sys/mips/rmi
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Nov 2009 22:36:19 -0000
Author: rrs
Date: Wed Nov 11 22:36:19 2009
New Revision: 199203
URL: http://svn.freebsd.org/changeset/base/199203
Log:
Ok set in the values in clock 7 as in the
original codes (I had changed one by accident)
Also do the pic_ack/pic_delayed_ack after the interrupt
so we clear it. The clock with these changes starts working.
Its off doing a short/long short/long warning but it
now runs.
My NFS mount now works but has the same problem with
sbin/init (errno 8 ENOEXEC) so it panics with no init.
Either this is a problem with my buildworld.. OR its a
yet undiscovered RMI issue.
Modified:
projects/mips/sys/mips/rmi/clock.c
projects/mips/sys/mips/rmi/intr_machdep.c
Modified: projects/mips/sys/mips/rmi/clock.c
==============================================================================
--- projects/mips/sys/mips/rmi/clock.c Wed Nov 11 22:31:02 2009 (r199202)
+++ projects/mips/sys/mips/rmi/clock.c Wed Nov 11 22:36:19 2009 (r199203)
@@ -240,7 +240,7 @@ platform_initclocks(void)
pic_update_control(1 << (8 + 7));
xlr_write_reg(mmio, PIC_TIMER_6_MAXVAL_0, (0xffffffff & 0xffffffff));
- xlr_write_reg(mmio, PIC_TIMER_6_MAXVAL_1, (0xffffffff & 0xffffffff));
+ xlr_write_reg(mmio, PIC_TIMER_6_MAXVAL_1, (0x0 & 0xffffffff));
xlr_write_reg(mmio, PIC_IRT_0_TIMER_6, (1 << cpu));
xlr_write_reg(mmio, PIC_IRT_1_TIMER_6, (1 << 31) | (0 << 30) | (1 << 6) | (PIC_TIMER_6_IRQ));
pic_update_control(1 << (8 + 6));
Modified: projects/mips/sys/mips/rmi/intr_machdep.c
==============================================================================
--- projects/mips/sys/mips/rmi/intr_machdep.c Wed Nov 11 22:31:02 2009 (r199202)
+++ projects/mips/sys/mips/rmi/intr_machdep.c Wed Nov 11 22:36:19 2009 (r199203)
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
#include <mips/rmi/xlrconfig.h>
#include <mips/rmi/interrupt.h>
#include <mips/rmi/clock.h>
+#include <mips/rmi/pic.h>
/*#include <machine/intrcnt.h>*/
@@ -167,6 +168,7 @@ cpu_intr(struct trapframe *tf)
ie = mih->mih_event;
write_c0_eirr64(1ULL << i);
+ pic_ack(i);
if (!ie || TAILQ_EMPTY(&ie->ie_handlers)) {
printf("stray interrupt %d\n", i);
continue;
@@ -174,6 +176,7 @@ cpu_intr(struct trapframe *tf)
if (intr_event_handle(ie, tf) != 0) {
printf("stray interrupt %d\n", i);
}
+ pic_delayed_ack(i);
}
critical_exit();
}
From owner-svn-src-projects@FreeBSD.ORG Wed Nov 11 22:37:17 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 8C6C61065693;
Wed, 11 Nov 2009 22:37:17 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 7C5CA8FC3B;
Wed, 11 Nov 2009 22:37:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nABMbH0f009514;
Wed, 11 Nov 2009 22:37:17 GMT (envelope-from rrs@svn.freebsd.org)
Received: (from rrs@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nABMbH15009512;
Wed, 11 Nov 2009 22:37:17 GMT (envelope-from rrs@svn.freebsd.org)
Message-Id: <200911112237.nABMbH15009512@svn.freebsd.org>
From: Randall Stewart <rrs@FreeBSD.org>
Date: Wed, 11 Nov 2009 22:37:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199204 - projects/mips/sys/mips/conf
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Nov 2009 22:37:17 -0000
Author: rrs
Date: Wed Nov 11 22:37:17 2009
New Revision: 199204
URL: http://svn.freebsd.org/changeset/base/199204
Log:
My NFS configured version.
Modified:
projects/mips/sys/mips/conf/XLR
Modified: projects/mips/sys/mips/conf/XLR
==============================================================================
--- projects/mips/sys/mips/conf/XLR Wed Nov 11 22:36:19 2009 (r199203)
+++ projects/mips/sys/mips/conf/XLR Wed Nov 11 22:37:17 2009 (r199204)
@@ -73,12 +73,13 @@ options UFS_ACL # Support for access
options UFS_DIRHASH # Improve performance on big directories
options NFSCLIENT
options NFS_ROOT
-options ROOTDEVNAME=\"nfs:10.1.1.15:/extra/nfsroot\"
+#
options BOOTP
options BOOTP_NFSROOT
options BOOTP_NFSV3
options BOOTP_WIRED_TO=rge0
options BOOTP_COMPAT
+options ROOTDEVNAME=\"nfs:10.1.1.15:/extra/nfsroot\"
#
#options MD_ROOT # MD is a potential root device
#options MD_ROOT_SIZE=21264
From owner-svn-src-projects@FreeBSD.ORG Thu Nov 12 00:36:24 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 88DAE1065670;
Thu, 12 Nov 2009 00:36:24 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 733928FC13;
Thu, 12 Nov 2009 00:36:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAC0aOeh012530;
Thu, 12 Nov 2009 00:36:24 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAC0aNxs012485;
Thu, 12 Nov 2009 00:36:23 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <200911120036.nAC0aNxs012485@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Thu, 12 Nov 2009 00:36:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199207 - in projects/mips: . bin/cat bin/csh
bin/getfacl bin/ls bin/ps bin/sh bin/uuidgen
cddl/contrib/opensolaris/lib/libzfs/common
contrib/bind9/bin/dig contrib/ee contrib/gcc/config...
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Nov 2009 00:36:24 -0000
Author: gonzo
Date: Thu Nov 12 00:36:22 2009
New Revision: 199207
URL: http://svn.freebsd.org/changeset/base/199207
Log:
MFC @199204
Added:
projects/mips/lib/libc/nls/ja_JP.UTF-8.msg
- copied unchanged from r199204, head/lib/libc/nls/ja_JP.UTF-8.msg
projects/mips/lib/libc/nls/ja_JP.eucJP.msg
- copied unchanged from r199204, head/lib/libc/nls/ja_JP.eucJP.msg
projects/mips/lib/libc/sys/pselect.2
- copied unchanged from r199204, head/lib/libc/sys/pselect.2
projects/mips/lib/libthr/arch/ia64/ia64/_umtx_op_err.S
- copied unchanged from r199204, head/lib/libthr/arch/ia64/ia64/_umtx_op_err.S
projects/mips/share/examples/ses/srcs/eltsub.h
- copied unchanged from r199204, head/share/examples/ses/srcs/eltsub.h
projects/mips/share/man/man9/BUS_BIND_INTR.9
- copied unchanged from r199204, head/share/man/man9/BUS_BIND_INTR.9
projects/mips/share/man/man9/BUS_DESCRIBE_INTR.9
- copied unchanged from r199204, head/share/man/man9/BUS_DESCRIBE_INTR.9
projects/mips/sys/cam/ata/ata_pmp.c
- copied unchanged from r199204, head/sys/cam/ata/ata_pmp.c
projects/mips/sys/contrib/dev/acpica/common/dmextern.c
- copied unchanged from r199204, head/sys/contrib/dev/acpica/common/dmextern.c
projects/mips/sys/contrib/dev/iwn/iwlwifi-4965-228.57.2.23.fw.uu
- copied unchanged from r199204, head/sys/contrib/dev/iwn/iwlwifi-4965-228.57.2.23.fw.uu
projects/mips/sys/contrib/dev/iwn/iwlwifi-5000-5.4.A.11.fw.uu
- copied unchanged from r199204, head/sys/contrib/dev/iwn/iwlwifi-5000-5.4.A.11.fw.uu
projects/mips/sys/contrib/dev/iwn/iwlwifi-5150-8.24.2.2.fw.uu
- copied unchanged from r199204, head/sys/contrib/dev/iwn/iwlwifi-5150-8.24.2.2.fw.uu
projects/mips/sys/dev/ath/ath_hal/ah_eeprom_v4k.c
- copied unchanged from r199204, head/sys/dev/ath/ath_hal/ah_eeprom_v4k.c
projects/mips/sys/dev/ath/ath_hal/ah_eeprom_v4k.h
- copied unchanged from r199204, head/sys/dev/ath/ath_hal/ah_eeprom_v4k.h
projects/mips/sys/dev/cxgb/common/cxgb_aq100x.c
- copied unchanged from r199204, head/sys/dev/cxgb/common/cxgb_aq100x.c
projects/mips/sys/dev/usb/controller/ehcireg.h
- copied unchanged from r199204, head/sys/dev/usb/controller/ehcireg.h
projects/mips/sys/dev/usb/controller/ohcireg.h
- copied unchanged from r199204, head/sys/dev/usb/controller/ohcireg.h
projects/mips/sys/dev/usb/controller/uhcireg.h
- copied unchanged from r199204, head/sys/dev/usb/controller/uhcireg.h
projects/mips/sys/dev/usb/input/atp.c
- copied unchanged from r199204, head/sys/dev/usb/input/atp.c
projects/mips/sys/ia64/ia64/highfp.c
- copied unchanged from r199204, head/sys/ia64/ia64/highfp.c
projects/mips/sys/modules/iwnfw/Makefile.inc
- copied unchanged from r199204, head/sys/modules/iwnfw/Makefile.inc
projects/mips/sys/modules/iwnfw/iwn4965/
- copied from r199204, head/sys/modules/iwnfw/iwn4965/
projects/mips/sys/modules/iwnfw/iwn5000/
- copied from r199204, head/sys/modules/iwnfw/iwn5000/
projects/mips/sys/modules/iwnfw/iwn5150/
- copied from r199204, head/sys/modules/iwnfw/iwn5150/
projects/mips/sys/modules/usb/atp/
- copied from r199204, head/sys/modules/usb/atp/
projects/mips/tools/regression/bin/sh/errors/backquote-error2.0
- copied unchanged from r199204, head/tools/regression/bin/sh/errors/backquote-error2.0
projects/mips/tools/regression/bin/sh/execution/unknown1.0
- copied unchanged from r199204, head/tools/regression/bin/sh/execution/unknown1.0
projects/mips/tools/regression/bin/sh/expansion/question1.0
- copied unchanged from r199204, head/tools/regression/bin/sh/expansion/question1.0
projects/mips/tools/regression/bin/sh/expansion/set-u1.0
- copied unchanged from r199204, head/tools/regression/bin/sh/expansion/set-u1.0
projects/mips/tools/regression/bin/sh/expansion/set-u2.0
- copied unchanged from r199204, head/tools/regression/bin/sh/expansion/set-u2.0
projects/mips/tools/regression/sockets/unix_seqpacket/
- copied from r199204, head/tools/regression/sockets/unix_seqpacket/
projects/mips/tools/regression/sockets/unix_seqpacket_exercise/
- copied from r199204, head/tools/regression/sockets/unix_seqpacket_exercise/
Deleted:
projects/mips/lib/libc/gen/pselect.3
projects/mips/lib/libc/gen/pselect.c
projects/mips/sys/arm/xscale/xscalereg.h
projects/mips/sys/arm/xscale/xscalevar.h
projects/mips/sys/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu
projects/mips/usr.sbin/sysinstall/acpi.c
projects/mips/usr.sbin/sysinstall/acpidump.h
projects/mips/usr.sbin/sysinstall/biosmptable.c
Modified:
projects/mips/Makefile.inc1
projects/mips/ObsoleteFiles.inc
projects/mips/UPDATING
projects/mips/bin/cat/Makefile
projects/mips/bin/csh/iconv_stub.c
projects/mips/bin/getfacl/getfacl.1
projects/mips/bin/ls/ls.c
projects/mips/bin/ps/keyword.c
projects/mips/bin/sh/arith_lex.l
projects/mips/bin/sh/eval.c
projects/mips/bin/sh/exec.c
projects/mips/bin/sh/expand.c
projects/mips/bin/sh/parser.c
projects/mips/bin/sh/sh.1
projects/mips/bin/uuidgen/Makefile
projects/mips/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
projects/mips/contrib/bind9/bin/dig/dighost.c
projects/mips/contrib/ee/ee.c
projects/mips/contrib/gcc/config/i386/i386.c
projects/mips/contrib/libpcap/inet.c
projects/mips/contrib/ncurses/ncurses/base/lib_getch.c
projects/mips/contrib/openpam/doc/man/pam.conf.5
projects/mips/contrib/tcpdump/print-tcp.c
projects/mips/contrib/tcpdump/tcp.h
projects/mips/contrib/tcsh/sh.c
projects/mips/crypto/openssh/ssh_namespace.h
projects/mips/crypto/openssh/sshd_config
projects/mips/etc/defaults/rc.conf
projects/mips/etc/gettytab
projects/mips/etc/network.subr
projects/mips/etc/pam.d/ftpd
projects/mips/etc/pam.d/kde
projects/mips/etc/pam.d/other
projects/mips/etc/pam.d/sshd
projects/mips/etc/pam.d/system
projects/mips/etc/pam.d/telnetd
projects/mips/etc/pam.d/xdm
projects/mips/etc/rc.d/bgfsck
projects/mips/etc/rc.d/cleartmp
projects/mips/etc/rc.d/defaultroute
projects/mips/etc/rc.d/faith
projects/mips/etc/rc.d/fsck
projects/mips/etc/rc.d/hostid
projects/mips/etc/rc.d/hostname
projects/mips/etc/rc.d/ip6addrctl
projects/mips/etc/rc.d/jail
projects/mips/etc/rc.d/ldconfig
projects/mips/etc/rc.d/motd
projects/mips/etc/rc.d/mountcritlocal
projects/mips/etc/rc.d/moused
projects/mips/etc/rc.d/netif
projects/mips/etc/rc.d/netoptions
projects/mips/etc/rc.d/newsyslog
projects/mips/etc/rc.d/nfsclient
projects/mips/etc/rc.d/pf
projects/mips/etc/rc.d/routing
projects/mips/etc/rc.d/savecore
projects/mips/etc/rc.d/stf
projects/mips/etc/rc.subr
projects/mips/etc/services
projects/mips/games/fortune/datfiles/fortunes
projects/mips/games/fortune/datfiles/fortunes-o.real
projects/mips/games/fortune/datfiles/fortunes.sp.ok
projects/mips/games/number/Makefile
projects/mips/games/number/number.c
projects/mips/gnu/lib/libgcov/Makefile
projects/mips/include/langinfo.h
projects/mips/include/libgen.h
projects/mips/kerberos5/lib/libgssapi_krb5/Makefile
projects/mips/kerberos5/lib/libgssapi_spnego/Makefile
projects/mips/lib/libbluetooth/bluetooth.3
projects/mips/lib/libbluetooth/bluetooth.h
projects/mips/lib/libc/gen/Makefile.inc
projects/mips/lib/libc/gen/Symbol.map
projects/mips/lib/libc/gen/basename.3
projects/mips/lib/libc/gen/basename.c
projects/mips/lib/libc/gen/errlst.c
projects/mips/lib/libc/gen/fmtmsg.c
projects/mips/lib/libc/gen/fts.3
projects/mips/lib/libc/gen/fts.c
projects/mips/lib/libc/gen/getcwd.c
projects/mips/lib/libc/gen/posix_spawn.3
projects/mips/lib/libc/gen/posix_spawn_file_actions_addopen.3
projects/mips/lib/libc/gen/posix_spawn_file_actions_init.3
projects/mips/lib/libc/gen/posix_spawnattr_getflags.3
projects/mips/lib/libc/gen/posix_spawnattr_getpgroup.3
projects/mips/lib/libc/gen/posix_spawnattr_getschedparam.3
projects/mips/lib/libc/gen/posix_spawnattr_getschedpolicy.3
projects/mips/lib/libc/gen/posix_spawnattr_getsigdefault.3
projects/mips/lib/libc/gen/posix_spawnattr_getsigmask.3
projects/mips/lib/libc/gen/posix_spawnattr_init.3
projects/mips/lib/libc/gen/wordexp.c
projects/mips/lib/libc/include/namespace.h
projects/mips/lib/libc/include/un-namespace.h
projects/mips/lib/libc/locale/isblank.3
projects/mips/lib/libc/locale/nl_langinfo.c
projects/mips/lib/libc/net/gai_strerror.c
projects/mips/lib/libc/net/ip6opt.c
projects/mips/lib/libc/nls/C.msg
projects/mips/lib/libc/nls/Makefile.inc
projects/mips/lib/libc/nls/nl_NL.ISO8859-1.msg
projects/mips/lib/libc/nls/uk_UA.UTF-8.msg (contents, props changed)
projects/mips/lib/libc/stdio/getdelim.c
projects/mips/lib/libc/sys/Makefile.inc
projects/mips/lib/libc/sys/Symbol.map
projects/mips/lib/libc/sys/accept.2
projects/mips/lib/libc/sys/intro.2
projects/mips/lib/libc/sys/mmap.2
projects/mips/lib/libc/sys/nanosleep.2
projects/mips/lib/libfetch/common.c
projects/mips/lib/libkvm/kvm_i386.c
projects/mips/lib/libpam/modules/pam_ssh/Makefile
projects/mips/lib/libpmc/Makefile
projects/mips/lib/libpmc/libpmc.c
projects/mips/lib/libpmc/pmc_attach.3
projects/mips/lib/libstand/open.c
projects/mips/lib/libstand/udp.c
projects/mips/lib/libthr/arch/ia64/Makefile.inc
projects/mips/lib/libthr/arch/ia64/include/pthread_md.h
projects/mips/lib/libthr/pthread.map
projects/mips/lib/libthr/thread/thr_private.h
projects/mips/lib/libthr/thread/thr_syscalls.c
projects/mips/lib/libusb/libusb.h
projects/mips/lib/libusb/libusb10.c
projects/mips/lib/libusb/libusb10_desc.c
projects/mips/lib/libusb/libusb10_io.c
projects/mips/lib/libusb/libusb20.c
projects/mips/lib/libusb/libusb20_desc.c
projects/mips/lib/libusb/libusb20_ugen20.c
projects/mips/libexec/rtld-elf/map_object.c
projects/mips/libexec/rtld-elf/rtld.c
projects/mips/release/doc/README
projects/mips/release/doc/en_US.ISO8859-1/errata/article.sgml
projects/mips/release/doc/share/misc/man2hwnotes.pl
projects/mips/release/doc/share/mk/doc.relnotes.mk
projects/mips/release/doc/share/sgml/release.dsl
projects/mips/release/doc/share/sgml/release.ent
projects/mips/release/picobsd/bridge/PICOBSD
projects/mips/release/scripts/package-split.py
projects/mips/sbin/Makefile.inc
projects/mips/sbin/adjkerntz/Makefile
projects/mips/sbin/atacontrol/Makefile
projects/mips/sbin/atm/atmconfig/Makefile
projects/mips/sbin/badsect/Makefile
projects/mips/sbin/bsdlabel/Makefile
projects/mips/sbin/camcontrol/Makefile
projects/mips/sbin/camcontrol/camcontrol.8
projects/mips/sbin/camcontrol/camcontrol.c
projects/mips/sbin/ccdconfig/Makefile
projects/mips/sbin/clri/Makefile
projects/mips/sbin/comcontrol/Makefile
projects/mips/sbin/conscontrol/Makefile
projects/mips/sbin/ddb/ddb_capture.c
projects/mips/sbin/dhclient/Makefile
projects/mips/sbin/dhclient/bpf.c
projects/mips/sbin/dhclient/dhcpd.h
projects/mips/sbin/dhclient/packet.c
projects/mips/sbin/dmesg/Makefile
projects/mips/sbin/dump/Makefile
projects/mips/sbin/dumpfs/Makefile
projects/mips/sbin/dumpfs/dumpfs.c
projects/mips/sbin/dumpon/Makefile
projects/mips/sbin/geom/Makefile
projects/mips/sbin/geom/Makefile.inc
projects/mips/sbin/geom/class/part/Makefile
projects/mips/sbin/geom/class/part/geom_part.c
projects/mips/sbin/geom/class/part/gpart.8
projects/mips/sbin/ggate/Makefile.inc
projects/mips/sbin/growfs/Makefile
projects/mips/sbin/growfs/growfs.c
projects/mips/sbin/gvinum/Makefile
projects/mips/sbin/ifconfig/af_nd6.c
projects/mips/sbin/ifconfig/ifconfig.8
projects/mips/sbin/ifconfig/ifconfig.c
projects/mips/sbin/ifconfig/ifieee80211.c
projects/mips/sbin/init/Makefile
projects/mips/sbin/ipf/Makefile.inc
projects/mips/sbin/iscontrol/Makefile
projects/mips/sbin/kldunload/Makefile
projects/mips/sbin/ldconfig/Makefile
projects/mips/sbin/md5/Makefile
projects/mips/sbin/mdconfig/Makefile
projects/mips/sbin/mdmfs/Makefile
projects/mips/sbin/mknod/mknod.8
projects/mips/sbin/mksnap_ffs/Makefile
projects/mips/sbin/mount/Makefile
projects/mips/sbin/mount/mount.8
projects/mips/sbin/mount_autofs/Makefile
projects/mips/sbin/mount_cd9660/Makefile
projects/mips/sbin/mount_ext2fs/Makefile
projects/mips/sbin/mount_msdosfs/Makefile
projects/mips/sbin/mount_nfs/mount_nfs.c
projects/mips/sbin/mount_nullfs/Makefile
projects/mips/sbin/mount_reiserfs/Makefile
projects/mips/sbin/mount_unionfs/Makefile
projects/mips/sbin/newfs_msdos/Makefile
projects/mips/sbin/nfsiod/Makefile
projects/mips/sbin/pfctl/Makefile
projects/mips/sbin/rcorder/Makefile
projects/mips/sbin/reboot/Makefile
projects/mips/sbin/reboot/reboot.c
projects/mips/sbin/recoverdisk/Makefile
projects/mips/sbin/routed/Makefile
projects/mips/sbin/savecore/Makefile
projects/mips/sbin/sconfig/Makefile
projects/mips/sbin/shutdown/Makefile
projects/mips/sbin/spppcontrol/Makefile
projects/mips/sbin/swapon/Makefile
projects/mips/sbin/sysctl/sysctl.c
projects/mips/sbin/tunefs/Makefile
projects/mips/sbin/tunefs/tunefs.8
projects/mips/secure/lib/libssh/Makefile
projects/mips/secure/usr.bin/bdes/bdes.c
projects/mips/share/examples/ses/srcs/chpmon.c
projects/mips/share/examples/ses/srcs/eltsub.c
projects/mips/share/examples/ses/srcs/getencstat.c
projects/mips/share/examples/ses/srcs/getnobj.c
projects/mips/share/examples/ses/srcs/getobjmap.c
projects/mips/share/examples/ses/srcs/getobjstat.c
projects/mips/share/examples/ses/srcs/inienc.c
projects/mips/share/examples/ses/srcs/sesd.c
projects/mips/share/examples/ses/srcs/setencstat.c
projects/mips/share/examples/ses/srcs/setobjstat.c
projects/mips/share/man/man3/tree.3
projects/mips/share/man/man4/Makefile
projects/mips/share/man/man4/acpi_hp.4
projects/mips/share/man/man4/acpi_wmi.4
projects/mips/share/man/man4/ata.4
projects/mips/share/man/man4/atapicam.4
projects/mips/share/man/man4/bce.4
projects/mips/share/man/man4/bge.4
projects/mips/share/man/man4/de.4
projects/mips/share/man/man4/hifn.4
projects/mips/share/man/man4/hptrr.4
projects/mips/share/man/man4/ichwd.4
projects/mips/share/man/man4/iwn.4
projects/mips/share/man/man4/iwnfw.4
projects/mips/share/man/man4/lindev.4
projects/mips/share/man/man4/mac_mls.4
projects/mips/share/man/man4/malo.4
projects/mips/share/man/man4/msk.4
projects/mips/share/man/man4/netintro.4
projects/mips/share/man/man4/sbp_targ.4
projects/mips/share/man/man4/targ.4
projects/mips/share/man/man4/tty.4
projects/mips/share/man/man4/umass.4
projects/mips/share/man/man4/unix.4
projects/mips/share/man/man4/urtw.4
projects/mips/share/man/man4/zyd.4
projects/mips/share/man/man5/ar.5
projects/mips/share/man/man5/make.conf.5
projects/mips/share/man/man5/msdosfs.5
projects/mips/share/man/man5/rc.conf.5
projects/mips/share/man/man5/regdomain.5
projects/mips/share/man/man7/adding_user.7
projects/mips/share/man/man9/Makefile
projects/mips/share/man/man9/fetch.9
projects/mips/share/man/man9/get_cyclecount.9
projects/mips/share/man/man9/store.9
projects/mips/share/misc/bsd-family-tree
projects/mips/share/misc/committers-src.dot
projects/mips/share/misc/iso3166
projects/mips/share/misc/organization.dot
projects/mips/share/mk/bsd.sys.mk
projects/mips/share/timedef/ja_JP.SJIS.src
projects/mips/share/timedef/ja_JP.UTF-8.src
projects/mips/share/timedef/ja_JP.eucJP.src
projects/mips/share/zoneinfo/Makefile
projects/mips/share/zoneinfo/antarctica
projects/mips/share/zoneinfo/asia
projects/mips/share/zoneinfo/australasia
projects/mips/share/zoneinfo/europe
projects/mips/share/zoneinfo/southamerica
projects/mips/share/zoneinfo/zone.tab
projects/mips/sys/amd64/acpica/acpi_machdep.c
projects/mips/sys/amd64/acpica/acpi_wakecode.S
projects/mips/sys/amd64/acpica/acpi_wakeup.c
projects/mips/sys/amd64/amd64/elf_machdep.c
projects/mips/sys/amd64/amd64/identcpu.c
projects/mips/sys/amd64/amd64/initcpu.c
projects/mips/sys/amd64/amd64/intr_machdep.c
projects/mips/sys/amd64/amd64/machdep.c
projects/mips/sys/amd64/amd64/mp_machdep.c
projects/mips/sys/amd64/amd64/nexus.c
projects/mips/sys/amd64/amd64/pmap.c
projects/mips/sys/amd64/amd64/trap.c
projects/mips/sys/amd64/amd64/vm_machdep.c
projects/mips/sys/amd64/conf/GENERIC
projects/mips/sys/amd64/ia32/ia32_signal.c
projects/mips/sys/amd64/include/atomic.h
projects/mips/sys/amd64/include/elf.h
projects/mips/sys/amd64/include/intr_machdep.h
projects/mips/sys/amd64/isa/isa_dma.c
projects/mips/sys/amd64/linux32/linux32_machdep.c
projects/mips/sys/amd64/linux32/linux32_sysvec.c
projects/mips/sys/arm/arm/cpufunc.c
projects/mips/sys/arm/arm/db_trace.c
projects/mips/sys/arm/arm/elf_machdep.c
projects/mips/sys/arm/arm/gdb_machdep.c
projects/mips/sys/arm/arm/machdep.c
projects/mips/sys/arm/arm/pmap.c
projects/mips/sys/arm/arm/trap.c
projects/mips/sys/arm/arm/vm_machdep.c
projects/mips/sys/arm/at91/at91_machdep.c
projects/mips/sys/arm/conf/HL200
projects/mips/sys/arm/conf/KB920X
projects/mips/sys/arm/include/elf.h
projects/mips/sys/arm/mv/mv_machdep.c
projects/mips/sys/arm/mv/mv_sata.c
projects/mips/sys/arm/sa11x0/assabet_machdep.c
projects/mips/sys/arm/xscale/i80321/i80321_timer.c
projects/mips/sys/boot/common/commands.c
projects/mips/sys/boot/i386/zfsboot/zfsboot.c
projects/mips/sys/boot/uboot/lib/glue.c
projects/mips/sys/boot/zfs/zfs.c
projects/mips/sys/boot/zfs/zfsimpl.c
projects/mips/sys/cam/ata/ata_all.c
projects/mips/sys/cam/ata/ata_all.h
projects/mips/sys/cam/ata/ata_da.c
projects/mips/sys/cam/ata/ata_xpt.c
projects/mips/sys/cam/cam.c
projects/mips/sys/cam/cam.h
projects/mips/sys/cam/cam_ccb.h
projects/mips/sys/cam/cam_periph.c
projects/mips/sys/cam/cam_periph.h
projects/mips/sys/cam/cam_queue.c
projects/mips/sys/cam/cam_xpt.c
projects/mips/sys/cam/cam_xpt_internal.h
projects/mips/sys/cam/scsi/scsi_all.c
projects/mips/sys/cam/scsi/scsi_cd.c
projects/mips/sys/cam/scsi/scsi_ch.c
projects/mips/sys/cam/scsi/scsi_da.c
projects/mips/sys/cam/scsi/scsi_low.c
projects/mips/sys/cam/scsi/scsi_pt.c
projects/mips/sys/cam/scsi/scsi_sa.c
projects/mips/sys/cam/scsi/scsi_sg.c
projects/mips/sys/cam/scsi/scsi_targ_bh.c
projects/mips/sys/cam/scsi/scsi_target.c
projects/mips/sys/cam/scsi/scsi_xpt.c
projects/mips/sys/cddl/boot/zfs/zfsimpl.h
projects/mips/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c
projects/mips/sys/cddl/compat/opensolaris/sys/policy.h
projects/mips/sys/cddl/compat/opensolaris/sys/vnode.h
projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c
projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
projects/mips/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h
projects/mips/sys/compat/freebsd32/freebsd32_misc.c
projects/mips/sys/compat/freebsd32/freebsd32_proto.h
projects/mips/sys/compat/freebsd32/freebsd32_syscall.h
projects/mips/sys/compat/freebsd32/freebsd32_syscalls.c
projects/mips/sys/compat/freebsd32/freebsd32_sysent.c
projects/mips/sys/compat/freebsd32/syscalls.master
projects/mips/sys/compat/ia32/ia32_sysvec.c
projects/mips/sys/compat/linux/linux_ipc.c
projects/mips/sys/compat/linux/linux_socket.c
projects/mips/sys/compat/ndis/kern_ndis.c
projects/mips/sys/compat/ndis/kern_windrv.c
projects/mips/sys/compat/ndis/subr_hal.c
projects/mips/sys/compat/ndis/subr_ndis.c
projects/mips/sys/compat/ndis/subr_ntoskrnl.c
projects/mips/sys/compat/ndis/subr_pe.c
projects/mips/sys/compat/ndis/subr_usbd.c
projects/mips/sys/compat/x86bios/x86bios.c
projects/mips/sys/compat/x86bios/x86bios.h
projects/mips/sys/conf/NOTES
projects/mips/sys/conf/files
projects/mips/sys/conf/files.amd64
projects/mips/sys/conf/files.i386
projects/mips/sys/conf/files.ia64
projects/mips/sys/conf/options
projects/mips/sys/contrib/altq/altq/altq_hfsc.c
projects/mips/sys/contrib/dev/acpica/changes.txt
projects/mips/sys/contrib/dev/acpica/common/adfile.c
projects/mips/sys/contrib/dev/acpica/common/adisasm.c
projects/mips/sys/contrib/dev/acpica/common/adwalk.c
projects/mips/sys/contrib/dev/acpica/common/dmtable.c
projects/mips/sys/contrib/dev/acpica/common/getopt.c
projects/mips/sys/contrib/dev/acpica/compiler/aslload.c
projects/mips/sys/contrib/dev/acpica/debugger/dbcmds.c
projects/mips/sys/contrib/dev/acpica/debugger/dbinput.c
projects/mips/sys/contrib/dev/acpica/disassembler/dmutils.c
projects/mips/sys/contrib/dev/acpica/disassembler/dmwalk.c
projects/mips/sys/contrib/dev/acpica/dispatcher/dswload.c
projects/mips/sys/contrib/dev/acpica/events/evregion.c
projects/mips/sys/contrib/dev/acpica/include/acapps.h
projects/mips/sys/contrib/dev/acpica/include/acdebug.h
projects/mips/sys/contrib/dev/acpica/include/acdisasm.h
projects/mips/sys/contrib/dev/acpica/include/acglobal.h
projects/mips/sys/contrib/dev/acpica/include/aclocal.h
projects/mips/sys/contrib/dev/acpica/include/acpixf.h
projects/mips/sys/contrib/dev/acpica/namespace/nsrepair.c
projects/mips/sys/contrib/dev/acpica/utilities/utglobal.c
projects/mips/sys/contrib/dev/iwn/LICENSE
projects/mips/sys/dev/aac/aac.c
projects/mips/sys/dev/aac/aac_cam.c
projects/mips/sys/dev/aac/aacreg.h
projects/mips/sys/dev/aac/aacvar.h
projects/mips/sys/dev/acpi_support/acpi_aiboost.c
projects/mips/sys/dev/acpica/acpi.c
projects/mips/sys/dev/acpica/acpi_cpu.c
projects/mips/sys/dev/acpica/acpi_ec.c
projects/mips/sys/dev/acpica/acpi_hpet.c
projects/mips/sys/dev/acpica/acpivar.h
projects/mips/sys/dev/agp/agp_i810.c
projects/mips/sys/dev/ahci/ahci.c
projects/mips/sys/dev/ahci/ahci.h
projects/mips/sys/dev/aic7xxx/aic79xx_pci.c
projects/mips/sys/dev/aic7xxx/aicasm/aicasm.c
projects/mips/sys/dev/amr/amr.c
projects/mips/sys/dev/an/if_an.c
projects/mips/sys/dev/an/if_an_isa.c
projects/mips/sys/dev/an/if_an_pccard.c
projects/mips/sys/dev/an/if_an_pci.c
projects/mips/sys/dev/an/if_anreg.h
projects/mips/sys/dev/arcmsr/arcmsr.c
projects/mips/sys/dev/arcmsr/arcmsr.h
projects/mips/sys/dev/ata/ata-all.c
projects/mips/sys/dev/ata/ata-all.h
projects/mips/sys/dev/ata/ata-disk.c
projects/mips/sys/dev/ata/ata-dma.c
projects/mips/sys/dev/ata/ata-lowlevel.c
projects/mips/sys/dev/ata/ata-pci.c
projects/mips/sys/dev/ata/ata-pci.h
projects/mips/sys/dev/ata/ata-queue.c
projects/mips/sys/dev/ata/ata-raid.c
projects/mips/sys/dev/ata/ata-sata.c
projects/mips/sys/dev/ata/atapi-cam.c
projects/mips/sys/dev/ata/atapi-cd.c
projects/mips/sys/dev/ata/atapi-fd.c
projects/mips/sys/dev/ata/atapi-tape.c
projects/mips/sys/dev/ata/chipsets/ata-adaptec.c
projects/mips/sys/dev/ata/chipsets/ata-ahci.c
projects/mips/sys/dev/ata/chipsets/ata-ati.c
projects/mips/sys/dev/ata/chipsets/ata-intel.c
projects/mips/sys/dev/ata/chipsets/ata-marvell.c
projects/mips/sys/dev/ata/chipsets/ata-nvidia.c
projects/mips/sys/dev/ata/chipsets/ata-promise.c
projects/mips/sys/dev/ata/chipsets/ata-serverworks.c
projects/mips/sys/dev/ata/chipsets/ata-siliconimage.c
projects/mips/sys/dev/ata/chipsets/ata-via.c
projects/mips/sys/dev/ath/if_ath.c
projects/mips/sys/dev/atkbdc/atkbd.c
projects/mips/sys/dev/bce/if_bce.c
projects/mips/sys/dev/bce/if_bcereg.h
projects/mips/sys/dev/bge/if_bge.c
projects/mips/sys/dev/bge/if_bgereg.h
projects/mips/sys/dev/bwi/if_bwi.c
projects/mips/sys/dev/bwi/if_bwivar.h
projects/mips/sys/dev/cxgb/common/cxgb_ael1002.c
projects/mips/sys/dev/cxgb/common/cxgb_common.h
projects/mips/sys/dev/cxgb/common/cxgb_mv88e1xxx.c
projects/mips/sys/dev/cxgb/common/cxgb_regs.h
projects/mips/sys/dev/cxgb/common/cxgb_t3_hw.c
projects/mips/sys/dev/cxgb/common/cxgb_tn1010.c
projects/mips/sys/dev/cxgb/common/cxgb_vsc8211.c
projects/mips/sys/dev/cxgb/common/cxgb_xgmac.c
projects/mips/sys/dev/cxgb/cxgb_adapter.h
projects/mips/sys/dev/cxgb/cxgb_main.c
projects/mips/sys/dev/cxgb/cxgb_osdep.h
projects/mips/sys/dev/cxgb/cxgb_t3fw.h
projects/mips/sys/dev/dpms/dpms.c
projects/mips/sys/dev/drm/drmP.h
projects/mips/sys/dev/drm/drm_pciids.h
projects/mips/sys/dev/drm/drm_scatter.c
projects/mips/sys/dev/drm/i915_drv.h
projects/mips/sys/dev/drm/mach64_state.c
projects/mips/sys/dev/drm/r600_blit.c
projects/mips/sys/dev/drm/radeon_cp.c
projects/mips/sys/dev/e1000/if_igb.c
projects/mips/sys/dev/fb/vesa.c
projects/mips/sys/dev/fb/vesa.h
projects/mips/sys/dev/fb/vgareg.h
projects/mips/sys/dev/fdc/fdc.c
projects/mips/sys/dev/gem/if_gem_pci.c
projects/mips/sys/dev/hatm/if_hatm.c
projects/mips/sys/dev/hptrr/hptrr_osm_bsd.c
projects/mips/sys/dev/hwpmc/hwpmc_core.c
projects/mips/sys/dev/hwpmc/hwpmc_mod.c
projects/mips/sys/dev/ichwd/ichwd.c
projects/mips/sys/dev/ieee488/ibfoo.c
projects/mips/sys/dev/if_ndis/if_ndis.c
projects/mips/sys/dev/if_ndis/if_ndis_usb.c
projects/mips/sys/dev/ips/ips_disk.c
projects/mips/sys/dev/isp/isp_sbus.c
projects/mips/sys/dev/iwn/if_iwn.c
projects/mips/sys/dev/iwn/if_iwnreg.h
projects/mips/sys/dev/iwn/if_iwnvar.h
projects/mips/sys/dev/ixgb/if_ixgb.c
projects/mips/sys/dev/ixgb/if_ixgb.h
projects/mips/sys/dev/ixgbe/ixgbe.c
projects/mips/sys/dev/mii/brgphy.c
projects/mips/sys/dev/mii/miidevs
projects/mips/sys/dev/mpt/mpt.c
projects/mips/sys/dev/mpt/mpt.h
projects/mips/sys/dev/mpt/mpt_cam.c
projects/mips/sys/dev/mpt/mpt_raid.c
projects/mips/sys/dev/msk/if_msk.c
projects/mips/sys/dev/msk/if_mskreg.h
projects/mips/sys/dev/mwl/if_mwl_pci.c
projects/mips/sys/dev/mxge/if_mxge.c
projects/mips/sys/dev/mxge/if_mxge_var.h
projects/mips/sys/dev/nfe/if_nfe.c
projects/mips/sys/dev/patm/if_patm_attach.c
projects/mips/sys/dev/pci/pci.c
projects/mips/sys/dev/pci/vga_pci.c
projects/mips/sys/dev/ppbus/lpt.c
projects/mips/sys/dev/ppbus/pcfclock.c
projects/mips/sys/dev/re/if_re.c
projects/mips/sys/dev/siis/siis.c
projects/mips/sys/dev/siis/siis.h
projects/mips/sys/dev/sk/if_sk.c
projects/mips/sys/dev/sound/usb/uaudio.c
projects/mips/sys/dev/stge/if_stge.c
projects/mips/sys/dev/sym/sym_hipd.c
projects/mips/sys/dev/syscons/scterm-teken.c
projects/mips/sys/dev/syscons/syscons.c
projects/mips/sys/dev/syscons/syscons.h
projects/mips/sys/dev/uart/uart_bus.h
projects/mips/sys/dev/uart/uart_core.c
projects/mips/sys/dev/uart/uart_tty.c
projects/mips/sys/dev/usb/controller/ehci.c
projects/mips/sys/dev/usb/controller/ehci.h
projects/mips/sys/dev/usb/controller/ehci_ixp4xx.c
projects/mips/sys/dev/usb/controller/ehci_mbus.c
projects/mips/sys/dev/usb/controller/ehci_pci.c
projects/mips/sys/dev/usb/controller/ohci.c
projects/mips/sys/dev/usb/controller/ohci.h
projects/mips/sys/dev/usb/controller/ohci_atmelarm.c
projects/mips/sys/dev/usb/controller/ohci_pci.c
projects/mips/sys/dev/usb/controller/uhci.c
projects/mips/sys/dev/usb/controller/uhci.h
projects/mips/sys/dev/usb/controller/uhci_pci.c
projects/mips/sys/dev/usb/input/uhid.c
projects/mips/sys/dev/usb/input/ukbd.c
projects/mips/sys/dev/usb/input/ums.c
projects/mips/sys/dev/usb/net/if_cdce.c
projects/mips/sys/dev/usb/serial/uchcom.c
projects/mips/sys/dev/usb/serial/usb_serial.c
projects/mips/sys/dev/usb/storage/umass.c
projects/mips/sys/dev/usb/usb_compat_linux.c
projects/mips/sys/dev/usb/usb_compat_linux.h
projects/mips/sys/dev/usb/usb_core.h
projects/mips/sys/dev/usb/usb_transfer.c
projects/mips/sys/dev/usb/usbdevs
projects/mips/sys/dev/usb/usbdi.h
projects/mips/sys/dev/usb/wlan/if_rum.c
projects/mips/sys/dev/usb/wlan/if_uath.c
projects/mips/sys/dev/usb/wlan/if_upgt.c
projects/mips/sys/dev/usb/wlan/if_ural.c
projects/mips/sys/dev/usb/wlan/if_urtw.c
projects/mips/sys/dev/usb/wlan/if_urtwreg.h
projects/mips/sys/dev/usb/wlan/if_urtwvar.h
projects/mips/sys/dev/usb/wlan/if_zyd.c
projects/mips/sys/dev/vge/if_vge.c
projects/mips/sys/dev/vge/if_vgevar.h
projects/mips/sys/dev/wpi/if_wpi.c
projects/mips/sys/fs/fifofs/fifo_vnops.c
projects/mips/sys/fs/nfsclient/nfs_clport.c
projects/mips/sys/fs/nfsclient/nfs_clstate.c
projects/mips/sys/fs/nfsclient/nfs_clsubs.c
projects/mips/sys/fs/nfsclient/nfs_clvnops.c
projects/mips/sys/fs/smbfs/smbfs_vfsops.c
projects/mips/sys/fs/tmpfs/tmpfs.h
projects/mips/sys/fs/tmpfs/tmpfs_subr.c
projects/mips/sys/fs/tmpfs/tmpfs_vnops.c
projects/mips/sys/geom/concat/g_concat.c
projects/mips/sys/geom/label/g_label.c
projects/mips/sys/geom/part/g_part.c
projects/mips/sys/geom/part/g_part_gpt.c
projects/mips/sys/geom/shsec/g_shsec.c
projects/mips/sys/geom/stripe/g_stripe.c
projects/mips/sys/geom/uzip/g_uzip.c
projects/mips/sys/geom/vinum/geom_vinum_create.c
projects/mips/sys/geom/vinum/geom_vinum_events.c
projects/mips/sys/geom/vinum/geom_vinum_init.c
projects/mips/sys/geom/vinum/geom_vinum_move.c
projects/mips/sys/geom/vinum/geom_vinum_rm.c
projects/mips/sys/geom/vinum/geom_vinum_subr.c
projects/mips/sys/gnu/fs/ext2fs/ext2_inode_cnv.c
projects/mips/sys/gnu/fs/ext2fs/ext2_vnops.c
projects/mips/sys/i386/bios/apm.c
projects/mips/sys/i386/conf/GENERIC
projects/mips/sys/i386/conf/NOTES
projects/mips/sys/i386/i386/elf_machdep.c
projects/mips/sys/i386/i386/identcpu.c
projects/mips/sys/i386/i386/initcpu.c
projects/mips/sys/i386/i386/intr_machdep.c
projects/mips/sys/i386/i386/machdep.c
projects/mips/sys/i386/i386/nexus.c
projects/mips/sys/i386/i386/pmap.c
projects/mips/sys/i386/i386/trap.c
projects/mips/sys/i386/i386/vm_machdep.c
projects/mips/sys/i386/include/atomic.h
projects/mips/sys/i386/include/cpufunc.h
projects/mips/sys/i386/include/elf.h
projects/mips/sys/i386/include/intr_machdep.h
projects/mips/sys/i386/isa/isa_dma.c
projects/mips/sys/i386/linux/linux_machdep.c
projects/mips/sys/i386/linux/linux_sysvec.c
projects/mips/sys/i386/xen/pmap.c
projects/mips/sys/i386/xen/xen_machdep.c
projects/mips/sys/ia64/conf/GENERIC
projects/mips/sys/ia64/ia64/elf_machdep.c
projects/mips/sys/ia64/ia64/interrupt.c
projects/mips/sys/ia64/ia64/machdep.c
projects/mips/sys/ia64/ia64/pmap.c
projects/mips/sys/ia64/ia64/trap.c
projects/mips/sys/ia64/ia64/vm_machdep.c
projects/mips/sys/ia64/include/asm.h
projects/mips/sys/ia64/include/elf.h
projects/mips/sys/ia64/include/md_var.h
projects/mips/sys/ia64/include/param.h
projects/mips/sys/ia64/include/proc.h
projects/mips/sys/isa/vga_isa.c
projects/mips/sys/kern/bus_if.m
projects/mips/sys/kern/imgact_elf.c
projects/mips/sys/kern/init_main.c
projects/mips/sys/kern/init_sysent.c
projects/mips/sys/kern/kern_context.c
projects/mips/sys/kern/kern_cpuset.c
projects/mips/sys/kern/kern_event.c
projects/mips/sys/kern/kern_exec.c
projects/mips/sys/kern/kern_exit.c
projects/mips/sys/kern/kern_idle.c
projects/mips/sys/kern/kern_intr.c
projects/mips/sys/kern/kern_jail.c
projects/mips/sys/kern/kern_ktrace.c
projects/mips/sys/kern/kern_lock.c
projects/mips/sys/kern/kern_proc.c
projects/mips/sys/kern/kern_shutdown.c
projects/mips/sys/kern/kern_sig.c
projects/mips/sys/kern/kern_thr.c
projects/mips/sys/kern/kern_thread.c
projects/mips/sys/kern/sched_4bsd.c
projects/mips/sys/kern/sched_ule.c
projects/mips/sys/kern/stack_protector.c
projects/mips/sys/kern/subr_bus.c
projects/mips/sys/kern/subr_log.c
projects/mips/sys/kern/subr_prf.c
projects/mips/sys/kern/subr_taskqueue.c
projects/mips/sys/kern/subr_trap.c
projects/mips/sys/kern/sys_generic.c
projects/mips/sys/kern/sys_process.c
projects/mips/sys/kern/syscalls.c
projects/mips/sys/kern/syscalls.master
projects/mips/sys/kern/systrace_args.c
projects/mips/sys/kern/sysv_shm.c
projects/mips/sys/kern/tty.c
projects/mips/sys/kern/tty_ttydisc.c
projects/mips/sys/kern/uipc_socket.c
projects/mips/sys/kern/uipc_syscalls.c
projects/mips/sys/kern/uipc_usrreq.c
projects/mips/sys/kern/vfs_acl.c
projects/mips/sys/kern/vfs_lookup.c
projects/mips/sys/kern/vfs_mount.c
projects/mips/sys/mips/include/elf.h
projects/mips/sys/mips/include/pcb.h
projects/mips/sys/mips/mips/elf64_machdep.c
projects/mips/sys/mips/mips/elf_machdep.c
projects/mips/sys/mips/mips/pm_machdep.c
projects/mips/sys/mips/mips/pmap.c
projects/mips/sys/mips/mips/trap.c
projects/mips/sys/mips/mips/vm_machdep.c
projects/mips/sys/modules/Makefile
projects/mips/sys/modules/acpi/acpi/Makefile
projects/mips/sys/modules/cam/Makefile
projects/mips/sys/modules/cxgb/cxgb/Makefile
projects/mips/sys/modules/dpms/Makefile
projects/mips/sys/modules/ichwd/Makefile
projects/mips/sys/modules/iwnfw/Makefile
projects/mips/sys/modules/nfslockd/Makefile
projects/mips/sys/modules/pf/Makefile
projects/mips/sys/modules/ubser/Makefile
projects/mips/sys/modules/usb/Makefile
projects/mips/sys/modules/usb/ucom/Makefile
projects/mips/sys/modules/vesa/Makefile
projects/mips/sys/modules/x86bios/Makefile
projects/mips/sys/net/bpf.c
projects/mips/sys/net/flowtable.c
projects/mips/sys/net/if.c
projects/mips/sys/net/if.h
projects/mips/sys/net/if_bridge.c
projects/mips/sys/net/if_ef.c
projects/mips/sys/net/if_enc.c
projects/mips/sys/net/if_ethersubr.c
projects/mips/sys/net/if_gif.c
projects/mips/sys/net/if_var.h
projects/mips/sys/net/pfil.c
projects/mips/sys/net/pfil.h
projects/mips/sys/net/route.c
projects/mips/sys/net80211/ieee80211.c
projects/mips/sys/net80211/ieee80211_action.c
projects/mips/sys/net80211/ieee80211_hwmp.c
projects/mips/sys/net80211/ieee80211_ioctl.h
projects/mips/sys/net80211/ieee80211_mesh.c
projects/mips/sys/net80211/ieee80211_mesh.h
projects/mips/sys/net80211/ieee80211_output.c
projects/mips/sys/net80211/ieee80211_proto.h
projects/mips/sys/netgraph/NOTES
projects/mips/sys/netgraph/ng_bridge.c
projects/mips/sys/netgraph/ng_eiface.c
projects/mips/sys/netgraph/ng_fec.c
projects/mips/sys/netgraph/ng_iface.c
projects/mips/sys/netgraph/ng_sppp.c
projects/mips/sys/netinet/if_ether.c
projects/mips/sys/netinet/in.c
projects/mips/sys/netinet/ip_fastfwd.c
projects/mips/sys/netinet/ip_icmp.c
projects/mips/sys/netinet/ip_input.c
projects/mips/sys/netinet/ip_ipsec.c
projects/mips/sys/netinet/ip_ipsec.h
projects/mips/sys/netinet/ip_output.c
projects/mips/sys/netinet/ip_var.h
projects/mips/sys/netinet/ipfw/ip_dummynet.c
projects/mips/sys/netinet/ipfw/ip_fw2.c
projects/mips/sys/netinet/ipfw/ip_fw_pfil.c
projects/mips/sys/netinet/libalias/alias.c
projects/mips/sys/netinet/raw_ip.c
projects/mips/sys/netinet/sctp_bsd_addr.c
projects/mips/sys/netinet/sctp_cc_functions.c
projects/mips/sys/netinet/sctp_os_bsd.h
projects/mips/sys/netinet/sctp_output.c
projects/mips/sys/netinet/sctp_pcb.c
projects/mips/sys/netinet/tcp_input.c
projects/mips/sys/netinet/tcp_output.c
projects/mips/sys/netinet6/icmp6.c
projects/mips/sys/netinet6/in6.c
projects/mips/sys/netinet6/in6_ifattach.c
projects/mips/sys/netinet6/ip6_forward.c
projects/mips/sys/netinet6/ip6_input.c
projects/mips/sys/netinet6/ip6_output.c
projects/mips/sys/netinet6/ip6_var.h
projects/mips/sys/netinet6/nd6.c
projects/mips/sys/nfsclient/nfs_kdtrace.c
projects/mips/sys/nfsclient/nfs_vnops.c
projects/mips/sys/nlm/nlm.h
projects/mips/sys/nlm/nlm_prot_impl.c
projects/mips/sys/nlm/nlm_prot_server.c
projects/mips/sys/pc98/cbus/scterm-sck.c
projects/mips/sys/pc98/conf/GENERIC
projects/mips/sys/pc98/pc98/machdep.c
projects/mips/sys/powerpc/aim/clock.c
projects/mips/sys/powerpc/aim/copyinout.c
projects/mips/sys/powerpc/aim/machdep.c
projects/mips/sys/powerpc/aim/mmu_oea.c
projects/mips/sys/powerpc/aim/mmu_oea64.c
projects/mips/sys/powerpc/aim/mp_cpudep.c
projects/mips/sys/powerpc/aim/platform_chrp.c
projects/mips/sys/powerpc/aim/swtch.S
projects/mips/sys/powerpc/aim/trap.c
projects/mips/sys/powerpc/aim/trap_subr.S
projects/mips/sys/powerpc/aim/vm_machdep.c
projects/mips/sys/powerpc/booke/machdep.c
projects/mips/sys/powerpc/booke/mp_cpudep.c
projects/mips/sys/powerpc/booke/pmap.c
projects/mips/sys/powerpc/booke/trap.c
projects/mips/sys/powerpc/booke/vm_machdep.c
projects/mips/sys/powerpc/include/elf.h
projects/mips/sys/powerpc/include/hid.h
projects/mips/sys/powerpc/include/pcpu.h
projects/mips/sys/powerpc/include/pmap.h
projects/mips/sys/powerpc/include/smp.h
projects/mips/sys/powerpc/include/spr.h
projects/mips/sys/powerpc/powermac/hrowpic.c
projects/mips/sys/powerpc/powerpc/cpu.c
projects/mips/sys/powerpc/powerpc/elf_machdep.c
projects/mips/sys/powerpc/powerpc/mmu_if.m
projects/mips/sys/powerpc/powerpc/mp_machdep.c
projects/mips/sys/powerpc/powerpc/pmap_dispatch.c
projects/mips/sys/powerpc/powerpc/stack_machdep.c
projects/mips/sys/powerpc/powerpc/uio_machdep.c
projects/mips/sys/rpc/clnt_vc.c
projects/mips/sys/sparc64/conf/GENERIC
projects/mips/sys/sparc64/include/elf.h
projects/mips/sys/sparc64/include/in_cksum.h
projects/mips/sys/sparc64/include/pcb.h
projects/mips/sys/sparc64/sparc64/elf_machdep.c
projects/mips/sys/sparc64/sparc64/machdep.c
projects/mips/sys/sparc64/sparc64/pmap.c
projects/mips/sys/sparc64/sparc64/trap.c
projects/mips/sys/sparc64/sparc64/vm_machdep.c
projects/mips/sys/sun4v/include/elf.h
projects/mips/sys/sun4v/sun4v/machdep.c
projects/mips/sys/sun4v/sun4v/pmap.c
projects/mips/sys/sun4v/sun4v/trap.c
projects/mips/sys/sun4v/sun4v/vm_machdep.c
projects/mips/sys/sys/aac_ioctl.h
projects/mips/sys/sys/ata.h
projects/mips/sys/sys/bus.h
projects/mips/sys/sys/conf.h
projects/mips/sys/sys/errno.h
projects/mips/sys/sys/fbio.h
projects/mips/sys/sys/interrupt.h
projects/mips/sys/sys/kernel.h
projects/mips/sys/sys/ktrace.h
projects/mips/sys/sys/mman.h
projects/mips/sys/sys/msgbuf.h
projects/mips/sys/sys/param.h
projects/mips/sys/sys/pmc.h
projects/mips/sys/sys/priv.h
projects/mips/sys/sys/proc.h
projects/mips/sys/sys/signalvar.h
projects/mips/sys/sys/sockio.h
projects/mips/sys/sys/syscall.h
projects/mips/sys/sys/syscall.mk
projects/mips/sys/sys/syscallsubr.h
projects/mips/sys/sys/sysproto.h
projects/mips/sys/sys/time.h
projects/mips/sys/sys/ttyqueue.h
projects/mips/sys/teken/sequences
projects/mips/sys/teken/teken.c
projects/mips/sys/teken/teken.h
projects/mips/sys/teken/teken_subr.h
projects/mips/sys/tools/fw_stub.awk
projects/mips/sys/tools/makeobjops.awk
projects/mips/sys/vm/pmap.h
projects/mips/sys/vm/swap_pager.c
projects/mips/sys/vm/vm_extern.h
projects/mips/sys/vm/vm_fault.c
projects/mips/sys/vm/vm_glue.c
projects/mips/sys/vm/vm_map.c
projects/mips/sys/vm/vm_mmap.c
projects/mips/sys/vm/vm_page.c
projects/mips/sys/vm/vm_page.h
projects/mips/sys/vm/vm_zeroidle.c
projects/mips/tools/regression/fstest/tests/rename/21.t
projects/mips/tools/regression/lib/libc/gen/test-wordexp.c
projects/mips/tools/regression/lib/libc/stdio/test-getdelim.c
projects/mips/tools/regression/lib/libutil/test-flopen.c
projects/mips/tools/regression/mmap/mmap.c
projects/mips/tools/regression/sigqueue/sigqtest1/sigqtest1.c
projects/mips/tools/regression/sigqueue/sigqtest2/sigqtest2.c
projects/mips/tools/regression/tmpfs/h_tools.c
projects/mips/tools/tools/netrate/netsend/netsend.c
projects/mips/usr.bin/bsdiff/bsdiff/bsdiff.1
projects/mips/usr.bin/bsdiff/bspatch/bspatch.1
projects/mips/usr.bin/calendar/calendars/calendar.freebsd
projects/mips/usr.bin/gzip/unbzip2.c
projects/mips/usr.bin/kdump/kdump.c
projects/mips/usr.bin/leave/leave.c
projects/mips/usr.bin/locale/locale.1
projects/mips/usr.bin/locale/locale.c
projects/mips/usr.bin/logger/logger.c
projects/mips/usr.bin/make/job.c
projects/mips/usr.bin/make/main.c
projects/mips/usr.bin/netstat/main.c
projects/mips/usr.bin/netstat/netstat.h
projects/mips/usr.bin/netstat/route.c
projects/mips/usr.bin/netstat/unix.c
projects/mips/usr.bin/systat/keyboard.c
projects/mips/usr.bin/systat/main.c
projects/mips/usr.bin/tail/tail.1
projects/mips/usr.bin/touch/touch.c
projects/mips/usr.bin/vmstat/vmstat.c
projects/mips/usr.bin/whois/whois.1
projects/mips/usr.bin/whois/whois.c
projects/mips/usr.sbin/acpi/iasl/Makefile
projects/mips/usr.sbin/cdcontrol/cdcontrol.c
projects/mips/usr.sbin/crashinfo/crashinfo.sh
projects/mips/usr.sbin/i2c/i2c.8
projects/mips/usr.sbin/jail/jail.8
projects/mips/usr.sbin/nfsd/stablerestart.5
projects/mips/usr.sbin/ntp/doc/ntpd.8
projects/mips/usr.sbin/sysinstall/Makefile
projects/mips/usr.sbin/sysinstall/cdrom.c
projects/mips/usr.sbin/sysinstall/dist.c
projects/mips/usr.sbin/sysinstall/install.c
projects/mips/usr.sbin/sysinstall/menus.c
projects/mips/usr.sbin/sysinstall/sysinstall.8
projects/mips/usr.sbin/sysinstall/tcpip.c
projects/mips/usr.sbin/tzsetup/tzsetup.8
projects/mips/usr.sbin/tzsetup/tzsetup.c
projects/mips/usr.sbin/usbconfig/dump.c
projects/mips/usr.sbin/usbconfig/usbconfig.8
projects/mips/usr.sbin/vidcontrol/vidcontrol.1
projects/mips/usr.sbin/vidcontrol/vidcontrol.c
projects/mips/usr.sbin/wake/wake.8
projects/mips/usr.sbin/zic/zdump.c
projects/mips/usr.sbin/zic/zic.8
Directory Properties:
projects/mips/ (props changed)
projects/mips/cddl/contrib/opensolaris/ (props changed)
projects/mips/contrib/bind9/ (props changed)
projects/mips/contrib/cpio/ (props changed)
projects/mips/contrib/csup/ (props changed)
projects/mips/contrib/ee/ (props changed)
projects/mips/contrib/file/ (props changed)
projects/mips/contrib/gdb/ (props changed)
projects/mips/contrib/gdtoa/ (props changed)
projects/mips/contrib/less/ (props changed)
projects/mips/contrib/libpcap/ (props changed)
projects/mips/contrib/ncurses/ (props changed)
projects/mips/contrib/netcat/ (props changed)
projects/mips/contrib/ntp/ (props changed)
projects/mips/contrib/openbsm/ (props changed)
projects/mips/contrib/openpam/ (props changed)
projects/mips/contrib/pf/ (props changed)
projects/mips/contrib/sendmail/ (props changed)
projects/mips/contrib/tcpdump/ (props changed)
projects/mips/contrib/tcsh/ (props changed)
projects/mips/contrib/top/ (props changed)
projects/mips/contrib/top/install-sh (props changed)
projects/mips/crypto/openssh/ (props changed)
projects/mips/crypto/openssh/sftp-server.8 (props changed)
projects/mips/crypto/openssh/ssh-agent.1 (props changed)
projects/mips/crypto/openssl/ (props changed)
projects/mips/games/fortune/datfiles/gerrold.limerick (props changed)
projects/mips/lib/libc/ (props changed)
projects/mips/lib/libc/stdio/asprintf.c (props changed)
projects/mips/lib/libc/stdtime/ (props changed)
projects/mips/lib/libc/string/ffsll.c (props changed)
projects/mips/lib/libc/string/flsll.c (props changed)
projects/mips/lib/libc/string/wcpcpy.c (props changed)
projects/mips/lib/libc/string/wcpncpy.c (props changed)
projects/mips/lib/libutil/ (props changed)
projects/mips/sbin/ (props changed)
projects/mips/sbin/ipfw/ (props changed)
projects/mips/share/zoneinfo/ (props changed)
projects/mips/sys/ (props changed)
projects/mips/sys/amd64/include/xen/ (props changed)
projects/mips/sys/cddl/contrib/opensolaris/ (props changed)
projects/mips/sys/contrib/dev/acpica/ (props changed)
projects/mips/sys/contrib/pf/ (props changed)
projects/mips/sys/dev/xen/xenpci/ (props changed)
projects/mips/sys/mips/conf/OCTEON1 (props changed)
projects/mips/sys/mips/octeon1/ (props changed)
projects/mips/tools/regression/usr.bin/pkill/pgrep-_g.t (props changed)
projects/mips/tools/regression/usr.bin/pkill/pgrep-_s.t (props changed)
projects/mips/tools/regression/usr.bin/pkill/pkill-_g.t (props changed)
projects/mips/tools/tools/termcap/termcap.pl (props changed)
projects/mips/usr.bin/csup/ (props changed)
projects/mips/usr.bin/procstat/ (props changed)
projects/mips/usr.sbin/dumpcis/cardinfo.h (props changed)
projects/mips/usr.sbin/dumpcis/cis.h (props changed)
projects/mips/usr.sbin/mfiutil/mfiutil.8 (props changed)
projects/mips/usr.sbin/zic/ (props changed)
Modified: projects/mips/Makefile.inc1
==============================================================================
--- projects/mips/Makefile.inc1 Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/Makefile.inc1 Thu Nov 12 00:36:22 2009 (r199207)
@@ -272,7 +272,7 @@ LIB32CPUFLAGS= -march=i686 -mmmx -msse -
LIB32CPUFLAGS= -march=${TARGET_CPUTYPE}
.endif
LIB32FLAGS= -m32 ${LIB32CPUFLAGS} -mfancy-math-387 -DCOMPAT_32BIT \
- -iprefix ${LIB32TMP}/usr/ \
+ -isystem ${LIB32TMP}/usr/include/ \
-L${LIB32TMP}/usr/lib32 \
-B${LIB32TMP}/usr/lib32
@@ -599,11 +599,14 @@ installcheck_UGID:
.if ${MK_INFO} != "no"
_install-info= install-info
.endif
+.if ${MK_ZONEINFO} != "no"
+_zoneinfo= zic tzsetup
+.endif
ITOOLS= [ awk cap_mkdb cat chflags chmod chown \
date echo egrep find grep ${_install-info} \
ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
- test true uname wc zic
+ test true uname wc ${_zoneinfo}
#
# distributeworld
@@ -929,6 +932,10 @@ _ar= usr.bin/ar
_mklocale= usr.bin/mklocale
.endif
+.if ${BOOTSTRAPPING} < 900002
+_sed= usr.bin/sed
+.endif
+
.if ${BOOTSTRAPPING} < 700018
_gensnmptree= usr.sbin/bsnmpd/gensnmptree
.endif
@@ -954,6 +961,7 @@ bootstrap-tools:
usr.bin/makewhatis \
${_mklocale} \
usr.bin/rpcgen \
+ ${_sed} \
usr.bin/xinstall \
${_gensnmptree} \
usr.sbin/config \
@@ -1033,7 +1041,6 @@ cross-tools:
.for _tool in \
gnu/usr.bin/binutils \
gnu/usr.bin/cc \
- usr.bin/sed \
usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \
${_btxld} \
${_crunchide} \
@@ -1122,7 +1129,7 @@ lib/libradius__L secure/lib/libssl__L: s
_secure_lib_libssh= secure/lib/libssh
secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
.if ${MK_KERBEROS} != "no"
-kerberos5/lib/libgssapi_krb5__L: kerberos5/lib/libkrb5__L \
+kerberos5/lib/libgssapi_krb5__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \
kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \
lib/libmd__L kerberos5/lib/libroken__L secure/lib/libcrypto__L \
lib/libcrypt__L
Modified: projects/mips/ObsoleteFiles.inc
==============================================================================
--- projects/mips/ObsoleteFiles.inc Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/ObsoleteFiles.inc Thu Nov 12 00:36:22 2009 (r199207)
@@ -14,6 +14,11 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20091027: pselect.3 implemented as syscall
+OLD_FILES+=usr/share/man/man3/pselect.3.gz
+# 20091005: fusword.9 and susword.9 removed
+OLD_FILES+=usr/share/man/man9/fusword.9.gz
+OLD_FILES+=usr/share/man/man9/susword.9.gz
# 20090909: vesa and dpms promoted to be i386/amd64 common
OLD_FILES+=usr/include/machine/pc/vesa.h
OLD_FILES+=usr/share/man/man4/i386/dpms.4.gz
@@ -26,6 +31,49 @@ OLD_FILES+=usr/share/man/man8/lukemftpd.
OLD_FILES+=etc/mtree/BSD.local.dist
OLD_FILES+=etc/mtree/BSD.x11.dist
OLD_FILES+=etc/mtree/BSD.x11-4.dist
+# 20090812: net80211 documentation overhaul
+OLD_FILES+=usr/share/man/man9/ieee80211_add_rates.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_add_xrates.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_alloc_node.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_attach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_begin_scan.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_cfgget.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_cfgset.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_chan2ieee.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_chan2mode.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_create_ibss.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_crypto_attach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_crypto_detach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_decap.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_dump_pkt.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_dup_bss.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_encap.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_end_scan.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_find_node.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_fix_rate.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_free_allnodes.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_ieee2mhz.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_ioctl.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_lookup_node.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_media2rate.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_media_change.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_media_init.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_media_status.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_mhz2ieee.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_next_scan.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_node_attach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_node_detach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_node_lateattach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_print_essid.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_proto_attach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_proto_detach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_rate2media.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_recv_mgmt.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_send_mgmt.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_setmode.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_timeout_nodes.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_watchdog.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_wep_crypt.9.gz
# 20090801: vimage.h removed in favour of vnet.h
OLD_FILES+=usr/include/sys/vimage.h
# 20090719: library version bump for 8.0
@@ -503,6 +551,8 @@ OLD_FILES+=usr/include/dev/usb/usb_quirk
OLD_FILES+=usr/include/dev/usb/usbcdc.h
OLD_FILES+=usr/include/dev/usb/usbdivar.h
OLD_FILES+=usr/include/dev/usb/uxb360gp_rdesc.h
+OLD_FILES+=usr/sbin/usbdevs
+OLD_FILES+=usr/share/man/man8/usbdevs.8.gz
# 20090203: removal of pccard header files
OLD_FILES+=usr/include/pccard/cardinfo.h
OLD_FILES+=usr/include/pccard/cis.h
Modified: projects/mips/UPDATING
==============================================================================
--- projects/mips/UPDATING Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/UPDATING Thu Nov 12 00:36:22 2009 (r199207)
@@ -22,6 +22,19 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.
machines to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20091109:
+ The layout of the structure ieee80211req_scan_result has changed.
+ Applications that require wireless scan results (e.g. ifconfig(8))
+ from net80211 need to be recompiled.
+
+20091025:
+ The iwn(4) driver has been updated to support the 5000 and 5150 series.
+ There's one kernel module for each firmware. Adding "device iwnfw"
+ to the kernel configuration file means including all three firmware
+ images inside the kernel. If you want to include just the one for
+ your wireless card, use the the devices iwn4965fw, iwn5000fw or
+ iwn5150fw.
+
20090926:
The rc.d/network_ipv6, IPv6 configuration script has been integrated
into rc.d/netif. The changes are the following:
@@ -529,6 +542,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.
# Map old usb library to new one for usb2 stack
libusb-0.1.so.8 libusb20.so.1
+20090209:
+ All USB ethernet devices now attach as interfaces under the name ueN
+ (eg. ue0). This is to provide a predictable name as vendors often
+ change usb chipsets in a product without notice.
+
20090203:
The ichsmb(4) driver has been changed to require SMBus slave
addresses be left-justified (xxxxxxx0b) rather than right-justified.
@@ -624,6 +642,15 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.
userland (libpmc(3)) and the kernel module (hwpmc(4)) in
sync.
+20081009:
+ atapci kernel module now includes only generic PCI ATA
+ driver. AHCI driver moved to ataahci kernel module.
+ All vendor-specific code moved into separate kernel modules:
+ ataacard, ataacerlabs, ataadaptec, ataamd, ataati, atacenatek,
+ atacypress, atacyrix, atahighpoint, ataintel, ataite, atajmicron,
+ atamarvell, atamicron, atanational, atanetcell, atanvidia,
+ atapromise, ataserverworks, atasiliconimage, atasis, atavia
+
20080820:
The TTY subsystem of the kernel has been replaced by a new
implementation, which provides better scalability and an
Modified: projects/mips/bin/cat/Makefile
==============================================================================
--- projects/mips/bin/cat/Makefile Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/bin/cat/Makefile Thu Nov 12 00:36:22 2009 (r199207)
@@ -2,6 +2,5 @@
# $FreeBSD$
PROG= cat
-WARNS?= 6
.include <bsd.prog.mk>
Modified: projects/mips/bin/csh/iconv_stub.c
==============================================================================
--- projects/mips/bin/csh/iconv_stub.c Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/bin/csh/iconv_stub.c Thu Nov 12 00:36:22 2009 (r199207)
@@ -61,9 +61,20 @@ dl_iconv_open(const char *tocode, const
if (iconvlib == NULL)
return (iconv_t)-1;
iconv_open = (iconv_open_t *)dlfunc(iconvlib, ICONV_OPEN);
+ if (iconv_open == NULL)
+ goto dlfunc_err;
dl_iconv = (dl_iconv_t *)dlfunc(iconvlib, ICONV_ENGINE);
+ if (dl_iconv == NULL)
+ goto dlfunc_err;
dl_iconv_close = (dl_iconv_close_t *)dlfunc(iconvlib,
ICONV_CLOSE);
+ if (dl_iconv_close == NULL)
+ goto dlfunc_err;
}
return iconv_open(tocode, fromcode);
+
+dlfunc_err:
+ dlclose(iconvlib);
+ iconvlib = NULL;
+ return (iconv_t)-1;
}
Modified: projects/mips/bin/getfacl/getfacl.1
==============================================================================
--- projects/mips/bin/getfacl/getfacl.1 Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/bin/getfacl/getfacl.1 Thu Nov 12 00:36:22 2009 (r199207)
@@ -30,7 +30,7 @@
.\" Developed by the TrustedBSD Project.
.\" Support for POSIX.1e access control lists.
.\"
-.Dd September 04, 2009
+.Dd September 4, 2009
.Dt GETFACL 1
.Os
.Sh NAME
Modified: projects/mips/bin/ls/ls.c
==============================================================================
--- projects/mips/bin/ls/ls.c Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/bin/ls/ls.c Thu Nov 12 00:36:22 2009 (r199207)
@@ -399,7 +399,7 @@ main(int argc, char *argv[])
* If not -F, -d or -l options, follow any symbolic links listed on
* the command line.
*/
- if (!f_longform && !f_listdir && !f_type)
+ if (!f_longform && !f_listdir && (!f_type || f_slash))
fts_options |= FTS_COMFOLLOW;
/*
Modified: projects/mips/bin/ps/keyword.c
==============================================================================
--- projects/mips/bin/ps/keyword.c Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/bin/ps/keyword.c Thu Nov 12 00:36:22 2009 (r199207)
@@ -70,7 +70,7 @@ static int vcmp(const void *, const voi
/* PLEASE KEEP THE TABLE BELOW SORTED ALPHABETICALLY!!! */
static VAR var[] = {
- {"%cpu", "%CPU", NULL, 0, pcpu, NULL, 4, 0, CHAR, NULL, 0},
+ {"%cpu", "%CPU", NULL, 0, pcpu, NULL, 5, 0, CHAR, NULL, 0},
{"%mem", "%MEM", NULL, 0, pmem, NULL, 4, 0, CHAR, NULL, 0},
{"acflag", "ACFLG", NULL, 0, kvar, NULL, 3, KOFF(ki_acflag), USHORT,
"x", 0},
@@ -159,7 +159,7 @@ static VAR var[] = {
UINT, UIDFMT, 0},
{"rgroup", "RGROUP", NULL, LJUST|DSIZ, rgroupname, s_rgroupname,
USERLEN, 0, CHAR, NULL, 0},
- {"rss", "RSS", NULL, 0, kvar, NULL, 5, KOFF(ki_rssize), PGTOK, "ld", 0},
+ {"rss", "RSS", NULL, 0, kvar, NULL, 6, KOFF(ki_rssize), PGTOK, "ld", 0},
{"rtprio", "RTPRIO", NULL, 0, priorityr, NULL, 7, KOFF(ki_pri), CHAR,
NULL, 0},
{"ruid", "RUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_ruid),
@@ -207,7 +207,7 @@ static VAR var[] = {
NULL, 0},
{"usrpri", "", "upr", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
{"vsize", "", "vsz", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
- {"vsz", "VSZ", NULL, 0, vsize, NULL, 5, 0, CHAR, NULL, 0},
+ {"vsz", "VSZ", NULL, 0, vsize, NULL, 6, 0, CHAR, NULL, 0},
{"wchan", "WCHAN", NULL, LJUST, wchan, NULL, 6, 0, CHAR, NULL, 0},
{"xstat", "XSTAT", NULL, 0, kvar, NULL, 4, KOFF(ki_xstat), USHORT,
"x", 0},
Modified: projects/mips/bin/sh/arith_lex.l
==============================================================================
--- projects/mips/bin/sh/arith_lex.l Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/bin/sh/arith_lex.l Thu Nov 12 00:36:22 2009 (r199207)
@@ -51,6 +51,13 @@ __FBSDID("$FreeBSD$");
int yylex(void);
+struct varname
+{
+ struct varname *next;
+ char name[1];
+};
+static struct varname *varnames;
+
#undef YY_INPUT
#define YY_INPUT(buf,result,max) \
result = (*buf = *arith_buf++) ? 1 : YY_NULL;
@@ -80,11 +87,14 @@ int yylex(void);
* If variable doesn't exist, we should initialize
* it to zero.
*/
- char *temp;
+ struct varname *temp;
if (lookupvar(yytext) == NULL)
setvarsafe(yytext, "0", 0);
- temp = (char *)ckmalloc(strlen(yytext) + 1);
- yylval.s_value = strcpy(temp, yytext);
+ temp = ckmalloc(sizeof(struct varname) +
+ strlen(yytext));
+ temp->next = varnames;
+ varnames = temp;
+ yylval.s_value = strcpy(temp->name, yytext);
return ARITH_VAR;
}
@@ -130,5 +140,15 @@ int yylex(void);
void
arith_lex_reset(void)
{
+ struct varname *name, *next;
+
YY_NEW_FILE;
+
+ name = varnames;
+ while (name != NULL) {
+ next = name->next;
+ ckfree(name);
+ name = next;
+ }
+ varnames = NULL;
}
Modified: projects/mips/bin/sh/eval.c
==============================================================================
--- projects/mips/bin/sh/eval.c Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/bin/sh/eval.c Thu Nov 12 00:36:22 2009 (r199207)
@@ -713,12 +713,7 @@ evalcommand(union node *cmd, int flags,
do_clearcmdentry = 1;
}
- find_command(argv[0], &cmdentry, 1, path);
- if (cmdentry.cmdtype == CMDUNKNOWN) { /* command not found */
- exitstatus = 127;
- flushout(&errout);
- return;
- }
+ find_command(argv[0], &cmdentry, 0, path);
/* implement the bltin builtin here */
if (cmdentry.cmdtype == CMDBUILTIN && cmdentry.u.index == BLTINCMD) {
for (;;) {
@@ -740,7 +735,7 @@ evalcommand(union node *cmd, int flags,
/* Fork off a child process if necessary. */
if (cmd->ncmd.backgnd
- || (cmdentry.cmdtype == CMDNORMAL
+ || ((cmdentry.cmdtype == CMDNORMAL || cmdentry.cmdtype == CMDUNKNOWN)
&& ((flags & EV_EXIT) == 0 || have_traps()))
|| ((flags & EV_BACKCMD) != 0
&& (cmdentry.cmdtype != CMDBUILTIN
Modified: projects/mips/bin/sh/exec.c
==============================================================================
--- projects/mips/bin/sh/exec.c Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/bin/sh/exec.c Thu Nov 12 00:36:22 2009 (r199207)
@@ -429,6 +429,7 @@ loop:
outfmt(out2, "%s: %s\n", name, strerror(e));
}
entry->cmdtype = CMDUNKNOWN;
+ entry->u.index = 0;
return;
success:
Modified: projects/mips/bin/sh/expand.c
==============================================================================
--- projects/mips/bin/sh/expand.c Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/bin/sh/expand.c Thu Nov 12 00:36:22 2009 (r199207)
@@ -657,7 +657,7 @@ again: /* jump here after setting a vari
}
varlen = 0;
startloc = expdest - stackblock();
- if (!set && uflag) {
+ if (!set && uflag && *var != '@' && *var != '*') {
switch (subtype) {
case VSNORMAL:
case VSTRIMLEFT:
Modified: projects/mips/bin/sh/parser.c
==============================================================================
--- projects/mips/bin/sh/parser.c Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/bin/sh/parser.c Thu Nov 12 00:36:22 2009 (r199207)
@@ -82,7 +82,6 @@ struct heredoc {
STATIC struct heredoc *heredoclist; /* list of here documents to read */
-STATIC int parsebackquote; /* nonzero if we are inside backquotes */
STATIC int doprompt; /* if set, prompt the user */
STATIC int needprompt; /* true if interactive and at start of line */
STATIC int lasttoken; /* last token read */
@@ -1043,7 +1042,7 @@ readtoken1(int firstc, char const *synta
endword:
if (syntax == ARISYNTAX)
synerror("Missing '))'");
- if (syntax != BASESYNTAX && ! parsebackquote && eofmark == NULL)
+ if (syntax != BASESYNTAX && eofmark == NULL)
synerror("Unterminated quoted string");
if (varnest != 0) {
startlinno = plinno;
@@ -1303,20 +1302,22 @@ parsesub: {
parsebackq: {
struct nodelist **nlpp;
- int savepbq;
union node *n;
char *volatile str;
struct jmploc jmploc;
struct jmploc *const savehandler = handler;
int savelen;
int saveprompt;
+ const int bq_startlinno = plinno;
- savepbq = parsebackquote;
if (setjmp(jmploc.loc)) {
if (str)
ckfree(str);
- parsebackquote = 0;
handler = savehandler;
+ if (exception == EXERROR) {
+ startlinno = bq_startlinno;
+ synerror("Error in command substitution");
+ }
longjmp(handler->loc, 1);
}
INTOFF;
@@ -1397,7 +1398,6 @@ done:
nlpp = &(*nlpp)->next;
*nlpp = (struct nodelist *)stalloc(sizeof (struct nodelist));
(*nlpp)->next = NULL;
- parsebackquote = oldstyle;
if (oldstyle) {
saveprompt = doprompt;
@@ -1433,7 +1433,6 @@ done:
str = NULL;
INTON;
}
- parsebackquote = savepbq;
handler = savehandler;
if (arinest || dblquote)
USTPUTC(CTLBACKQ | CTLQUOTE, out);
Modified: projects/mips/bin/sh/sh.1
==============================================================================
--- projects/mips/bin/sh/sh.1 Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/bin/sh/sh.1 Thu Nov 12 00:36:22 2009 (r199207)
@@ -32,7 +32,7 @@
.\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95
.\" $FreeBSD$
.\"
-.Dd May 31, 2009
+.Dd October 24, 2009
.Dt SH 1
.Os
.Sh NAME
@@ -296,7 +296,10 @@ sh -T -c "trap 'exit 1' 2 ; some-blockin
.Ed
.It Fl u Li nounset
Write a message to standard error when attempting
-to expand a variable that is not set, and if the
+to expand a variable, a positional parameter or
+the special parameter
+.Va \&!
+that is not set, and if the
shell is not interactive, exit immediately.
.It Fl V Li vi
Enable the built-in
@@ -1227,6 +1230,9 @@ In all cases, the
final value of
.Ar parameter
is substituted.
+Quoting inside
+.Ar word
+does not prevent field splitting or pathname expansion.
Only variables, not positional
parameters or special parameters, can be
assigned in this way.
Modified: projects/mips/bin/uuidgen/Makefile
==============================================================================
--- projects/mips/bin/uuidgen/Makefile Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/bin/uuidgen/Makefile Thu Nov 12 00:36:22 2009 (r199207)
@@ -1,6 +1,5 @@
# $FreeBSD$
PROG= uuidgen
-WARNS?= 6
.include <bsd.prog.mk>
Modified: projects/mips/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- projects/mips/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Thu Nov 12 00:36:22 2009 (r199207)
@@ -1790,11 +1790,14 @@ zfs_prop_set(zfs_handle_t *zhp, const ch
/* We don't support those properties on FreeBSD. */
switch (prop) {
- case ZFS_PROP_SHAREISCSI:
case ZFS_PROP_DEVICES:
- case ZFS_PROP_ACLMODE:
- case ZFS_PROP_ACLINHERIT:
+ case ZFS_PROP_ZONED:
+ case ZFS_PROP_SHAREISCSI:
case ZFS_PROP_ISCSIOPTIONS:
+ case ZFS_PROP_XATTR:
+ case ZFS_PROP_VSCAN:
+ case ZFS_PROP_NBMAND:
+ case ZFS_PROP_SHARESMB:
(void) snprintf(errbuf, sizeof (errbuf),
"property '%s' not supported on FreeBSD", propname);
ret = zfs_error(hdl, EZFS_PERM, errbuf);
Modified: projects/mips/contrib/bind9/bin/dig/dighost.c
==============================================================================
--- projects/mips/contrib/bind9/bin/dig/dighost.c Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/contrib/bind9/bin/dig/dighost.c Thu Nov 12 00:36:22 2009 (r199207)
@@ -2604,10 +2604,12 @@ connect_done(isc_task_t *task, isc_event
if (sevent->result == ISC_R_CANCELED) {
debug("in cancel handler");
- isc_socket_detach(&query->sock);
- sockcount--;
- INSIST(sockcount >= 0);
- debug("sockcount=%d", sockcount);
+ if (query->sock != NULL) {
+ isc_socket_detach(&query->sock);
+ sockcount--;
+ INSIST(sockcount >= 0);
+ debug("sockcount=%d", sockcount);
+ }
query->waiting_connect = ISC_FALSE;
isc_event_free(&event);
l = query->lookup;
Modified: projects/mips/contrib/ee/ee.c
==============================================================================
--- projects/mips/contrib/ee/ee.c Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/contrib/ee/ee.c Thu Nov 12 00:36:22 2009 (r199207)
@@ -1989,7 +1989,7 @@ char *cmd_str;
int number;
int i;
char *ptr;
- char *direction = NULL;
+ char *direction = "d";
struct text *t_line;
ptr = cmd_str;
Modified: projects/mips/contrib/gcc/config/i386/i386.c
==============================================================================
--- projects/mips/contrib/gcc/config/i386/i386.c Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/contrib/gcc/config/i386/i386.c Thu Nov 12 00:36:22 2009 (r199207)
@@ -1614,7 +1614,7 @@ override_options (void)
"-mtune=generic instead as appropriate.");
if (!ix86_arch_string)
- ix86_arch_string = TARGET_64BIT ? "x86-64" : "i386";
+ ix86_arch_string = TARGET_64BIT ? "x86-64" : "i486";
if (!strcmp (ix86_arch_string, "generic"))
error ("generic CPU can be used only for -mtune= switch");
if (!strncmp (ix86_arch_string, "generic", 7))
Modified: projects/mips/contrib/libpcap/inet.c
==============================================================================
--- projects/mips/contrib/libpcap/inet.c Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/contrib/libpcap/inet.c Thu Nov 12 00:36:22 2009 (r199207)
@@ -403,22 +403,30 @@ add_addr_to_iflist(pcap_if_t **alldevs,
pcap_addr_t *curaddr, *prevaddr, *nextaddr;
#ifdef SIOCGIFDESCR
struct ifreq ifrdesc;
+#ifdef __FreeBSD__
+#define _IFDESCRSIZE 64
+ char ifdescr[_IFDESCRSIZE];
+#else
char ifdescr[IFDESCRSIZE];
- int s;
#endif
+ int s;
-#ifdef SIOCGIFDESCR
/*
* Get the description for the interface.
*/
memset(&ifrdesc, 0, sizeof ifrdesc);
strlcpy(ifrdesc.ifr_name, name, sizeof ifrdesc.ifr_name);
+#ifdef __FreeBSD__
+ ifrdesc.ifr_buffer.buffer = ifdescr;
+ ifrdesc.ifr_buffer.length = _IFDESCRSIZE;
+#else
ifrdesc.ifr_data = (caddr_t)&ifdescr;
+#endif
s = socket(AF_INET, SOCK_DGRAM, 0);
if (s >= 0) {
if (ioctl(s, SIOCGIFDESCR, &ifrdesc) == 0 &&
- strlen(ifrdesc.ifr_data) != 0)
- description = ifrdesc.ifr_data;
+ strlen(ifdescr) != 0)
+ description = ifdescr;
close(s);
}
#endif
Modified: projects/mips/contrib/ncurses/ncurses/base/lib_getch.c
==============================================================================
--- projects/mips/contrib/ncurses/ncurses/base/lib_getch.c Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/contrib/ncurses/ncurses/base/lib_getch.c Thu Nov 12 00:36:22 2009 (r199207)
@@ -476,6 +476,12 @@ _nc_wgetch(WINDOW *win,
/* resizeterm can push KEY_RESIZE */
if (cooked_key_in_fifo()) {
*result = fifo_pull(sp);
+ /*
+ * Get the ERR from queue -- it is from WINCH,
+ * so we should take it out, the "error" is handled.
+ */
+ if (fifo_peek(sp) == -1)
+ fifo_pull(sp);
returnCode(*result >= KEY_MIN ? KEY_CODE_YES : OK);
}
}
Modified: projects/mips/contrib/openpam/doc/man/pam.conf.5
==============================================================================
--- projects/mips/contrib/openpam/doc/man/pam.conf.5 Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/contrib/openpam/doc/man/pam.conf.5 Thu Nov 12 00:36:22 2009 (r199207)
@@ -109,7 +109,7 @@ will be failure regardless of the succes
.It Cm requisite
If this module succeeds, the result of the chain will be success
unless a later module fails.
-If it module fails, the chain is broken and the result is failure.
+If the module fails, the chain is broken and the result is failure.
.It Cm sufficient
If this module succeeds, the chain is broken and the result is
success.
Modified: projects/mips/contrib/tcpdump/print-tcp.c
==============================================================================
--- projects/mips/contrib/tcpdump/print-tcp.c Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/contrib/tcpdump/print-tcp.c Thu Nov 12 00:36:22 2009 (r199207)
@@ -124,6 +124,7 @@ struct tok tcp_option_values[] = {
{ TCPOPT_CCECHO, "" },
{ TCPOPT_SIGNATURE, "md5" },
{ TCPOPT_AUTH, "enhanced auth" },
+ { TCPOPT_UTO, "uto" },
{ 0, NULL }
};
@@ -613,6 +614,17 @@ tcp_print(register const u_char *bp, reg
*/
break;
+ case TCPOPT_UTO:
+ datalen = 2;
+ LENCHECK(datalen);
+ uint utoval = EXTRACT_16BITS(cp);
+ if (utoval & 0x0001)
+ utoval = (utoval >> 1) * 60;
+ else
+ utoval >>= 1;
+ (void)printf(" %u", utoval);
+ break;
+
default:
datalen = len - 2;
for (i = 0; i < datalen; ++i) {
Modified: projects/mips/contrib/tcpdump/tcp.h
==============================================================================
--- projects/mips/contrib/tcpdump/tcp.h Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/contrib/tcpdump/tcp.h Thu Nov 12 00:36:22 2009 (r199207)
@@ -83,6 +83,8 @@ struct tcphdr {
#define TCPOLEN_SIGNATURE 18
#define TCP_SIGLEN 16 /* length of an option 19 digest */
#define TCPOPT_AUTH 20 /* Enhanced AUTH option */
+#define TCPOPT_UTO 28 /* tcp user timeout (rfc5482) */
+#define TCPOLEN_UTO 4
#define TCPOPT_TSTAMP_HDR \
(TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP)
Modified: projects/mips/contrib/tcsh/sh.c
==============================================================================
--- projects/mips/contrib/tcsh/sh.c Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/contrib/tcsh/sh.c Thu Nov 12 00:36:22 2009 (r199207)
@@ -1291,6 +1291,8 @@ main(int argc, char **argv)
/*
* Mop-up.
*/
+ /* Take care of these (especially HUP) here instead of inside flush. */
+ handle_pending_signals();
if (intty) {
if (loginsh) {
xprintf("logout\n");
Modified: projects/mips/crypto/openssh/ssh_namespace.h
==============================================================================
--- projects/mips/crypto/openssh/ssh_namespace.h Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/crypto/openssh/ssh_namespace.h Thu Nov 12 00:36:22 2009 (r199207)
@@ -7,7 +7,7 @@
*
* A list of symbols which need munging is obtained as follows:
*
- * nm libssh.a | awk '$2 == "T" && $3 !~ /^ssh_/ { print "#define", $3, "ssh_" $3 }'
+ * nm libssh.a | awk '/[0-9a-z] [A-Z] / && $3 !~ /^ssh_/ { print "#define", $3, "ssh_" $3 }'
*
* $FreeBSD$
*/
@@ -18,6 +18,7 @@
#define acss_setkey ssh_acss_setkey
#define acss_setsubkey ssh_acss_setsubkey
#define add_host_to_hostfile ssh_add_host_to_hostfile
+#define add_recv_bytes ssh_add_recv_bytes
#define addargs ssh_addargs
#define addr_match_list ssh_addr_match_list
#define ask_permission ssh_ask_permission
@@ -111,6 +112,8 @@
#define channel_open_message ssh_channel_open_message
#define channel_output_poll ssh_channel_output_poll
#define channel_permit_all_opens ssh_channel_permit_all_opens
+#define channel_post ssh_channel_post
+#define channel_pre ssh_channel_pre
#define channel_prepare_select ssh_channel_prepare_select
#define channel_print_adm_permitted_opens ssh_channel_print_adm_permitted_opens
#define channel_register_cleanup ssh_channel_register_cleanup
@@ -150,14 +153,19 @@
#define cipher_set_key_string ssh_cipher_set_key_string
#define cipher_set_keycontext ssh_cipher_set_keycontext
#define cipher_set_keyiv ssh_cipher_set_keyiv
+#define ciphers ssh_ciphers
#define ciphers_valid ssh_ciphers_valid
#define cleanhostname ssh_cleanhostname
#define cleanup_exit ssh_cleanup_exit
#define clear_cached_addr ssh_clear_cached_addr
#define colon ssh_colon
+#define compat13 ssh_compat13
+#define compat20 ssh_compat20
#define compat_cipher_proposal ssh_compat_cipher_proposal
#define compat_datafellows ssh_compat_datafellows
#define convtime ssh_convtime
+#define current_keys ssh_current_keys
+#define datafellows ssh_datafellows
#define debug ssh_debug
#define debug ssh_debug
#define debug2 ssh_debug2
@@ -175,6 +183,7 @@
#define dh_new_group14 ssh_dh_new_group14
#define dh_new_group_asc ssh_dh_new_group_asc
#define dh_pub_is_valid ssh_dh_pub_is_valid
+#define dispatch ssh_dispatch
#define dispatch_init ssh_dispatch_init
#define dispatch_protocol_error ssh_dispatch_protocol_error
#define dispatch_protocol_ignore ssh_dispatch_protocol_ignore
@@ -205,6 +214,7 @@
#define get_local_port ssh_get_local_port
#define get_peer_ipaddr ssh_get_peer_ipaddr
#define get_peer_port ssh_get_peer_port
+#define get_recv_bytes ssh_get_recv_bytes
#define get_remote_ipaddr ssh_get_remote_ipaddr
#define get_remote_name_or_ip ssh_get_remote_name_or_ip
#define get_remote_port ssh_get_remote_port
@@ -213,9 +223,12 @@
#define get_u32 ssh_get_u32
#define get_u64 ssh_get_u64
#define getrrsetbyname ssh_getrrsetbyname
+#define glob ssh_glob
+#define globfree ssh_globfree
#define host_hash ssh_host_hash
#define hostfile_read_key ssh_hostfile_read_key
#define hpdelim ssh_hpdelim
+#define incoming_stream ssh_incoming_stream
#define init_rng ssh_init_rng
#define ipv64_normalise_mapped ssh_ipv64_normalise_mapped
#define kex_derive_keys ssh_kex_derive_keys
@@ -268,6 +281,7 @@
#define mac_init ssh_mac_init
#define mac_setup ssh_mac_setup
#define mac_valid ssh_mac_valid
+#define macs ssh_macs
#define match_host_and_ip ssh_match_host_and_ip
#define match_hostname ssh_match_hostname
#define match_list ssh_match_list
@@ -279,6 +293,7 @@
#define ms_subtract_diff ssh_ms_subtract_diff
#define ms_to_timeval ssh_ms_to_timeval
#define mysignal ssh_mysignal
+#define outgoing_stream ssh_outgoing_stream
#define packet_add_padding ssh_packet_add_padding
#define packet_backup_state ssh_packet_backup_state
#define packet_close ssh_packet_close
@@ -363,9 +378,13 @@
#define refresh_progress_meter ssh_refresh_progress_meter
#define replacearg ssh_replacearg
#define restore_uid ssh_restore_uid
+#define resume_in_progress ssh_resume_in_progress
+#define resume_kex ssh_resume_kex
#define rijndael_decrypt ssh_rijndael_decrypt
#define rijndael_encrypt ssh_rijndael_encrypt
#define rijndael_set_key ssh_rijndael_set_key
+#define roaming_read ssh_roaming_read
+#define roaming_write ssh_roaming_write
#define rsa_generate_additional_parameters ssh_rsa_generate_additional_parameters
#define rsa_private_decrypt ssh_rsa_private_decrypt
#define rsa_public_encrypt ssh_rsa_public_encrypt
@@ -393,6 +412,7 @@
#define tty_make_modes ssh_tty_make_modes
#define tty_parse_modes ssh_tty_parse_modes
#define tun_open ssh_tun_open
+#define umac_ctx ssh_umac_ctx
#define umac_delete ssh_umac_delete
#define umac_final ssh_umac_final
#define umac_new ssh_umac_new
Modified: projects/mips/crypto/openssh/sshd_config
==============================================================================
--- projects/mips/crypto/openssh/sshd_config Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/crypto/openssh/sshd_config Thu Nov 12 00:36:22 2009 (r199207)
@@ -17,7 +17,6 @@
#VersionAddendum FreeBSD-20091001
#Port 22
-#Protocol 2
#AddressFamily any
#ListenAddress 0.0.0.0
#ListenAddress ::
Modified: projects/mips/etc/defaults/rc.conf
==============================================================================
--- projects/mips/etc/defaults/rc.conf Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/etc/defaults/rc.conf Thu Nov 12 00:36:22 2009 (r199207)
@@ -600,6 +600,7 @@ harvest_ethernet="YES" # Entropy device
harvest_p_to_p="YES" # Entropy device harvests point-to-point randomness
dmesg_enable="YES" # Save dmesg(8) to /var/run/dmesg.boot
watchdogd_enable="NO" # Start the software watchdog daemon
+watchdogd_flags="" # Flags to watchdogd (if enabled)
devfs_rulesets="/etc/defaults/devfs.rules /etc/devfs.rules" # Files containing
# devfs(8) rules.
devfs_system_ruleset="" # The name (NOT number) of a ruleset to apply to /dev
Modified: projects/mips/etc/gettytab
==============================================================================
--- projects/mips/etc/gettytab Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/etc/gettytab Thu Nov 12 00:36:22 2009 (r199207)
@@ -162,7 +162,7 @@ X|Xwindow|X window system:\
:fd@:nd@:cd@:rw:sp#9600:
P|Pc|Pc console:\
- :ht:np:sp#115200:
+ :ht:np:sp#9600:
#
# Wierdo special case for fast crt's with hardcopy devices
Modified: projects/mips/etc/network.subr
==============================================================================
--- projects/mips/etc/network.subr Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/etc/network.subr Thu Nov 12 00:36:22 2009 (r199207)
@@ -356,6 +356,16 @@ afexists()
inet6)
${SYSCTL_N} net.inet6 > /dev/null 2>&1
;;
+ ipx)
+ ${SYSCTL_N} net.ipx > /dev/null 2>&1
+ ;;
+ atm)
+ if [ -x /sbin/atmconfig ]; then
+ /sbin/atmconfig diag list > /dev/null 2>&1
+ else
+ return 1
+ fi
+ ;;
*)
err 1 "afexists(): Unsupported address family: $_af"
;;
Modified: projects/mips/etc/pam.d/ftpd
==============================================================================
--- projects/mips/etc/pam.d/ftpd Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/etc/pam.d/ftpd Thu Nov 12 00:36:22 2009 (r199207)
@@ -8,12 +8,12 @@
auth sufficient pam_opie.so no_warn no_fake_prompts
auth requisite pam_opieaccess.so no_warn allow_local
#auth sufficient pam_krb5.so no_warn
-#auth sufficient pam_ssh.so no_warn try_first_pass
+#auth sufficient pam_ssh.so no_warn try_first_pass
auth required pam_unix.so no_warn try_first_pass
# account
account required pam_nologin.so
-#account required pam_krb5.so
+#account required pam_krb5.so
account required pam_unix.so
# session
Modified: projects/mips/etc/pam.d/kde
==============================================================================
--- projects/mips/etc/pam.d/kde Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/etc/pam.d/kde Thu Nov 12 00:36:22 2009 (r199207)
@@ -11,9 +11,9 @@ auth required pam_unix.so no_warn try_
# account
account required pam_nologin.so
-#account required pam_krb5.so
+#account required pam_krb5.so
account required pam_unix.so
# session
-#session optional pam_ssh.so
+#session optional pam_ssh.so want_agent
session required pam_permit.so
Modified: projects/mips/etc/pam.d/other
==============================================================================
--- projects/mips/etc/pam.d/other Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/etc/pam.d/other Thu Nov 12 00:36:22 2009 (r199207)
@@ -13,12 +13,12 @@ auth required pam_unix.so no_warn try_
# account
account required pam_nologin.so
-#account required pam_krb5.so
+#account required pam_krb5.so
account required pam_login_access.so
account required pam_unix.so
# session
-#session optional pam_ssh.so
+#session optional pam_ssh.so want_agent
session required pam_permit.so
# password
Modified: projects/mips/etc/pam.d/sshd
==============================================================================
--- projects/mips/etc/pam.d/sshd Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/etc/pam.d/sshd Thu Nov 12 00:36:22 2009 (r199207)
@@ -13,12 +13,12 @@ auth required pam_unix.so no_warn try_
# account
account required pam_nologin.so
-#account required pam_krb5.so
+#account required pam_krb5.so
account required pam_login_access.so
account required pam_unix.so
# session
-#session optional pam_ssh.so
+#session optional pam_ssh.so want_agent
session required pam_permit.so
# password
Modified: projects/mips/etc/pam.d/system
==============================================================================
--- projects/mips/etc/pam.d/system Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/etc/pam.d/system Thu Nov 12 00:36:22 2009 (r199207)
@@ -12,12 +12,12 @@ auth requisite pam_opieaccess.so no_war
auth required pam_unix.so no_warn try_first_pass nullok
# account
-#account required pam_krb5.so
+#account required pam_krb5.so
account required pam_login_access.so
account required pam_unix.so
# session
-#session optional pam_ssh.so
+#session optional pam_ssh.so want_agent
session required pam_lastlog.so no_fail
# password
Modified: projects/mips/etc/pam.d/telnetd
==============================================================================
--- projects/mips/etc/pam.d/telnetd Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/etc/pam.d/telnetd Thu Nov 12 00:36:22 2009 (r199207)
@@ -13,12 +13,12 @@ auth required pam_unix.so no_warn try_
# account
account required pam_nologin.so
-#account required pam_krb5.so
+#account required pam_krb5.so
account required pam_login_access.so
account required pam_unix.so
# session
-#session optional pam_ssh.so
+#session optional pam_ssh.so want_agent
session required pam_lastlog.so no_fail
# password
Modified: projects/mips/etc/pam.d/xdm
==============================================================================
--- projects/mips/etc/pam.d/xdm Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/etc/pam.d/xdm Thu Nov 12 00:36:22 2009 (r199207)
@@ -11,11 +11,11 @@ auth required pam_unix.so no_warn try_
# account
account required pam_nologin.so
-#account required pam_krb5.so
+#account required pam_krb5.so
account required pam_unix.so
# session
-#session required pam_ssh.so want_agent
+#session required pam_ssh.so want_agent
session required pam_lastlog.so no_fail
# password
Modified: projects/mips/etc/rc.d/bgfsck
==============================================================================
--- projects/mips/etc/rc.d/bgfsck Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/etc/rc.d/bgfsck Thu Nov 12 00:36:22 2009 (r199207)
@@ -31,7 +31,7 @@ bgfsck_start ()
bgfsck_msg="${bgfsck_msg} in ${background_fsck_delay} seconds"
fi
if [ -z "${rc_force}" ]; then
- [ -z "${rc_quiet}" ] && echo "${bgfsck_msg}."
+ check_startmsgs && echo "${bgfsck_msg}."
fi
(sleep ${background_fsck_delay}; nice -4 fsck -B -p) 2>&1 | \
Modified: projects/mips/etc/rc.d/cleartmp
==============================================================================
--- projects/mips/etc/rc.d/cleartmp Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/etc/rc.d/cleartmp Thu Nov 12 00:36:22 2009 (r199207)
@@ -25,7 +25,7 @@ cleartmp_start()
${tmp}/.ICE-unix ${tmp}/.font-unix"
if checkyesno ${rcvar1}; then
- [ -z "${rc_quiet}" ] && echo "Clearing ${tmp}."
+ check_startmsgs && echo "Clearing ${tmp}."
# This is not needed for mfs, but doesn't hurt anything.
# Things to note:
@@ -44,7 +44,7 @@ cleartmp_start()
elif checkyesno clear_tmp_X; then
# Remove X lock files, since they will prevent you from
# restarting X. Remove other X related directories.
- [ -z "${rc_quiet}" ] && echo "Clearing ${tmp} (X related)."
+ check_startmsgs && echo "Clearing ${tmp} (X related)."
rm -rf ${tmp}/.X[0-9]-lock ${x11_socket_dirs}
fi
if checkyesno clear_tmp_X; then
Modified: projects/mips/etc/rc.d/defaultroute
==============================================================================
--- projects/mips/etc/rc.d/defaultroute Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/etc/rc.d/defaultroute Thu Nov 12 00:36:22 2009 (r199207)
@@ -20,6 +20,8 @@ defaultroute_start()
{
local output carrier nocarrier nl
+ afexists inet || return 0
+
# Return without waiting if we don't have dhcp interfaces or
# if none of the dhcp interfaces is plugged in.
dhcp_interfaces=`list_net_interfaces dhcp`
Modified: projects/mips/etc/rc.d/faith
==============================================================================
--- projects/mips/etc/rc.d/faith Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/etc/rc.d/faith Thu Nov 12 00:36:22 2009 (r199207)
@@ -3,7 +3,7 @@
#
# PROVIDE: faith
-# REQUIRE: netif routing
+# REQUIRE: netif
# KEYWORD: nojail
. /etc/rc.subr
@@ -39,9 +39,7 @@ faith_up()
route change -inet6 ${prefix} -prefixlen ${prefixlen} \
-ifp faith0
done
- if [ -z "${rc_quiet}" ]; then
- ifconfig faith0
- fi
+ check_startmsgs && ifconfig faith0
;;
esac
}
Modified: projects/mips/etc/rc.d/fsck
==============================================================================
--- projects/mips/etc/rc.d/fsck Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/etc/rc.d/fsck Thu Nov 12 00:36:22 2009 (r199207)
@@ -23,7 +23,7 @@ fsck_start()
# During fsck ignore SIGQUIT
trap : 3
- [ -z "${rc_quiet}" ] && echo "Starting file system checks:"
+ check_startmsgs && echo "Starting file system checks:"
if checkyesno background_fsck; then
fsck -F -p
else
Modified: projects/mips/etc/rc.d/hostid
==============================================================================
--- projects/mips/etc/rc.d/hostid Thu Nov 12 00:20:31 2009 (r199206)
+++ projects/mips/etc/rc.d/hostid Thu Nov 12 00:36:22 2009 (r199207)
@@ -49,9 +49,9 @@ hostid_set()
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Thu Nov 12 20:48:04 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id B4D2C106578F;
Thu, 12 Nov 2009 20:48:04 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id A40A28FC18;
Thu, 12 Nov 2009 20:48:04 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nACKm4ww042940;
Thu, 12 Nov 2009 20:48:04 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nACKm4ER042937;
Thu, 12 Nov 2009 20:48:04 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <200911122048.nACKm4ER042937@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Thu, 12 Nov 2009 20:48:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199233 - projects/mips/sys/mips/atheros
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Nov 2009 20:48:04 -0000
Author: gonzo
Date: Thu Nov 12 20:48:04 2009
New Revision: 199233
URL: http://svn.freebsd.org/changeset/base/199233
Log:
- include register definitions for respective controllers
Modified:
projects/mips/sys/mips/atheros/ar71xx_ehci.c
projects/mips/sys/mips/atheros/ar71xx_ohci.c
Modified: projects/mips/sys/mips/atheros/ar71xx_ehci.c
==============================================================================
--- projects/mips/sys/mips/atheros/ar71xx_ehci.c Thu Nov 12 19:30:49 2009 (r199232)
+++ projects/mips/sys/mips/atheros/ar71xx_ehci.c Thu Nov 12 20:48:04 2009 (r199233)
@@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/usb_controller.h>
#include <dev/usb/usb_bus.h>
#include <dev/usb/controller/ehci.h>
+#include <dev/usb/controller/ehcireg.h>
#include <mips/atheros/ar71xx_bus_space_reversed.h>
Modified: projects/mips/sys/mips/atheros/ar71xx_ohci.c
==============================================================================
--- projects/mips/sys/mips/atheros/ar71xx_ohci.c Thu Nov 12 19:30:49 2009 (r199232)
+++ projects/mips/sys/mips/atheros/ar71xx_ohci.c Thu Nov 12 20:48:04 2009 (r199233)
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/usb_controller.h>
#include <dev/usb/usb_bus.h>
#include <dev/usb/controller/ohci.h>
+#include <dev/usb/controller/ohcireg.h>
#include <sys/rman.h>
From owner-svn-src-projects@FreeBSD.ORG Thu Nov 12 21:27:59 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id DBA561065672;
Thu, 12 Nov 2009 21:27:58 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id C9B438FC17;
Thu, 12 Nov 2009 21:27:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nACLRwJL043840;
Thu, 12 Nov 2009 21:27:58 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nACLRwg3043837;
Thu, 12 Nov 2009 21:27:58 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <200911122127.nACLRwg3043837@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Thu, 12 Nov 2009 21:27:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199234 - projects/mips/sys/mips/atheros
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Nov 2009 21:27:59 -0000
Author: gonzo
Date: Thu Nov 12 21:27:58 2009
New Revision: 199234
URL: http://svn.freebsd.org/changeset/base/199234
Log:
- Handle multiphy MAC case: create interface with
fixed-state media with parameters set via hints
and configure MAC accordingly to these parameters.
All the underlying PHY magic is done by boot manager
on startup. At the moment there is no proper way
to make active and control all PHYs simultaneously
from one MII bus and there is no way to associate
incoming/outgoing packet with specific PHY.
Modified:
projects/mips/sys/mips/atheros/if_arge.c
projects/mips/sys/mips/atheros/if_argevar.h
Modified: projects/mips/sys/mips/atheros/if_arge.c
==============================================================================
--- projects/mips/sys/mips/atheros/if_arge.c Thu Nov 12 20:48:04 2009 (r199233)
+++ projects/mips/sys/mips/atheros/if_arge.c Thu Nov 12 21:27:58 2009 (r199234)
@@ -95,6 +95,7 @@ static int arge_ioctl(struct ifnet *, u_
static void arge_init(void *);
static void arge_init_locked(struct arge_softc *);
static void arge_link_task(void *, int);
+static void arge_set_pll(struct arge_softc *, int, int);
static int arge_miibus_readreg(device_t, int, int);
static void arge_miibus_statchg(device_t);
static int arge_miibus_writereg(device_t, int, int, int);
@@ -118,6 +119,12 @@ static void arge_intr(void *);
static int arge_intr_filter(void *);
static void arge_tick(void *);
+/*
+ * ifmedia callbacks for multiPHY MAC
+ */
+void arge_multiphy_mediastatus(struct ifnet *, struct ifmediareq *);
+int arge_multiphy_mediachange(struct ifnet *);
+
static void arge_dmamap_cb(void *, bus_dma_segment_t *, int, int);
static int arge_dma_alloc(struct arge_softc *);
static void arge_dma_free(struct arge_softc *);
@@ -197,9 +204,10 @@ arge_attach(device_t dev)
uint8_t eaddr[ETHER_ADDR_LEN];
struct ifnet *ifp;
struct arge_softc *sc;
- int error = 0, rid, phynum;
+ int error = 0, rid, phymask;
uint32_t reg, rnd;
- int is_base_mac_empty, i;
+ int is_base_mac_empty, i, phys_total;
+ uint32_t hint;
sc = device_get_softc(dev);
sc->arge_dev = dev;
@@ -221,20 +229,43 @@ arge_attach(device_t dev)
* Get which PHY of 5 available we should use for this unit
*/
if (resource_int_value(device_get_name(dev), device_get_unit(dev),
- "phy", &phynum) != 0) {
+ "phymask", &phymask) != 0) {
/*
* Use port 4 (WAN) for GE0. For any other port use
* its PHY the same as its unit number
*/
if (sc->arge_mac_unit == 0)
- phynum = 4;
+ phymask = (1 << 4);
else
- phynum = sc->arge_mac_unit;
+ /* Use all phys up to 4 */
+ phymask = (1 << 4) - 1;
- device_printf(dev, "No PHY specified, using %d\n", phynum);
+ device_printf(dev, "No PHY specified, using mask %d\n", phymask);
}
- sc->arge_phy_num = phynum;
+ /*
+ * Get default media & duplex mode, by default its Base100T
+ * and full duplex
+ */
+ if (resource_int_value(device_get_name(dev), device_get_unit(dev),
+ "media", &hint) != 0)
+ hint = 0;
+
+ if (hint == 1000)
+ sc->arge_media_type = IFM_1000_T;
+ else
+ sc->arge_media_type = IFM_100_TX;
+
+ if (resource_int_value(device_get_name(dev), device_get_unit(dev),
+ "fduplex", &hint) != 0)
+ hint = 1;
+
+ if (hint)
+ sc->arge_duplex_mode = IFM_FDX;
+ else
+ sc->arge_duplex_mode = 0;
+
+ sc->arge_phymask = phymask;
mtx_init(&sc->arge_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
MTX_DEF);
@@ -379,14 +410,40 @@ arge_attach(device_t dev)
ARGE_WRITE(sc, AR71XX_MAC_FIFO_RX_FILTMASK,
FIFO_RX_FILTMASK_DEFAULT);
- /* Do MII setup. */
- if (mii_phy_probe(dev, &sc->arge_miibus,
- arge_ifmedia_upd, arge_ifmedia_sts)) {
- device_printf(dev, "MII without any phy!\n");
- error = ENXIO;
+ /*
+ * Check if we have single-PHY MAC or multi-PHY
+ */
+ phys_total = 0;
+ for (i = 0; i < ARGE_NPHY; i++)
+ if (phymask & (1 << i))
+ phys_total ++;
+
+ if (phys_total == 0) {
+ error = EINVAL;
goto fail;
}
+ if (phys_total == 1) {
+ /* Do MII setup. */
+ if (mii_phy_probe(dev, &sc->arge_miibus,
+ arge_ifmedia_upd, arge_ifmedia_sts)) {
+ device_printf(dev, "MII without any phy!\n");
+ error = ENXIO;
+ goto fail;
+ }
+ }
+ else {
+ ifmedia_init(&sc->arge_ifmedia, 0,
+ arge_multiphy_mediachange,
+ arge_multiphy_mediastatus);
+ ifmedia_add(&sc->arge_ifmedia,
+ IFM_ETHER | sc->arge_media_type | sc->arge_duplex_mode,
+ 0, NULL);
+ ifmedia_set(&sc->arge_ifmedia,
+ IFM_ETHER | sc->arge_media_type | sc->arge_duplex_mode);
+ arge_set_pll(sc, sc->arge_media_type, sc->arge_duplex_mode);
+ }
+
/* Call MI attach routine. */
ether_ifattach(ifp, eaddr);
@@ -432,6 +489,7 @@ arge_detach(device_t dev)
if (sc->arge_miibus)
device_delete_child(dev, sc->arge_miibus);
+
bus_generic_detach(dev);
if (sc->arge_intrhand)
@@ -490,7 +548,7 @@ arge_miibus_readreg(device_t dev, int ph
uint32_t addr = (phy << MAC_MII_PHY_ADDR_SHIFT)
| (reg & MAC_MII_REG_MASK);
- if (phy != sc->arge_phy_num)
+ if ((sc->arge_phymask & (1 << phy)) == 0)
return (0);
mtx_lock(&miibus_mtx);
@@ -529,7 +587,7 @@ arge_miibus_writereg(device_t dev, int p
(phy << MAC_MII_PHY_ADDR_SHIFT) | (reg & MAC_MII_REG_MASK);
- if (phy != sc->arge_phy_num)
+ if ((sc->arge_phymask & (1 << phy)) == 0)
return (-1);
dprintf("%s: phy=%d, reg=%02x, value=%04x\n", __func__,
@@ -570,8 +628,7 @@ arge_link_task(void *arg, int pending)
struct arge_softc *sc;
struct mii_data *mii;
struct ifnet *ifp;
- uint32_t media;
- uint32_t cfg, ifcontrol, rx_filtmask, pll, sec_cfg;
+ uint32_t media, duplex;
sc = (struct arge_softc *)arg;
@@ -590,68 +647,8 @@ arge_link_task(void *arg, int pending)
if (media != IFM_NONE) {
sc->arge_link_status = 1;
-
- cfg = ARGE_READ(sc, AR71XX_MAC_CFG2);
- cfg &= ~(MAC_CFG2_IFACE_MODE_1000
- | MAC_CFG2_IFACE_MODE_10_100
- | MAC_CFG2_FULL_DUPLEX);
-
- if ((mii->mii_media_active & IFM_GMASK) == IFM_FDX)
- cfg |= MAC_CFG2_FULL_DUPLEX;
-
- ifcontrol = ARGE_READ(sc, AR71XX_MAC_IFCONTROL);
- ifcontrol &= ~MAC_IFCONTROL_SPEED;
- rx_filtmask =
- ARGE_READ(sc, AR71XX_MAC_FIFO_RX_FILTMASK);
- rx_filtmask &= ~FIFO_RX_MASK_BYTE_MODE;
-
- switch(media) {
- case IFM_10_T:
- cfg |= MAC_CFG2_IFACE_MODE_10_100;
- pll = PLL_ETH_INT_CLK_10;
- break;
- case IFM_100_TX:
- cfg |= MAC_CFG2_IFACE_MODE_10_100;
- ifcontrol |= MAC_IFCONTROL_SPEED;
- pll = PLL_ETH_INT_CLK_100;
- break;
- case IFM_1000_T:
- case IFM_1000_SX:
- cfg |= MAC_CFG2_IFACE_MODE_1000;
- rx_filtmask |= FIFO_RX_MASK_BYTE_MODE;
- pll = PLL_ETH_INT_CLK_1000;
- break;
- default:
- pll = PLL_ETH_INT_CLK_100;
- device_printf(sc->arge_dev,
- "Unknown media %d\n", media);
- }
-
- ARGE_WRITE(sc, AR71XX_MAC_FIFO_TX_THRESHOLD,
- 0x008001ff);
-
- ARGE_WRITE(sc, AR71XX_MAC_CFG2, cfg);
- ARGE_WRITE(sc, AR71XX_MAC_IFCONTROL, ifcontrol);
- ARGE_WRITE(sc, AR71XX_MAC_FIFO_RX_FILTMASK,
- rx_filtmask);
-
- /* set PLL registers */
- sec_cfg = ATH_READ_REG(AR71XX_PLL_SEC_CONFIG);
- sec_cfg &= ~(3 << sc->arge_pll_reg_shift);
- sec_cfg |= (2 << sc->arge_pll_reg_shift);
-
- ATH_WRITE_REG(AR71XX_PLL_SEC_CONFIG, sec_cfg);
- DELAY(100);
-
- ATH_WRITE_REG(sc->arge_pll_reg, pll);
-
- sec_cfg |= (3 << sc->arge_pll_reg_shift);
- ATH_WRITE_REG(AR71XX_PLL_SEC_CONFIG, sec_cfg);
- DELAY(100);
-
- sec_cfg &= ~(3 << sc->arge_pll_reg_shift);
- ATH_WRITE_REG(AR71XX_PLL_SEC_CONFIG, sec_cfg);
- DELAY(100);
+ duplex = mii->mii_media_active & IFM_GMASK;
+ arge_set_pll(sc, media, duplex);
}
} else
sc->arge_link_status = 0;
@@ -660,6 +657,75 @@ arge_link_task(void *arg, int pending)
}
static void
+arge_set_pll(struct arge_softc *sc, int media, int duplex)
+{
+ uint32_t cfg, ifcontrol, rx_filtmask, pll, sec_cfg;
+
+ cfg = ARGE_READ(sc, AR71XX_MAC_CFG2);
+ cfg &= ~(MAC_CFG2_IFACE_MODE_1000
+ | MAC_CFG2_IFACE_MODE_10_100
+ | MAC_CFG2_FULL_DUPLEX);
+
+ if (duplex == IFM_FDX)
+ cfg |= MAC_CFG2_FULL_DUPLEX;
+
+ ifcontrol = ARGE_READ(sc, AR71XX_MAC_IFCONTROL);
+ ifcontrol &= ~MAC_IFCONTROL_SPEED;
+ rx_filtmask =
+ ARGE_READ(sc, AR71XX_MAC_FIFO_RX_FILTMASK);
+ rx_filtmask &= ~FIFO_RX_MASK_BYTE_MODE;
+
+ switch(media) {
+ case IFM_10_T:
+ cfg |= MAC_CFG2_IFACE_MODE_10_100;
+ pll = PLL_ETH_INT_CLK_10;
+ break;
+ case IFM_100_TX:
+ cfg |= MAC_CFG2_IFACE_MODE_10_100;
+ ifcontrol |= MAC_IFCONTROL_SPEED;
+ pll = PLL_ETH_INT_CLK_100;
+ break;
+ case IFM_1000_T:
+ case IFM_1000_SX:
+ cfg |= MAC_CFG2_IFACE_MODE_1000;
+ rx_filtmask |= FIFO_RX_MASK_BYTE_MODE;
+ pll = PLL_ETH_INT_CLK_1000;
+ break;
+ default:
+ pll = PLL_ETH_INT_CLK_100;
+ device_printf(sc->arge_dev,
+ "Unknown media %d\n", media);
+ }
+
+ ARGE_WRITE(sc, AR71XX_MAC_FIFO_TX_THRESHOLD,
+ 0x008001ff);
+
+ ARGE_WRITE(sc, AR71XX_MAC_CFG2, cfg);
+ ARGE_WRITE(sc, AR71XX_MAC_IFCONTROL, ifcontrol);
+ ARGE_WRITE(sc, AR71XX_MAC_FIFO_RX_FILTMASK,
+ rx_filtmask);
+
+ /* set PLL registers */
+ sec_cfg = ATH_READ_REG(AR71XX_PLL_SEC_CONFIG);
+ sec_cfg &= ~(3 << sc->arge_pll_reg_shift);
+ sec_cfg |= (2 << sc->arge_pll_reg_shift);
+
+ ATH_WRITE_REG(AR71XX_PLL_SEC_CONFIG, sec_cfg);
+ DELAY(100);
+
+ ATH_WRITE_REG(sc->arge_pll_reg, pll);
+
+ sec_cfg |= (3 << sc->arge_pll_reg_shift);
+ ATH_WRITE_REG(AR71XX_PLL_SEC_CONFIG, sec_cfg);
+ DELAY(100);
+
+ sec_cfg &= ~(3 << sc->arge_pll_reg_shift);
+ ATH_WRITE_REG(AR71XX_PLL_SEC_CONFIG, sec_cfg);
+ DELAY(100);
+}
+
+
+static void
arge_reset_dma(struct arge_softc *sc)
{
ARGE_WRITE(sc, AR71XX_DMA_RX_CONTROL, 0);
@@ -707,8 +773,6 @@ arge_init_locked(struct arge_softc *sc)
ARGE_LOCK_ASSERT(sc);
- mii = device_get_softc(sc->arge_miibus);
-
arge_stop(sc);
/* Init circular RX list. */
@@ -724,13 +788,24 @@ arge_init_locked(struct arge_softc *sc)
arge_reset_dma(sc);
- sc->arge_link_status = 0;
- mii_mediachg(mii);
+
+ if (sc->arge_miibus) {
+ sc->arge_link_status = 0;
+ mii = device_get_softc(sc->arge_miibus);
+ mii_mediachg(mii);
+ }
+ else {
+ /*
+ * Sun always shines over multiPHY interface
+ */
+ sc->arge_link_status = 1;
+ }
ifp->if_drv_flags |= IFF_DRV_RUNNING;
ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
- callout_reset(&sc->arge_stat_callout, hz, arge_tick, sc);
+ if (sc->arge_miibus)
+ callout_reset(&sc->arge_stat_callout, hz, arge_tick, sc);
ARGE_WRITE(sc, AR71XX_DMA_TX_DESC, ARGE_TX_RING_ADDR(sc, 0));
ARGE_WRITE(sc, AR71XX_DMA_RX_DESC, ARGE_RX_RING_ADDR(sc, 0));
@@ -899,7 +974,8 @@ arge_stop(struct arge_softc *sc)
ifp = sc->arge_ifp;
ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
- callout_stop(&sc->arge_stat_callout);
+ if (sc->arge_miibus)
+ callout_stop(&sc->arge_stat_callout);
/* mask out interrupts */
ARGE_WRITE(sc, AR71XX_DMA_INTR, 0);
@@ -948,8 +1024,12 @@ arge_ioctl(struct ifnet *ifp, u_long com
break;
case SIOCGIFMEDIA:
case SIOCSIFMEDIA:
- mii = device_get_softc(sc->arge_miibus);
- error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, command);
+ if (sc->arge_miibus) {
+ mii = device_get_softc(sc->arge_miibus);
+ error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, command);
+ }
+ else
+ error = ifmedia_ioctl(ifp, ifr, &sc->arge_ifmedia, command);
break;
case SIOCSIFCAP:
/* XXX: Check other capabilities */
@@ -1690,7 +1770,42 @@ arge_tick(void *xsc)
ARGE_LOCK_ASSERT(sc);
- mii = device_get_softc(sc->arge_miibus);
- mii_tick(mii);
- callout_reset(&sc->arge_stat_callout, hz, arge_tick, sc);
+ if (sc->arge_miibus) {
+ mii = device_get_softc(sc->arge_miibus);
+ mii_tick(mii);
+ callout_reset(&sc->arge_stat_callout, hz, arge_tick, sc);
+ }
}
+
+int
+arge_multiphy_mediachange(struct ifnet *ifp)
+{
+ struct arge_softc *sc = ifp->if_softc;
+ struct ifmedia *ifm = &sc->arge_ifmedia;
+ struct ifmedia_entry *ife = ifm->ifm_cur;
+
+ if (IFM_TYPE(ifm->ifm_media) != IFM_ETHER)
+ return (EINVAL);
+
+ if (IFM_SUBTYPE(ife->ifm_media) == IFM_AUTO) {
+ device_printf(sc->arge_dev,
+ "AUTO is not supported for multiphy MAC");
+ return (EINVAL);
+ }
+
+ /*
+ * Ignore everything
+ */
+ return (0);
+}
+
+void
+arge_multiphy_mediastatus(struct ifnet *ifp, struct ifmediareq *ifmr)
+{
+ struct arge_softc *sc = ifp->if_softc;
+
+ ifmr->ifm_status = IFM_AVALID | IFM_ACTIVE;
+ ifmr->ifm_active = IFM_ETHER | sc->arge_media_type |
+ sc->arge_duplex_mode;
+}
+
Modified: projects/mips/sys/mips/atheros/if_argevar.h
==============================================================================
--- projects/mips/sys/mips/atheros/if_argevar.h Thu Nov 12 20:48:04 2009 (r199233)
+++ projects/mips/sys/mips/atheros/if_argevar.h Thu Nov 12 21:27:58 2009 (r199234)
@@ -28,6 +28,7 @@
#ifndef __IF_ARGEVAR_H__
#define __IF_ARGEVAR_H__
+#define ARGE_NPHY 32
#define ARGE_TX_RING_COUNT 128
#define ARGE_RX_RING_COUNT 128
#define ARGE_RX_DMA_SIZE ARGE_RX_RING_COUNT * sizeof(struct arge_desc)
@@ -124,6 +125,12 @@ struct arge_ring_data {
struct arge_softc {
struct ifnet *arge_ifp; /* interface info */
device_t arge_dev;
+ struct ifmedia arge_ifmedia;
+ /*
+ * Media & duples settings for multiPHY MAC
+ */
+ uint32_t arge_media_type;
+ uint32_t arge_duplex_mode;
struct resource *arge_res;
int arge_rid;
struct resource *arge_irq;
@@ -140,7 +147,7 @@ struct arge_softc {
int arge_detach;
uint32_t arge_intr_status;
int arge_mac_unit;
- int arge_phy_num;
+ int arge_phymask;
uint32_t arge_ddr_flush_reg;
uint32_t arge_pll_reg;
uint32_t arge_pll_reg_shift;
From owner-svn-src-projects@FreeBSD.ORG Thu Nov 12 21:33:37 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 5A59B1065788;
Thu, 12 Nov 2009 21:33:37 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 498F88FC1A;
Thu, 12 Nov 2009 21:33:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nACLXaNo043997;
Thu, 12 Nov 2009 21:33:36 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nACLXa8E043995;
Thu, 12 Nov 2009 21:33:36 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <200911122133.nACLXa8E043995@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Thu, 12 Nov 2009 21:33:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199235 - projects/mips/sys/mips/conf
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Nov 2009 21:33:37 -0000
Author: gonzo
Date: Thu Nov 12 21:33:36 2009
New Revision: 199235
URL: http://svn.freebsd.org/changeset/base/199235
Log:
- Reorganize hints according to if_arge changes: set media
for multiPHY MAC and use mask to specify PHYs.
Modified:
projects/mips/sys/mips/conf/AR71XX.hints
Modified: projects/mips/sys/mips/conf/AR71XX.hints
==============================================================================
--- projects/mips/sys/mips/conf/AR71XX.hints Thu Nov 12 21:27:58 2009 (r199234)
+++ projects/mips/sys/mips/conf/AR71XX.hints Thu Nov 12 21:33:36 2009 (r199235)
@@ -29,16 +29,23 @@ hint.arge.0.at="nexus0"
hint.arge.0.maddr=0x19000000
hint.arge.0.msize=0x1000
hint.arge.0.irq=2
+# PHY4 = 1 << 4
+hint.arge.0.phymask=0x10
# Uncomment this hint for RS (not PRO)
-# hint.arge.0.phy=20
+# PHY20 = 1 << 20
+# hint.arge.0.phymask=0x100000
hint.arge.1.at="nexus0"
hint.arge.1.maddr=0x1a000000
hint.arge.1.msize=0x1000
hint.arge.1.irq=3
-hint.arge.1.phy=3
+# PHY1, PHY2, PHY3
+hint.arge.1.phymask=0x0e
+# should be 100 for RS
+hint.arge.1.media=1000
+hint.arge.1.fduplex=1
# Uncomment this hint for RS (not PRO)
-# hint.arge.1.phy=19
+# hint.arge.0.phymask=70000
# SPI flash
hint.spi.0.at="nexus0"
From owner-svn-src-projects@FreeBSD.ORG Fri Nov 13 09:24:09 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id AE84A1065670;
Fri, 13 Nov 2009 09:24:09 +0000 (UTC)
(envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 9ED998FC1A;
Fri, 13 Nov 2009 09:24:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAD9O9bN060657;
Fri, 13 Nov 2009 09:24:09 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAD9O9U2060655;
Fri, 13 Nov 2009 09:24:09 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <200911130924.nAD9O9U2060655@svn.freebsd.org>
From: Neel Natu <neel@FreeBSD.org>
Date: Fri, 13 Nov 2009 09:24:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199246 - projects/mips/sys/mips/mips
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Nov 2009 09:24:09 -0000
Author: neel
Date: Fri Nov 13 09:24:09 2009
New Revision: 199246
URL: http://svn.freebsd.org/changeset/base/199246
Log:
Make pmap_copy_page() L2-cache friendly by doing the copy through the
cacheable window on physical memory (KSEG0). On the Sibyte processor
going through the uncacheable window (KSEG1) bypasses both L1 and L2
caches so we may end up with stale contents in the L2 cache.
This also makes it consistent with the rest of the function that
uses cacheable mappings to copy pages.
Approved by: imp (mentor)
Modified:
projects/mips/sys/mips/mips/pmap.c
Modified: projects/mips/sys/mips/mips/pmap.c
==============================================================================
--- projects/mips/sys/mips/mips/pmap.c Fri Nov 13 09:07:33 2009 (r199245)
+++ projects/mips/sys/mips/mips/pmap.c Fri Nov 13 09:24:09 2009 (r199246)
@@ -2415,7 +2415,7 @@ pmap_copy_page(vm_page_t src, vm_page_t
#endif
{
if ((phy_src < MIPS_KSEG0_LARGEST_PHYS) && (phy_dst < MIPS_KSEG0_LARGEST_PHYS)) {
- /* easy case, all can be accessed via KSEG1 */
+ /* easy case, all can be accessed via KSEG0 */
/*
* Flush all caches for VA that are mapped to this page
* to make sure that data in SDRAM is up to date
@@ -2423,9 +2423,10 @@ pmap_copy_page(vm_page_t src, vm_page_t
pmap_flush_pvcache(src);
mips_dcache_wbinv_range_index(
MIPS_PHYS_TO_CACHED(phy_dst), NBPG);
- va_src = MIPS_PHYS_TO_UNCACHED(phy_src);
- va_dst = MIPS_PHYS_TO_UNCACHED(phy_dst);
+ va_src = MIPS_PHYS_TO_CACHED(phy_src);
+ va_dst = MIPS_PHYS_TO_CACHED(phy_dst);
bcopy((caddr_t)va_src, (caddr_t)va_dst, PAGE_SIZE);
+ mips_dcache_wbinv_range(va_dst, PAGE_SIZE);
} else {
int cpu;
struct local_sysmaps *sysm;