From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=42909 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PHueM-0002gT-6v for qemu-devel@nongnu.org; Mon, 15 Nov 2010 03:42:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PHueF-00006t-Th for qemu-devel@nongnu.org; Mon, 15 Nov 2010 03:42:54 -0500 Received: from mx1.redhat.com ([209.132.183.28]:15307) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PHueF-00006c-MO for qemu-devel@nongnu.org; Mon, 15 Nov 2010 03:42:47 -0500 Date: Mon, 15 Nov 2010 10:42:42 +0200 From: Gleb Natapov Message-ID: <20101115084242.GG7948@redhat.com> References: <1289749181-12070-1-git-send-email-gleb@redhat.com> <1289749181-12070-16-git-send-email-gleb@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: Subject: [Qemu-devel] Re: [PATCHv4 15/15] Pass boot device list to firmware. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Blue Swirl Cc: kvm@vger.kernel.org, mst@redhat.com, qemu-devel@nongnu.org, armbru@redhat.com, alex.williamson@redhat.com, kevin@koconnor.net On Sun, Nov 14, 2010 at 10:50:13PM +0000, Blue Swirl wrote: > On Sun, Nov 14, 2010 at 3:39 PM, Gleb Natapov wrote: > > > > Signed-off-by: Gleb Natapov > > --- > > =9Ahw/fw_cfg.c | =9A 14 ++++++++++++++ > > =9Ahw/fw_cfg.h | =9A =9A4 +++- > > =9Asysemu.h =9A =9A| =9A =9A1 + > > =9Avl.c =9A =9A =9A =9A| =9A 51 +++++++++++++++++++++++++++++++++++++++= ++++++++++++ > > =9A4 files changed, 69 insertions(+), 1 deletions(-) > > > > diff --git a/hw/fw_cfg.c b/hw/fw_cfg.c > > index 7b9434f..f6a67db 100644 > > --- a/hw/fw_cfg.c > > +++ b/hw/fw_cfg.c > > @@ -53,6 +53,7 @@ struct FWCfgState { > > =9A =9A FWCfgFiles *files; > > =9A =9A uint16_t cur_entry; > > =9A =9A uint32_t cur_offset; > > + =9A =9ANotifier machine_ready; > > =9A}; > > > > =9Astatic void fw_cfg_write(FWCfgState *s, uint8_t value) > > @@ -315,6 +316,15 @@ int fw_cfg_add_file(FWCfgState *s, =9Aconst char *= filename, uint8_t *data, > > =9A =9A return 1; > > =9A} > > > > +static void fw_cfg_machine_ready(struct Notifier* n) > > +{ > > + =9A =9Auint32_t len; > > + =9A =9Achar *bootindex =3D get_boot_devices_list(&len); > > + > > + =9A =9Afw_cfg_add_bytes(container_of(n, FWCfgState, machine_ready), > > + =9A =9A =9A =9A =9A =9A =9A =9A =9A =9A FW_CFG_BOOTINDEX, (uint8_t*)b= ootindex, len); > > +} > > + > > =9AFWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, > > =9A =9A =9A =9A =9A =9A =9A =9A =9A =9A =9A =9A target_phys_addr_t ctl_= addr, target_phys_addr_t data_addr) > > =9A{ > > @@ -343,6 +353,10 @@ FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_= t data_port, > > =9A =9A fw_cfg_add_i16(s, FW_CFG_MAX_CPUS, (uint16_t)max_cpus); > > =9A =9A fw_cfg_add_i16(s, FW_CFG_BOOT_MENU, (uint16_t)boot_menu); > > > > + > > + =9A =9As->machine_ready.notify =3D fw_cfg_machine_ready; > > + =9A =9Aqemu_add_machine_init_done_notifier(&s->machine_ready); > > + > > =9A =9A return s; > > =9A} > > > > diff --git a/hw/fw_cfg.h b/hw/fw_cfg.h > > index 856bf91..4d61410 100644 > > --- a/hw/fw_cfg.h > > +++ b/hw/fw_cfg.h > > @@ -30,7 +30,9 @@ > > > > =9A#define FW_CFG_FILE_FIRST =9A =9A =9A 0x20 > > =9A#define FW_CFG_FILE_SLOTS =9A =9A =9A 0x10 > > -#define FW_CFG_MAX_ENTRY =9A =9A =9A =9A(FW_CFG_FILE_FIRST+FW_CFG_FILE= _SLOTS) > > +#define FW_CFG_FILE_LAST_SLOT =9A (FW_CFG_FILE_FIRST+FW_CFG_FILE_SLOTS) > > +#define FW_CFG_BOOTINDEX =9A =9A =9A =9A(FW_CFG_FILE_LAST_SLOT + 1) > > +#define FW_CFG_MAX_ENTRY =9A =9A =9A =9AFW_CFG_BOOTINDEX >=20 > This should be > #define FW_CFG_MAX_ENTRY (FW_CFG_BOOTINDEX + 1) > because the check is like this: > if ((key & FW_CFG_ENTRY_MASK) >=3D FW_CFG_MAX_ENTRY) { > s->cur_entry =3D FW_CFG_INVALID; >=20 Yeah, will fix. > With that change, I got the bootindex passed to OpenBIOS: > OpenBIOS for Sparc64 > Configuration device id QEMU version 1 machine id 0 > kernel cmdline > CPUs: 1 x SUNW,UltraSPARC-IIi > UUID: 00000000-0000-0000-0000-000000000000 > bootindex num_strings 1 > bootindex /pbm@000001fe00000000/ide@5/drive@1/disk@0 >=20 > The device path does not match exactly, but it's close: > /pci@1fe,0/pci-ata@5/ide1@600/disk@0 pbm->pci should be solvable by the patch at the end. Were in the spec it is allowed to abbreviate 1fe00000000 as 1fe,0? Spec allows to drop starting zeroes but TARGET_FMT_plx definition in targphys.h has 0 after %. I can define another one without leading zeroes. Can you suggest a name? TARGET_FMT_lx is poisoned. As of ATA there is no open firmware binding spec for ATA, so everyone does what he pleases. I based my implementation on what open firmware showing when running on qemu x86. "pci-ata" should be "ide" according to PCI binding spec :)=20 diff --git a/hw/apb_pci.c b/hw/apb_pci.c index c619112..643aa49 100644 --- a/hw/apb_pci.c +++ b/hw/apb_pci.c @@ -453,6 +453,7 @@ static PCIDeviceInfo pbm_pci_host_info =3D { =20 static SysBusDeviceInfo pbm_host_info =3D { .qdev.name =3D "pbm", + .qdev.fw_name =3D "pci", .qdev.size =3D sizeof(APBState), .qdev.reset =3D pci_pbm_reset, .init =3D pci_pbm_init_device, -- Gleb.