* [Qemu-devel] [PULL v2 00/31] Misc changes for 2016-05-27
@ 2016-05-27 14:09 Paolo Bonzini
2016-05-27 14:09 ` [Qemu-devel] [PULL 01/31] Add optionrom compatible with fw_cfg DMA version Paolo Bonzini
2016-05-27 15:30 ` [Qemu-devel] [PULL v2 00/31] Misc changes for 2016-05-27 Peter Maydell
0 siblings, 2 replies; 9+ messages in thread
From: Paolo Bonzini @ 2016-05-27 14:09 UTC (permalink / raw)
To: qemu-devel
The following changes since commit 2c56d06bafd8933d2a9c6e0aeb5d45f7c1fb5616:
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2016-05-26 14:29:30 +0100)
are available in the git repository at:
git://github.com/bonzini/qemu.git tags/for-upstream
for you to fetch changes up to 103876bc5e1ea67eec386461114df5c953110e34:
exec: hide mr->ram_addr from qemu_get_ram_ptr users (2016-05-27 16:07:32 +0200)
----------------------------------------------------------------
* docs/atomics fixes and atomic_rcu_* optimization (Emilio)
* NBD bugfix (Eric)
* Memory fixes and cleanups (Paolo, Paul)
* scsi-block support for SCSI status, including persistent
reservations (Paolo)
* linuxboot support for fw_cfg DMA (Marc, Richard Jones)
* kvm_stat moves to the Linux repository
* SCSI bug fixes (Peter, Prasad)
* Killing qemu_char_get_next_serial, non-ARM parts (Xiaoqiang)
----------------------------------------------------------------
Emilio G. Cota (3):
docs/atomics: update atomic_read/set comparison with Linux
atomics: emit an smp_read_barrier_depends() barrier only for Alpha and Thread Sanitizer
atomics: do not emit consume barrier for atomic_rcu_read
Eric Blake (1):
nbd: Don't trim unrequested bytes
Fam Zheng (1):
scsi-generic: Merge block max xfer len in INQUIRY response
Marc Marí (1):
Add optionrom compatible with fw_cfg DMA version
Paolo Bonzini (13):
Revert "memory: Drop FlatRange.romd_mode"
kvm_stat: Remove
bt: rewrite csrhci_write to avoid out-of-bounds writes
docs/atomics: update comparison with Linux
scsi-disk: introduce a common base class
scsi-disk: introduce dma_readv and dma_writev
scsi-disk: add need_fua_emulation to SCSIDiskClass
scsi-disk: introduce scsi_disk_req_check_error
scsi-block: always use SG_IO
memory: remove qemu_get_ram_fd, qemu_set_ram_fd, qemu_ram_block_host_ptr
exec: remove ram_addr argument from qemu_ram_block_from_host
memory: split memory_region_from_host from qemu_ram_addr_from_host
exec: hide mr->ram_addr from qemu_get_ram_ptr users
Paul Durrant (1):
xen-hvm: ignore background I/O sections
Peter Lieven (1):
block/iscsi: avoid potential overflow of acb->task->cdb
Prasad J Pandit (5):
scsi: pvscsi: check command descriptor ring buffer size (CVE-2016-4952)
scsi: mptsas: infinite loop while fetching requests
scsi: megasas: use appropriate property buffer size
scsi: megasas: initialise local configuration data buffer
scsi: megasas: check 'read_queue_head' index value
xiaoqiang zhao (5):
hw/char: QOM'ify escc.c
hw/char: QOM'ify etraxfs_ser.c
hw/char: QOM'ify lm32_juart.c
hw/char: QOM'ify lm32_uart.c
hw/char: QOM'ify milkymist-uart.c
.gitignore | 4 +
Makefile | 11 +-
block/iscsi.c | 7 +
configure | 20 +
cputlb.c | 3 +-
docs/atomics.txt | 38 +-
exec.c | 110 ++---
hw/bt/hci-csr.c | 67 +++-
hw/char/escc.c | 30 +-
hw/char/etraxfs_ser.c | 27 +-
hw/char/lm32_juart.c | 17 +-
hw/char/lm32_uart.c | 28 +-
hw/char/milkymist-uart.c | 10 +-
hw/cris/axis_dev88.c | 4 +-
hw/i386/pc.c | 10 +-
hw/lm32/lm32.h | 19 +-
hw/lm32/lm32_boards.c | 9 +-
hw/lm32/milkymist-hw.h | 4 +-
hw/lm32/milkymist.c | 4 +-
hw/misc/ivshmem.c | 5 +-
hw/nvram/fw_cfg.c | 2 +-
hw/scsi/megasas.c | 6 +-
hw/scsi/mptsas.c | 9 +-
hw/scsi/scsi-disk.c | 412 +++++++++++++------
hw/scsi/scsi-generic.c | 12 +
hw/scsi/vmw_pvscsi.c | 24 +-
hw/virtio/vhost-user.c | 25 +-
include/exec/cpu-common.h | 4 +-
include/exec/memory.h | 36 +-
include/exec/ram_addr.h | 3 -
include/hw/cris/etraxfs.h | 16 +
include/hw/nvram/fw_cfg.h | 1 +
include/qemu/atomic.h | 25 +-
memory.c | 43 +-
migration/postcopy-ram.c | 3 +-
nbd/server.c | 20 +-
pc-bios/optionrom/Makefile | 20 +-
pc-bios/optionrom/code16gcc.h | 3 +
pc-bios/optionrom/linuxboot_dma.c | 292 ++++++++++++++
scripts/dump-guest-memory.py | 19 +-
scripts/kvm/kvm_stat | 825 --------------------------------------
scripts/kvm/kvm_stat.texi | 55 ---
target-i386/kvm.c | 6 +-
xen-hvm.c | 14 +-
44 files changed, 1057 insertions(+), 1245 deletions(-)
create mode 100644 pc-bios/optionrom/code16gcc.h
create mode 100644 pc-bios/optionrom/linuxboot_dma.c
delete mode 100755 scripts/kvm/kvm_stat
delete mode 100644 scripts/kvm/kvm_stat.texi
--
2.5.5
^ permalink raw reply [flat|nested] 9+ messages in thread* [Qemu-devel] [PULL 01/31] Add optionrom compatible with fw_cfg DMA version 2016-05-27 14:09 [Qemu-devel] [PULL v2 00/31] Misc changes for 2016-05-27 Paolo Bonzini @ 2016-05-27 14:09 ` Paolo Bonzini 2016-05-27 14:16 ` Richard W.M. Jones 2016-06-10 21:45 ` Richard W.M. Jones 2016-05-27 15:30 ` [Qemu-devel] [PULL v2 00/31] Misc changes for 2016-05-27 Peter Maydell 1 sibling, 2 replies; 9+ messages in thread From: Paolo Bonzini @ 2016-05-27 14:09 UTC (permalink / raw) To: qemu-devel; +Cc: Marc Marí, Richard W.M. Jones From: Marc Marí <markmb@redhat.com> This optionrom is based on linuxboot.S. Signed-off-by: Marc Marí <markmb@redhat.com> Signed-off-by: Richard W.M. Jones <rjones@redhat.com> Message-Id: <1464027093-24073-2-git-send-email-rjones@redhat.com> [Add -fno-toplevel-reorder and fix Win32 compilation. - Paolo] Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- .gitignore | 4 + Makefile | 2 +- configure | 20 +++ hw/i386/pc.c | 10 +- hw/nvram/fw_cfg.c | 2 +- include/hw/nvram/fw_cfg.h | 1 + pc-bios/optionrom/Makefile | 20 ++- pc-bios/optionrom/code16gcc.h | 3 + pc-bios/optionrom/linuxboot_dma.c | 292 ++++++++++++++++++++++++++++++++++++++ 9 files changed, 348 insertions(+), 6 deletions(-) create mode 100644 pc-bios/optionrom/code16gcc.h create mode 100644 pc-bios/optionrom/linuxboot_dma.c diff --git a/.gitignore b/.gitignore index 88a80ff..101d1e0 100644 --- a/.gitignore +++ b/.gitignore @@ -94,6 +94,10 @@ /pc-bios/optionrom/linuxboot.bin /pc-bios/optionrom/linuxboot.raw /pc-bios/optionrom/linuxboot.img +/pc-bios/optionrom/linuxboot_dma.asm +/pc-bios/optionrom/linuxboot_dma.bin +/pc-bios/optionrom/linuxboot_dma.raw +/pc-bios/optionrom/linuxboot_dma.img /pc-bios/optionrom/multiboot.asm /pc-bios/optionrom/multiboot.bin /pc-bios/optionrom/multiboot.raw diff --git a/Makefile b/Makefile index a5d7e62..3a9782e 100644 --- a/Makefile +++ b/Makefile @@ -400,7 +400,7 @@ efi-e1000.rom efi-eepro100.rom efi-ne2k_pci.rom \ efi-pcnet.rom efi-rtl8139.rom efi-virtio.rom \ qemu-icon.bmp qemu_logo_no_text.svg \ bamboo.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \ -multiboot.bin linuxboot.bin kvmvapic.bin \ +multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin \ s390-ccw.img \ spapr-rtas.bin slof.bin \ palcode-clipper \ diff --git a/configure b/configure index b5aab72..6d4cbbd 100755 --- a/configure +++ b/configure @@ -237,6 +237,7 @@ fortify_source="" strip_opt="yes" tcg_interpreter="no" bigendian="no" +compiler_m16="no" mingw32="no" gcov="no" gcov_tool="gcov" @@ -1524,6 +1525,21 @@ if test "$static" = "yes" ; then fi fi +# Check if the compiler supports -m16 to generate i8086 binaries. +# +# GCC < 4.9 didn't, so we have to work around that when building the +# linuxboot_dma option ROM. When GCC < 4.9 is considered sufficiently +# old that we no longer care about it, we can remove this section and +# CONFIG_COMPILER_M16 which will simplify the build. +if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then + cat > $TMPC << EOF +int main(void) { return 0; } +EOF + if compile_prog "-m16" "" ; then + compiler_m16=yes + fi +fi + # Unconditional check for compiler __thread support cat > $TMPC << EOF static __thread int tls_var; @@ -4780,6 +4796,7 @@ fi echo "module support $modules" echo "host CPU $cpu" echo "host big endian $bigendian" +echo "compiler has -m16 $compiler_m16" echo "target list $target_list" echo "tcg debug enabled $debug_tcg" echo "gprof enabled $gprof" @@ -4928,6 +4945,9 @@ fi if test "$bigendian" = "yes" ; then echo "HOST_WORDS_BIGENDIAN=y" >> $config_host_mak fi +if test "$compiler_m16" = "yes" ; then + echo "CONFIG_COMPILER_M16=y" >> $config_host_mak +fi if test "$mingw32" = "yes" ; then echo "CONFIG_WIN32=y" >> $config_host_mak rc_version=`cat $source_path/VERSION` diff --git a/hw/i386/pc.c b/hw/i386/pc.c index e29ccc8..2ab7b42 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1000,8 +1000,13 @@ static void load_linux(PCMachineState *pcms, fw_cfg_add_i32(fw_cfg, FW_CFG_SETUP_SIZE, setup_size); fw_cfg_add_bytes(fw_cfg, FW_CFG_SETUP_DATA, setup, setup_size); - option_rom[nb_option_roms].name = "linuxboot.bin"; - option_rom[nb_option_roms].bootindex = 0; + if (fw_cfg_dma_enabled(fw_cfg)) { + option_rom[nb_option_roms].name = "linuxboot_dma.bin"; + option_rom[nb_option_roms].bootindex = 0; + } else { + option_rom[nb_option_roms].name = "linuxboot.bin"; + option_rom[nb_option_roms].bootindex = 0; + } nb_option_roms++; } @@ -1264,6 +1269,7 @@ void xen_load_linux(PCMachineState *pcms) load_linux(pcms, fw_cfg); for (i = 0; i < nb_option_roms; i++) { assert(!strcmp(option_rom[i].name, "linuxboot.bin") || + !strcmp(option_rom[i].name, "linuxboot_dma.bin") || !strcmp(option_rom[i].name, "multiboot.bin")); rom_add_option(option_rom[i].name, option_rom[i].bootindex); } diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index cdbdfb5..6ac486e 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -552,7 +552,7 @@ static bool is_version_1(void *opaque, int version_id) return version_id == 1; } -static bool fw_cfg_dma_enabled(void *opaque) +bool fw_cfg_dma_enabled(void *opaque) { FWCfgState *s = opaque; diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index d008112..5c27a1f 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -182,5 +182,6 @@ FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr, hwaddr dma_addr, AddressSpace *dma_as); FWCfgState *fw_cfg_find(void); +bool fw_cfg_dma_enabled(void *opaque); #endif diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index ce4852a..14e7f71 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -13,15 +13,31 @@ CFLAGS := -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin CFLAGS += -I$(SRC_PATH) CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector) CFLAGS += $(CFLAGS_NOPIE) +ifdef CONFIG_COMPILER_M16 +CFLAGS += -m16 +else +# Attempt to work around the lack of support for -m16 in gcc < 4.9. +CFLAGS += -m32 -fno-toplevel-reorder +linuxboot_dma.o-cflags += -include code16gcc.h +endif QEMU_CFLAGS = $(CFLAGS) -build-all: multiboot.bin linuxboot.bin kvmvapic.bin +ASFLAGS += -32 + +build-all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin # suppress auto-removal of intermediate files .SECONDARY: +ifdef CONFIG_WIN32 +LD_EMULATION = i386pe +CFLAGS += -Wa,-32 +else +LD_EMULATION = elf_i386 +endif + %.img: %.o - $(call quiet-command,$(LD) $(LDFLAGS_NOPIE) -Ttext 0 -e _start -s -o $@ $<," Building $(TARGET_DIR)$@") + $(call quiet-command,$(LD) $(LDFLAGS_NOPIE) -m $(LD_EMULATION) -Ttext 0 -e _start -s -o $@ $<," Building $(TARGET_DIR)$@") %.raw: %.img $(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@," Building $(TARGET_DIR)$@") diff --git a/pc-bios/optionrom/code16gcc.h b/pc-bios/optionrom/code16gcc.h new file mode 100644 index 0000000..9c8d25d --- /dev/null +++ b/pc-bios/optionrom/code16gcc.h @@ -0,0 +1,3 @@ +asm( +".code16gcc\n" +); diff --git a/pc-bios/optionrom/linuxboot_dma.c b/pc-bios/optionrom/linuxboot_dma.c new file mode 100644 index 0000000..98d9184 --- /dev/null +++ b/pc-bios/optionrom/linuxboot_dma.c @@ -0,0 +1,292 @@ +/* + * Linux Boot Option ROM for fw_cfg DMA + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * Copyright (c) 2015-2016 Red Hat Inc. + * Authors: + * Marc Marà <marc.mari.barcelo@gmail.com> + * Richard W.M. Jones <rjones@redhat.com> + */ + +asm( +".text\n" +".global _start\n" +"_start:\n" +" .short 0xaa55\n" +" .byte 0\n" /* size in 512 units, filled in by signrom.py */ +" .byte 0xcb\n" /* far return without prefix */ +" .org 0x18\n" +" .short 0\n" +" .short _pnph\n" +"_pnph:\n" +" .ascii \"$PnP\"\n" +" .byte 0x01\n" +" .byte (_pnph_len / 16)\n" +" .short 0x0000\n" +" .byte 0x00\n" +" .byte 0x00\n" +" .long 0x00000000\n" +" .short _manufacturer\n" +" .short _product\n" +" .long 0x00000000\n" +" .short 0x0000\n" +" .short 0x0000\n" +" .short _bev\n" +" .short 0x0000\n" +" .short 0x0000\n" +" .equ _pnph_len, . - _pnph\n" +"_manufacturer:\n" +" .asciz \"QEMU\"\n" +"_product:\n" +" .asciz \"Linux loader DMA\"\n" +" .align 4, 0\n" +"_bev:\n" +" cli\n" +" cld\n" +" jmp load_kernel\n" +); + +#include "../../include/hw/nvram/fw_cfg_keys.h" + +/* QEMU_CFG_DMA_CONTROL bits */ +#define BIOS_CFG_DMA_CTL_ERROR 0x01 +#define BIOS_CFG_DMA_CTL_READ 0x02 +#define BIOS_CFG_DMA_CTL_SKIP 0x04 +#define BIOS_CFG_DMA_CTL_SELECT 0x08 + +#define BIOS_CFG_DMA_ADDR_HIGH 0x514 +#define BIOS_CFG_DMA_ADDR_LOW 0x518 + +#define uint64_t unsigned long long +#define uint32_t unsigned int +#define uint16_t unsigned short + +#define barrier() asm("" : : : "memory") + +typedef struct FWCfgDmaAccess { + uint32_t control; + uint32_t length; + uint64_t address; +} __attribute__((packed)) FWCfgDmaAccess; + +static inline void outl(uint32_t value, uint16_t port) +{ + asm("outl %0, %w1" : : "a"(value), "Nd"(port)); +} + +static inline void set_es(void *addr) +{ + uint32_t seg = (uint32_t)addr >> 4; + asm("movl %0, %%es" : : "r"(seg)); +} + +#ifdef __clang__ +#define ADDR32 +#else +#define ADDR32 "addr32 " +#endif + +static inline uint16_t readw_es(uint16_t offset) +{ + uint16_t val; + asm(ADDR32 "movw %%es:(%1), %0" : "=r"(val) : "r"((uint32_t)offset)); + barrier(); + return val; +} + +static inline uint32_t readl_es(uint16_t offset) +{ + uint32_t val; + asm(ADDR32 "movl %%es:(%1), %0" : "=r"(val) : "r"((uint32_t)offset)); + barrier(); + return val; +} + +static inline void writel_es(uint16_t offset, uint32_t val) +{ + barrier(); + asm(ADDR32 "movl %0, %%es:(%1)" : : "r"(val), "r"((uint32_t)offset)); +} + +static inline uint32_t bswap32(uint32_t x) +{ + return + ((x & 0x000000ffU) << 24) | + ((x & 0x0000ff00U) << 8) | + ((x & 0x00ff0000U) >> 8) | + ((x & 0xff000000U) >> 24); +} + +static inline uint64_t bswap64(uint64_t x) +{ + return + ((x & 0x00000000000000ffULL) << 56) | + ((x & 0x000000000000ff00ULL) << 40) | + ((x & 0x0000000000ff0000ULL) << 24) | + ((x & 0x00000000ff000000ULL) << 8) | + ((x & 0x000000ff00000000ULL) >> 8) | + ((x & 0x0000ff0000000000ULL) >> 24) | + ((x & 0x00ff000000000000ULL) >> 40) | + ((x & 0xff00000000000000ULL) >> 56); +} + +static inline uint64_t cpu_to_be64(uint64_t x) +{ + return bswap64(x); +} + +static inline uint32_t cpu_to_be32(uint32_t x) +{ + return bswap32(x); +} + +static inline uint32_t be32_to_cpu(uint32_t x) +{ + return bswap32(x); +} + +static void bios_cfg_read_entry(void *buf, uint16_t entry, uint32_t len) +{ + FWCfgDmaAccess access; + uint32_t control = (entry << 16) | BIOS_CFG_DMA_CTL_SELECT + | BIOS_CFG_DMA_CTL_READ; + + access.address = cpu_to_be64((uint64_t)(uint32_t)buf); + access.length = cpu_to_be32(len); + access.control = cpu_to_be32(control); + + barrier(); + + outl(cpu_to_be32((uint32_t)&access), BIOS_CFG_DMA_ADDR_LOW); + + while (be32_to_cpu(access.control) & ~BIOS_CFG_DMA_CTL_ERROR) { + barrier(); + } +} + +/* Return top of memory using BIOS function E801. */ +static uint32_t get_e801_addr(void) +{ + uint16_t ax, bx, cx, dx; + uint32_t ret; + + asm("int $0x15\n" + : "=a"(ax), "=b"(bx), "=c"(cx), "=d"(dx) + : "a"(0xe801), "b"(0), "c"(0), "d"(0)); + + /* Not SeaBIOS, but in theory a BIOS could return CX=DX=0 in which + * case we need to use the result from AX & BX instead. + */ + if (cx == 0 && dx == 0) { + cx = ax; + dx = bx; + } + + if (dx) { + /* DX = extended memory above 16M, in 64K units. + * Convert it to bytes and return. + */ + ret = ((uint32_t)dx + 256 /* 16M in 64K units */) << 16; + } else { + /* This is a fallback path for machines with <= 16MB of RAM, + * which probably would never be the case, but deal with it + * anyway. + * + * CX = extended memory between 1M and 16M, in kilobytes + * Convert it to bytes and return. + */ + ret = ((uint32_t)cx + 1024 /* 1M in K */) << 10; + } + + return ret; +} + +extern void load_kernel(void) asm("load_kernel"); +void load_kernel(void) +{ + void *setup_addr; + void *initrd_addr; + void *kernel_addr; + void *cmdline_addr; + uint32_t setup_size; + uint32_t initrd_size; + uint32_t kernel_size; + uint32_t cmdline_size; + uint32_t initrd_end_page, max_allowed_page; + uint32_t segment_addr, stack_addr; + + bios_cfg_read_entry(&setup_addr, FW_CFG_SETUP_ADDR, 4); + bios_cfg_read_entry(&setup_size, FW_CFG_SETUP_SIZE, 4); + bios_cfg_read_entry(setup_addr, FW_CFG_SETUP_DATA, setup_size); + + set_es(setup_addr); + + /* For protocol < 0x203 we don't have initrd_max ... */ + if (readw_es(0x206) < 0x203) { + /* ... so we assume initrd_max = 0x37ffffff. */ + writel_es(0x22c, 0x37ffffff); + } + + bios_cfg_read_entry(&initrd_addr, FW_CFG_INITRD_ADDR, 4); + bios_cfg_read_entry(&initrd_size, FW_CFG_INITRD_SIZE, 4); + + initrd_end_page = ((uint32_t)(initrd_addr + initrd_size) & -4096); + max_allowed_page = (readl_es(0x22c) & -4096); + + if (initrd_end_page != 0 && max_allowed_page != 0 && + initrd_end_page != max_allowed_page) { + /* Initrd at the end of memory. Compute better initrd address + * based on e801 data + */ + initrd_addr = (void *)((get_e801_addr() - initrd_size) & -4096); + writel_es(0x218, (uint32_t)initrd_addr); + + } + + bios_cfg_read_entry(initrd_addr, FW_CFG_INITRD_DATA, initrd_size); + + bios_cfg_read_entry(&kernel_addr, FW_CFG_KERNEL_ADDR, 4); + bios_cfg_read_entry(&kernel_size, FW_CFG_KERNEL_SIZE, 4); + bios_cfg_read_entry(kernel_addr, FW_CFG_KERNEL_DATA, kernel_size); + + bios_cfg_read_entry(&cmdline_addr, FW_CFG_CMDLINE_ADDR, 4); + bios_cfg_read_entry(&cmdline_size, FW_CFG_CMDLINE_SIZE, 4); + bios_cfg_read_entry(cmdline_addr, FW_CFG_CMDLINE_DATA, cmdline_size); + + /* Boot linux */ + segment_addr = ((uint32_t)setup_addr >> 4); + stack_addr = (uint32_t)(cmdline_addr - setup_addr - 16); + + /* As we are changing critical registers, we cannot leave freedom to the + * compiler. + */ + asm("movw %%ax, %%ds\n" + "movw %%ax, %%es\n" + "movw %%ax, %%fs\n" + "movw %%ax, %%gs\n" + "movw %%ax, %%ss\n" + "movl %%ebx, %%esp\n" + "addw $0x20, %%ax\n" + "pushw %%ax\n" /* CS */ + "pushw $0\n" /* IP */ + /* Clear registers and jump to Linux */ + "xor %%ebx, %%ebx\n" + "xor %%ecx, %%ecx\n" + "xor %%edx, %%edx\n" + "xor %%edi, %%edi\n" + "xor %%ebp, %%ebp\n" + "lretw\n" + : : "a"(segment_addr), "b"(stack_addr)); +} -- 2.5.5 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PULL 01/31] Add optionrom compatible with fw_cfg DMA version 2016-05-27 14:09 ` [Qemu-devel] [PULL 01/31] Add optionrom compatible with fw_cfg DMA version Paolo Bonzini @ 2016-05-27 14:16 ` Richard W.M. Jones 2016-06-10 21:45 ` Richard W.M. Jones 1 sibling, 0 replies; 9+ messages in thread From: Richard W.M. Jones @ 2016-05-27 14:16 UTC (permalink / raw) To: Paolo Bonzini; +Cc: qemu-devel, Marc Marí On Fri, May 27, 2016 at 04:09:32PM +0200, Paolo Bonzini wrote: > From: Marc Marí <markmb@redhat.com> > > This optionrom is based on linuxboot.S. > > Signed-off-by: Marc Marí <markmb@redhat.com> > Signed-off-by: Richard W.M. Jones <rjones@redhat.com> > Message-Id: <1464027093-24073-2-git-send-email-rjones@redhat.com> > [Add -fno-toplevel-reorder and fix Win32 compilation. - Paolo] > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> This matches my version, minus a comment, and I just test-built it on GCC (Linux & Win32 cross), and clang, so ... Acked-by: Richard W.M. Jones <rjones@redhat.com> Rich. > .gitignore | 4 + > Makefile | 2 +- > configure | 20 +++ > hw/i386/pc.c | 10 +- > hw/nvram/fw_cfg.c | 2 +- > include/hw/nvram/fw_cfg.h | 1 + > pc-bios/optionrom/Makefile | 20 ++- > pc-bios/optionrom/code16gcc.h | 3 + > pc-bios/optionrom/linuxboot_dma.c | 292 ++++++++++++++++++++++++++++++++++++++ > 9 files changed, 348 insertions(+), 6 deletions(-) > create mode 100644 pc-bios/optionrom/code16gcc.h > create mode 100644 pc-bios/optionrom/linuxboot_dma.c > > diff --git a/.gitignore b/.gitignore > index 88a80ff..101d1e0 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -94,6 +94,10 @@ > /pc-bios/optionrom/linuxboot.bin > /pc-bios/optionrom/linuxboot.raw > /pc-bios/optionrom/linuxboot.img > +/pc-bios/optionrom/linuxboot_dma.asm > +/pc-bios/optionrom/linuxboot_dma.bin > +/pc-bios/optionrom/linuxboot_dma.raw > +/pc-bios/optionrom/linuxboot_dma.img > /pc-bios/optionrom/multiboot.asm > /pc-bios/optionrom/multiboot.bin > /pc-bios/optionrom/multiboot.raw > diff --git a/Makefile b/Makefile > index a5d7e62..3a9782e 100644 > --- a/Makefile > +++ b/Makefile > @@ -400,7 +400,7 @@ efi-e1000.rom efi-eepro100.rom efi-ne2k_pci.rom \ > efi-pcnet.rom efi-rtl8139.rom efi-virtio.rom \ > qemu-icon.bmp qemu_logo_no_text.svg \ > bamboo.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \ > -multiboot.bin linuxboot.bin kvmvapic.bin \ > +multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin \ > s390-ccw.img \ > spapr-rtas.bin slof.bin \ > palcode-clipper \ > diff --git a/configure b/configure > index b5aab72..6d4cbbd 100755 > --- a/configure > +++ b/configure > @@ -237,6 +237,7 @@ fortify_source="" > strip_opt="yes" > tcg_interpreter="no" > bigendian="no" > +compiler_m16="no" > mingw32="no" > gcov="no" > gcov_tool="gcov" > @@ -1524,6 +1525,21 @@ if test "$static" = "yes" ; then > fi > fi > > +# Check if the compiler supports -m16 to generate i8086 binaries. > +# > +# GCC < 4.9 didn't, so we have to work around that when building the > +# linuxboot_dma option ROM. When GCC < 4.9 is considered sufficiently > +# old that we no longer care about it, we can remove this section and > +# CONFIG_COMPILER_M16 which will simplify the build. > +if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then > + cat > $TMPC << EOF > +int main(void) { return 0; } > +EOF > + if compile_prog "-m16" "" ; then > + compiler_m16=yes > + fi > +fi > + > # Unconditional check for compiler __thread support > cat > $TMPC << EOF > static __thread int tls_var; > @@ -4780,6 +4796,7 @@ fi > echo "module support $modules" > echo "host CPU $cpu" > echo "host big endian $bigendian" > +echo "compiler has -m16 $compiler_m16" > echo "target list $target_list" > echo "tcg debug enabled $debug_tcg" > echo "gprof enabled $gprof" > @@ -4928,6 +4945,9 @@ fi > if test "$bigendian" = "yes" ; then > echo "HOST_WORDS_BIGENDIAN=y" >> $config_host_mak > fi > +if test "$compiler_m16" = "yes" ; then > + echo "CONFIG_COMPILER_M16=y" >> $config_host_mak > +fi > if test "$mingw32" = "yes" ; then > echo "CONFIG_WIN32=y" >> $config_host_mak > rc_version=`cat $source_path/VERSION` > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index e29ccc8..2ab7b42 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -1000,8 +1000,13 @@ static void load_linux(PCMachineState *pcms, > fw_cfg_add_i32(fw_cfg, FW_CFG_SETUP_SIZE, setup_size); > fw_cfg_add_bytes(fw_cfg, FW_CFG_SETUP_DATA, setup, setup_size); > > - option_rom[nb_option_roms].name = "linuxboot.bin"; > - option_rom[nb_option_roms].bootindex = 0; > + if (fw_cfg_dma_enabled(fw_cfg)) { > + option_rom[nb_option_roms].name = "linuxboot_dma.bin"; > + option_rom[nb_option_roms].bootindex = 0; > + } else { > + option_rom[nb_option_roms].name = "linuxboot.bin"; > + option_rom[nb_option_roms].bootindex = 0; > + } > nb_option_roms++; > } > > @@ -1264,6 +1269,7 @@ void xen_load_linux(PCMachineState *pcms) > load_linux(pcms, fw_cfg); > for (i = 0; i < nb_option_roms; i++) { > assert(!strcmp(option_rom[i].name, "linuxboot.bin") || > + !strcmp(option_rom[i].name, "linuxboot_dma.bin") || > !strcmp(option_rom[i].name, "multiboot.bin")); > rom_add_option(option_rom[i].name, option_rom[i].bootindex); > } > diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c > index cdbdfb5..6ac486e 100644 > --- a/hw/nvram/fw_cfg.c > +++ b/hw/nvram/fw_cfg.c > @@ -552,7 +552,7 @@ static bool is_version_1(void *opaque, int version_id) > return version_id == 1; > } > > -static bool fw_cfg_dma_enabled(void *opaque) > +bool fw_cfg_dma_enabled(void *opaque) > { > FWCfgState *s = opaque; > > diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h > index d008112..5c27a1f 100644 > --- a/include/hw/nvram/fw_cfg.h > +++ b/include/hw/nvram/fw_cfg.h > @@ -182,5 +182,6 @@ FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr, > hwaddr dma_addr, AddressSpace *dma_as); > > FWCfgState *fw_cfg_find(void); > +bool fw_cfg_dma_enabled(void *opaque); > > #endif > diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile > index ce4852a..14e7f71 100644 > --- a/pc-bios/optionrom/Makefile > +++ b/pc-bios/optionrom/Makefile > @@ -13,15 +13,31 @@ CFLAGS := -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin > CFLAGS += -I$(SRC_PATH) > CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector) > CFLAGS += $(CFLAGS_NOPIE) > +ifdef CONFIG_COMPILER_M16 > +CFLAGS += -m16 > +else > +# Attempt to work around the lack of support for -m16 in gcc < 4.9. > +CFLAGS += -m32 -fno-toplevel-reorder > +linuxboot_dma.o-cflags += -include code16gcc.h > +endif > QEMU_CFLAGS = $(CFLAGS) > > -build-all: multiboot.bin linuxboot.bin kvmvapic.bin > +ASFLAGS += -32 > + > +build-all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin > > # suppress auto-removal of intermediate files > .SECONDARY: > > +ifdef CONFIG_WIN32 > +LD_EMULATION = i386pe > +CFLAGS += -Wa,-32 > +else > +LD_EMULATION = elf_i386 > +endif > + > %.img: %.o > - $(call quiet-command,$(LD) $(LDFLAGS_NOPIE) -Ttext 0 -e _start -s -o $@ $<," Building $(TARGET_DIR)$@") > + $(call quiet-command,$(LD) $(LDFLAGS_NOPIE) -m $(LD_EMULATION) -Ttext 0 -e _start -s -o $@ $<," Building $(TARGET_DIR)$@") > > %.raw: %.img > $(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@," Building $(TARGET_DIR)$@") > diff --git a/pc-bios/optionrom/code16gcc.h b/pc-bios/optionrom/code16gcc.h > new file mode 100644 > index 0000000..9c8d25d > --- /dev/null > +++ b/pc-bios/optionrom/code16gcc.h > @@ -0,0 +1,3 @@ > +asm( > +".code16gcc\n" > +); > diff --git a/pc-bios/optionrom/linuxboot_dma.c b/pc-bios/optionrom/linuxboot_dma.c > new file mode 100644 > index 0000000..98d9184 > --- /dev/null > +++ b/pc-bios/optionrom/linuxboot_dma.c > @@ -0,0 +1,292 @@ > +/* > + * Linux Boot Option ROM for fw_cfg DMA > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, see <http://www.gnu.org/licenses/>. > + * > + * Copyright (c) 2015-2016 Red Hat Inc. > + * Authors: > + * Marc Marà <marc.mari.barcelo@gmail.com> > + * Richard W.M. Jones <rjones@redhat.com> > + */ > + > +asm( > +".text\n" > +".global _start\n" > +"_start:\n" > +" .short 0xaa55\n" > +" .byte 0\n" /* size in 512 units, filled in by signrom.py */ > +" .byte 0xcb\n" /* far return without prefix */ > +" .org 0x18\n" > +" .short 0\n" > +" .short _pnph\n" > +"_pnph:\n" > +" .ascii \"$PnP\"\n" > +" .byte 0x01\n" > +" .byte (_pnph_len / 16)\n" > +" .short 0x0000\n" > +" .byte 0x00\n" > +" .byte 0x00\n" > +" .long 0x00000000\n" > +" .short _manufacturer\n" > +" .short _product\n" > +" .long 0x00000000\n" > +" .short 0x0000\n" > +" .short 0x0000\n" > +" .short _bev\n" > +" .short 0x0000\n" > +" .short 0x0000\n" > +" .equ _pnph_len, . - _pnph\n" > +"_manufacturer:\n" > +" .asciz \"QEMU\"\n" > +"_product:\n" > +" .asciz \"Linux loader DMA\"\n" > +" .align 4, 0\n" > +"_bev:\n" > +" cli\n" > +" cld\n" > +" jmp load_kernel\n" > +); > + > +#include "../../include/hw/nvram/fw_cfg_keys.h" > + > +/* QEMU_CFG_DMA_CONTROL bits */ > +#define BIOS_CFG_DMA_CTL_ERROR 0x01 > +#define BIOS_CFG_DMA_CTL_READ 0x02 > +#define BIOS_CFG_DMA_CTL_SKIP 0x04 > +#define BIOS_CFG_DMA_CTL_SELECT 0x08 > + > +#define BIOS_CFG_DMA_ADDR_HIGH 0x514 > +#define BIOS_CFG_DMA_ADDR_LOW 0x518 > + > +#define uint64_t unsigned long long > +#define uint32_t unsigned int > +#define uint16_t unsigned short > + > +#define barrier() asm("" : : : "memory") > + > +typedef struct FWCfgDmaAccess { > + uint32_t control; > + uint32_t length; > + uint64_t address; > +} __attribute__((packed)) FWCfgDmaAccess; > + > +static inline void outl(uint32_t value, uint16_t port) > +{ > + asm("outl %0, %w1" : : "a"(value), "Nd"(port)); > +} > + > +static inline void set_es(void *addr) > +{ > + uint32_t seg = (uint32_t)addr >> 4; > + asm("movl %0, %%es" : : "r"(seg)); > +} > + > +#ifdef __clang__ > +#define ADDR32 > +#else > +#define ADDR32 "addr32 " > +#endif > + > +static inline uint16_t readw_es(uint16_t offset) > +{ > + uint16_t val; > + asm(ADDR32 "movw %%es:(%1), %0" : "=r"(val) : "r"((uint32_t)offset)); > + barrier(); > + return val; > +} > + > +static inline uint32_t readl_es(uint16_t offset) > +{ > + uint32_t val; > + asm(ADDR32 "movl %%es:(%1), %0" : "=r"(val) : "r"((uint32_t)offset)); > + barrier(); > + return val; > +} > + > +static inline void writel_es(uint16_t offset, uint32_t val) > +{ > + barrier(); > + asm(ADDR32 "movl %0, %%es:(%1)" : : "r"(val), "r"((uint32_t)offset)); > +} > + > +static inline uint32_t bswap32(uint32_t x) > +{ > + return > + ((x & 0x000000ffU) << 24) | > + ((x & 0x0000ff00U) << 8) | > + ((x & 0x00ff0000U) >> 8) | > + ((x & 0xff000000U) >> 24); > +} > + > +static inline uint64_t bswap64(uint64_t x) > +{ > + return > + ((x & 0x00000000000000ffULL) << 56) | > + ((x & 0x000000000000ff00ULL) << 40) | > + ((x & 0x0000000000ff0000ULL) << 24) | > + ((x & 0x00000000ff000000ULL) << 8) | > + ((x & 0x000000ff00000000ULL) >> 8) | > + ((x & 0x0000ff0000000000ULL) >> 24) | > + ((x & 0x00ff000000000000ULL) >> 40) | > + ((x & 0xff00000000000000ULL) >> 56); > +} > + > +static inline uint64_t cpu_to_be64(uint64_t x) > +{ > + return bswap64(x); > +} > + > +static inline uint32_t cpu_to_be32(uint32_t x) > +{ > + return bswap32(x); > +} > + > +static inline uint32_t be32_to_cpu(uint32_t x) > +{ > + return bswap32(x); > +} > + > +static void bios_cfg_read_entry(void *buf, uint16_t entry, uint32_t len) > +{ > + FWCfgDmaAccess access; > + uint32_t control = (entry << 16) | BIOS_CFG_DMA_CTL_SELECT > + | BIOS_CFG_DMA_CTL_READ; > + > + access.address = cpu_to_be64((uint64_t)(uint32_t)buf); > + access.length = cpu_to_be32(len); > + access.control = cpu_to_be32(control); > + > + barrier(); > + > + outl(cpu_to_be32((uint32_t)&access), BIOS_CFG_DMA_ADDR_LOW); > + > + while (be32_to_cpu(access.control) & ~BIOS_CFG_DMA_CTL_ERROR) { > + barrier(); > + } > +} > + > +/* Return top of memory using BIOS function E801. */ > +static uint32_t get_e801_addr(void) > +{ > + uint16_t ax, bx, cx, dx; > + uint32_t ret; > + > + asm("int $0x15\n" > + : "=a"(ax), "=b"(bx), "=c"(cx), "=d"(dx) > + : "a"(0xe801), "b"(0), "c"(0), "d"(0)); > + > + /* Not SeaBIOS, but in theory a BIOS could return CX=DX=0 in which > + * case we need to use the result from AX & BX instead. > + */ > + if (cx == 0 && dx == 0) { > + cx = ax; > + dx = bx; > + } > + > + if (dx) { > + /* DX = extended memory above 16M, in 64K units. > + * Convert it to bytes and return. > + */ > + ret = ((uint32_t)dx + 256 /* 16M in 64K units */) << 16; > + } else { > + /* This is a fallback path for machines with <= 16MB of RAM, > + * which probably would never be the case, but deal with it > + * anyway. > + * > + * CX = extended memory between 1M and 16M, in kilobytes > + * Convert it to bytes and return. > + */ > + ret = ((uint32_t)cx + 1024 /* 1M in K */) << 10; > + } > + > + return ret; > +} > + > +extern void load_kernel(void) asm("load_kernel"); > +void load_kernel(void) > +{ > + void *setup_addr; > + void *initrd_addr; > + void *kernel_addr; > + void *cmdline_addr; > + uint32_t setup_size; > + uint32_t initrd_size; > + uint32_t kernel_size; > + uint32_t cmdline_size; > + uint32_t initrd_end_page, max_allowed_page; > + uint32_t segment_addr, stack_addr; > + > + bios_cfg_read_entry(&setup_addr, FW_CFG_SETUP_ADDR, 4); > + bios_cfg_read_entry(&setup_size, FW_CFG_SETUP_SIZE, 4); > + bios_cfg_read_entry(setup_addr, FW_CFG_SETUP_DATA, setup_size); > + > + set_es(setup_addr); > + > + /* For protocol < 0x203 we don't have initrd_max ... */ > + if (readw_es(0x206) < 0x203) { > + /* ... so we assume initrd_max = 0x37ffffff. */ > + writel_es(0x22c, 0x37ffffff); > + } > + > + bios_cfg_read_entry(&initrd_addr, FW_CFG_INITRD_ADDR, 4); > + bios_cfg_read_entry(&initrd_size, FW_CFG_INITRD_SIZE, 4); > + > + initrd_end_page = ((uint32_t)(initrd_addr + initrd_size) & -4096); > + max_allowed_page = (readl_es(0x22c) & -4096); > + > + if (initrd_end_page != 0 && max_allowed_page != 0 && > + initrd_end_page != max_allowed_page) { > + /* Initrd at the end of memory. Compute better initrd address > + * based on e801 data > + */ > + initrd_addr = (void *)((get_e801_addr() - initrd_size) & -4096); > + writel_es(0x218, (uint32_t)initrd_addr); > + > + } > + > + bios_cfg_read_entry(initrd_addr, FW_CFG_INITRD_DATA, initrd_size); > + > + bios_cfg_read_entry(&kernel_addr, FW_CFG_KERNEL_ADDR, 4); > + bios_cfg_read_entry(&kernel_size, FW_CFG_KERNEL_SIZE, 4); > + bios_cfg_read_entry(kernel_addr, FW_CFG_KERNEL_DATA, kernel_size); > + > + bios_cfg_read_entry(&cmdline_addr, FW_CFG_CMDLINE_ADDR, 4); > + bios_cfg_read_entry(&cmdline_size, FW_CFG_CMDLINE_SIZE, 4); > + bios_cfg_read_entry(cmdline_addr, FW_CFG_CMDLINE_DATA, cmdline_size); > + > + /* Boot linux */ > + segment_addr = ((uint32_t)setup_addr >> 4); > + stack_addr = (uint32_t)(cmdline_addr - setup_addr - 16); > + > + /* As we are changing critical registers, we cannot leave freedom to the > + * compiler. > + */ > + asm("movw %%ax, %%ds\n" > + "movw %%ax, %%es\n" > + "movw %%ax, %%fs\n" > + "movw %%ax, %%gs\n" > + "movw %%ax, %%ss\n" > + "movl %%ebx, %%esp\n" > + "addw $0x20, %%ax\n" > + "pushw %%ax\n" /* CS */ > + "pushw $0\n" /* IP */ > + /* Clear registers and jump to Linux */ > + "xor %%ebx, %%ebx\n" > + "xor %%ecx, %%ecx\n" > + "xor %%edx, %%edx\n" > + "xor %%edi, %%edi\n" > + "xor %%ebp, %%ebp\n" > + "lretw\n" > + : : "a"(segment_addr), "b"(stack_addr)); > +} > -- > 2.5.5 -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PULL 01/31] Add optionrom compatible with fw_cfg DMA version 2016-05-27 14:09 ` [Qemu-devel] [PULL 01/31] Add optionrom compatible with fw_cfg DMA version Paolo Bonzini 2016-05-27 14:16 ` Richard W.M. Jones @ 2016-06-10 21:45 ` Richard W.M. Jones 2016-06-13 8:22 ` Paolo Bonzini 1 sibling, 1 reply; 9+ messages in thread From: Richard W.M. Jones @ 2016-06-10 21:45 UTC (permalink / raw) To: Paolo Bonzini; +Cc: qemu-devel, Marc Marí On Fri, May 27, 2016 at 04:09:32PM +0200, Paolo Bonzini wrote: > From: Marc Marí <markmb@redhat.com> > > This optionrom is based on linuxboot.S. > > Signed-off-by: Marc Marí <markmb@redhat.com> > Signed-off-by: Richard W.M. Jones <rjones@redhat.com> > Message-Id: <1464027093-24073-2-git-send-email-rjones@redhat.com> > [Add -fno-toplevel-reorder and fix Win32 compilation. - Paolo] > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> [...] Hi Paolo, Did this patch get dropped again? It hasn't appeared upstream. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://people.redhat.com/~rjones/virt-top ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PULL 01/31] Add optionrom compatible with fw_cfg DMA version 2016-06-10 21:45 ` Richard W.M. Jones @ 2016-06-13 8:22 ` Paolo Bonzini 0 siblings, 0 replies; 9+ messages in thread From: Paolo Bonzini @ 2016-06-13 8:22 UTC (permalink / raw) To: Richard W.M. Jones; +Cc: qemu-devel, Marc Marí On 10/06/2016 23:45, Richard W.M. Jones wrote: > Hi Paolo, > > Did this patch get dropped again? It hasn't appeared upstream. Yes, some versions of clang don't support -m16. It needs to be tested. I still want to get it in 2.7, but I have to set aside some time. Paolo ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PULL v2 00/31] Misc changes for 2016-05-27 2016-05-27 14:09 [Qemu-devel] [PULL v2 00/31] Misc changes for 2016-05-27 Paolo Bonzini 2016-05-27 14:09 ` [Qemu-devel] [PULL 01/31] Add optionrom compatible with fw_cfg DMA version Paolo Bonzini @ 2016-05-27 15:30 ` Peter Maydell 2016-05-27 15:37 ` Paolo Bonzini 1 sibling, 1 reply; 9+ messages in thread From: Peter Maydell @ 2016-05-27 15:30 UTC (permalink / raw) To: Paolo Bonzini; +Cc: QEMU Developers On 27 May 2016 at 15:09, Paolo Bonzini <pbonzini@redhat.com> wrote: > The following changes since commit 2c56d06bafd8933d2a9c6e0aeb5d45f7c1fb5616: > > Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2016-05-26 14:29:30 +0100) > > are available in the git repository at: > > git://github.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to 103876bc5e1ea67eec386461114df5c953110e34: > > exec: hide mr->ram_addr from qemu_get_ram_ptr users (2016-05-27 16:07:32 +0200) > > ---------------------------------------------------------------- > * docs/atomics fixes and atomic_rcu_* optimization (Emilio) > * NBD bugfix (Eric) > * Memory fixes and cleanups (Paolo, Paul) > * scsi-block support for SCSI status, including persistent > reservations (Paolo) > * linuxboot support for fw_cfg DMA (Marc, Richard Jones) > * kvm_stat moves to the Linux repository > * SCSI bug fixes (Peter, Prasad) > * Killing qemu_char_get_next_serial, non-ARM parts (Xiaoqiang) > > ---------------------------------------------------------------- This version fails on the "retypedefing a typedef" clang warning: /home/petmay01/linaro/qemu-for-merges/hw/scsi/scsi-disk.c:73:3: error: redefinition of typedef 'SCSIDiskClass' is a C11 feature [-Werror,-Wtypedef-redefinition] } SCSIDiskClass; ^ /home/petmay01/linaro/qemu-for-merges/hw/scsi/scsi-disk.c:66:30: note: previous definition is here typedef struct SCSIDiskClass SCSIDiskClass; ^ 1 error generated. thanks -- PMM ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PULL v2 00/31] Misc changes for 2016-05-27 2016-05-27 15:30 ` [Qemu-devel] [PULL v2 00/31] Misc changes for 2016-05-27 Peter Maydell @ 2016-05-27 15:37 ` Paolo Bonzini 2016-05-28 11:21 ` Fam Zheng 0 siblings, 1 reply; 9+ messages in thread From: Paolo Bonzini @ 2016-05-27 15:37 UTC (permalink / raw) To: Peter Maydell; +Cc: QEMU Developers On 27/05/2016 17:30, Peter Maydell wrote: > This version fails on the "retypedefing a typedef" clang warning: > > /home/petmay01/linaro/qemu-for-merges/hw/scsi/scsi-disk.c:73:3: error: > redefinition of typedef 'SCSIDiskClass' is a C11 feature > [-Werror,-Wtypedef-redefinition] > } SCSIDiskClass; > ^ > /home/petmay01/linaro/qemu-for-merges/hw/scsi/scsi-disk.c:66:30: note: > previous definition is here > typedef struct SCSIDiskClass SCSIDiskClass; > ^ > 1 error generated. Ugh, I am so much waiting for the docker series to get in... Paolo ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PULL v2 00/31] Misc changes for 2016-05-27 2016-05-27 15:37 ` Paolo Bonzini @ 2016-05-28 11:21 ` Fam Zheng 0 siblings, 0 replies; 9+ messages in thread From: Fam Zheng @ 2016-05-28 11:21 UTC (permalink / raw) To: Paolo Bonzini; +Cc: Peter Maydell, QEMU Developers On Fri, 05/27 17:37, Paolo Bonzini wrote: > > > On 27/05/2016 17:30, Peter Maydell wrote: > > This version fails on the "retypedefing a typedef" clang warning: > > > > /home/petmay01/linaro/qemu-for-merges/hw/scsi/scsi-disk.c:73:3: error: > > redefinition of typedef 'SCSIDiskClass' is a C11 feature > > [-Werror,-Wtypedef-redefinition] > > } SCSIDiskClass; > > ^ > > /home/petmay01/linaro/qemu-for-merges/hw/scsi/scsi-disk.c:66:30: note: > > previous definition is here > > typedef struct SCSIDiskClass SCSIDiskClass; > > ^ > > 1 error generated. > > Ugh, I am so much waiting for the docker series to get in... If you could ack this one patch: https://lists.nongnu.org/archive/html/qemu-devel/2016-05/msg05027.html the next PULL will be sent :) Fam ^ permalink raw reply [flat|nested] 9+ messages in thread
* [Qemu-devel] [PULL 00/31] Misc changes for 2016-05-27
@ 2016-05-27 10:06 Paolo Bonzini
2016-05-27 10:06 ` [Qemu-devel] [PULL 01/31] Add optionrom compatible with fw_cfg DMA version Paolo Bonzini
0 siblings, 1 reply; 9+ messages in thread
From: Paolo Bonzini @ 2016-05-27 10:06 UTC (permalink / raw)
To: qemu-devel
The following changes since commit b75536c9fa742f887304769d0608557bb8e3a27f:
blockjob: Remove BlockJob.bs (2016-05-25 19:04:21 +0200)
are available in the git repository at:
git://github.com/bonzini/qemu.git tags/for-upstream
for you to fetch changes up to 7052033834d4c2d7ade147cf5b045be6eaf07113:
exec: hide mr->ram_addr from qemu_get_ram_ptr users (2016-05-27 11:55:23 +0200)
----------------------------------------------------------------
* docs/atomics fixes and atomic_rcu_* optimization (Emilio)
* NBD bugfix (Eric)
* Memory fixes and cleanups (Paolo, Paul)
* scsi-block support for SCSI status, including persistent
reservations (Paolo)
* linuxboot support for fw_cfg DMA (Marc, Richard Jones)
* kvm_stat moves to the Linux repository
* SCSI bug fixes (Peter, Prasad)
* Killing qemu_char_get_next_serial, non-ARM parts (Xiaoqiang)
----------------------------------------------------------------
Emilio G. Cota (3):
docs/atomics: update atomic_read/set comparison with Linux
atomics: emit an smp_read_barrier_depends() barrier only for Alpha and Thread Sanitizer
atomics: do not emit consume barrier for atomic_rcu_read
Eric Blake (1):
nbd: Don't trim unrequested bytes
Fam Zheng (1):
scsi-generic: Merge block max xfer len in INQUIRY response
Marc Marí (1):
Add optionrom compatible with fw_cfg DMA version
Paolo Bonzini (13):
Revert "memory: Drop FlatRange.romd_mode"
kvm_stat: Remove
bt: rewrite csrhci_write to avoid out-of-bounds writes
docs/atomics: update comparison with Linux
scsi-disk: introduce a common base class
scsi-disk: introduce dma_readv and dma_writev
scsi-disk: add need_fua_emulation to SCSIDiskClass
scsi-disk: introduce scsi_disk_req_check_error
scsi-block: always use SG_IO
memory: remove qemu_get_ram_fd, qemu_set_ram_fd, qemu_ram_block_host_ptr
exec: remove ram_addr argument from qemu_ram_block_from_host
memory: split memory_region_from_host from qemu_ram_addr_from_host
exec: hide mr->ram_addr from qemu_get_ram_ptr users
Paul Durrant (1):
xen-hvm: ignore background I/O sections
Peter Lieven (1):
block/iscsi: avoid potential overflow of acb->task->cdb
Prasad J Pandit (5):
scsi: pvscsi: check command descriptor ring buffer size (CVE-2016-4952)
scsi: mptsas: infinite loop while fetching requests
scsi: megasas: use appropriate property buffer size
scsi: megasas: initialise local configuration data buffer
scsi: megasas: check 'read_queue_head' index value
xiaoqiang zhao (5):
hw/char: QOM'ify escc.c
hw/char: QOM'ify etraxfs_ser.c
hw/char: QOM'ify lm32_juart.c
hw/char: QOM'ify lm32_uart.c
hw/char: QOM'ify milkymist-uart.c
.gitignore | 4 +
Makefile | 11 +-
block/iscsi.c | 7 +
configure | 20 +
cputlb.c | 3 +-
docs/atomics.txt | 38 +-
exec.c | 110 ++---
hw/bt/hci-csr.c | 67 +++-
hw/char/escc.c | 30 +-
hw/char/etraxfs_ser.c | 27 +-
hw/char/lm32_juart.c | 17 +-
hw/char/lm32_uart.c | 28 +-
hw/char/milkymist-uart.c | 10 +-
hw/cris/axis_dev88.c | 4 +-
hw/i386/pc.c | 10 +-
hw/lm32/lm32.h | 19 +-
hw/lm32/lm32_boards.c | 9 +-
hw/lm32/milkymist-hw.h | 4 +-
hw/lm32/milkymist.c | 4 +-
hw/misc/ivshmem.c | 5 +-
hw/nvram/fw_cfg.c | 2 +-
hw/scsi/megasas.c | 6 +-
hw/scsi/mptsas.c | 9 +-
hw/scsi/scsi-disk.c | 412 +++++++++++++------
hw/scsi/scsi-generic.c | 12 +
hw/scsi/vmw_pvscsi.c | 24 +-
hw/virtio/vhost-user.c | 25 +-
include/exec/cpu-common.h | 4 +-
include/exec/memory.h | 36 +-
include/exec/ram_addr.h | 3 -
include/hw/cris/etraxfs.h | 16 +
include/hw/nvram/fw_cfg.h | 1 +
include/qemu/atomic.h | 25 +-
memory.c | 43 +-
migration/postcopy-ram.c | 3 +-
nbd/server.c | 20 +-
pc-bios/optionrom/Makefile | 19 +-
pc-bios/optionrom/code16gcc.h | 3 +
pc-bios/optionrom/linuxboot_dma.c | 291 ++++++++++++++
scripts/dump-guest-memory.py | 19 +-
scripts/kvm/kvm_stat | 825 --------------------------------------
scripts/kvm/kvm_stat.texi | 55 ---
target-i386/kvm.c | 6 +-
xen-hvm.c | 14 +-
44 files changed, 1055 insertions(+), 1245 deletions(-)
create mode 100644 pc-bios/optionrom/code16gcc.h
create mode 100644 pc-bios/optionrom/linuxboot_dma.c
delete mode 100755 scripts/kvm/kvm_stat
delete mode 100644 scripts/kvm/kvm_stat.texi
--
2.5.5
^ permalink raw reply [flat|nested] 9+ messages in thread* [Qemu-devel] [PULL 01/31] Add optionrom compatible with fw_cfg DMA version 2016-05-27 10:06 [Qemu-devel] [PULL " Paolo Bonzini @ 2016-05-27 10:06 ` Paolo Bonzini 0 siblings, 0 replies; 9+ messages in thread From: Paolo Bonzini @ 2016-05-27 10:06 UTC (permalink / raw) To: qemu-devel; +Cc: Marc Marí, Richard W.M. Jones From: Marc Marí <markmb@redhat.com> This optionrom is based on linuxboot.S. Signed-off-by: Marc Marí <markmb@redhat.com> Signed-off-by: Richard W.M. Jones <rjones@redhat.com> Message-Id: <1464027093-24073-2-git-send-email-rjones@redhat.com> [Add -fno-toplevel-reorder. - Paolo] Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- .gitignore | 4 + Makefile | 2 +- configure | 20 +++ hw/i386/pc.c | 10 +- hw/nvram/fw_cfg.c | 2 +- include/hw/nvram/fw_cfg.h | 1 + pc-bios/optionrom/Makefile | 19 ++- pc-bios/optionrom/code16gcc.h | 3 + pc-bios/optionrom/linuxboot_dma.c | 291 ++++++++++++++++++++++++++++++++++++++ 9 files changed, 346 insertions(+), 6 deletions(-) create mode 100644 pc-bios/optionrom/code16gcc.h create mode 100644 pc-bios/optionrom/linuxboot_dma.c diff --git a/.gitignore b/.gitignore index 88a80ff..101d1e0 100644 --- a/.gitignore +++ b/.gitignore @@ -94,6 +94,10 @@ /pc-bios/optionrom/linuxboot.bin /pc-bios/optionrom/linuxboot.raw /pc-bios/optionrom/linuxboot.img +/pc-bios/optionrom/linuxboot_dma.asm +/pc-bios/optionrom/linuxboot_dma.bin +/pc-bios/optionrom/linuxboot_dma.raw +/pc-bios/optionrom/linuxboot_dma.img /pc-bios/optionrom/multiboot.asm /pc-bios/optionrom/multiboot.bin /pc-bios/optionrom/multiboot.raw diff --git a/Makefile b/Makefile index a5d7e62..3a9782e 100644 --- a/Makefile +++ b/Makefile @@ -400,7 +400,7 @@ efi-e1000.rom efi-eepro100.rom efi-ne2k_pci.rom \ efi-pcnet.rom efi-rtl8139.rom efi-virtio.rom \ qemu-icon.bmp qemu_logo_no_text.svg \ bamboo.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \ -multiboot.bin linuxboot.bin kvmvapic.bin \ +multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin \ s390-ccw.img \ spapr-rtas.bin slof.bin \ palcode-clipper \ diff --git a/configure b/configure index b5aab72..6d4cbbd 100755 --- a/configure +++ b/configure @@ -237,6 +237,7 @@ fortify_source="" strip_opt="yes" tcg_interpreter="no" bigendian="no" +compiler_m16="no" mingw32="no" gcov="no" gcov_tool="gcov" @@ -1524,6 +1525,21 @@ if test "$static" = "yes" ; then fi fi +# Check if the compiler supports -m16 to generate i8086 binaries. +# +# GCC < 4.9 didn't, so we have to work around that when building the +# linuxboot_dma option ROM. When GCC < 4.9 is considered sufficiently +# old that we no longer care about it, we can remove this section and +# CONFIG_COMPILER_M16 which will simplify the build. +if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then + cat > $TMPC << EOF +int main(void) { return 0; } +EOF + if compile_prog "-m16" "" ; then + compiler_m16=yes + fi +fi + # Unconditional check for compiler __thread support cat > $TMPC << EOF static __thread int tls_var; @@ -4780,6 +4796,7 @@ fi echo "module support $modules" echo "host CPU $cpu" echo "host big endian $bigendian" +echo "compiler has -m16 $compiler_m16" echo "target list $target_list" echo "tcg debug enabled $debug_tcg" echo "gprof enabled $gprof" @@ -4928,6 +4945,9 @@ fi if test "$bigendian" = "yes" ; then echo "HOST_WORDS_BIGENDIAN=y" >> $config_host_mak fi +if test "$compiler_m16" = "yes" ; then + echo "CONFIG_COMPILER_M16=y" >> $config_host_mak +fi if test "$mingw32" = "yes" ; then echo "CONFIG_WIN32=y" >> $config_host_mak rc_version=`cat $source_path/VERSION` diff --git a/hw/i386/pc.c b/hw/i386/pc.c index e29ccc8..2ab7b42 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1000,8 +1000,13 @@ static void load_linux(PCMachineState *pcms, fw_cfg_add_i32(fw_cfg, FW_CFG_SETUP_SIZE, setup_size); fw_cfg_add_bytes(fw_cfg, FW_CFG_SETUP_DATA, setup, setup_size); - option_rom[nb_option_roms].name = "linuxboot.bin"; - option_rom[nb_option_roms].bootindex = 0; + if (fw_cfg_dma_enabled(fw_cfg)) { + option_rom[nb_option_roms].name = "linuxboot_dma.bin"; + option_rom[nb_option_roms].bootindex = 0; + } else { + option_rom[nb_option_roms].name = "linuxboot.bin"; + option_rom[nb_option_roms].bootindex = 0; + } nb_option_roms++; } @@ -1264,6 +1269,7 @@ void xen_load_linux(PCMachineState *pcms) load_linux(pcms, fw_cfg); for (i = 0; i < nb_option_roms; i++) { assert(!strcmp(option_rom[i].name, "linuxboot.bin") || + !strcmp(option_rom[i].name, "linuxboot_dma.bin") || !strcmp(option_rom[i].name, "multiboot.bin")); rom_add_option(option_rom[i].name, option_rom[i].bootindex); } diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index cdbdfb5..6ac486e 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -552,7 +552,7 @@ static bool is_version_1(void *opaque, int version_id) return version_id == 1; } -static bool fw_cfg_dma_enabled(void *opaque) +bool fw_cfg_dma_enabled(void *opaque) { FWCfgState *s = opaque; diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index d008112..5c27a1f 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -182,5 +182,6 @@ FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr, hwaddr dma_addr, AddressSpace *dma_as); FWCfgState *fw_cfg_find(void); +bool fw_cfg_dma_enabled(void *opaque); #endif diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index ce4852a..2b11cd3 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -13,15 +13,30 @@ CFLAGS := -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin CFLAGS += -I$(SRC_PATH) CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector) CFLAGS += $(CFLAGS_NOPIE) +ifdef CONFIG_COMPILER_M16 +CFLAGS += -m16 +else +# Attempt to work around the lack of support for -m16 in gcc < 4.9. +CFLAGS += -m32 -fno-toplevel-reorder +linuxboot_dma.o-cflags += -include code16gcc.h +endif QEMU_CFLAGS = $(CFLAGS) -build-all: multiboot.bin linuxboot.bin kvmvapic.bin +ASFLAGS += -32 + +build-all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin # suppress auto-removal of intermediate files .SECONDARY: +ifdef CONFIG_WIN32 +LD_EMULATION = i386pe +else +LD_EMULATION = elf_i386 +endif + %.img: %.o - $(call quiet-command,$(LD) $(LDFLAGS_NOPIE) -Ttext 0 -e _start -s -o $@ $<," Building $(TARGET_DIR)$@") + $(call quiet-command,$(LD) $(LDFLAGS_NOPIE) -m $(LD_EMULATION) -Ttext 0 -e _start -s -o $@ $<," Building $(TARGET_DIR)$@") %.raw: %.img $(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@," Building $(TARGET_DIR)$@") diff --git a/pc-bios/optionrom/code16gcc.h b/pc-bios/optionrom/code16gcc.h new file mode 100644 index 0000000..9c8d25d --- /dev/null +++ b/pc-bios/optionrom/code16gcc.h @@ -0,0 +1,3 @@ +asm( +".code16gcc\n" +); diff --git a/pc-bios/optionrom/linuxboot_dma.c b/pc-bios/optionrom/linuxboot_dma.c new file mode 100644 index 0000000..7057ead --- /dev/null +++ b/pc-bios/optionrom/linuxboot_dma.c @@ -0,0 +1,291 @@ +/* + * Linux Boot Option ROM for fw_cfg DMA + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * Copyright (c) 2015-2016 Red Hat Inc. + * Authors: + * Marc Marà <marc.mari.barcelo@gmail.com> + * Richard W.M. Jones <rjones@redhat.com> + */ + +asm( +".text\n" +".global _start\n" +"_start:\n" +" .short 0xaa55\n" +" .byte 0\n" /* size in 512 units, filled in by signrom.py */ +" .byte 0xcb\n" /* far return without prefix */ +" .org 0x18\n" +" .short 0\n" +" .short _pnph\n" +"_pnph:\n" +" .ascii \"$PnP\"\n" +" .byte 0x01\n" +" .byte (_pnph_len / 16)\n" +" .short 0x0000\n" +" .byte 0x00\n" +" .byte 0x00\n" +" .long 0x00000000\n" +" .short _manufacturer\n" +" .short _product\n" +" .long 0x00000000\n" +" .short 0x0000\n" +" .short 0x0000\n" +" .short _bev\n" +" .short 0x0000\n" +" .short 0x0000\n" +" .equ _pnph_len, . - _pnph\n" +"_manufacturer:\n" +" .asciz \"QEMU\"\n" +"_product:\n" +" .asciz \"Linux loader DMA\"\n" +" .align 4, 0\n" +"_bev:\n" +" cli\n" +" cld\n" +" jmp load_kernel\n" +); + +#include "../../include/hw/nvram/fw_cfg_keys.h" + +/* QEMU_CFG_DMA_CONTROL bits */ +#define BIOS_CFG_DMA_CTL_ERROR 0x01 +#define BIOS_CFG_DMA_CTL_READ 0x02 +#define BIOS_CFG_DMA_CTL_SKIP 0x04 +#define BIOS_CFG_DMA_CTL_SELECT 0x08 + +#define BIOS_CFG_DMA_ADDR_HIGH 0x514 +#define BIOS_CFG_DMA_ADDR_LOW 0x518 + +#define uint64_t unsigned long long +#define uint32_t unsigned int +#define uint16_t unsigned short + +#define barrier() asm("" : : : "memory") + +typedef struct FWCfgDmaAccess { + uint32_t control; + uint32_t length; + uint64_t address; +} __attribute__((packed)) FWCfgDmaAccess; + +static inline void outl(uint32_t value, uint16_t port) +{ + asm("outl %0, %w1" : : "a"(value), "Nd"(port)); +} + +static inline void set_es(void *addr) +{ + uint32_t seg = (uint32_t)addr >> 4; + asm("movl %0, %%es" : : "r"(seg)); +} + +#ifdef __clang__ +#define ADDR32 +#else +#define ADDR32 "addr32 " +#endif + +static inline uint16_t readw_es(uint16_t offset) +{ + uint16_t val; + asm(ADDR32 "movw %%es:(%1), %0" : "=r"(val) : "r"((uint32_t)offset)); + barrier(); + return val; +} + +static inline uint32_t readl_es(uint16_t offset) +{ + uint32_t val; + asm(ADDR32 "movl %%es:(%1), %0" : "=r"(val) : "r"((uint32_t)offset)); + barrier(); + return val; +} + +static inline void writel_es(uint16_t offset, uint32_t val) +{ + barrier(); + asm(ADDR32 "movl %0, %%es:(%1)" : : "r"(val), "r"((uint32_t)offset)); +} + +static inline uint32_t bswap32(uint32_t x) +{ + return + ((x & 0x000000ffU) << 24) | + ((x & 0x0000ff00U) << 8) | + ((x & 0x00ff0000U) >> 8) | + ((x & 0xff000000U) >> 24); +} + +static inline uint64_t bswap64(uint64_t x) +{ + return + ((x & 0x00000000000000ffULL) << 56) | + ((x & 0x000000000000ff00ULL) << 40) | + ((x & 0x0000000000ff0000ULL) << 24) | + ((x & 0x00000000ff000000ULL) << 8) | + ((x & 0x000000ff00000000ULL) >> 8) | + ((x & 0x0000ff0000000000ULL) >> 24) | + ((x & 0x00ff000000000000ULL) >> 40) | + ((x & 0xff00000000000000ULL) >> 56); +} + +static inline uint64_t cpu_to_be64(uint64_t x) +{ + return bswap64(x); +} + +static inline uint32_t cpu_to_be32(uint32_t x) +{ + return bswap32(x); +} + +static inline uint32_t be32_to_cpu(uint32_t x) +{ + return bswap32(x); +} + +static void bios_cfg_read_entry(void *buf, uint16_t entry, uint32_t len) +{ + FWCfgDmaAccess access; + uint32_t control = (entry << 16) | BIOS_CFG_DMA_CTL_SELECT + | BIOS_CFG_DMA_CTL_READ; + + access.address = cpu_to_be64((uint64_t)(uint32_t)buf); + access.length = cpu_to_be32(len); + access.control = cpu_to_be32(control); + + barrier(); + + outl(cpu_to_be32((uint32_t)&access), BIOS_CFG_DMA_ADDR_LOW); + + while (be32_to_cpu(access.control) & ~BIOS_CFG_DMA_CTL_ERROR) { + barrier(); + } +} + +/* Return top of memory using BIOS function E801. */ +static uint32_t get_e801_addr(void) +{ + uint16_t ax, bx, cx, dx; + uint32_t ret; + + asm("int $0x15\n" + : "=a"(ax), "=b"(bx), "=c"(cx), "=d"(dx) + : "a"(0xe801), "b"(0), "c"(0), "d"(0)); + + /* Not SeaBIOS, but in theory a BIOS could return CX=DX=0 in which + * case we need to use the result from AX & BX instead. + */ + if (cx == 0 && dx == 0) { + cx = ax; + dx = bx; + } + + if (dx) { + /* DX = extended memory above 16M, in 64K units. + * Convert it to bytes and return. + */ + ret = ((uint32_t)dx + 256 /* 16M in 64K units */) << 16; + } else { + /* This is a fallback path for machines with <= 16MB of RAM, + * which probably would never be the case, but deal with it + * anyway. + * + * CX = extended memory between 1M and 16M, in kilobytes + * Convert it to bytes and return. + */ + ret = ((uint32_t)cx + 1024 /* 1M in K */) << 10; + } + + return ret; +} + +void load_kernel(void) +{ + void *setup_addr; + void *initrd_addr; + void *kernel_addr; + void *cmdline_addr; + uint32_t setup_size; + uint32_t initrd_size; + uint32_t kernel_size; + uint32_t cmdline_size; + uint32_t initrd_end_page, max_allowed_page; + uint32_t segment_addr, stack_addr; + + bios_cfg_read_entry(&setup_addr, FW_CFG_SETUP_ADDR, 4); + bios_cfg_read_entry(&setup_size, FW_CFG_SETUP_SIZE, 4); + bios_cfg_read_entry(setup_addr, FW_CFG_SETUP_DATA, setup_size); + + set_es(setup_addr); + + /* For protocol < 0x203 we don't have initrd_max ... */ + if (readw_es(0x206) < 0x203) { + /* ... so we assume initrd_max = 0x37ffffff. */ + writel_es(0x22c, 0x37ffffff); + } + + bios_cfg_read_entry(&initrd_addr, FW_CFG_INITRD_ADDR, 4); + bios_cfg_read_entry(&initrd_size, FW_CFG_INITRD_SIZE, 4); + + initrd_end_page = ((uint32_t)(initrd_addr + initrd_size) & -4096); + max_allowed_page = (readl_es(0x22c) & -4096); + + if (initrd_end_page != 0 && max_allowed_page != 0 && + initrd_end_page != max_allowed_page) { + /* Initrd at the end of memory. Compute better initrd address + * based on e801 data + */ + initrd_addr = (void *)((get_e801_addr() - initrd_size) & -4096); + writel_es(0x218, (uint32_t)initrd_addr); + + } + + bios_cfg_read_entry(initrd_addr, FW_CFG_INITRD_DATA, initrd_size); + + bios_cfg_read_entry(&kernel_addr, FW_CFG_KERNEL_ADDR, 4); + bios_cfg_read_entry(&kernel_size, FW_CFG_KERNEL_SIZE, 4); + bios_cfg_read_entry(kernel_addr, FW_CFG_KERNEL_DATA, kernel_size); + + bios_cfg_read_entry(&cmdline_addr, FW_CFG_CMDLINE_ADDR, 4); + bios_cfg_read_entry(&cmdline_size, FW_CFG_CMDLINE_SIZE, 4); + bios_cfg_read_entry(cmdline_addr, FW_CFG_CMDLINE_DATA, cmdline_size); + + /* Boot linux */ + segment_addr = ((uint32_t)setup_addr >> 4); + stack_addr = (uint32_t)(cmdline_addr - setup_addr - 16); + + /* As we are changing critical registers, we cannot leave freedom to the + * compiler. + */ + asm("movw %%ax, %%ds\n" + "movw %%ax, %%es\n" + "movw %%ax, %%fs\n" + "movw %%ax, %%gs\n" + "movw %%ax, %%ss\n" + "movl %%ebx, %%esp\n" + "addw $0x20, %%ax\n" + "pushw %%ax\n" /* CS */ + "pushw $0\n" /* IP */ + /* Clear registers and jump to Linux */ + "xor %%ebx, %%ebx\n" + "xor %%ecx, %%ecx\n" + "xor %%edx, %%edx\n" + "xor %%edi, %%edi\n" + "xor %%ebp, %%ebp\n" + "lretw\n" + : : "a"(segment_addr), "b"(stack_addr)); +} -- 2.5.5 ^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-06-13 8:22 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-05-27 14:09 [Qemu-devel] [PULL v2 00/31] Misc changes for 2016-05-27 Paolo Bonzini 2016-05-27 14:09 ` [Qemu-devel] [PULL 01/31] Add optionrom compatible with fw_cfg DMA version Paolo Bonzini 2016-05-27 14:16 ` Richard W.M. Jones 2016-06-10 21:45 ` Richard W.M. Jones 2016-06-13 8:22 ` Paolo Bonzini 2016-05-27 15:30 ` [Qemu-devel] [PULL v2 00/31] Misc changes for 2016-05-27 Peter Maydell 2016-05-27 15:37 ` Paolo Bonzini 2016-05-28 11:21 ` Fam Zheng -- strict thread matches above, loose matches on Subject: below -- 2016-05-27 10:06 [Qemu-devel] [PULL " Paolo Bonzini 2016-05-27 10:06 ` [Qemu-devel] [PULL 01/31] Add optionrom compatible with fw_cfg DMA version Paolo Bonzini
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.