diff options
author | RajithaY <rajithax.yerrumsetty@intel.com> | 2017-04-25 03:31:15 -0700 |
---|---|---|
committer | Rajitha Yerrumchetty <rajithax.yerrumsetty@intel.com> | 2017-05-22 06:48:08 +0000 |
commit | bb756eebdac6fd24e8919e2c43f7d2c8c4091f59 (patch) | |
tree | ca11e03542edf2d8f631efeca5e1626d211107e3 /qemu/roms/openbios/include/arch/amd64 | |
parent | a14b48d18a9ed03ec191cf16b162206998a895ce (diff) |
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>
Diffstat (limited to 'qemu/roms/openbios/include/arch/amd64')
-rw-r--r-- | qemu/roms/openbios/include/arch/amd64/elf.h | 6 | ||||
-rw-r--r-- | qemu/roms/openbios/include/arch/amd64/io.h | 71 | ||||
-rw-r--r-- | qemu/roms/openbios/include/arch/amd64/pci.h | 66 | ||||
-rw-r--r-- | qemu/roms/openbios/include/arch/amd64/types.h | 67 |
4 files changed, 0 insertions, 210 deletions
diff --git a/qemu/roms/openbios/include/arch/amd64/elf.h b/qemu/roms/openbios/include/arch/amd64/elf.h deleted file mode 100644 index e391c62b6..000000000 --- a/qemu/roms/openbios/include/arch/amd64/elf.h +++ /dev/null @@ -1,6 +0,0 @@ -/* for now we're a 32bit architecture */ -#define ARCH_ELF_CLASS ELFCLASS32 -#define ARCH_ELF_DATA ELFDATA2LSB -#define ARCH_ELF_MACHINE_OK(x) ((x)==EM_386 || (x)==EM_486) -typedef Elf32_Ehdr Elf_ehdr; -typedef Elf32_Phdr Elf_phdr; diff --git a/qemu/roms/openbios/include/arch/amd64/io.h b/qemu/roms/openbios/include/arch/amd64/io.h deleted file mode 100644 index 9be1cb857..000000000 --- a/qemu/roms/openbios/include/arch/amd64/io.h +++ /dev/null @@ -1,71 +0,0 @@ -#ifndef _ASM_IO_H -#define _ASM_IO_H - -extern char _start, _end; -extern unsigned long virt_offset; - -#define phys_to_virt(phys) ((void *) ((unsigned long) (phys) - virt_offset)) -#define virt_to_phys(virt) ((unsigned long) (virt) + virt_offset) - -#ifndef BOOTSTRAP - -#define __SLOW_DOWN_IO "outb %%al,$0x80;" -static inline void slow_down_io(void) -{ - __asm__ __volatile__( - __SLOW_DOWN_IO -#ifdef REALLY_SLOW_IO - __SLOW_DOWN_IO __SLOW_DOWN_IO __SLOW_DOWN_IO -#endif - : : ); -} - -#define BUILDIO(bwl,bw,type) \ -static inline void out##bwl(unsigned type value, int port) { \ - __asm__ __volatile__("out" #bwl " %" #bw "0, %w1" : : "a"(value), "Nd"(port)); \ -} \ -static inline unsigned type in##bwl(int port) { \ - unsigned type value; \ - __asm__ __volatile__("in" #bwl " %w1, %" #bw "0" : "=a"(value) : "Nd"(port)); \ - return value; \ -} \ -static inline void out##bwl##_p(unsigned type value, int port) { \ - out##bwl(value, port); \ - slow_down_io(); \ -} \ -static inline unsigned type in##bwl##_p(int port) { \ - unsigned type value = in##bwl(port); \ - slow_down_io(); \ - return value; \ -} \ -static inline void outs##bwl(int port, const void *addr, unsigned long count) { \ - __asm__ __volatile__("rep; outs" #bwl : "+S"(addr), "+c"(count) : "d"(port)); \ -} \ -static inline void ins##bwl(int port, void *addr, unsigned long count) { \ - __asm__ __volatile__("rep; ins" #bwl : "+D"(addr), "+c"(count) : "d"(port)); \ -} - -BUILDIO(b,b,char) -BUILDIO(w,w,short) -BUILDIO(l,,int) - -#else /* BOOTSTRAP */ -#ifdef FCOMPILER -#define inb(reg) ((u8)0xff) -#define inw(reg) ((u16)0xffff) -#define inl(reg) ((u32)0xffffffff) -#define outb(reg, val) do{} while(0) -#define outw(reg, val) do{} while(0) -#define outl(reg, val) do{} while(0) -#else -extern u8 inb(u32 reg); -extern u16 inw(u32 reg); -extern u32 inl(u32 reg); -extern void insw(u32 reg, void *addr, unsigned long count); -extern void outb(u32 reg, u8 val); -extern void outw(u32 reg, u16 val); -extern void outl(u32 reg, u32 val); -extern void outsw(u32 reg, const void *addr, unsigned long count); -#endif -#endif -#endif diff --git a/qemu/roms/openbios/include/arch/amd64/pci.h b/qemu/roms/openbios/include/arch/amd64/pci.h deleted file mode 100644 index 3e88e150b..000000000 --- a/qemu/roms/openbios/include/arch/amd64/pci.h +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef AMD64_PCI_H -#define AMD64_PCI_H - -#include "asm/io.h" - -#if !(defined(PCI_CONFIG_1) || defined(PCI_CONFIG_2)) -#define PCI_CONFIG_1 1 /* default */ -#endif - -#ifdef PCI_CONFIG_1 - -/* PCI Configuration Mechanism #1 */ - -/* Have pci_addr in the same format as the values written to 0xcf8 - * so register accesses can be made easy. */ -#define PCI_ADDR(bus, dev, fn) \ - ((pci_addr) (0x80000000u \ - | (uint32_t) (bus) << 16 \ - | (uint32_t) (dev) << 11 \ - | (uint32_t) (fn) << 8)) - -#define PCI_BUS(pcidev) ((uint8_t) ((pcidev) >> 16)) -#define PCI_DEV(pcidev) ((uint8_t) ((pcidev) >> 11) & 0x1f) -#define PCI_FN(pcidev) ((uint8_t) ((pcidev) >> 8) & 7) - -static inline uint8_t pci_config_read8(pci_addr dev, uint8_t reg) -{ - outl(dev | (reg & ~3), 0xcf8); - return inb(0xcfc | (reg & 3)); -} - -static inline uint16_t pci_config_read16(pci_addr dev, uint8_t reg) -{ - outl(dev | (reg & ~3), 0xcf8); - return inw(0xcfc | (reg & 2)); -} - -static inline uint32_t pci_config_read32(pci_addr dev, uint8_t reg) -{ - outl(dev | reg, 0xcf8); - return inl(0xcfc | reg); -} - -static inline void pci_config_write8(pci_addr dev, uint8_t reg, uint8_t val) -{ - outl(dev | (reg & ~3), 0xcf8); - outb(val, 0xcfc | (reg & 3)); -} - -static inline void pci_config_write16(pci_addr dev, uint8_t reg, uint16_t val) -{ - outl(dev | (reg & ~3), 0xcf8); - outw(val, 0xcfc | (reg & 2)); -} - -static inline void pci_config_write32(pci_addr dev, uint8_t reg, uint32_t val) -{ - outl(dev | reg, 0xcf8); - outl(val, 0xcfc); -} - -#else /* !PCI_CONFIG_1 */ -#error PCI Configuration Mechanism is not specified or implemented -#endif - -#endif /* AMD64_PCI_H */ diff --git a/qemu/roms/openbios/include/arch/amd64/types.h b/qemu/roms/openbios/include/arch/amd64/types.h deleted file mode 100644 index 5b146cada..000000000 --- a/qemu/roms/openbios/include/arch/amd64/types.h +++ /dev/null @@ -1,67 +0,0 @@ -/* tag: data types for forth engine - * - * This file is autogenerated by types.sh. Do not edit! - * - * Copyright (C) 2003 Patrick Mauritz, Stefan Reinauer - * - * See the file "COPYING" for further information about - * the copyright and warranty status of this work. - */ - -#ifndef __TYPES_H -#define __TYPES_H - -#include <inttypes.h> - -/* endianess */ -#include "autoconf.h" - -/* physical address */ - -typedef uint64_t phys_addr_t; - -#define FMT_plx "%016" PRIx64 - -/* cell based types */ - -typedef int64_t cell; -typedef uint64_t ucell; -typedef __int128_t dcell; -typedef __uint128_t ducell; - -#define FMT_cell "%" PRId64 -#define FMT_ucellx "%016" PRIx64 -#define FMT_ucell "%" PRIu64 - -typedef int64_t prom_arg_t; -typedef uint64_t prom_uarg_t; - -#define PRIdPROMARG PRId64 -#define PRIuPROMARG PRIu64 -#define PRIxPROMARG PRIx64 -#define FMT_prom_arg "%" PRIdPROMARG -#define FMT_prom_uarg "%" PRIuPROMARG -#define FMT_prom_uargx "%016" PRIxPROMARG - -#define FMT_elf "%#x" - -#define bitspercell (sizeof(cell)<<3) -#define bitsperdcell (sizeof(dcell)<<3) - -#define BITS 64 - -#define PAGE_SHIFT 12 - -/* size named types */ - -typedef unsigned char u8; -typedef unsigned short u16; -typedef unsigned int u32; -typedef unsigned long u64; - -typedef char s8; -typedef short s16; -typedef int s32; -typedef long s64; - -#endif |