[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree
zrouter-src-freebsd at zrouter.org
zrouter-src-freebsd at zrouter.org
Wed Jul 25 14:36:33 UTC 2012
details: http://zrouter.org/hg/FreeBSD/head//rev/c22c78e72f3e
changeset: 513:c22c78e72f3e
user: Aleksandr Rybalko <ray at ddteam.net>
date: Wed Jul 25 17:22:27 2012 +0300
description:
Lazy update
diffstat:
head/sys/mips/mips/bus_space_generic.c | 132 ++++++++++++++++++++++++--------
head/sys/mips/mips/pmap.c | 12 +-
head/sys/mips/nlm/board.c | 4 +-
head/sys/mips/nlm/dev/net/mdio.c | 57 +++++++++-----
head/sys/mips/nlm/hal/mdio.h | 3 +-
head/sys/mips/nlm/xlp.h | 25 ++++++-
head/sys/mips/nlm/xlp_pci.c | 6 +-
head/sys/mips/rmi/rootfs_list.txt | 3 +-
8 files changed, 175 insertions(+), 67 deletions(-)
diffs (627 lines):
diff -r dcbb0dea2fa3 -r c22c78e72f3e head/sys/mips/mips/bus_space_generic.c
--- a/head/sys/mips/mips/bus_space_generic.c Wed Jul 25 17:22:09 2012 +0300
+++ b/head/sys/mips/mips/bus_space_generic.c Wed Jul 25 17:22:27 2012 +0300
@@ -69,10 +69,10 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* from: src/sys/alpha/include/bus.h,v 1.5 1999/08/28 00:38:40 peter
- * $FreeBSD: head/sys/mips/mips/bus_space_generic.c 232896 2012-03-12 21:25:32Z jmallett $
+ * $FreeBSD: head/sys/mips/mips/bus_space_generic.c 234921 2012-05-02 08:23:53Z rwatson $
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/mips/mips/bus_space_generic.c 232896 2012-03-12 21:25:32Z jmallett $");
+__FBSDID("$FreeBSD: head/sys/mips/mips/bus_space_generic.c 234921 2012-05-02 08:23:53Z rwatson $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -99,8 +99,8 @@
generic_bs_subregion,
/* allocation/deallocation */
- NULL,
- NULL,
+ generic_bs_alloc,
+ generic_bs_free,
/* barrier */
generic_bs_barrier,
@@ -115,13 +115,13 @@
generic_bs_rm_1,
generic_bs_rm_2,
generic_bs_rm_4,
- NULL,
+ generic_bs_rm_8,
/* read region */
generic_bs_rr_1,
generic_bs_rr_2,
generic_bs_rr_4,
- NULL,
+ generic_bs_rr_8,
/* write (single) */
generic_bs_w_1,
@@ -133,67 +133,67 @@
generic_bs_wm_1,
generic_bs_wm_2,
generic_bs_wm_4,
- NULL,
+ generic_bs_wm_8,
/* write region */
generic_bs_wr_1,
generic_bs_wr_2,
generic_bs_wr_4,
- NULL,
+ generic_bs_wr_8,
/* set multiple */
- NULL,
- NULL,
- NULL,
- NULL,
+ generic_bs_sm_1,
+ generic_bs_sm_2,
+ generic_bs_sm_4,
+ generic_bs_sm_8,
/* set region */
generic_bs_sr_1,
generic_bs_sr_2,
generic_bs_sr_4,
- NULL,
+ generic_bs_sr_8,
/* copy */
- NULL,
+ generic_bs_c_1,
generic_bs_c_2,
- NULL,
- NULL,
+ generic_bs_c_4,
+ generic_bs_c_8,
/* read (single) stream */
generic_bs_r_1,
generic_bs_r_2,
generic_bs_r_4,
- NULL,
+ generic_bs_r_8,
/* read multiple stream */
generic_bs_rm_1,
generic_bs_rm_2,
generic_bs_rm_4,
- NULL,
+ generic_bs_rm_8,
/* read region stream */
generic_bs_rr_1,
generic_bs_rr_2,
generic_bs_rr_4,
- NULL,
+ generic_bs_rr_8,
/* write (single) stream */
generic_bs_w_1,
generic_bs_w_2,
generic_bs_w_4,
- NULL,
+ generic_bs_w_8,
/* write multiple stream */
generic_bs_wm_1,
generic_bs_wm_2,
generic_bs_wm_4,
- NULL,
+ generic_bs_wm_8,
/* write region stream */
generic_bs_wr_1,
generic_bs_wr_2,
generic_bs_wr_4,
- NULL,
+ generic_bs_wr_8,
};
/* Ultra-gross kludge */
@@ -202,30 +202,24 @@
#define rd8(a) cvmx_read64_uint8(a)
#define rd16(a) cvmx_read64_uint16(a)
#define rd32(a) cvmx_read64_uint32(a)
-#define rd64(a) cvmx_read64_uint64(a)
#define wr8(a, v) cvmx_write64_uint8(a, v)
#define wr16(a, v) cvmx_write64_uint16(a, v)
#define wr32(a, v) cvmx_write64_uint32(a, v)
-#define wr64(a, v) cvmx_write64_uint64(a, v)
#elif defined(CPU_SB1) && _BYTE_ORDER == _BIG_ENDIAN
#include <mips/sibyte/sb_bus_space.h>
#define rd8(a) sb_big_endian_read8(a)
#define rd16(a) sb_big_endian_read16(a)
#define rd32(a) sb_big_endian_read32(a)
-#define rd64(a) NULL
#define wr8(a, v) sb_big_endian_write8(a, v)
#define wr16(a, v) sb_big_endian_write16(a, v)
#define wr32(a, v) sb_big_endian_write32(a, v)
-#define wr64(a, v) NULL
#else
#define rd8(a) readb(a)
#define rd16(a) readw(a)
#define rd32(a) readl(a)
-#define rd64(a) readd(a)
#define wr8(a, v) writeb(a, v)
#define wr16(a, v) writew(a, v)
#define wr32(a, v) writel(a, v)
-#define wr64(a, v) writed(a, v)
#endif
/* generic bus_space tag */
@@ -259,6 +253,22 @@
return (0);
}
+int
+generic_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend,
+ bus_size_t size, bus_size_t alignment, bus_size_t boundary, int flags,
+ bus_addr_t *bpap, bus_space_handle_t *bshp)
+{
+
+ panic("%s: not implemented", __func__);
+}
+
+void
+generic_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
+{
+
+ panic("%s: not implemented", __func__);
+}
+
uint8_t
generic_bs_r_1(void *t, bus_space_handle_t handle,
bus_size_t offset)
@@ -284,11 +294,10 @@
}
uint64_t
-generic_bs_r_8(void *t, bus_space_handle_t handle,
- bus_size_t offset)
+generic_bs_r_8(void *t, bus_space_handle_t handle, bus_size_t offset)
{
- return (uint64_t)(rd64(handle + offset));
+ panic("%s: not implemented", __func__);
}
void
@@ -320,6 +329,13 @@
*addr++ = rd32(baddr);
}
+void
+generic_bs_rm_8(void *t, bus_space_handle_t bsh, bus_size_t offset,
+ uint64_t *addr, size_t count)
+{
+
+ panic("%s: not implemented", __func__);
+}
/*
* Read `count' 1, 2, 4, or 8 byte quantities from bus space
@@ -362,6 +378,14 @@
}
}
+void
+generic_bs_rr_8(void *t, bus_space_handle_t bsh, bus_size_t offset,
+ uint64_t *addr, size_t count)
+{
+
+ panic("%s: not implemented", __func__);
+}
+
/*
* Write the 1, 2, 4, or 8 byte value `value' to bus space
* described by tag/handle/offset.
@@ -391,11 +415,11 @@
}
void
-generic_bs_w_8(void *t, bus_space_handle_t bsh,
- bus_size_t offset, uint64_t value)
+generic_bs_w_8(void *t, bus_space_handle_t bsh, bus_size_t offset,
+ uint64_t value)
{
- wr64(bsh + offset, value);
+ panic("%s: not implemented", __func__);
}
/*
@@ -432,6 +456,14 @@
wr32(baddr, *addr++);
}
+void
+generic_bs_wm_8(void *t, bus_space_handle_t bsh, bus_size_t offset,
+ const uint64_t *addr, size_t count)
+{
+
+ panic("%s: not implemented", __func__);
+}
+
/*
* Write `count' 1, 2, 4, or 8 byte quantities from the buffer provided
* to bus space described by tag/handle starting at `offset'.
@@ -472,6 +504,14 @@
}
}
+void
+generic_bs_wr_8(void *t, bus_space_handle_t bsh, bus_size_t offset,
+ const uint64_t *addr, size_t count)
+{
+
+ panic("%s: not implemented", __func__);
+}
+
/*
* Write the 1, 2, 4, or 8 byte value `val' to bus space described
* by tag/handle/offset `count' times.
@@ -506,6 +546,14 @@
wr32(addr, value);
}
+void
+generic_bs_sm_8(void *t, bus_space_handle_t bsh, bus_size_t offset,
+ uint64_t value, size_t count)
+{
+
+ panic("%s: not implemented", __func__);
+}
+
/*
* Write `count' 1, 2, 4, or 8 byte value `val' to bus space described
* by tag/handle starting at `offset'.
@@ -540,6 +588,14 @@
wr32(addr, value);
}
+void
+generic_bs_sr_8(void *t, bus_space_handle_t bsh, bus_size_t offset,
+ uint64_t value, size_t count)
+{
+
+ panic("%s: not implemented", __func__);
+}
+
/*
* Copy `count' 1, 2, 4, or 8 byte values from bus space starting
* at tag/bsh1/off1 to bus space starting at tag/bsh2/off2.
@@ -605,6 +661,14 @@
}
void
+generic_bs_c_8(void *t, bus_space_handle_t bsh1, bus_size_t off1,
+ bus_space_handle_t bsh2, bus_size_t off2, size_t count)
+{
+
+ panic("%s: not implemented", __func__);
+}
+
+void
generic_bs_barrier(void *t __unused,
bus_space_handle_t bsh __unused,
bus_size_t offset __unused, bus_size_t len __unused,
diff -r dcbb0dea2fa3 -r c22c78e72f3e head/sys/mips/mips/pmap.c
--- a/head/sys/mips/mips/pmap.c Wed Jul 25 17:22:09 2012 +0300
+++ b/head/sys/mips/mips/pmap.c Wed Jul 25 17:22:27 2012 +0300
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/mips/mips/pmap.c 233308 2012-03-22 15:14:10Z jchandra $");
+__FBSDID("$FreeBSD: head/sys/mips/mips/pmap.c 238561 2012-07-18 05:21:34Z alc $");
#include "opt_ddb.h"
@@ -765,6 +765,7 @@
vm_page_t
pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot)
{
+ pt_entry_t *ptep;
pt_entry_t pte;
vm_page_t m;
vm_paddr_t pa;
@@ -773,8 +774,9 @@
pa = 0;
PMAP_LOCK(pmap);
retry:
- pte = *pmap_pte(pmap, va);
- if (pte != 0 && pte_test(&pte, PTE_V) &&
+ ptep = pmap_pte(pmap, va);
+ if ((ptep != NULL) && ((pte = *ptep) != 0) &&
+ pte_test(&pte, PTE_V) &&
(pte_test(&pte, PTE_D) || (prot & VM_PROT_WRITE) == 0)) {
if (vm_page_pa_tryrelock(pmap, TLBLO_PTE_TO_PA(pte), &pa))
goto retry;
@@ -1032,9 +1034,9 @@
{
#ifdef __mips_n64
- vm_contig_grow_cache(3, 0, MIPS_XKPHYS_LARGEST_PHYS);
+ vm_pageout_grow_cache(3, 0, MIPS_XKPHYS_LARGEST_PHYS);
#else
- vm_contig_grow_cache(3, 0, MIPS_KSEG0_LARGEST_PHYS);
+ vm_pageout_grow_cache(3, 0, MIPS_KSEG0_LARGEST_PHYS);
#endif
}
diff -r dcbb0dea2fa3 -r c22c78e72f3e head/sys/mips/nlm/board.c
--- a/head/sys/mips/nlm/board.c Wed Jul 25 17:22:09 2012 +0300
+++ b/head/sys/mips/nlm/board.c Wed Jul 25 17:22:27 2012 +0300
@@ -28,7 +28,7 @@
* NETLOGIC_BSD */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/mips/nlm/board.c 233545 2012-03-27 14:05:12Z jchandra $");
+__FBSDID("$FreeBSD: head/sys/mips/nlm/board.c 238290 2012-07-09 10:24:45Z jchandra $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
@@ -362,6 +362,8 @@
revstr = "A2"; break;
case 3:
revstr = "B0"; break;
+ case 4:
+ revstr = "B1"; break;
default:
revstr = "??"; break;
}
diff -r dcbb0dea2fa3 -r c22c78e72f3e head/sys/mips/nlm/dev/net/mdio.c
--- a/head/sys/mips/nlm/dev/net/mdio.c Wed Jul 25 17:22:09 2012 +0300
+++ b/head/sys/mips/nlm/dev/net/mdio.c Wed Jul 25 17:22:27 2012 +0300
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/mips/nlm/dev/net/mdio.c 233545 2012-03-27 14:05:12Z jchandra $");
+__FBSDID("$FreeBSD: head/sys/mips/nlm/dev/net/mdio.c 238293 2012-07-09 10:39:57Z jchandra $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -38,6 +38,8 @@
#include <mips/nlm/hal/nae.h>
#include <mips/nlm/hal/mdio.h>
+#include <mips/nlm/xlp.h>
+
/* Internal MDIO READ/WRITE Routines */
int
nlm_int_gmac_mdio_read(uint64_t nae_base, int bus, int block,
@@ -176,12 +178,7 @@
int intf_type, int phyaddr, int regidx)
{
uint32_t mdio_ld_cmd;
- uint32_t val;
-
- val = EXT_G_MDIO_CMD_SP |
- (phyaddr << EXT_G_MDIO_PHYADDR_POS) |
- (regidx << EXT_G_MDIO_REGADDR_POS) |
- EXT_G_MDIO_DIV;
+ uint32_t ctrlval;
mdio_ld_cmd = nlm_read_nae_reg(nae_base, NAE_REG(block, intf_type,
(EXT_G0_MDIO_CTRL + bus * 4)));
@@ -195,14 +192,22 @@
EXT_G_MDIO_STAT_MBSY);
}
- nlm_write_nae_reg(nae_base,
+ ctrlval = EXT_G_MDIO_CMD_SP |
+ (phyaddr << EXT_G_MDIO_PHYADDR_POS) |
+ (regidx << EXT_G_MDIO_REGADDR_POS);
+ if (nlm_is_xlp8xx_ax() || nlm_is_xlp8xx_b0() || nlm_is_xlp3xx_ax())
+ ctrlval |= EXT_G_MDIO_DIV;
+ else
+ ctrlval |= EXT_G_MDIO_DIV_WITH_HW_DIV64;
+
+ nlm_write_nae_reg(nae_base,
NAE_REG(block, intf_type, (EXT_G0_MDIO_CTRL+bus*4)),
- val);
+ ctrlval);
nlm_write_nae_reg(nae_base,
NAE_REG(block, intf_type, (EXT_G0_MDIO_CTRL+bus*4)),
- val | (1<<18));
-
+ ctrlval | (1<<18));
+ DELAY(1000);
/* poll master busy bit until it is not busy */
while(nlm_read_nae_reg(nae_base,
NAE_REG(block, intf_type, (EXT_G0_MDIO_RD_STAT + bus * 4))) &
@@ -210,7 +215,7 @@
nlm_write_nae_reg(nae_base,
NAE_REG(block, intf_type, (EXT_G0_MDIO_CTRL+bus*4)),
- val);
+ ctrlval);
/* Read the data back */
return nlm_read_nae_reg(nae_base,
@@ -236,11 +241,6 @@
uint32_t mdio_ld_cmd;
uint32_t ctrlval;
- ctrlval = EXT_G_MDIO_CMD_SP |
- (phyaddr << EXT_G_MDIO_PHYADDR_POS) |
- (regidx << EXT_G_MDIO_REGADDR_POS) |
- EXT_G_MDIO_DIV;
-
mdio_ld_cmd = nlm_read_nae_reg(nae_base, NAE_REG(block, intf_type,
(EXT_G0_MDIO_CTRL + bus * 4)));
if (mdio_ld_cmd & EXT_G_MDIO_CMD_LCD) {
@@ -258,6 +258,14 @@
NAE_REG(block, intf_type, (EXT_G0_MDIO_CTRL_DATA+bus*4)),
val);
+ ctrlval = EXT_G_MDIO_CMD_SP |
+ (phyaddr << EXT_G_MDIO_PHYADDR_POS) |
+ (regidx << EXT_G_MDIO_REGADDR_POS);
+ if (nlm_is_xlp8xx_ax() || nlm_is_xlp8xx_b0() || nlm_is_xlp3xx_ax())
+ ctrlval |= EXT_G_MDIO_DIV;
+ else
+ ctrlval |= EXT_G_MDIO_DIV_WITH_HW_DIV64;
+
nlm_write_nae_reg(nae_base,
NAE_REG(block, intf_type, (EXT_G0_MDIO_CTRL+bus*4)),
ctrlval);
@@ -265,6 +273,7 @@
nlm_write_nae_reg(nae_base,
NAE_REG(block, intf_type, (EXT_G0_MDIO_CTRL+bus*4)),
ctrlval | EXT_G_MDIO_CMD_LCD);
+ DELAY(1000);
/* poll master busy bit until it is not busy */
while(nlm_read_nae_reg(nae_base,
@@ -291,11 +300,17 @@
nlm_gmac_mdio_reset(uint64_t nae_base, int bus, int block,
int intf_type)
{
+ uint32_t ctrlval;
+
+ if (nlm_is_xlp8xx_ax() || nlm_is_xlp8xx_b0() || nlm_is_xlp3xx_ax())
+ ctrlval = EXT_G_MDIO_DIV;
+ else
+ ctrlval = EXT_G_MDIO_DIV_WITH_HW_DIV64;
+
nlm_write_nae_reg(nae_base,
- NAE_REG(block, intf_type, (EXT_G0_MDIO_CTRL+bus*4)),
- EXT_G_MDIO_MMRST | EXT_G_MDIO_DIV);
+ NAE_REG(block, intf_type, (EXT_G0_MDIO_CTRL + bus * 4)),
+ EXT_G_MDIO_MMRST | ctrlval);
nlm_write_nae_reg(nae_base,
- NAE_REG(block, intf_type, (EXT_G0_MDIO_CTRL+bus*4)),
- EXT_G_MDIO_DIV);
+ NAE_REG(block, intf_type, (EXT_G0_MDIO_CTRL + bus * 4)), ctrlval);
return (0);
}
diff -r dcbb0dea2fa3 -r c22c78e72f3e head/sys/mips/nlm/hal/mdio.h
--- a/head/sys/mips/nlm/hal/mdio.h Wed Jul 25 17:22:09 2012 +0300
+++ b/head/sys/mips/nlm/hal/mdio.h Wed Jul 25 17:22:27 2012 +0300
@@ -25,7 +25,7 @@
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: head/sys/mips/nlm/hal/mdio.h 233545 2012-03-27 14:05:12Z jchandra $
+ * $FreeBSD: head/sys/mips/nlm/hal/mdio.h 238293 2012-07-09 10:39:57Z jchandra $
*/
#ifndef __NLM_MDIO_H__
@@ -81,6 +81,7 @@
#define EXT_G_MDIO_CMD_SC 0x00080000
#define EXT_G_MDIO_MMRST 0x00100000
#define EXT_G_MDIO_DIV 0x0000001E
+#define EXT_G_MDIO_DIV_WITH_HW_DIV64 0x00000010
#define EXT_G_MDIO_RD_STAT_MASK 0x0000FFFF
#define EXT_G_MDIO_STAT_LFV 0x00010000
diff -r dcbb0dea2fa3 -r c22c78e72f3e head/sys/mips/nlm/xlp.h
--- a/head/sys/mips/nlm/xlp.h Wed Jul 25 17:22:09 2012 +0300
+++ b/head/sys/mips/nlm/xlp.h Wed Jul 25 17:22:27 2012 +0300
@@ -26,7 +26,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*
* NETLOGIC_BSD
- * $FreeBSD: head/sys/mips/nlm/xlp.h 233563 2012-03-27 15:39:55Z jchandra $
+ * $FreeBSD: head/sys/mips/nlm/xlp.h 238290 2012-07-09 10:24:45Z jchandra $
*/
#ifndef __NLM_XLP_H__
@@ -57,6 +57,7 @@
#define XLP_REVISION_A1 0x01
#define XLP_REVISION_A2 0x02
#define XLP_REVISION_B0 0x03
+#define XLP_REVISION_B1 0x04
#ifndef LOCORE
/*
@@ -87,6 +88,16 @@
return (nlm_processor_id() == CHIP_PROCESSOR_ID_XLP_3XX);
}
+static __inline int nlm_is_xlp3xx_ax(void)
+{
+ uint32_t procid = mips_rd_prid();
+ int prid = (procid >> 8) & 0xff;
+ int rev = procid & 0xff;
+
+ return (prid == CHIP_PROCESSOR_ID_XLP_3XX &&
+ rev < XLP_REVISION_B0);
+}
+
static __inline int nlm_is_xlp4xx(void)
{
int prid = nlm_processor_id();
@@ -116,5 +127,17 @@
(rev < XLP_REVISION_B0));
}
+static __inline int nlm_is_xlp8xx_b0(void)
+{
+ uint32_t procid = mips_rd_prid();
+ int prid = (procid >> 8) & 0xff;
+ int rev = procid & 0xff;
+
+ return ((prid == CHIP_PROCESSOR_ID_XLP_8XX ||
+ prid == CHIP_PROCESSOR_ID_XLP_432 ||
+ prid == CHIP_PROCESSOR_ID_XLP_416) &&
+ rev == XLP_REVISION_B0);
+}
+
#endif /* LOCORE */
#endif /* __NLM_XLP_H__ */
diff -r dcbb0dea2fa3 -r c22c78e72f3e head/sys/mips/nlm/xlp_pci.c
--- a/head/sys/mips/nlm/xlp_pci.c Wed Jul 25 17:22:09 2012 +0300
+++ b/head/sys/mips/nlm/xlp_pci.c Wed Jul 25 17:22:27 2012 +0300
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/mips/nlm/xlp_pci.c 233570 2012-03-27 18:26:35Z jchandra $");
+__FBSDID("$FreeBSD: head/sys/mips/nlm/xlp_pci.c 238289 2012-07-09 10:17:06Z jchandra $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -507,13 +507,13 @@
nlm_write_pci_reg(linkpcibase, PCIE_BYTE_SWAP_MEM_BASE, bar);
bar = nlm_read_bridge_reg(bbase, BRIDGE_PCIEMEM_LIMIT0 + link);
- nlm_write_pci_reg(linkpcibase, PCIE_BYTE_SWAP_MEM_LIM, bar);
+ nlm_write_pci_reg(linkpcibase, PCIE_BYTE_SWAP_MEM_LIM, bar | 0xFFF);
bar = nlm_read_bridge_reg(bbase, BRIDGE_PCIEIO_BASE0 + link);
nlm_write_pci_reg(linkpcibase, PCIE_BYTE_SWAP_IO_BASE, bar);
bar = nlm_read_bridge_reg(bbase, BRIDGE_PCIEIO_LIMIT0 + link);
- nlm_write_pci_reg(linkpcibase, PCIE_BYTE_SWAP_IO_LIM, bar);
+ nlm_write_pci_reg(linkpcibase, PCIE_BYTE_SWAP_IO_LIM, bar | 0xFFF);
}
static int
diff -r dcbb0dea2fa3 -r c22c78e72f3e head/sys/mips/rmi/rootfs_list.txt
--- a/head/sys/mips/rmi/rootfs_list.txt Wed Jul 25 17:22:09 2012 +0300
+++ b/head/sys/mips/rmi/rootfs_list.txt Wed Jul 25 17:22:27 2012 +0300
@@ -1,3 +1,5 @@
+# $FreeBSD: head/sys/mips/rmi/rootfs_list.txt 236966 2012-06-12 17:04:56Z des $
+#
# This is the list of files that
# should be in your rootfs (copy it from
# the build world nfsmount dir. When the rge0
@@ -321,7 +323,6 @@
./etc/ssh/moduli
./etc/ssl
./etc/ssl/openssl.cnf
-./etc/auth.conf
./etc/crontab
./etc/devd.conf
./etc/devfs.conf
More information about the Zrouter-src-freebsd
mailing list