- Assert that HEAPSZ is a multiple of PAGE_SIZE as at least the firmware

  of Sun Fire V1280 doesn't round up the size itself but instead lets
  claiming of non page-sized amounts of memory fail.
- Change parameters and variables related to the TLB slots to unsigned
  which is more appropriate.
- Search the whole OFW device tree instead of only the children of the
  root nexus device for the BSP as starting with UltraSPARC IV the 'cpu'
  nodes hang off of from 'cmp' (chip multi-threading processor) or 'core'
  or combinations thereof. Also in large UltraSPARC III based machines
  the 'cpu' nodes hang off of 'ssm' (scalable shared memory) nodes which
  group snooping-coherency domains together instead of directly from the
  nexus.
- Add support for UltraSPARC IV and IV+ BSPs. Due to the fact that these
  are multi-core each CPU has two Fireplane config registers and thus the
  module/target ID has to be determined differently so the one specific
  to a certain core is used. Similarly, starting with UltraSPARC IV the
  individual cores use a different property in the OFW device tree to
  indicate the CPU/core ID as it no longer is in coincidence with the
  shared slot/socket ID.
  While at it additionally distinguish between CPUs with Fireplane and
  JBus interconnects as these also use slightly different sizes for the
  JBus/agent/module/target IDs.
- Check the return value of init_heap(). This requires moving it after
  cons_probe() so we can panic when appropriate. This should be fine as
  the PowerPC OFW loader uses that order for quite some time now.

4 files changed, 28 insertions, 0 deletions

diff --git a/sys/sun4v/include/asi.h b/sys/sun4v/include/asi.h
index 07b097b..e377859 100644
--- a/sys/sun4v/include/asi.h
+++ b/sys/sun4v/include/asi.h
@@ -158,6 +158,11 @@
 #define	AA_DMMU_TAR			        0x30
 
 #define ASI_UPA_CONFIG_REG                      0x4a    /* US-I, II */
+#define	ASI_FIREPLANE_CONFIG_REG		0x4a	/* US-III{,+}, IV{,+} */
+#define		AA_FIREPLANE_CONFIG		0x0	/* US-III{,+}, IV{,+} */
+#define		AA_FIREPLANE_ADDRESS		0x8	/* US-III{,+}, IV{,+} */
+#define		AA_FIREPLANE_CONFIG_2		0x10	/* US-IV{,+} */
+#define	ASI_JBUS_CONFIG_REG			0x4a	/* US-IIIi{,+} */
 #define	ASI_IMMU				0x50
 #define	ASI_ITLB_DATA_IN_REG			0x54
 #define	ASI_ITLB_DATA_ACCESS_REG		0x55
@@ -167,5 +172,7 @@
 #define	ASI_DTLB_DATA_IN_REG			0x5c
 #define	ASI_DTLB_DATA_ACCESS_REG		0x5d
 #define	ASI_DTLB_TAG_READ_REG			0x5e
+#define	ASI_INTR_ID				0x63	/* US-IV{,+} */
+#define		AA_INTR_ID			0x0	/* US-IV{,+} */
 
 #endif /* !_MACHINE_ASI_H_ */
diff --git a/sys/sun4v/include/cmt.h b/sys/sun4v/include/cmt.h
new file mode 100644
index 0000000..4fddc63
--- /dev/null
+++ b/sys/sun4v/include/cmt.h
@@ -0,0 +1,7 @@
+/*-
+ * This file is in the public domain.
+ *
+ * $FreeBSD$
+ */
+
+#include <sparc64/cmt.h>
diff --git a/sys/sun4v/include/fireplane.h b/sys/sun4v/include/fireplane.h
new file mode 100644
index 0000000..7c81412
--- /dev/null
+++ b/sys/sun4v/include/fireplane.h
@@ -0,0 +1,7 @@
+/*-
+ * This file is in the public domain.
+ *
+ * $FreeBSD$
+ */
+
+#include <sparc64/fireplane.h>
diff --git a/sys/sun4v/include/jbus.h b/sys/sun4v/include/jbus.h
new file mode 100644
index 0000000..502f785
--- /dev/null
+++ b/sys/sun4v/include/jbus.h
@@ -0,0 +1,7 @@
+/*-
+ * This file is in the public domain.
+ *
+ * $FreeBSD$
+ */
+
+#include <sparc64/jbus.h>