Add qemu 2.4.0

Change-Id: Ic99cbad4b61f8b127b7dc74d04576c0bcbaaf4f5
Signed-off-by: Yang Zhang <yang.z.zhang@intel.com>

2 files changed, 199 insertions, 0 deletions

diff --git a/qemu/roms/SLOF/include/ppc970/cache.h b/qemu/roms/SLOF/include/ppc970/cache.h
new file mode 100644
index 000000000..b74868986
--- /dev/null
+++ b/qemu/roms/SLOF/include/ppc970/cache.h
@@ -0,0 +1,86 @@
+/******************************************************************************
+ * Copyright (c) 2004, 2008 IBM Corporation
+ * All rights reserved.
+ * This program and the accompanying materials
+ * are made available under the terms of the BSD License
+ * which accompanies this distribution, and is available at
+ * http://www.opensource.org/licenses/bsd-license.php
+ *
+ * Contributors:
+ *     IBM Corporation - initial implementation
+ *****************************************************************************/
+
+#ifndef __CACHE_H
+#define __CACHE_H
+
+#include <cpu.h>
+#include <stdint.h>
+
+#define cache_inhibited_access(type,name) 			\
+	static inline type ci_read_##name(type * addr)		\
+	{							\
+		type val;					\
+		set_ci();					\
+		val = *addr;					\
+		clr_ci();					\
+		return val;					\
+	}							\
+	static inline void ci_write_##name(type * addr, type data)	\
+	{							\
+		set_ci();					\
+		*addr = data;					\
+		clr_ci();					\
+	}
+
+cache_inhibited_access(uint8_t,  8)
+cache_inhibited_access(uint16_t, 16)
+cache_inhibited_access(uint32_t, 32)
+cache_inhibited_access(uint64_t, 64)
+
+#define _FWOVERLAP(s, d, size) ((d >= s) && ((type_u)d < ((type_u)s + size)))
+
+// 3.1
+#define _FWMOVE(s, d, size, t)	\
+	{ t *s1=(t *)s, *d1=(t *)d; \
+		while (size > 0) { *d1++ = *s1++; size -= sizeof(t); } }
+
+#define _BWMOVE(s, d, size, t)	{ \
+	t *s1=(t *)((char *)s+size), *d1=(t *)((char *)d+size); \
+	while (size > 0) { *--d1 = *--s1; size -= sizeof(t); } \
+}
+
+
+#define	_MOVE(s, d, size, t) if _FWOVERLAP(s, d, size) _BWMOVE(s, d, size, t) else  _FWMOVE(s, d, size, t)
+
+#define _FASTMOVE(s, d, size) \
+	switch (((type_u)s | (type_u)d | size) & (sizeof(type_u)-1)) { \
+		case 0:			_MOVE(s, d, size, type_u); break; \
+		case sizeof(type_l):	_MOVE(s, d, size, type_l); break; \
+		case sizeof(type_w):	_MOVE(s, d, size, type_w); break; \
+		default:		_MOVE(s, d, size, type_c); break; \
+	}
+
+// Device IO block data helpers
+#define _FWRMOVE(s, d, size, t)	\
+	{ t *s1=(t *)s, *d1=(t *)d; SET_CI; \
+		while (size > 0) { *d1++ = *s1++; size -= sizeof(t); } \
+		CLR_CI; \
+}
+
+#define _BWRMOVE(s, d, size, t)	{ \
+	t *s1=(t *)((char *)s+size), *d1=(t *)((char *)d+size); SET_CI; \
+	while (size > 0) { *--d1 = *--s1; size -= sizeof(t); } \
+		CLR_CI; \
+}
+
+#define	_RMOVE(s, d, size, t) if _FWOVERLAP(s, d, size) _BWRMOVE(s, d, size, t) else  _FWRMOVE(s, d, size, t)
+
+#define _FASTRMOVE(s, d, size) \
+	switch (((type_u)s | (type_u)d | size) & (sizeof(type_u)-1)) { \
+		case 0:			_RMOVE(s, d, size, type_u); break; \
+		case sizeof(type_l):	_RMOVE(s, d, size, type_l); break; \
+		case sizeof(type_w):	_RMOVE(s, d, size, type_w); break; \
+		default:		_RMOVE(s, d, size, type_c); break; \
+	}
+
+#endif
diff --git a/qemu/roms/SLOF/include/ppc970/cpu.h b/qemu/roms/SLOF/include/ppc970/cpu.h
new file mode 100644
index 000000000..0e66dff36
--- /dev/null
+++ b/qemu/roms/SLOF/include/ppc970/cpu.h
@@ -0,0 +1,113 @@
+/******************************************************************************
+ * Copyright (c) 2004, 2008 IBM Corporation
+ * All rights reserved.
+ * This program and the accompanying materials
+ * are made available under the terms of the BSD License
+ * which accompanies this distribution, and is available at
+ * http://www.opensource.org/licenses/bsd-license.php
+ *
+ * Contributors:
+ *     IBM Corporation - initial implementation
+ *****************************************************************************/
+
+#ifndef __PPC970_H
+#define __PPC970_H
+
+/* SPRs numbers */
+
+#define CTRL_RD 136
+#define CTRL_WR 152
+#define PVR     287
+#define HSPRG0  304
+#define HSPRG1  305
+#define HIOR    311
+#define HID0    1008
+#define HID1    1009
+#define HID4    1012
+#define HID6    1017
+#define PIR     1023
+
+#define SETCI(r)	sync; \
+			mfspr	r, HID4; \
+			sync; \
+			rldicl	r, r, 32,0; \
+			ori	r, r, 0x0100; \
+			rldicl	r, r, 32,0; \
+			sync; \
+			slbia; \
+			mtspr	HID4, r; \
+			isync; \
+			eieio;
+
+#define CLRCI(r)	sync; \
+			mfspr	r, HID4; \
+			sync; \
+			rldicl	r, r, 32, 0; \
+			ori	r, r, 0x0100; \
+			xori	r, r, 0x0100; \
+			rldicl	r, r, 32, 0; \
+			sync; \
+			slbia; \
+			mtspr	HID4, r; \
+			isync; \
+			eieio;
+
+/* This macro uses r0 */
+#define FLUSH_CACHE(r, n)	add	n, n, r; \
+				addi	n, n, 127; \
+				rlwinm	r, r, 0,0,24; \
+				rlwinm	n, n, 0,0,24; \
+				sub	n, n, r; \
+				srwi	n, n, 7; \
+				mtctr	n; \
+			0:	dcbst	0, r; \
+				sync; \
+				icbi	0, r; \
+				sync; \
+				isync; \
+				addi	r, r, 128; \
+				bdnz	0b;
+
+#ifndef __ASSEMBLER__
+#define STRINGIFY(x...) #x
+#define EXPAND(x) STRINGIFY(x)
+
+static inline void
+set_ci(void)
+{
+	unsigned long tmp;
+	asm volatile(EXPAND(SETCI(%0)) : "=r"(tmp) :: "memory", "cc");
+}
+
+static inline void
+clr_ci(void)
+{
+	unsigned long tmp;
+	asm volatile(EXPAND(CLRCI(%0)) : "=r"(tmp) :: "memory", "cc");
+}
+
+static inline void eieio(void)
+{
+	asm volatile ("eieio":::"memory");
+}
+
+static inline void barrier(void)
+{
+	asm volatile("" : : : "memory");
+}
+#define cpu_relax() barrier()
+
+static inline void sync(void)
+{
+	asm volatile ("sync" ::: "memory");
+}
+#define mb() sync()
+
+static inline void flush_cache(void* r, long n)
+{
+	asm volatile(EXPAND(FLUSH_CACHE(%0, %1)) : "+r"(r), "+r"(n) :: "memory", "cc", "r0", "ctr");
+}
+
+#endif /* __ASSEMBLER__ */
+
+#endif