From patchwork Mon Nov 15 08:42:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gleb Natapov X-Patchwork-Id: 71201 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3EFAEB7108 for ; Mon, 15 Nov 2010 19:44:16 +1100 (EST) Received: from localhost ([127.0.0.1]:39110 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PHufd-0003QT-EM for incoming@patchwork.ozlabs.org; Mon, 15 Nov 2010 03:44:13 -0500 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 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oAF8gidk028191 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 15 Nov 2010 03:42:44 -0500 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oAF8gh3m004418; Mon, 15 Nov 2010 03:42:43 -0500 Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 13519) id EB66818D46D; Mon, 15 Nov 2010 10:42:42 +0200 (IST) Date: Mon, 15 Nov 2010 10:42:42 +0200 From: Gleb Natapov To: Blue Swirl 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-Disposition: inline In-Reply-To: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kvm@vger.kernel.org, mst@redhat.com, qemu-devel@nongnu.org, armbru@redhat.com, alex.williamson@redhat.com, kevin@koconnor.net Subject: [Qemu-devel] Re: [PATCHv4 15/15] Pass boot device list to firmware. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 > > --- > >  hw/fw_cfg.c |   14 ++++++++++++++ > >  hw/fw_cfg.h |    4 +++- > >  sysemu.h    |    1 + > >  vl.c        |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++ > >  4 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 { > >     FWCfgFiles *files; > >     uint16_t cur_entry; > >     uint32_t cur_offset; > > +    Notifier machine_ready; > >  }; > > > >  static void fw_cfg_write(FWCfgState *s, uint8_t value) > > @@ -315,6 +316,15 @@ int fw_cfg_add_file(FWCfgState *s,  const char *filename, uint8_t *data, > >     return 1; > >  } > > > > +static void fw_cfg_machine_ready(struct Notifier* n) > > +{ > > +    uint32_t len; > > +    char *bootindex = get_boot_devices_list(&len); > > + > > +    fw_cfg_add_bytes(container_of(n, FWCfgState, machine_ready), > > +                     FW_CFG_BOOTINDEX, (uint8_t*)bootindex, len); > > +} > > + > >  FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, > >                         target_phys_addr_t ctl_addr, target_phys_addr_t data_addr) > >  { > > @@ -343,6 +353,10 @@ FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, > >     fw_cfg_add_i16(s, FW_CFG_MAX_CPUS, (uint16_t)max_cpus); > >     fw_cfg_add_i16(s, FW_CFG_BOOT_MENU, (uint16_t)boot_menu); > > > > + > > +    s->machine_ready.notify = fw_cfg_machine_ready; > > +    qemu_add_machine_init_done_notifier(&s->machine_ready); > > + > >     return s; > >  } > > > > 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 @@ > > > >  #define FW_CFG_FILE_FIRST       0x20 > >  #define FW_CFG_FILE_SLOTS       0x10 > > -#define FW_CFG_MAX_ENTRY        (FW_CFG_FILE_FIRST+FW_CFG_FILE_SLOTS) > > +#define FW_CFG_FILE_LAST_SLOT   (FW_CFG_FILE_FIRST+FW_CFG_FILE_SLOTS) > > +#define FW_CFG_BOOTINDEX        (FW_CFG_FILE_LAST_SLOT + 1) > > +#define FW_CFG_MAX_ENTRY        FW_CFG_BOOTINDEX > > This should be > #define FW_CFG_MAX_ENTRY (FW_CFG_BOOTINDEX + 1) > because the check is like this: > if ((key & FW_CFG_ENTRY_MASK) >= FW_CFG_MAX_ENTRY) { > s->cur_entry = FW_CFG_INVALID; > 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 > > 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 :) --- Gleb. 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 = { static SysBusDeviceInfo pbm_host_info = { .qdev.name = "pbm", + .qdev.fw_name = "pci", .qdev.size = sizeof(APBState), .qdev.reset = pci_pbm_reset, .init = pci_pbm_init_device,