From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:38626) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIkup-00057f-Dg for qemu-devel@nongnu.org; Mon, 22 Apr 2019 22:12:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hIkum-0000mb-G9 for qemu-devel@nongnu.org; Mon, 22 Apr 2019 22:12:11 -0400 Date: Tue, 23 Apr 2019 11:20:58 +1000 From: David Gibson Message-ID: <20190423012057.GA31496@umbus.fritz.box> References: <20190422195020.1494-1-philmd@redhat.com> <20190422195020.1494-6-philmd@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="huq684BweRXVnRxX" Content-Disposition: inline In-Reply-To: <20190422195020.1494-6-philmd@redhat.com> Subject: Re: [Qemu-devel] [PATCH v3 5/7] hw/ppc: Implement fw_cfg_arch_key_name() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= Cc: qemu-devel@nongnu.org, Marcel Apfelbaum , "Michael S. Tsirkin" , Paolo Bonzini , Eduardo Habkost , Artyom Tarasenko , Richard Henderson , Laszlo Ersek , Gerd Hoffmann , Mark Cave-Ayland , qemu-ppc@nongnu.org --huq684BweRXVnRxX Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Apr 22, 2019 at 09:50:18PM +0200, Philippe Mathieu-Daud=E9 wrote: > Implement fw_cfg_arch_key_name(), which returns the name of a > ppc-specific key. >=20 > Signed-off-by: Philippe Mathieu-Daud=E9 What ppc machines actually use fw_cfg? I know pseries and powernv don't. > --- > hw/ppc/Makefile.objs | 2 +- > hw/ppc/fw_cfg.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 46 insertions(+), 1 deletion(-) > create mode 100644 hw/ppc/fw_cfg.c >=20 > diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs > index 1111b218a04..ae940981553 100644 > --- a/hw/ppc/Makefile.objs > +++ b/hw/ppc/Makefile.objs > @@ -1,5 +1,5 @@ > # shared objects > -obj-y +=3D ppc.o ppc_booke.o fdt.o > +obj-y +=3D ppc.o ppc_booke.o fdt.o fw_cfg.o > # IBM pSeries (sPAPR) > obj-$(CONFIG_PSERIES) +=3D spapr.o spapr_caps.o spapr_vio.o spapr_events= =2Eo > obj-$(CONFIG_PSERIES) +=3D spapr_hcall.o spapr_iommu.o spapr_rtas.o > diff --git a/hw/ppc/fw_cfg.c b/hw/ppc/fw_cfg.c > new file mode 100644 > index 00000000000..a88b5c4bde2 > --- /dev/null > +++ b/hw/ppc/fw_cfg.c > @@ -0,0 +1,45 @@ > +/* > + * fw_cfg helpers (PPC specific) > + * > + * Copyright (c) 2019 Red Hat, Inc. > + * > + * Author: > + * Philippe Mathieu-Daud=E9 > + * > + * SPDX-License-Identifier: GPL-2.0-or-later > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or la= ter. > + * See the COPYING file in the top-level directory. > + */ > + > +#include "qemu/osdep.h" > +#include "hw/ppc/ppc.h" > +#include "hw/nvram/fw_cfg.h" > + > +const char *fw_cfg_arch_key_name(uint16_t key) > +{ > + static const struct { > + uint16_t key; > + const char *name; > + } fw_cfg_arch_wellknown_keys[] =3D { > + {FW_CFG_PPC_WIDTH, "width"}, > + {FW_CFG_PPC_HEIGHT, "height"}, > + {FW_CFG_PPC_DEPTH, "depth"}, > + {FW_CFG_PPC_TBFREQ, "tbfreq"}, > + {FW_CFG_PPC_CLOCKFREQ, "clockfreq"}, > + {FW_CFG_PPC_IS_KVM, "is_kvm"}, > + {FW_CFG_PPC_KVM_HC, "kvm_hc"}, > + {FW_CFG_PPC_KVM_PID, "pid"}, > + {FW_CFG_PPC_NVRAM_ADDR, "nvram_addr"}, > + {FW_CFG_PPC_BUSFREQ, "busfreq"}, > + {FW_CFG_PPC_NVRAM_FLAT, "nvram_flat"}, > + {FW_CFG_PPC_VIACONFIG, "viaconfig"}, > + }; > + > + for (size_t i =3D 0; i < ARRAY_SIZE(fw_cfg_arch_wellknown_keys); i++= ) { > + if (fw_cfg_arch_wellknown_keys[i].key =3D=3D key) { > + return fw_cfg_arch_wellknown_keys[i].name; > + } > + } > + return NULL; > +} --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --huq684BweRXVnRxX Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAly+aHcACgkQbDjKyiDZ s5K8Ng//SAbwWizfTobNUXBQgCMEtUx2RQwnov/uF3uCUauWbuHSFqnUv32hjVjD dEjt47mByme7liW4Zft0T1GVeZSf17+4VvbF3b7b1ApHxW6EMJyBxgS1LYNce021 h079CsDBsV9lQYr36tQrYP5GR+NEqt6OphbVEguE3LeQ92MGfaKByz0dXamaQrQL pWptZ/I/veE6vujRI2DBmtN13mxCsS5TZun2aO3MhcbiuavVFEaWXsUs711okurs CtrWxGmoZppx125EzJrkeqVZi1WUG/g6qk5Bdio6TLTNLqghwx7xHxJASpuK/VB8 fqXp5AGbk/7YAh58ef6JRuGXJejqITrVjcSR5aQ01Xxhw+kqPihHs27Uguj9aCbB qrcQ1+AAsqwmoy3e7Jq6jE3xwumQha24jEyhAKZrbGWQTvpPCDXzGKSU5VNjl2eE cLIVuJA6KOyAms3kN2okxKBBS25CjKfbdhdzbjKCaUVZ4kCHZpX352CP1kMyD43p R7FZbWvu9aDNUVIrIvgCLUzEK+EZKDoF56Aao01oDjkXpo/lRPNk8k7LmL49x7oS lU5OwqLg+CnIBC3CupOGAzBDodL0r9ke7J5UZ1oYQiOlka5sohpF2fv8D+91hm5r eJLfDXpYfURSLLe7MHE1Y91V3bsMYLNrtYfDCzk/zMic4WrhUdQ= =HL/c -----END PGP SIGNATURE----- --huq684BweRXVnRxX-- From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81073C10F11 for ; Tue, 23 Apr 2019 02:13:16 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 435BF2077C for ; Tue, 23 Apr 2019 02:13:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b="EZZXs1i8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 435BF2077C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:46843 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIkvr-0005ZX-DO for qemu-devel@archiver.kernel.org; Mon, 22 Apr 2019 22:13:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38626) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIkup-00057f-Dg for qemu-devel@nongnu.org; Mon, 22 Apr 2019 22:12:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hIkum-0000mb-G9 for qemu-devel@nongnu.org; Mon, 22 Apr 2019 22:12:11 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:39511 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hIkul-0000hL-0p; Mon, 22 Apr 2019 22:12:08 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 44p6QN1znsz9sBV; Tue, 23 Apr 2019 12:11:56 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1555985516; bh=QjhrWgR5xBx2IBrZ4DnEPK/s97QJzLb3Can7SWLzXV0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=EZZXs1i8+YMxUnbjfGZNT8nMAndZ6xipcY7VBgfzFXaf9vbwgfxJhIxW4ZnlpUVhE 27VPofh/Rqj+TwjJ/uvn4ukG/PD2KiboR7ERdZaT9HbTJnexu5ncqwGvRQvcoN5qu2 AyPKPcok6d49xJT5ugOvvPrqV4FcsT1Q3WSPM83U= Date: Tue, 23 Apr 2019 11:20:58 +1000 From: David Gibson To: Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= Message-ID: <20190423012057.GA31496@umbus.fritz.box> References: <20190422195020.1494-1-philmd@redhat.com> <20190422195020.1494-6-philmd@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="huq684BweRXVnRxX" Content-Disposition: inline In-Reply-To: <20190422195020.1494-6-philmd@redhat.com> User-Agent: Mutt/1.11.3 (2019-02-01) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 203.11.71.1 Subject: Re: [Qemu-devel] [PATCH v3 5/7] hw/ppc: Implement fw_cfg_arch_key_name() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , "Michael S. Tsirkin" , Mark Cave-Ayland , qemu-devel@nongnu.org, qemu-ppc@nongnu.org, Gerd Hoffmann , Paolo Bonzini , Laszlo Ersek , Artyom Tarasenko , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190423012058.48lyK7sK4W-Yz3T2V1DULHQwcvL59-zM1qvl14VsAmw@z> --huq684BweRXVnRxX Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Apr 22, 2019 at 09:50:18PM +0200, Philippe Mathieu-Daud=E9 wrote: > Implement fw_cfg_arch_key_name(), which returns the name of a > ppc-specific key. >=20 > Signed-off-by: Philippe Mathieu-Daud=E9 What ppc machines actually use fw_cfg? I know pseries and powernv don't. > --- > hw/ppc/Makefile.objs | 2 +- > hw/ppc/fw_cfg.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 46 insertions(+), 1 deletion(-) > create mode 100644 hw/ppc/fw_cfg.c >=20 > diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs > index 1111b218a04..ae940981553 100644 > --- a/hw/ppc/Makefile.objs > +++ b/hw/ppc/Makefile.objs > @@ -1,5 +1,5 @@ > # shared objects > -obj-y +=3D ppc.o ppc_booke.o fdt.o > +obj-y +=3D ppc.o ppc_booke.o fdt.o fw_cfg.o > # IBM pSeries (sPAPR) > obj-$(CONFIG_PSERIES) +=3D spapr.o spapr_caps.o spapr_vio.o spapr_events= =2Eo > obj-$(CONFIG_PSERIES) +=3D spapr_hcall.o spapr_iommu.o spapr_rtas.o > diff --git a/hw/ppc/fw_cfg.c b/hw/ppc/fw_cfg.c > new file mode 100644 > index 00000000000..a88b5c4bde2 > --- /dev/null > +++ b/hw/ppc/fw_cfg.c > @@ -0,0 +1,45 @@ > +/* > + * fw_cfg helpers (PPC specific) > + * > + * Copyright (c) 2019 Red Hat, Inc. > + * > + * Author: > + * Philippe Mathieu-Daud=E9 > + * > + * SPDX-License-Identifier: GPL-2.0-or-later > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or la= ter. > + * See the COPYING file in the top-level directory. > + */ > + > +#include "qemu/osdep.h" > +#include "hw/ppc/ppc.h" > +#include "hw/nvram/fw_cfg.h" > + > +const char *fw_cfg_arch_key_name(uint16_t key) > +{ > + static const struct { > + uint16_t key; > + const char *name; > + } fw_cfg_arch_wellknown_keys[] =3D { > + {FW_CFG_PPC_WIDTH, "width"}, > + {FW_CFG_PPC_HEIGHT, "height"}, > + {FW_CFG_PPC_DEPTH, "depth"}, > + {FW_CFG_PPC_TBFREQ, "tbfreq"}, > + {FW_CFG_PPC_CLOCKFREQ, "clockfreq"}, > + {FW_CFG_PPC_IS_KVM, "is_kvm"}, > + {FW_CFG_PPC_KVM_HC, "kvm_hc"}, > + {FW_CFG_PPC_KVM_PID, "pid"}, > + {FW_CFG_PPC_NVRAM_ADDR, "nvram_addr"}, > + {FW_CFG_PPC_BUSFREQ, "busfreq"}, > + {FW_CFG_PPC_NVRAM_FLAT, "nvram_flat"}, > + {FW_CFG_PPC_VIACONFIG, "viaconfig"}, > + }; > + > + for (size_t i =3D 0; i < ARRAY_SIZE(fw_cfg_arch_wellknown_keys); i++= ) { > + if (fw_cfg_arch_wellknown_keys[i].key =3D=3D key) { > + return fw_cfg_arch_wellknown_keys[i].name; > + } > + } > + return NULL; > +} --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --huq684BweRXVnRxX Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAly+aHcACgkQbDjKyiDZ s5K8Ng//SAbwWizfTobNUXBQgCMEtUx2RQwnov/uF3uCUauWbuHSFqnUv32hjVjD dEjt47mByme7liW4Zft0T1GVeZSf17+4VvbF3b7b1ApHxW6EMJyBxgS1LYNce021 h079CsDBsV9lQYr36tQrYP5GR+NEqt6OphbVEguE3LeQ92MGfaKByz0dXamaQrQL pWptZ/I/veE6vujRI2DBmtN13mxCsS5TZun2aO3MhcbiuavVFEaWXsUs711okurs CtrWxGmoZppx125EzJrkeqVZi1WUG/g6qk5Bdio6TLTNLqghwx7xHxJASpuK/VB8 fqXp5AGbk/7YAh58ef6JRuGXJejqITrVjcSR5aQ01Xxhw+kqPihHs27Uguj9aCbB qrcQ1+AAsqwmoy3e7Jq6jE3xwumQha24jEyhAKZrbGWQTvpPCDXzGKSU5VNjl2eE cLIVuJA6KOyAms3kN2okxKBBS25CjKfbdhdzbjKCaUVZ4kCHZpX352CP1kMyD43p R7FZbWvu9aDNUVIrIvgCLUzEK+EZKDoF56Aao01oDjkXpo/lRPNk8k7LmL49x7oS lU5OwqLg+CnIBC3CupOGAzBDodL0r9ke7J5UZ1oYQiOlka5sohpF2fv8D+91hm5r eJLfDXpYfURSLLe7MHE1Y91V3bsMYLNrtYfDCzk/zMic4WrhUdQ= =HL/c -----END PGP SIGNATURE----- --huq684BweRXVnRxX--