Adding qemu as a submodule of KVMFORNFV

This Patch includes the changes to add qemu as a submodule to
kvmfornfv repo and make use of the updated latest qemu for the
execution of all testcase
Change-Id: I1280af507a857675c7f81d30c95255635667bdd7
Signed-off-by:RajithaY<rajithax.yerrumsetty@intel.com>

5 files changed, 0 insertions, 1080 deletions

diff --git a/qemu/roms/SLOF/clients/net-snk/oflib/Makefile b/qemu/roms/SLOF/clients/net-snk/oflib/Makefile
deleted file mode 100644
index aad3e89ff..000000000
--- a/qemu/roms/SLOF/clients/net-snk/oflib/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# *****************************************************************************
-# * 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 TOP
-  TOP = $(shell while ! test -e make.rules; do cd ..  ; done; pwd)
-  export TOP
-endif
-include $(TOP)/make.rules
-
-OBJS    = rtas.o of.o pci.o
-OBJS2   = entry.o
-
-all: 		oflib.o
-
-
-oflib.o:	$(OBJS) $(OBJS2)
-		$(LD) $(LDFLAGS) $^ -o oflib.o -r
-
-clean:		
-		$(RM) -f $(OBJS) $(OBJS2) oflib.o
-
-include $(TOP)/make.depend
-
-
-#mrproper : clean
-#	rm -rf .depend 
-#
-#depend :
-#	@rm -rf .depend ; touch .depend ; \
-#	makedepend -v -f.depend -- $(CFLAGS) -- $(OBJS:.o=.c) 2> /dev/null ; \
-#	$(CC) -M $(CFLAGS) $(OBJS2:.o=.S) >> .depend
diff --git a/qemu/roms/SLOF/clients/net-snk/oflib/entry.S b/qemu/roms/SLOF/clients/net-snk/oflib/entry.S
deleted file mode 100644
index f08026762..000000000
--- a/qemu/roms/SLOF/clients/net-snk/oflib/entry.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2011 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
- *****************************************************************************/
-
-#include <macros.h>
-
-	.section	".toc","aw"	# TOC entries are needed for relocation
-.prom_entry_toc:
-	.tc		_prom_entry[TC],_prom_entry
-
-
-C_ENTRY(call_client_interface)
-	ld	r4, .prom_entry_toc@toc(r2)	# Load prom entry point
-	mflr	r0
-	std	r0, 16(r1)
-	ld	r4, 0(r4)
-	stdu	r1, -128(r1)
-	std	r2,40(r1)
-	mtctr	r4
-	bctrl
-	ld	r2,40(r1)
-	addi	r1, r1, 128
-	ld	r0, 16(r1)
-	mtlr	r0
-	blr
-
-
-C_ENTRY(rtas_call_entry)
-	mtctr	r5
-	bctr
diff --git a/qemu/roms/SLOF/clients/net-snk/oflib/of.c b/qemu/roms/SLOF/clients/net-snk/oflib/of.c
deleted file mode 100644
index 5c502ac60..000000000
--- a/qemu/roms/SLOF/clients/net-snk/oflib/of.c
+++ /dev/null
@@ -1,715 +0,0 @@
-/******************************************************************************
- * 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
- *****************************************************************************/
-
-#include <stdint.h>
-#include <of.h>
-#include <rtas.h>
-#include <string.h>
-#include <libbootmsg.h>
-#include <kernel.h>
-
-extern void call_client_interface(of_arg_t *);
-
-static int claim_rc = 0;
-static void* client_start;
-static size_t client_size;
-
-static inline int
-of_0_1(const char *serv)
-{
-	of_arg_t arg = {
-		p32cast serv,
-		0, 1,
-		{ 0 }
-	};
-
-	call_client_interface(&arg);
-
-	return arg.args[0];
-}
-
-static inline void
-of_1_0(const char *serv, int arg0)
-{
-	of_arg_t arg = {
-		p32cast serv,
-		1, 0,
-		{arg0, 0}
-	};
-
-	call_client_interface(&arg);
-}
-
-static inline unsigned int
-of_1_1(const char *serv, int arg0)
-{
-	of_arg_t arg = {
-		p32cast serv,
-		1, 1,
-		{arg0, 0}
-	};
-
-	call_client_interface(&arg);
-	return arg.args[1];
-}
-
-static inline unsigned int
-of_1_2(const char *serv, int arg0, int *ret0)
-{
-        of_arg_t arg = {
-                p32cast serv,
-                1, 2,
-                {arg0, 0, 0}
-        };
-
-        call_client_interface(&arg);
-        *ret0 = arg.args[2];
-        return arg.args[1];
-}
-
-static inline void
-of_2_0(const char *serv, int arg0, int arg1)
-{
-	of_arg_t arg = {
-		p32cast serv,
-		2, 0,
-		{arg0, arg1, 0}
-	};
-
-	call_client_interface(&arg);
-}
-
-static inline unsigned int
-of_2_1(const char *serv, int arg0, int arg1)
-{
-	of_arg_t arg = {
-		p32cast serv,
-		2, 1,
-		{arg0, arg1, 0}
-	};
-
-	call_client_interface(&arg);
-	return arg.args[2];
-}
-
-static inline unsigned int
-of_2_2(const char *serv, int arg0, int arg1, int *ret0)
-{
-	of_arg_t arg = {
-		p32cast serv,
-		2, 2,
-		{arg0, arg1, 0, 0}
-	};
-
-	call_client_interface(&arg);
-	*ret0 = arg.args[3];
-	return arg.args[2];
-}
-
-static inline unsigned int
-of_2_3(const char *serv, int arg0, int arg1, int *ret0, int *ret1)
-{
-	of_arg_t arg = {
-		p32cast serv,
-		2, 3,
-		{arg0, arg1, 0, 0, 0}
-	};
-
-	call_client_interface(&arg);
-	*ret0 = arg.args[3];
-	*ret1 = arg.args[4];
-	return arg.args[2];
-}
-
-static inline void
-of_3_0(const char *serv, int arg0, int arg1, int arg2)
-{
-	of_arg_t arg = {
-		p32cast serv,
-		3, 0,
-		{arg0, arg1, arg2, 0}
-	};
-
-	call_client_interface(&arg);
-	return;
-}
-
-static inline unsigned int
-of_3_1(const char *serv, int arg0, int arg1, int arg2)
-{
-	of_arg_t arg = {
-		p32cast serv,
-		3, 1,
-		{arg0, arg1, arg2, 0}
-	};
-
-	call_client_interface(&arg);
-	return arg.args[3];
-}
-
-static inline unsigned int
-of_3_2(const char *serv, int arg0, int arg1, int arg2, int *ret0)
-{
-	of_arg_t arg = {
-		p32cast serv,
-		3, 2,
-		{arg0, arg1, arg2, 0, 0}
-	};
-
-	call_client_interface(&arg);
-	*ret0 = arg.args[4];
-	return arg.args[3];
-}
-
-static inline unsigned int
-of_3_3(const char *serv, int arg0, int arg1, int arg2, int *ret0, int *ret1)
-{
-	of_arg_t arg = {
-		p32cast serv,
-		3, 3,
-		{arg0, arg1, arg2, 0, 0, 0}
-	};
-
-	call_client_interface(&arg);
-	*ret0 = arg.args[4];
-	*ret1 = arg.args[5];
-	return arg.args[3];
-}
-
-static inline unsigned int
-of_4_1(const char *serv, int arg0, int arg1, int arg2, int arg3)
-{
-	of_arg_t arg = {
-		p32cast serv,
-		4, 1,
-		{arg0, arg1, arg2, arg3, 0}
-	};
-
-	call_client_interface(&arg);
-	return arg.args[4];
-}
-
-int
-of_test(const char *name)
-{
-	return (int) of_1_1("test", p32cast name);
-}
-
-int
-of_interpret_1(void *s, void *ret)
-{
-	return of_1_2("interpret", p32cast s, ret);
-}
-
-void
-of_close(ihandle_t ihandle)
-{
-	of_1_0("close", ihandle);
-}
-
-int
-of_write(ihandle_t ihandle, void *s, int len)
-{
-	return of_3_1("write", ihandle, p32cast s, len);
-}
-
-int
-of_read(ihandle_t ihandle, void *s, int len)
-{
-	return of_3_1("read", ihandle, p32cast s, len);
-}
-
-int
-of_seek(ihandle_t ihandle, int poshi, int poslo)
-{
-	return of_3_1("seek", ihandle, poshi, poslo);
-}
-
-int
-of_getprop(phandle_t phandle, const char *name, void *buf, int len)
-{
-	return of_4_1("getprop", phandle, p32cast name, p32cast buf, len);
-}
-
-phandle_t
-of_peer(phandle_t phandle)
-{
-	return (phandle_t) of_1_1("peer", phandle);
-}
-
-phandle_t
-of_child(phandle_t phandle)
-{
-	return (phandle_t) of_1_1("child", phandle);
-}
-
-phandle_t
-of_parent(phandle_t phandle)
-{
-	return (phandle_t) of_1_1("parent", phandle);
-}
-
-phandle_t
-of_instance_to_package(ihandle_t ihandle)
-{
-	return (phandle_t) of_1_1("instance-to-package", ihandle);
-}
-
-
-phandle_t
-of_finddevice(const char *name)
-{
-	return (phandle_t) of_1_1("finddevice", p32cast name);
-}
-
-ihandle_t
-of_open(const char *name)
-{
-	return (ihandle_t) of_1_1("open", p32cast name);
-}
-
-void *
-of_claim(void *start, unsigned int size, unsigned int align)
-{
-	return(void *)(long)(size_t)of_3_1("claim", p32cast start, size, align);
-}
-
-void
-of_release(void *start, unsigned int size)
-{
-	(void) of_2_0("release", p32cast start, size);
-}
-
-void *
-of_call_method_3(const char *name, ihandle_t ihandle, int arg0)
-{
-	int entry, rc;
-	rc = of_3_2("call-method", p32cast name, ihandle, arg0, &entry);
-	return rc != 0 ? 0 : (void *) (long) entry;
-}
-
-int
-vpd_read(unsigned int offset, unsigned int length, char *data)
-{
-	int result;
-	long tmp = (long) data;
-	result = of_3_1("rtas-read-vpd", offset, length, (int) tmp);
-	return result;
-}
-
-int
-vpd_write(unsigned int offset, unsigned int length, char *data)
-{
-	int result;
-	long tmp = (long) data;
-	result = of_3_1("rtas-write-vpd", offset, length, (int) tmp);
-	return result;
-}
-
-static void
-ipmi_oem_led_set(int type, int instance, int state)
-{
-	return of_3_0("set-led", type, instance, state);
-}
-
-int
-write_mm_log(char *data, unsigned int length, unsigned short type)
-{
-	long tmp = (long) data;
-
-	ipmi_oem_led_set(2, 0, 1);
-	return of_3_1("write-mm-log", (int) tmp, length, type);
-}
-
-int
-of_yield(void)
-{
-	return of_0_1("yield");
-}
-
-void *
-of_set_callback(void *addr)
-{
-	return (void *) (long) (size_t) of_1_1("set-callback", p32cast addr);
-}
-
-void
-bootmsg_warning(short id, const char *str, short lvl)
-{
-	(void) of_3_0("bootmsg-warning", id, lvl, p32cast str);
-}
-
-void
-bootmsg_error(short id, const char *str)
-{
-	(void) of_2_0("bootmsg-error", id, p32cast str);
-}
-
-/*
-void
-bootmsg_debugcp(short id, const char *str, short lvl)
-{
-	(void) of_3_0("bootmsg-debugcp", id, lvl, p32cast str);
-}
-
-void
-bootmsg_cp(short id)
-{
-	(void) of_1_0("bootmsg-cp", id);
-}
-*/
-
-#define CONFIG_SPACE 0
-#define IO_SPACE 1
-#define MEM_SPACE 2
-
-#define ASSIGNED_ADDRESS_PROPERTY 0
-#define REG_PROPERTY 1
-
-#define DEBUG_TRANSLATE_ADDRESS 0
-#if DEBUG_TRANSLATE_ADDRESS != 0
-#define DEBUG_TR(str...) printf(str)
-#else
-#define DEBUG_TR(str...)
-#endif
-
-/**
- * pci_address_type tries to find the type for which a
- * mapping should be done. This is PCI specific and is done by
- * looking at the first 32bit of the phys-addr in
- * assigned-addresses
- *
- * @param node     the node of the device which requests
- *                 translatation
- * @param address  the address which needs to be translated
- * @param prop_type the type of the property to search in (either REG_PROPERTY or ASSIGNED_ADDRESS_PROPERTY)
- * @return         the corresponding type (config, i/o, mem)
- */
-static int
-pci_address_type(phandle_t node, uint64_t address, uint8_t prop_type)
-{
-	char *prop_name = "assigned-addresses";
-	if (prop_type == REG_PROPERTY)
-		prop_name = "reg";
-	/* #address-cells */
-	const unsigned int nac = 3;	//PCI
-	/* #size-cells */
-	const unsigned int nsc = 2;	//PCI
-	/* up to 11 pairs of (phys-addr(3) size(2)) */
-	unsigned char buf[11 * (nac + nsc) * sizeof(int)];
-	unsigned int *assigned_ptr;
-	int result = -1;
-	int len;
-	len = of_getprop(node, prop_name, buf, 11 * (nac + nsc) * sizeof(int));
-	assigned_ptr = (unsigned int *) &buf[0];
-	while (len > 0) {
-		if ((prop_type == REG_PROPERTY)
-		    && ((assigned_ptr[0] & 0xFF) != 0)) {
-			//BARs and Expansion ROM must be in assigned-addresses... so in reg
-			// we only look for those without config space offset set...
-			assigned_ptr += (nac + nsc);
-			len -= (nac + nsc) * sizeof(int);
-			continue;
-		}
-		DEBUG_TR("%s %x size %x\n", prop_name, assigned_ptr[2],
-			 assigned_ptr[4]);
-		if (address >= assigned_ptr[2]
-		    && address <= assigned_ptr[2] + assigned_ptr[4]) {
-			DEBUG_TR("found a match\n");
-			result = (assigned_ptr[0] & 0x03000000) >> 24;
-			break;
-		}
-		assigned_ptr += (nac + nsc);
-		len -= (nac + nsc) * sizeof(int);
-	}
-	/* this can only handle 32bit memory space and should be
-	 * removed as soon as translations for 64bit are available */
-	return (result == 3) ? MEM_SPACE : result;
-}
-
-/**
- * this is a hack which returns the lower 64 bit of any number of cells
- * all the higher bits will silently discarded
- * right now this works pretty good as long 64 bit addresses is all we want
- *
- * @param addr  a pointer to the first address cell
- * @param nc    number of cells addr points to
- * @return      the lower 64 bit to which addr points
- */
-static uint64_t
-get_dt_address(uint32_t *addr, uint32_t nc)
-{
-	uint64_t result = 0;
-	while (nc--)
-		result = (result << 32) | *(addr++);
-	return result;
-}
-
-/**
- * this functions tries to find a mapping for the given address
- * it assumes that if we have #address-cells == 3 that we are trying
- * to do a PCI translation
- *
- * @param  addr    a pointer to the address that should be translated
- *                 if a translation has been found the address will
- *                 be modified
- * @param  type    this is required for PCI devices to find the
- *                 correct translation
- * @param ranges   this is one "range" containing the translation
- *                 information (one range = nac + pnac + nsc)
- * @param nac      the OF property #address-cells
- * @param nsc      the OF property #size-cells
- * @param pnac     the OF property #address-cells from the parent node
- * @return         -1 if no translation was possible; else 0
- */
-static int
-map_one_range(uint64_t *addr, int type, uint32_t *ranges, uint32_t nac,
-	      uint32_t nsc, uint32_t pnac)
-{
-	long offset;
-	/* cm - child mapping */
-	/* pm - parent mapping */
-	uint64_t cm, size, pm;
-	/* only check for the type if nac == 3 (PCI) */
-	DEBUG_TR("type %x, nac %x\n", ranges[0], nac);
-	if (((ranges[0] & 0x03000000) >> 24) != type && nac == 3)
-		return -1;
-	/* okay, it is the same type let's see if we find a mapping */
-	size = get_dt_address(ranges + nac + pnac, nsc);
-	if (nac == 3)		/* skip type if PCI */
-		cm = get_dt_address(ranges + 1, nac - 1);
-	else
-		cm = get_dt_address(ranges, nac);
-
-	DEBUG_TR("\t\tchild_mapping %lx\n", cm);
-	DEBUG_TR("\t\tsize %lx\n", size);
-	DEBUG_TR("\t\t*address %lx\n", (uint64_t) * addr);
-	if (cm + size <= (uint64_t) * addr || cm > (uint64_t) * addr)
-		/* it is not inside the mapping range */
-		return -1;
-	/* get the offset */
-	offset = *addr - cm;
-	/* and add the offset on the parent mapping */
-	if (pnac == 3)		/* skip type if PCI */
-		pm = get_dt_address(ranges + nac + 1, pnac - 1);
-	else
-		pm = get_dt_address(ranges + nac, pnac);
-	DEBUG_TR("\t\tparent_mapping %lx\n", pm);
-	*addr = pm + offset;
-	DEBUG_TR("\t\t*address %lx\n", *addr);
-	return 0;
-}
-
-/**
- * translate_address_dev tries to translate the device specific address
- * to a host specific address by walking up in the device tree
- *
- * @param address  a pointer to a 64 bit value which will be
- *                 translated
- * @param current_node phandle of the device from which the
- *                     translation will be started
- */
-void
-translate_address_dev(uint64_t *addr, phandle_t current_node)
-{
-	unsigned char buf[1024];
-	phandle_t parent;
-	unsigned int pnac;
-	unsigned int nac;
-	unsigned int nsc;
-	int addr_type;
-	int len;
-	unsigned int *ranges;
-	unsigned int one_range;
-	DEBUG_TR("translate address %lx, node: %lx\n", *addr, current_node);
-	of_getprop(current_node, "name", buf, 400);
-	DEBUG_TR("current node: %s\n", buf);
-	addr_type =
-	    pci_address_type(current_node, *addr, ASSIGNED_ADDRESS_PROPERTY);
-	if (addr_type == -1) {
-		// check in "reg" property if not found in "assigned-addresses"
-		addr_type = pci_address_type(current_node, *addr, REG_PROPERTY);
-	}
-	DEBUG_TR("address_type %x\n", addr_type);
-	current_node = of_parent(current_node);
-	while (1) {
-		parent = of_parent(current_node);
-		if (!parent) {
-			DEBUG_TR("reached root node...\n");
-			break;
-		}
-		of_getprop(current_node, "#address-cells", &nac, 4);
-		of_getprop(current_node, "#size-cells", &nsc, 4);
-		of_getprop(parent, "#address-cells", &pnac, 4);
-		one_range = nac + pnac + nsc;
-		len = of_getprop(current_node, "ranges", buf, 400);
-		if (len < 0) {
-			DEBUG_TR("no 'ranges' property; not translatable\n");
-			return;
-		}
-		ranges = (unsigned int *) &buf[0];
-		while (len > 0) {
-			if (!map_one_range
-			    ((uint64_t *) addr, addr_type, ranges, nac, nsc,
-			     pnac))
-				/* after a successful mapping we stop
-				 * going through the ranges */
-				break;
-			ranges += one_range;
-			len -= one_range * sizeof(int);
-		}
-		DEBUG_TR("address %lx\n", *addr);
-		of_getprop(current_node, "name", buf, 400);
-		DEBUG_TR("current node: %s\n", buf);
-		DEBUG_TR("\t#address-cells: %x\n", nac);
-		DEBUG_TR("\t#size-cells: %x\n", nsc);
-		of_getprop(parent, "name", buf, 400);
-		DEBUG_TR("parent node: %s\n", buf);
-		DEBUG_TR("\t#address-cells: %x\n", pnac);
-		current_node = parent;
-	}
-}
-
-static phandle_t
-get_boot_device(void)
-{
-	char buf[1024];
-	phandle_t dev = of_finddevice("/chosen");
-
-	if (dev == -1) {
-		dev = of_finddevice("/aliases");
-		if (dev == -1)
-			return dev;
-		of_getprop(dev, "net", buf, 1024);
-	} else
-		of_getprop(dev, "bootpath", buf, 1024);
-
-	return of_finddevice(buf);
-}
-
-/**
- * translate_address tries to translate the device specific address
- * of the boot device to a host specific address
- *
- * @param address  a pointer to a 64 bit value which will be
- *                 translated
- */
-void
-translate_address(unsigned long *addr)
-{
-	translate_address_dev((uint64_t*) addr, get_boot_device());
-}
-
-/**
- * get_puid walks up in the device tree until it finds a parent
- * node without a reg property. get_puid is assuming that if the
- * parent node has no reg property it has found the pci host bridge
- *
- * this is not the correct way to find PHBs but it seems to work
- * for all our systems
- *
- * @param node   the device for which to find the puid
- *
- * @return       the puid or 0
- */
-uint64_t
-get_puid(phandle_t node)
-{
-	uint64_t puid = 0;
-	uint64_t tmp = 0;
-	phandle_t curr_node, last_node;
-
-	curr_node = last_node = of_parent(node);
-
-	while (curr_node) {
-		puid = tmp;
-		if (of_getprop(curr_node, "reg", &tmp, 8) < 8) {
-			/* if the found PHB is not directly under
-			 * root we need to translate the found address */
-			translate_address_dev(&puid, last_node);
-			return puid;
-		}
-		last_node = curr_node;
-		curr_node = of_parent(curr_node);
-	}
-
-	return 0;
-}
-
-int of_get_mac(phandle_t device, char *mac)
-{
-	uint8_t localmac[8];
-	int len;
-
-	len = of_getprop(device, "local-mac-address", localmac, 8);
-	if (len <= 0)
-		return -1;
-
-	if (len == 8) {
-		/* Some bad FDT nodes like veth use a 8-byte wide
-		 * property instead of 6-byte wide MACs... :-( */
-		memcpy(mac, &localmac[2], 6);
-	}
-	else {
-		memcpy(mac, localmac, 6);
-	}
-	return 0;
-}
-
-static void
-get_timebase(unsigned int *timebase)
-{
-	phandle_t cpu;
-	phandle_t cpus = of_finddevice("/cpus");
-
-	if (cpus == -1)
-		return;
-
-	cpu = of_child(cpus);
-
-	if (cpu == -1)
-		return;
-
-	of_getprop(cpu, "timebase-frequency", timebase, 4);
-}
-
-int of_glue_init(unsigned int * timebase,
-		 size_t _client_start, size_t _client_size)
-{
-	phandle_t chosen = of_finddevice("/chosen");
-	ihandle_t stdin_ih, stdout_ih;
-
-	client_start = (void *) (long) _client_start;
-	client_size = _client_size;
-
-	if (chosen == -1)
-		return -1;
-
-	of_getprop(chosen, "stdin", &stdin_ih, sizeof(ihandle_t));
-	of_getprop(chosen, "stdout", &stdout_ih, sizeof(ihandle_t));
-	pre_open_ih(0, stdin_ih);
-	pre_open_ih(1, stdout_ih);
-	pre_open_ih(2, stdout_ih);
-	get_timebase(timebase);
-	rtas_init();
-
-	claim_rc=(int)(long)of_claim(client_start, client_size, 0);
-
-	return 0;
-}
-
-void of_glue_release(void)
-{
-	if (claim_rc >= 0) {
-		of_release(client_start, client_size);
-	}
-}
diff --git a/qemu/roms/SLOF/clients/net-snk/oflib/pci.c b/qemu/roms/SLOF/clients/net-snk/oflib/pci.c
deleted file mode 100644
index 89003ae3e..000000000
--- a/qemu/roms/SLOF/clients/net-snk/oflib/pci.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/******************************************************************************
- * 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
- *****************************************************************************/
-
-#include <stdint.h>
-#include <rtas.h>
-#include <of.h>
-#include <pci.h>
-#include <string.h>
-#include <kernel.h>
-#include <cpu.h>
-#include <cache.h>
-
-unsigned int read_io(void *addr, size_t sz)
-{
-	unsigned int ret;
-
-	switch (sz) {
-	case 1:
-		ret = ci_read_8(addr);
-		break;
-	case 2:
-		ret = ci_read_16(addr);
-		break;
-	case 4:
-		ret = ci_read_32(addr);
-		break;
-	default:
-		ret = 0;
-	}
-
-	return ret;
-}
-
-int write_io(void *addr, unsigned int value, size_t sz)
-{
-	switch (sz) {
-	case 1:
-		ci_write_8(addr, value);
-		break;
-	case 2:
-		ci_write_16(addr, value);
-		break;
-	case 4:
-		ci_write_32(addr, value);
-		break;
-	default:
-		return -1;
-	}
-
-	return 0;
-}
diff --git a/qemu/roms/SLOF/clients/net-snk/oflib/rtas.c b/qemu/roms/SLOF/clients/net-snk/oflib/rtas.c
deleted file mode 100644
index c514c7079..000000000
--- a/qemu/roms/SLOF/clients/net-snk/oflib/rtas.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/******************************************************************************
- * 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
- *****************************************************************************/
-
-#include <stdint.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <rtas.h>
-#include <of.h>
-#include <kernel.h>
-
-typedef int rtas_arg_t;
-
-typedef struct {
-	int token;
-	int nargs;
-	int nret;
-	rtas_arg_t args[16];
-	rtas_arg_t *rets;	/* Pointer to return values in args[]. */
-} rtas_args_t;
-
-rtas_args_t rtas_args;
-
-typedef struct {
-	void *rtas_start;
-	void *rtas_entry;
-	int rtas_size;
-	phandle_t dev;
-} rtas_t;
-
-extern rtas_t _rtas;
-static int instantiate_rtas(void);
-void rtas_call_entry(rtas_args_t *, void *, void *);
-
-int
-rtas_token(const char *service)
-{
-	int token;
-	int retVal;
-	if (_rtas.dev == 0)
-		instantiate_rtas();
-
-	retVal = of_getprop(_rtas.dev, service, &token, sizeof(token));
-	if (retVal == -1) {
-		token = 0;
-	}
-	return token;
-}
-
-int
-rtas_call(int token, int nargs, int nret, int *outputs, ...)
-{
-	va_list list;
-	int i;
-
-	rtas_args.token = token;
-	rtas_args.nargs = nargs;
-	rtas_args.nret = nret;
-	rtas_args.rets = (rtas_arg_t *) & (rtas_args.args[nargs]);
-	va_start(list, outputs);
-	for (i = 0; i < nargs; ++i) {
-		rtas_args.args[i] = (rtas_arg_t) (va_arg(list, unsigned int));
-	}
-	va_end(list);
-
-	for (i = 0; i < nret; ++i)
-		rtas_args.rets[i] = 0;
-
-	rtas_call_entry(&rtas_args, _rtas.rtas_start, _rtas.rtas_entry);
-	if (nret > 0 && outputs != 0)
-		for (i = 0; i < nret; i++)
-			outputs[i] = rtas_args.rets[i];
-#if 0
-	printf("rtas call %x %x %x args: %x %x %x %x %x %x %x %x\n",
-	       token, nargs, nret,
-	       rtas_args.args[0],
-	       rtas_args.args[1],
-	       rtas_args.args[2],
-	       rtas_args.args[3],
-	       rtas_args.args[4], rtas_args.args[5], outputs[0], outputs[1]);
-#endif
-	return ((nret > 0) ? rtas_args.rets[0] : 0);
-}
-
-rtas_t _rtas;
-
-static int
-instantiate_rtas(void)
-{
-	long long *rtas_mem_space;
-	ihandle_t ihandle;
-
-	_rtas.dev = of_finddevice("/rtas");
-	if ((long) _rtas.dev < 0) {
-		printf("\nCould not open /rtas\n");
-		return -1;
-	}
-
-	of_getprop(_rtas.dev, "rtas-size", &_rtas.rtas_size,
-		   sizeof(_rtas.rtas_size));
-
-	if (_rtas.rtas_size <= 0) {
-		printf("\nSize of rtas (%x) too small to make sense\n",
-		       _rtas.rtas_size);
-		return -1;
-	}
-
-	rtas_mem_space = (long long *) malloc_aligned(_rtas.rtas_size, 0x100);
-
-	if (!rtas_mem_space) {
-		printf("\nFailed to allocated memory for RTAS\n");
-		return -1;
-	}
-
-	ihandle = of_open("/rtas");
-
-	if ((long) ihandle < 0) {
-		printf("Could not open /rtas\n");
-		return -1;
-	}
-
-	if ((long) (_rtas.rtas_entry = of_call_method_3("instantiate-rtas",
-							ihandle,
-							p32cast rtas_mem_space))
-	    > 0) {
-		_rtas.rtas_start = rtas_mem_space;
-	} else {
-		printf("instantiate-rtas failed\n");
-		return -1;
-	}
-#if 0
-	printf("\ninstantiate-rtas at %x size %x entry %x\n",
-	       _rtas.rtas_start, _rtas.rtas_size, _rtas.rtas_entry);
-#endif
-	return 0;
-}
-
-static int read_pci_config_token = 0;
-static int write_pci_config_token = 0;
-static int ibm_read_pci_config_token = 0;
-static int ibm_write_pci_config_token = 0;
-static int get_time_of_day_token = 0;
-
-void
-rtas_init()
-{
-	int ret;
-	ret = instantiate_rtas();
-	if (ret)
-		return;
-	read_pci_config_token = rtas_token("read-pci-config");
-	ibm_read_pci_config_token = rtas_token("ibm,read-pci-config");
-	write_pci_config_token = rtas_token("write-pci-config");
-	ibm_write_pci_config_token = rtas_token("ibm,write-pci-config");
-	get_time_of_day_token = rtas_token("get-time-of-day");
-}
-
-
-int
-rtas_pci_config_read(long long puid, int size, int bus, int devfn, int offset)
-{
-	int value[2];
-
-	if (ibm_read_pci_config_token && puid) {
-		rtas_call(ibm_read_pci_config_token, 4, 2, value,
-			  bus << 16 | devfn << 8 | offset,
-			  puid >> 32, puid & 0xffffffffULL, size);
-	} else if (read_pci_config_token) {
-		rtas_call(read_pci_config_token, 2, 2, value,
-			  bus << 16 | devfn << 8 | offset, size);
-	}
-
-	return value[1];
-}
-
-int
-rtas_pci_config_write(long long puid, int size, int bus, int devfn,
-		      int offset, int value)
-{
-	int rc;
-
-	if (ibm_write_pci_config_token && puid) {
-		rtas_call(ibm_write_pci_config_token, 5, 1, &rc,
-			  bus << 16 | devfn << 8 | offset,
-			  puid >> 32, puid & 0xffffffffULL, size, value);
-	} else
-		rtas_call(write_pci_config_token, 3, 1, &rc,
-			  bus << 16 | devfn << 8 | offset, size, value);
-
-	return rc;
-}
-
-int
-rtas_get_time_of_day(dtime * get)
-{
-	int rc = -1;
-	unsigned int year;
-	unsigned int month;
-	unsigned int day;
-	unsigned int hour;
-	unsigned int minute;
-	unsigned int second;
-	unsigned int nano;
-
-	if (get_time_of_day_token)
-		rtas_call(get_time_of_day_token, 0, 8, &rc, &year, &month, &day,
-			  &hour, &minute, &second, &nano);
-
-	get->year = year;
-	get->month = month;
-	get->day = day;
-	get->hour = hour;
-	get->minute = minute;
-	get->second = second;
-	get->nano = nano;
-
-	return rc;
-}