From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:59894) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJ0oI-0000IK-8a for qemu-devel@nongnu.org; Tue, 23 Apr 2019 15:10:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJ0gd-0000GS-7j for qemu-devel@nongnu.org; Tue, 23 Apr 2019 15:02:39 -0400 References: <20190422195020.1494-1-philmd@redhat.com> <20190422195020.1494-6-philmd@redhat.com> From: Laszlo Ersek Message-ID: Date: Tue, 23 Apr 2019 21:02:23 +0200 MIME-Version: 1.0 In-Reply-To: <20190422195020.1494-6-philmd@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable 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: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , qemu-devel@nongnu.org Cc: Eduardo Habkost , "Michael S. Tsirkin" , Mark Cave-Ayland , qemu-ppc@nongnu.org, Gerd Hoffmann , Paolo Bonzini , Richard Henderson , Artyom Tarasenko , David Gibson On 04/22/19 21:50, Philippe Mathieu-Daud=C3=A9 wrote: > Implement fw_cfg_arch_key_name(), which returns the name of a > ppc-specific key. >=20 > Signed-off-by: Philippe Mathieu-Daud=C3=A9 > --- > 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_even= ts.o > 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=C3=A9 > + * > + * SPDX-License-Identifier: GPL-2.0-or-later > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or = later. > + * 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 (1) Have you considered extracting the struct type, and the linear search, to code that's shared between the arches? It might suffice to make only the "fw_cfg_arch_wellknown_keys" array target-specific. (It's not complex code so I don't mind if you opt for the code duplicatio= n.) (2) PPC highlights my question#2 from under "v3 3/7". Namely, we extracted the x86 constants into "hw/i386/fw_cfg.h". But the PPC constants already exist in "include/hw/ppc/ppc.h". (My point being the difference in the "include/" pathname prefix.) Should we be consistent? If you decide to stick with this variant: Reviewed-by: Laszlo Ersek Thanks Laszlo 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=-6.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS 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 5FF8EC10F03 for ; Tue, 23 Apr 2019 19:12:21 +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 31749217D9 for ; Tue, 23 Apr 2019 19:12:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 31749217D9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com 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]:58397 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJ0q4-00021i-EE for qemu-devel@archiver.kernel.org; Tue, 23 Apr 2019 15:12:20 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59894) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJ0oI-0000IK-8a for qemu-devel@nongnu.org; Tue, 23 Apr 2019 15:10:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJ0gd-0000GS-7j for qemu-devel@nongnu.org; Tue, 23 Apr 2019 15:02:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40132) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hJ0gc-0000F0-Se; Tue, 23 Apr 2019 15:02:35 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9AA8B9B347; Tue, 23 Apr 2019 19:02:33 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-125-214.rdu2.redhat.com [10.10.125.214]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB0BD5C1B5; Tue, 23 Apr 2019 19:02:24 +0000 (UTC) To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , qemu-devel@nongnu.org References: <20190422195020.1494-1-philmd@redhat.com> <20190422195020.1494-6-philmd@redhat.com> From: Laszlo Ersek Message-ID: Date: Tue, 23 Apr 2019 21:02:23 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20190422195020.1494-6-philmd@redhat.com> Content-Type: text/plain; charset="UTF-8" Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 23 Apr 2019 19:02:33 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 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-ppc@nongnu.org, Gerd Hoffmann , Paolo Bonzini , David Gibson , Artyom Tarasenko , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190423190223.CMKf0x5en9bl0jxWvZuX5-lFWry5ZBDxydpxzdxaFn8@z> On 04/22/19 21:50, Philippe Mathieu-Daud=C3=A9 wrote: > Implement fw_cfg_arch_key_name(), which returns the name of a > ppc-specific key. >=20 > Signed-off-by: Philippe Mathieu-Daud=C3=A9 > --- > 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_even= ts.o > 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=C3=A9 > + * > + * SPDX-License-Identifier: GPL-2.0-or-later > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or = later. > + * 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 (1) Have you considered extracting the struct type, and the linear search, to code that's shared between the arches? It might suffice to make only the "fw_cfg_arch_wellknown_keys" array target-specific. (It's not complex code so I don't mind if you opt for the code duplicatio= n.) (2) PPC highlights my question#2 from under "v3 3/7". Namely, we extracted the x86 constants into "hw/i386/fw_cfg.h". But the PPC constants already exist in "include/hw/ppc/ppc.h". (My point being the difference in the "include/" pathname prefix.) Should we be consistent? If you decide to stick with this variant: Reviewed-by: Laszlo Ersek Thanks Laszlo