From bb756eebdac6fd24e8919e2c43f7d2c8c4091f59 Mon Sep 17 00:00:00 2001 From: RajithaY Date: Tue, 25 Apr 2017 03:31:15 -0700 Subject: 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 --- qemu/roms/openbios/include/drivers/drivers.h | 133 ---------------- qemu/roms/openbios/include/drivers/pci.h | 217 --------------------------- qemu/roms/openbios/include/drivers/usb.h | 8 - qemu/roms/openbios/include/drivers/vga.h | 20 --- 4 files changed, 378 deletions(-) delete mode 100644 qemu/roms/openbios/include/drivers/drivers.h delete mode 100644 qemu/roms/openbios/include/drivers/pci.h delete mode 100644 qemu/roms/openbios/include/drivers/usb.h delete mode 100644 qemu/roms/openbios/include/drivers/vga.h (limited to 'qemu/roms/openbios/include/drivers') diff --git a/qemu/roms/openbios/include/drivers/drivers.h b/qemu/roms/openbios/include/drivers/drivers.h deleted file mode 100644 index 48f81a870..000000000 --- a/qemu/roms/openbios/include/drivers/drivers.h +++ /dev/null @@ -1,133 +0,0 @@ -/* - * OpenBIOS driver prototypes - * - * (C) 2004 Stefan Reinauer - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 - * - */ -#ifndef OPENBIOS_DRIVERS_H -#define OPENBIOS_DRIVERS_H - -#include "config.h" - -#ifdef CONFIG_DRIVER_PCI -/* drivers/pci.c */ -int ob_pci_init(void); -#endif - -#if defined(CONFIG_DRIVER_PCI) || defined(CONFIG_DRIVER_ESCC) -#ifdef CONFIG_PPC -extern int is_apple(void); -extern int is_oldworld(void); -extern int is_newworld(void); -#else -static inline int is_apple(void) -{ - return 0; -} -static inline int is_oldworld(void) -{ - return 0; -} -static inline int is_newworld(void) -{ - return 0; -} -#endif -#define AAPL(_cmd) do { if (is_apple()) _cmd; } while(0) -#define OLDWORLD(_cmd) do { if (is_oldworld()) _cmd; } while(0) -#define NEWWORLD(_cmd) do { if (is_newworld()) _cmd; } while(0) -#endif -#ifdef CONFIG_DRIVER_SBUS -/* drivers/sbus.c */ -int ob_sbus_init(uint64_t base, int machine_id); - -/* arch/sparc32/console.c */ -void kbd_init(uint64_t base); -#endif -#ifdef CONFIG_DRIVER_IDE -/* drivers/ide.c */ -int ob_ide_init(const char *path, uint32_t io_port0, uint32_t ctl_port0, - uint32_t io_port1, uint32_t ctl_port1); -void ob_ide_quiesce(void); -int macio_ide_init(const char *path, uint32_t addr, int nb_channels); -#endif -#ifdef CONFIG_DRIVER_ESP -/* drivers/esp.c */ -int ob_esp_init(unsigned int slot, uint64_t base, unsigned long espoffset, - unsigned long dmaoffset); -#endif -#ifdef CONFIG_DRIVER_OBIO -/* drivers/obio.c */ -int ob_obio_init(uint64_t slavio_base, unsigned long fd_offset, - unsigned long counter_offset, unsigned long intr_offset, - int intr_ncpu, unsigned long aux1_offset, unsigned long aux2_offset, - unsigned long mem_size); -int start_cpu(unsigned int pc, unsigned int context_ptr, unsigned int context, - int cpu); -void ob_eccmemctl_init(uint64_t base); -void ss5_init(uint64_t base); - -/* drivers/iommu.c */ -void ob_init_iommu(uint64_t base); -void *dvma_alloc(int size, unsigned int *pphys); - -/* drivers/sbus.c */ -extern uint16_t graphic_depth; - -/* drivers/obio.c */ -extern volatile unsigned char *power_reg; -extern volatile unsigned int *reset_reg; -extern volatile struct sun4m_timer_regs *counter_regs; - -void ob_new_obio_device(const char *name, const char *type); -unsigned long ob_reg(uint64_t base, uint64_t offset, unsigned long size, int map); -void ob_intr(int intr); - -/* arch/sparc32/boot.c */ -extern uint32_t kernel_image; -extern uint32_t kernel_size; -extern uint32_t qemu_cmdline; -extern uint32_t cmdline_size; -extern char boot_device; -#endif -#ifdef CONFIG_DRIVER_FLOPPY -int ob_floppy_init(const char *path, const char *dev_name, - unsigned long io_base, unsigned long mmio_base); -#endif -#ifdef CONFIG_DRIVER_PC_KBD -void ob_pc_kbd_init(const char *path, const char *dev_name, uint64_t base, - uint64_t offset, int intr); -int pc_kbd_dataready(void); -unsigned char pc_kbd_readdata(void); -#endif -#ifdef CONFIG_DRIVER_PC_SERIAL -void ob_pc_serial_init(const char *path, const char *dev_name, uint64_t base, - uint64_t offset, int intr); -int uart_init(int port, unsigned long speed); -int uart_charav(int port); -char uart_getchar(int port); -void uart_putchar(int c); -#endif -#ifdef CONFIG_DRIVER_ESCC -int escc_uart_init(phys_addr_t port, unsigned long speed); -int escc_uart_charav(uintptr_t port); -char escc_uart_getchar(uintptr_t port); -void escc_uart_putchar(int c); -void serial_cls(void); -#ifdef CONFIG_DRIVER_ESCC_SUN -int keyboard_dataready(void); -unsigned char keyboard_readdata(void); -#endif -#endif -int macio_get_nvram_size(void); -void macio_nvram_put(char *buf); -void macio_nvram_get(char *buf); - -/* drivers/timer.c */ -void setup_timers(void); - -#endif /* OPENBIOS_DRIVERS_H */ diff --git a/qemu/roms/openbios/include/drivers/pci.h b/qemu/roms/openbios/include/drivers/pci.h deleted file mode 100644 index 2eb5685d3..000000000 --- a/qemu/roms/openbios/include/drivers/pci.h +++ /dev/null @@ -1,217 +0,0 @@ -#ifndef _H_PCI -#define _H_PCI - -typedef uint32_t pci_addr; - -typedef struct pci_arch_t pci_arch_t; - -struct pci_arch_t { - const char * name; - uint16_t vendor_id; - uint16_t device_id; - unsigned long cfg_addr; - unsigned long cfg_data; - unsigned long cfg_base; - unsigned long cfg_len; - unsigned long host_pci_base; /* offset of PCI memory space within host memory space */ - unsigned long pci_mem_base; /* in PCI memory space */ - unsigned long mem_len; - unsigned long io_base; - unsigned long io_len; - unsigned long rbase; - unsigned long rlen; - uint8_t irqs[4]; -}; - -extern const pci_arch_t *arch; - -/* Device tree offsets */ - -#define PCI_INT_MAP_PCI0 0 -#define PCI_INT_MAP_PCI1 1 -#define PCI_INT_MAP_PCI2 2 -#define PCI_INT_MAP_PCI_INT 3 -#define PCI_INT_MAP_PIC_HANDLE 4 -#define PCI_INT_MAP_PIC_INT 5 -#define PCI_INT_MAP_PIC_POL 6 - -/* Device classes and subclasses */ - -#define PCI_BASE_CLASS_STORAGE 0x01 -#define PCI_SUBCLASS_STORAGE_SCSI 0x00 -#define PCI_SUBCLASS_STORAGE_IDE 0x01 -#define PCI_SUBCLASS_STORAGE_FLOPPY 0x02 -#define PCI_SUBCLASS_STORAGE_IPI 0x03 -#define PCI_SUBCLASS_STORAGE_RAID 0x04 -#define PCI_SUBCLASS_STORAGE_ATA 0x05 -#define PCI_SUBCLASS_STORAGE_SAS 0x07 -#define PCI_SUBCLASS_STORAGE_OTHER 0x80 - -#define PCI_BASE_CLASS_NETWORK 0x02 -#define PCI_SUBCLASS_NETWORK_ETHERNET 0x00 -#define PCI_SUBCLASS_NETWORK_TOKEN_RING 0x01 -#define PCI_SUBCLASS_NETWORK_FDDI 0x02 -#define PCI_SUBCLASS_NETWORK_ATM 0x03 -#define PCI_SUBCLASS_NETWORK_ISDN 0x04 -#define PCI_SUBCLASS_NETWORK_WORDFIP 0x05 -#define PCI_SUBCLASS_NETWORK_PICMG214 0x06 -#define PCI_SUBCLASS_NETWORK_OTHER 0x80 - -#define PCI_BASE_CLASS_DISPLAY 0x03 -#define PCI_SUBCLASS_DISPLAY_VGA 0x00 -#define PCI_SUBCLASS_DISPLAY_XGA 0x01 -#define PCI_SUBCLASS_DISPLAY_3D 0x02 -#define PCI_SUBCLASS_DISPLAY_OTHER 0x80 - -#define PCI_BASE_CLASS_MULTIMEDIA 0x04 -#define PCI_SUBCLASS_MULTIMEDIA_VIDEO 0x00 -#define PCI_SUBCLASS_MULTIMEDIA_AUDIO 0x01 -#define PCI_SUBCLASS_MULTIMEDIA_PHONE 0x02 -#define PCI_SUBCLASS_MULTIMEDIA_OTHER 0x80 - -#define PCI_BASE_CLASS_MEMORY 0x05 -#define PCI_SUBCLASS_MEMORY_RAM 0x00 -#define PCI_SUBCLASS_MEMORY_FLASH 0x01 - -#define PCI_BASE_CLASS_BRIDGE 0x06 -#define PCI_SUBCLASS_BRIDGE_HOST 0x00 -#define PCI_SUBCLASS_BRIDGE_ISA 0x01 -#define PCI_SUBCLASS_BRIDGE_EISA 0x02 -#define PCI_SUBCLASS_BRIDGE_MC 0x03 -#define PCI_SUBCLASS_BRIDGE_PCI 0x04 -#define PCI_SUBCLASS_BRIDGE_PCMCIA 0x05 -#define PCI_SUBCLASS_BRIDGE_NUBUS 0x06 -#define PCI_SUBCLASS_BRIDGE_CARDBUS 0x07 -#define PCI_SUBCLASS_BRIDGE_RACEWAY 0x08 -#define PCI_SUBCLASS_BRIDGE_PCI_SEMITP 0x09 -#define PCI_SUBCLASS_BRIDGE_IB_PCI 0x0a -#define PCI_SUBCLASS_BRIDGE_OTHER 0x80 - -#define PCI_BASE_CLASS_COMMUNICATION 0x07 -#define PCI_SUBCLASS_COMMUNICATION_SERIAL 0x00 -#define PCI_SUBCLASS_COMMUNICATION_PARALLEL 0x01 -#define PCI_SUBCLASS_COMMUNICATION_MULTISERIAL 0x02 -#define PCI_SUBCLASS_COMMUNICATION_MODEM 0x03 -#define PCI_SUBCLASS_COMMUNICATION_GPIB 0x04 -#define PCI_SUBCLASS_COMMUNICATION_SC 0x05 -#define PCI_SUBCLASS_COMMUNICATION_OTHER 0x80 - -#define PCI_BASE_CLASS_SYSTEM 0x08 -#define PCI_SUBCLASS_SYSTEM_PIC 0x00 -#define PCI_SUBCLASS_SYSTEM_DMA 0x01 -#define PCI_SUBCLASS_SYSTEM_TIMER 0x02 -#define PCI_SUBCLASS_SYSTEM_RTC 0x03 -#define PCI_SUBCLASS_SYSTEM_PCI_HOTPLUG 0x04 -#define PCI_SUBCLASS_SYSTEM_OTHER 0x80 - -#define PCI_BASE_CLASS_INPUT 0x09 -#define PCI_SUBCLASS_INPUT_KEYBOARD 0x00 -#define PCI_SUBCLASS_INPUT_PEN 0x01 -#define PCI_SUBCLASS_INPUT_MOUSE 0x02 -#define PCI_SUBCLASS_INPUT_SCANNER 0x03 -#define PCI_SUBCLASS_INPUT_GAMEPORT 0x04 -#define PCI_SUBCLASS_INPUT_OTHER 0x80 - -#define PCI_BASE_CLASS_DOCKING 0x0a -#define PCI_SUBCLASS_DOCKING_GENERIC 0x00 -#define PCI_SUBCLASS_DOCKING_OTHER 0x80 - -#define PCI_BASE_CLASS_PROCESSOR 0x0b -#define PCI_SUBCLASS_PROCESSOR_386 0x00 -#define PCI_SUBCLASS_PROCESSOR_486 0x01 -#define PCI_SUBCLASS_PROCESSOR_PENTIUM 0x02 -#define PCI_SUBCLASS_PROCESSOR_ALPHA 0x10 -#define PCI_SUBCLASS_PROCESSOR_POWERPC 0x20 -#define PCI_SUBCLASS_PROCESSOR_MIPS 0x30 -#define PCI_SUBCLASS_PROCESSOR_CO 0x40 - -#define PCI_BASE_CLASS_SERIAL 0x0c -#define PCI_SUBCLASS_SERIAL_FIREWIRE 0x00 -#define PCI_SUBCLASS_SERIAL_ACCESS 0x01 -#define PCI_SUBCLASS_SERIAL_SSA 0x02 -#define PCI_SUBCLASS_SERIAL_USB 0x03 -#define PCI_SUBCLASS_SERIAL_FIBER 0x04 -#define PCI_SUBCLASS_SERIAL_SMBUS 0x05 -#define PCI_SUBCLASS_SERIAL_IB 0x06 -#define PCI_SUBCLASS_SERIAL_IPMI 0x07 -#define PCI_SUBCLASS_SERIAL_SERCOS 0x08 -#define PCI_SUBCLASS_SERIAL_CANBUS 0x09 - -#define PCI_BASE_CLASS_WIRELESS 0x0d -#define PCI_SUBCLASS_WIRELESS_IRDA 0x00 -#define PCI_SUBCLASS_WIRELESS_CIR 0x01 -#define PCI_SUBCLASS_WIRELESS_RF_CONTROLLER 0x10 -#define PCI_SUBCLASS_WIRELESS_BLUETOOTH 0x11 -#define PCI_SUBCLASS_WIRELESS_BROADBAND 0x12 -#define PCI_SUBCLASS_WIRELESS_OTHER 0x80 - -#define PCI_BASE_CLASS_SATELLITE 0x0f -#define PCI_SUBCLASS_SATELLITE_TV 0x00 -#define PCI_SUBCLASS_SATELLITE_AUDIO 0x01 -#define PCI_SUBCLASS_SATELLITE_VOICE 0x03 -#define PCI_SUBCLASS_SATELLITE_DATA 0x04 - -#define PCI_BASE_CLASS_CRYPT 0x10 -#define PCI_SUBCLASS_CRYPT_NETWORK 0x00 -#define PCI_SUBCLASS_CRYPT_ENTERTAINMENT 0x01 -#define PCI_SUBCLASS_CRYPT_OTHER 0x80 - -#define PCI_BASE_CLASS_SIGNAL_PROCESSING 0x11 -#define PCI_SUBCLASS_SP_DPIO 0x00 -#define PCI_SUBCLASS_SP_PERF 0x01 -#define PCI_SUBCLASS_SP_SYNCH 0x10 -#define PCI_SUBCLASS_SP_MANAGEMENT 0x20 -#define PCI_SUBCLASS_SP_OTHER 0x80 - -#define PCI_CLASS_OTHERS 0xff - -/* Vendors and devices. */ - -#define PCI_VENDOR_ID_ATI 0x1002 -#define PCI_DEVICE_ID_ATI_RAGE128_PF 0x5046 - -#define PCI_VENDOR_ID_DEC 0x1011 -#define PCI_DEVICE_ID_DEC_21154 0x0026 - -#define PCI_VENDOR_ID_IBM 0x1014 -#define PCI_DEVICE_ID_IBM_OPENPIC 0x0002 -#define PCI_DEVICE_ID_IBM_OPENPIC2 0xffff - -#define PCI_VENDOR_ID_MOTOROLA 0x1057 -#define PCI_DEVICE_ID_MOTOROLA_MPC106 0x0002 -#define PCI_DEVICE_ID_MOTOROLA_RAVEN 0x4801 - -#define PCI_VENDOR_ID_APPLE 0x106b -#define PCI_DEVICE_ID_APPLE_343S1201 0x0010 -#define PCI_DEVICE_ID_APPLE_343S1211 0x0017 -#define PCI_DEVICE_ID_APPLE_UNI_N_I_PCI 0x001e -#define PCI_DEVICE_ID_APPLE_UNI_N_PCI 0x001f -#define PCI_DEVICE_ID_APPLE_UNI_N_AGP 0x0020 -#define PCI_DEVICE_ID_APPLE_UNI_N_KEYL 0x0022 -#define PCI_DEVICE_ID_APPLE_KEYL_USB 0x003f -#define PCI_DEVICE_ID_APPLE_U3_AGP 0x004b - -#define PCI_VENDOR_ID_SUN 0x108e -#define PCI_DEVICE_ID_SUN_EBUS 0x1000 -#define PCI_DEVICE_ID_SUN_SIMBA 0x5000 -#define PCI_DEVICE_ID_SUN_PBM 0x8000 -#define PCI_DEVICE_ID_SUN_SABRE 0xa000 - -#define PCI_VENDOR_ID_CMD 0x1095 -#define PCI_DEVICE_ID_CMD_646 0x0646 - -#define PCI_VENDOR_ID_REALTEK 0x10ec -#define PCI_DEVICE_ID_REALTEK_RTL8029 0x8029 - -#define PCI_VENDOR_ID_QEMU 0x1234 -#define PCI_DEVICE_ID_QEMU_VGA 0x1111 - -#define PCI_VENDOR_ID_REDHAT_QUMRANET 0x1af4 -#define PCI_DEVICE_ID_VIRTIO_NET 0x1000 -#define PCI_DEVICE_ID_VIRTIO_BLOCK 0x1001 - -#define PCI_VENDOR_ID_INTEL 0x8086 -#define PCI_DEVICE_ID_INTEL_82378 0x0484 -#define PCI_DEVICE_ID_INTEL_82441 0x1237 - -#endif /* _H_PCI */ diff --git a/qemu/roms/openbios/include/drivers/usb.h b/qemu/roms/openbios/include/drivers/usb.h deleted file mode 100644 index 143ed27bc..000000000 --- a/qemu/roms/openbios/include/drivers/usb.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef USB_H -#define USB_H - -int ob_usb_ohci_init(const char *path, uint32_t addr); -void ob_usb_hid_add_keyboard(const char *path); -int usb_exit(void); - -#endif /* USB_H */ diff --git a/qemu/roms/openbios/include/drivers/vga.h b/qemu/roms/openbios/include/drivers/vga.h deleted file mode 100644 index a4951f870..000000000 --- a/qemu/roms/openbios/include/drivers/vga.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef VIDEO_VGA_H -#define VIDEO_VGA_H - -/* drivers/vga_load_regs.c */ -void vga_load_regs(void); - -/* drivers/vga_set_mode.c */ -void vga_set_gmode (void); -void vga_set_amode (void); -void vga_font_load(unsigned char *vidmem, const unsigned char *font, int height, int num_chars); - -/* drivers/vga_vbe.c */ -void vga_set_color(int i, unsigned int r, unsigned int g, unsigned int b); -void vga_vbe_set_mode(int width, int height, int depth); -void vga_vbe_init(const char *path, unsigned long fb, uint32_t fb_size, - unsigned long rom, uint32_t rom_size); - -extern volatile uint32_t *dac; - -#endif /* VIDEO_VGA_H */ -- cgit 1.2.3-korg