From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42253) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bz0kL-0001m6-BP for qemu-devel@nongnu.org; Tue, 25 Oct 2016 08:22:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bz0kH-0005qj-AV for qemu-devel@nongnu.org; Tue, 25 Oct 2016 08:22:25 -0400 References: <1476823604-15403-1-git-send-email-thuth@redhat.com> <20161019021650.GC11140@umbus.fritz.box> <317ca528-643a-42be-0a5a-e5c25bb2dec6@redhat.com> <20161024120450.GH11052@umbus.fritz.box> From: Thomas Huth Message-ID: <70f1e5d4-fb16-ff4e-0eba-42004de90a46@redhat.com> Date: Tue, 25 Oct 2016 14:22:08 +0200 MIME-Version: 1.0 In-Reply-To: <20161024120450.GH11052@umbus.fritz.box> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="AgaJ1L4eQSVEo8mwBVJ4nM1X0KaHiQcOf" Subject: Re: [Qemu-devel] [Qemu-ppc] [PATCH 0/5] nvram: Refactor OpenBIOS NVRAM code to support -prom-env on pseries, too List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson Cc: "qemu-devel@nongnu.org" , "qemu-ppc@nongnu.org" , Bharata B Rao , Artyom Tarasenko This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --AgaJ1L4eQSVEo8mwBVJ4nM1X0KaHiQcOf Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 24.10.2016 14:04, David Gibson wrote: > On Mon, Oct 24, 2016 at 12:36:05PM +0200, Thomas Huth wrote: >> On 24.10.2016 12:22, Bharata B Rao wrote: >>> >>> On Wed, Oct 19, 2016 at 7:46 AM, David Gibson >>> > wr= ote: >>> >>> On Tue, Oct 18, 2016 at 10:46:39PM +0200, Thomas Huth wrote: >>> > The OpenBIOS NVRAM set-up is based on the layout defined in the= CHRP >>> > (Common Hardware Reference Platform) specification. This is the= same >>> > layout that is also used by the PAPR specification and thus by = the >>> SLOF >>> > firmware of the pseries machine. By refactoring the NVRAM code = from >>> > mac_nvram.c, we can use the same functions for setting up the N= VRAM >>> > for both, OpenBIOS and SLOF. This way we can support the "-prom= -env" >>> > parameter of QEMU for SLOF, too, which is very useful to influe= nce >>> > the firmware boot process. >>> > >>> > Thomas Huth (5): >>> > nvram: Introduce helper functions for CHRP "system" and "free= space" >>> > partitions >>> > sparc: Use the new common NVRAM functions for system and free= space >>> > partition >>> > spapr_nvram: Pre-initialize the NVRAM to support the -prom-en= v >>> > parameter >>> > nvram: Move the remaining CHRP NVRAM related code to chrp_nvr= am.[ch] >>> > nvram: Rename openbios_firmware_abi.h into sun_nvram.h >>> > >>> > hw/nvram/Makefile.objs | 1 + >>> > hw/nvram/chrp_nvram.c | 85 >>> ++++++++++++++++++++++ >>> > hw/nvram/mac_nvram.c | 49 +++---= ------- >>> > hw/nvram/spapr_nvram.c | 6 ++ >>> > hw/sparc/sun4m.c | 35 ++----= --- >>> > hw/sparc64/sun4u.c | 35 ++----= --- >>> > include/hw/nvram/chrp_nvram.h | 54 >>> ++++++++++++++ >>> > .../nvram/{openbios_firmware_abi.h =3D> sun_nvram.h} | 47 +---= -------- >>> > tests/postcopy-test.c | 8 +- >>> > 9 files changed, 179 insertions(+), 141 deletions(-) >>> > create mode 100644 hw/nvram/chrp_nvram.c >>> > create mode 100644 include/hw/nvram/chrp_nvram.h >>> > rename include/hw/nvram/{openbios_firmware_abi.h =3D> sun_nvra= m.h} >>> (50%) >>> >>> Series, >>> >>> Reviewed-by: David Gibson >> > >>> >>> I've put it into ppc-for-2.8 tentatively. However I'd like to ge= t an >>> Acked-by from Mark for the Sparc bits before I send my next pull >>> request. >>> >>> >>> I observe an early boot failure in SLOF with a commit from this patch= set >>> on ppc-for-2.8 branch. >>> >>> 4e1257ed41bce16baa8a010 - spapr_nvram: Pre-initialize the NVRAM to >>> support the -prom-env parameter >>> >>> SLOF ****************************************************************= ****** >>> QEMU Starting >>> Build Date =3D Oct 19 2016 09:58:38 >>> FW Version =3D git-efd65f49929d7db7 >>> Press "s" to enter Open Firmware. >>> >>> Populating /vdevice methods >>> Populating /vdevice/vty@71000000 >>> Populating /vdevice/nvram@71000001 >>> Populating /vdevice/v-scsi@71000002 >>> SCSI: Looking for devices >>> 8200000000000000 CD-ROM : "QEMU QEMU CD-ROM 2.5+= " >>> Populating /pci@800000020000000 >>> 00 1000 (D) : 1033 0194 serial bus [ usb-xhci= ] >>> 00 0800 (D) : 1af4 1001 virtio [ block ] >>> 00 0000 (D) : 1af4 1000 virtio [ net ] >>> Scanning USB >>> XHCI: Initializing >>> Using default console: /vdevice/vty@71000000 >>> =20 >>> Welcome to Open Firmware >>> >>> Copyright (c) 2004, 2011 IBM Corporation All rights reserved. >>> This program and the accompanying materials are made available >>> under the terms of the BSD License available at >>> http://www.opensource.org/licenses/bsd-license.php >>> >>> >>> Trying to load: from: /pci@800000020000000/scsi@1 ... Successfully= loaded >>> error: out of memory. >>> out of memory >>> Aborted. Press any key to exit. >> >> Yuck. Confirmed. Sorry for the inconvenience. Seems like SLOF does not= >> create the properties in the /options device tree node anymore in this= case. >> >> David, could you please unqueue the "spapr_nvram: Pre-initialize the >> NVRAM to support the -prom-env parameter" patch from the ppc-for-2.8 >> branch until I figure out a fix for this problem? Thanks! >=20 > Done. FYI, SLOF patch to fix this issue is on the way: https://patchwork.ozlabs.org/patch/686426/ Thomas --AgaJ1L4eQSVEo8mwBVJ4nM1X0KaHiQcOf Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAEBAgAGBQJYD051AAoJEC7Z13T+cC21v0AP/2pAZjqIE/r143yZV0Hl2Mrw FzTnW+xKsfHIS/XUMin+yHeLt1ms/d5Vo57AQ5pQ1GeCtB97p1NnuGqFk4CDRw1r TUlsqd0rv8lECQs/jlEwM81OEoYJhpVfR9ys9J7bHsYm0zW0PwCcvmJA4kw2jBs6 DBn4gRkmm7Ef0ESqwWuP/NNqfusIeWgbVTCA2JB0nWD1uIw7UJ8HCzGVU/7y5QLB JRgCPauLYOW4qnclIs8kr4GIX46R1+5EmywIRFSMBFaic9BHIzKYzxUxPVoiJOLR zMf2WLBowKn0EozSoAyXTjtZJwuF5w5Dw4EaWPT0933IbPgPiybjBjfcJq88JWz1 IBrgV7u6lAOL4vXrTah39I8FxVJyFsdXHUSCcS+G6GuxbheFkF49wKm7i/toVy21 My2DyqhWEG43psqPs7Z9602sqRFHG7mgBJ+BO5tqpxPDCCY2IeHHg9qP++5OIH+g xBbdQfZtaut3lIw8CJArGDfu20UY4rT71ZvCJwtGl78jneTY+Np1vC8RLGbMBmCt E4ifq71qHMb/wGPqsyFhgmnr0uVzuSL0TjKmtBPWBnGqhVjJpgA/uWKxnD40JjD5 T0Y9/YZM5QD1H5U8bmYttHJdfIqOfZiNu7p46WQ4GUJuLTJUlWBhvlXatlUkUmiA ZKxjYdcUBv2vlllPpRRp =88m6 -----END PGP SIGNATURE----- --AgaJ1L4eQSVEo8mwBVJ4nM1X0KaHiQcOf--