From b1b876ca70f1b240852ad24e7d3ff788f2c47153 Mon Sep 17 00:00:00 2001 From: Stefano Garzarella Date: Fri, 18 Jan 2019 13:01:43 +0100 Subject: [PATCH] optionrom/pvh: load initrd from fw_cfg If we found initrd through fw_cfg, we can load it and use the first module of hvm_start_info to pass initrd address and size to the kernel. Signed-off-by: Stefano Garzarella Reviewed-by: Stefan Hajnoczi Reviewed-by: Liam Merwick Based-on: <1547554687-12687-1-git-send-email-liam.merwick@oracle.com> Signed-off-by: Paolo Bonzini --- pc-bios/optionrom/pvh_main.c | 21 +++++++++++++++++++-- pc-bios/pvh.bin | Bin 1536 -> 1536 bytes 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/pc-bios/optionrom/pvh_main.c b/pc-bios/optionrom/pvh_main.c index 1dcc5c9256..a015e1bf22 100644 --- a/pc-bios/optionrom/pvh_main.c +++ b/pc-bios/optionrom/pvh_main.c @@ -46,6 +46,7 @@ struct pvh_e820_table { struct pvh_e820_table pvh_e820 asm("pvh_e820") __attribute__ ((aligned)); static struct hvm_start_info start_info; +static struct hvm_modlist_entry ramdisk_mod; static uint8_t cmdline_buffer[CMDLINE_BUFSIZE]; @@ -71,8 +72,8 @@ extern void pvh_load_kernel(void) asm("pvh_load_kernel"); void pvh_load_kernel(void) { void *cmdline_addr = &cmdline_buffer; - void *kernel_entry; - uint32_t cmdline_size, fw_cfg_version = bios_cfg_version(); + void *kernel_entry, *initrd_addr; + uint32_t cmdline_size, initrd_size, fw_cfg_version = bios_cfg_version(); start_info.magic = XEN_HVM_START_MAGIC_VALUE; start_info.version = 1; @@ -110,6 +111,22 @@ void pvh_load_kernel(void) fw_cfg_version); start_info.cmdline_paddr = (uintptr_t)cmdline_addr; + /* Check if we have the initrd to load */ + bios_cfg_read_entry(&initrd_size, FW_CFG_INITRD_SIZE, 4, fw_cfg_version); + if (initrd_size) { + bios_cfg_read_entry(&initrd_addr, FW_CFG_INITRD_ADDR, 4, + fw_cfg_version); + bios_cfg_read_entry(initrd_addr, FW_CFG_INITRD_DATA, initrd_size, + fw_cfg_version); + + ramdisk_mod.paddr = (uintptr_t)initrd_addr; + ramdisk_mod.size = initrd_size; + + /* The first module is always ramdisk. */ + start_info.modlist_paddr = (uintptr_t)&ramdisk_mod; + start_info.nr_modules = 1; + } + bios_cfg_read_entry(&kernel_entry, FW_CFG_KERNEL_ENTRY, 4, fw_cfg_version); asm volatile("jmp *%1" : : "b"(&start_info), "c"(kernel_entry)); diff --git a/pc-bios/pvh.bin b/pc-bios/pvh.bin index 38a41761014957d50eb55d790b6957888cbeee0a..8033080ada2db4c4613fdc3bb5a69d79c7b0c0ca 100644 GIT binary patch delta 735 zcmZqRY2cYKndyM&#;Nv<`Y|dZ$5|Uh85k;#<{2MnZ4qT)U}RumSa?8`fno6mQ3i$` zCqS$fq6`ejS=We8W@b{7QDjF^*FgVV-M0BzvlXU$C1{MYe z%VXtYFVmP97<#vXWSb8NSRUhV3uR(p=oV=F6cp^D(Cxv}_%R?PNP+WW=>x+{i$Uge ziY^glVCXGl*q6Y{z|d);a@<9Q1+4!u6Mw5YBLl-;0agZv9U=@244tpi-tQJ+ebyDyG8{p*zKaivp4}9<|)v??RHTS zS)2hD%7F^)0I66!0W3BJDt4T;N0b8+hc7KAJ2K1E3%rQ^`~N>EEOvp^bbff@3*uvh z2-u&yK*7@Mq9XD_1EeTKMWppoNhU-J9Biweh!C4c_^e_8$y5sr}HoM3nWCAqxZ^Y{P%%?FvK85yeqP#WP{ delta 434 zcmZqRY2cYKnW;f!<5YV_{SpAU|3ur!oaYj z1H{S@VPH7UnjD}Y32_g(&aGW(oWU?cZbo~ql76t~( z!{uTx%@`RNdbfdOn-2(B9_DXTWn^IJ7HIqw6zrnV?ZMLcF(4#Jf%9VN1H(&;LFROd zrid^w^p-K~c3@#(=#)`8?xMm1*8hx&zjZnT1H)bcRtAP0AS*jxrM=%L$jZR56QrWI zMn$Ca)90KWqG=2a3?R8~9~F_#`yjDy7M1Q06_&*jA`A?jqA?(E2|yLW^a_B~?FNNJ zw~vaz|A);-WTNBZV-NRkQ3F|@HUaEBkQYH*28Ne0lOHn6gp0iR`}hBUkWITpK_=dK z@fO6#un%m_E|8_YE-C^qPW=7<|7H3A|Nnc-7z_`f`2FRZfB*k){>Z||IEnTDBvw1d F4gfEZi&+2w