 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.1.2.25 2010/03/21 21:22:28 cliff Exp $	*/
+/*	$NetBSD: machdep.c,v 1.1.2.26 2010/03/29 23:32:02 cliff Exp $	*/
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe and Simon Burge for Wasabi Systems, Inc.
+ *
  * 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
 @@ -102,27 +102,27 @@
  * 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.
+ *
  *	@(#)machdep.c   8.3 (Berkeley) 1/12/94
  *	from: Utah Hdr: machdep.c 1.63 91/04/24
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.1.2.25 2010/03/21 21:22:28 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.1.2.26 2010/03/29 23:32:02 cliff Exp $");
 #define __INTR_PRIVATE
 #include "opt_ddb.h"
 #include "opt_com.h"
 #include "opt_execfmt.h"
 #include "opt_memsize.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 @@ -156,27 +156,29 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
 #error no serial console
 #endif
 #include <dev/ic/comreg.h>
 #include <dev/ic/comvar.h>
 #include <mips/include/intr.h>
 #include <mips/rmi/rmixlreg.h>
 #include <mips/rmi/rmixlvar.h>
 #include <mips/rmi/rmixl_intr.h>
 #include <mips/rmi/rmixl_firmware.h>
 #include <mips/rmi/rmixl_comvar.h>
 #include <mips/rmi/rmixl_pcievar.h>
 #define MACHDEP_DEBUG 1	/* XXX TMP FIXME */
 #ifdef MACHDEP_DEBUG
 int machdep_debug=MACHDEP_DEBUG;
 # define DPRINTF(x)	do { if (machdep_debug) printf x ; } while(0)
 #else
 # define DPRINTF(x)
 #endif
 #ifndef CONSFREQ
 # define CONSFREQ 66000000
 #endif
 #ifndef CONSPEED
 # define CONSPEED 38400
 #endif
 @@ -196,28 +198,29 @@ struct rmixl_config rmixl_configuration;
 /*
  * array of tested firmware versions
  * if you find new ones and they work
  * please add them
  */
 typedef struct rmiclfw_psb_id {
 	uint64_t		psb_version;
 	rmixlfw_psb_type_t	psb_type;
 } rmiclfw_psb_id_t;
 static rmiclfw_psb_id_t rmiclfw_psb_id[] = {
 	{	0x4958d4fb00000056ULL, PSB_TYPE_RMI  },
 	{	0x49a5a8fa00000056ULL, PSB_TYPE_DELL },
 	{	0x4aacdb6a00000056ULL, PSB_TYPE_RMI  },
 	{	0x49a5a8fa00000056ULL, PSB_TYPE_DELL },
 	{	0x4b8ead3100000056ULL, PSB_TYPE_DELL },
 };
 #define RMICLFW_PSB_VERSIONS_LEN \
 	(sizeof(rmiclfw_psb_id)/sizeof(rmiclfw_psb_id[0]))
 /*
  * storage for fixed extent used to allocate physical address regions
  * because extent(9) start and end values are u_long, they are only
  * 32 bits on a 32 bit kernel, which is insuffucuent since XLS physical
  * address is 40 bits wide.  So the "physaddr" map stores regions
  * in units of megabytes.
  */
 static u_long rmixl_physaddr_storage[
 	EXTENT_FIXED_STORAGE_SIZE(32)/sizeof(u_long)
 @@ -598,73 +601,38 @@ rmixl_physaddr_init(void)
 		if ((r & RMIXL_DRAM_BAR_STATUS) == 0)
 			continue;	/* not enabled */
 		base = (u_long)(DRAM_BAR_TO_BASE((uint64_t)r) / (1024 * 1024));
 		size = (u_long)(DRAM_BAR_TO_SIZE((uint64_t)r) / (1024 * 1024));
 		DPRINTF(("%s: %d: %d: 0x%08x -- 0x%010lx:%lu MB\n",
 			__func__, __LINE__, i, r, base * (1024 * 1024), size));
 		if (extent_alloc_region(ext, base, size, EX_NOWAIT) != 0)
 			panic("%s: extent_alloc_region(%p, %#lx, %#lx, %#x) "
 				"failed", __func__, ext, base, size, EX_NOWAIT);
+	}
 	/*
-	 * grab regions per PCIe CFG, ECFG, IO, MEM BARs
+	 * get chip-dependent physaddr regions
 	 */
-	r = RMIXL_IOREG_READ(RMIXL_SBC_PCIE_CFG_BAR);
+	switch(cpu_rmixl_chip_type(mips_options.mips_cpu)) {
-	if ((r & RMIXL_PCIE_CFG_BAR_ENB) != 0) {
+	case CIDFL_RMI_TYPE_XLR:
-		base = (u_long)(RMIXL_PCIE_CFG_BAR_TO_BA((uint64_t)r)
+		/* XXX TBD */
-			/ (1024 * 1024));
+		break;
-		size = (u_long)RMIXL_PCIE_CFG_SIZE / (1024 * 1024);
+	case CIDFL_RMI_TYPE_XLS:
-		DPRINTF(("%s: %d: %s: 0x%08x -- 0x%010lx:%ld MB\n", __func__,
+		rmixl_physaddr_init_pcie(ext);
-			__LINE__, "CFG", r, base * 1024 * 1024, size));
+		break;
-		if (extent_alloc_region(ext, base, size, EX_NOWAIT) != 0)
+	case CIDFL_RMI_TYPE_XLP:
-			panic("%s: extent_alloc_region(%p, %#lx, %#lx, %#x) "
+		/* XXX TBD */
-				"failed", __func__, ext, base, size, EX_NOWAIT);
+		panic("%s: RMI XLP not yet supported", __func__);
 	r = RMIXL_IOREG_READ(RMIXL_SBC_PCIE_ECFG_BAR);
 	if ((r & RMIXL_PCIE_ECFG_BAR_ENB) != 0) {
 		base = (u_long)(RMIXL_PCIE_ECFG_BAR_TO_BA((uint64_t)r)
 			/ (1024 * 1024));
 		size = (u_long)RMIXL_PCIE_ECFG_SIZE / (1024 * 1024);
 		DPRINTF(("%s: %d: %s: 0x%08x -- 0x%010lx:%ld MB\n", __func__,
 			__LINE__, "ECFG", r, base * 1024 * 1024, size));
 		if (extent_alloc_region(ext, base, size, EX_NOWAIT) != 0)
 			panic("%s: extent_alloc_region(%p, %#lx, %#lx, %#x) "
 				"failed", __func__, ext, base, size, EX_NOWAIT);
 	r = RMIXL_IOREG_READ(RMIXL_SBC_PCIE_MEM_BAR);
 	if ((r & RMIXL_PCIE_MEM_BAR_ENB) != 0) {
 		base = (u_long)(RMIXL_PCIE_MEM_BAR_TO_BA((uint64_t)r)
 			/ (1024 * 1024));
 		size = (u_long)(RMIXL_PCIE_MEM_BAR_TO_SIZE((uint64_t)r)
 			/ (1024 * 1024));
 		DPRINTF(("%s: %d: %s: 0x%08x -- 0x%010lx:%ld MB\n", __func__,
 			__LINE__, "MEM", r, base * 1024 * 1024, size));
 		if (extent_alloc_region(ext, base, size, EX_NOWAIT) != 0)
 			panic("%s: extent_alloc_region(%p, %#lx, %#lx, %#x) "
 				"failed", __func__, ext, base, size, EX_NOWAIT);
 	r = RMIXL_IOREG_READ(RMIXL_SBC_PCIE_IO_BAR);
 	if ((r & RMIXL_PCIE_IO_BAR_ENB) != 0) {
 		base = (u_long)(RMIXL_PCIE_IO_BAR_TO_BA((uint64_t)r)
 			/ (1024 * 1024));
 		size = (u_long)(RMIXL_PCIE_IO_BAR_TO_SIZE((uint64_t)r)
 			/ (1024 * 1024));
 		DPRINTF(("%s: %d: %s: 0x%08x -- 0x%010lx:%ld MB\n", __func__,
 			__LINE__, "IO", r, base * 1024 * 1024, size));
 		if (extent_alloc_region(ext, base, size, EX_NOWAIT) != 0)
 			panic("%s: extent_alloc_region(%p, %#lx, %#lx, %#x) "
 				"failed", __func__, ext, base, size, EX_NOWAIT);
+	}
 	/*
 	 *  at this point all regions left in "physaddr" extent
 	 *  are unused holes in the physical adress space
 	 *  available for use as needed.
 	 */
 	rmixl_configuration.rc_phys_ex = ext;
 #ifdef MACHDEP_DEBUG
 	extent_print(ext);
 #endif
+}