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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 9A61BC433E0 for ; Fri, 22 Jan 2021 08:08:32 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0542923122 for ; Fri, 22 Jan 2021 08:08:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0542923122 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 ([::1]:34576 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2rUd-0008IK-09 for qemu-devel@archiver.kernel.org; Fri, 22 Jan 2021 03:08:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49478) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2rTd-0007kx-6w for qemu-devel@nongnu.org; Fri, 22 Jan 2021 03:07:29 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:60159) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l2rTW-00019W-Mn for qemu-devel@nongnu.org; Fri, 22 Jan 2021 03:07:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611302840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=wceigeWi447uFqqOJBTYIF2O1oO/W+rRjQCaPdz1EqM=; b=YLolBkqQqQ39UI9QU6/rdrU+pvm5Vvm79q8jkbsXiVeZ78j0F7e1X3lO6DMvIkuBNrXUof PFpZeECD6e7gX9RzlFbgb1Bl6w6pgR0l08cV3W+G6y55MNUQnQeJ39OexctxPyPOLk/OPo YkrmM4m0hcwzNNMorwsqX9ku5d8+tKc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-327-pqCwM7fwNsuwkhRTXI3Ppg-1; Fri, 22 Jan 2021 03:07:18 -0500 X-MC-Unique: pqCwM7fwNsuwkhRTXI3Ppg-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 353AC15725; Fri, 22 Jan 2021 08:07:17 +0000 (UTC) Received: from kamzik.brq.redhat.com (unknown [10.40.192.139]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E430A2C6BF; Fri, 22 Jan 2021 08:07:14 +0000 (UTC) Date: Fri, 22 Jan 2021 09:07:12 +0100 From: Andrew Jones To: Maxim Uvarov Subject: Re: [PATCHv8 2/3] arm-virt: refactor gpios creation Message-ID: <20210122080712.bwkjyyanwdv22eqd@kamzik.brq.redhat.com> References: <20210120092748.14789-1-maxim.uvarov@linaro.org> <20210120092748.14789-3-maxim.uvarov@linaro.org> MIME-Version: 1.0 In-Reply-To: <20210120092748.14789-3-maxim.uvarov@linaro.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=drjones@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=216.205.24.124; envelope-from=drjones@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.168, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Jose.Marinho@arm.com, qemu-devel@nongnu.org, f4bug@amsat.org, tf-a@lists.trustedfirmware.org, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wed, Jan 20, 2021 at 12:27:47PM +0300, Maxim Uvarov wrote: > No functional change. Just refactor code to better > support secure and normal world gpios. > > Signed-off-by: Maxim Uvarov > --- > hw/arm/virt.c | 64 ++++++++++++++++++++++++++++++++++----------------- > 1 file changed, 43 insertions(+), 21 deletions(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 96985917d3..c427ce5f81 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -820,17 +820,43 @@ static void virt_powerdown_req(Notifier *n, void *opaque) > } > } > > -static void create_gpio(const VirtMachineState *vms) > +static void create_gpio_keys(const VirtMachineState *vms, > + DeviceState *pl061_dev, > + uint32_t phandle) > +{ > + gpio_key_dev = sysbus_create_simple("gpio-key", -1, > + qdev_get_gpio_in(pl061_dev, 3)); > + > + qemu_fdt_add_subnode(vms->fdt, "/gpio-keys"); > + qemu_fdt_setprop_string(vms->fdt, "/gpio-keys", "compatible", "gpio-keys"); > + qemu_fdt_setprop_cell(vms->fdt, "/gpio-keys", "#size-cells", 0); > + qemu_fdt_setprop_cell(vms->fdt, "/gpio-keys", "#address-cells", 1); > + > + qemu_fdt_add_subnode(vms->fdt, "/gpio-keys/poweroff"); > + qemu_fdt_setprop_string(vms->fdt, "/gpio-keys/poweroff", > + "label", "GPIO Key Poweroff"); > + qemu_fdt_setprop_cell(vms->fdt, "/gpio-keys/poweroff", "linux,code", > + KEY_POWER); > + qemu_fdt_setprop_cells(vms->fdt, "/gpio-keys/poweroff", > + "gpios", phandle, 3, 0); > +} > + > +static void create_gpio_devices(const VirtMachineState *vms, int gpio, > + MemoryRegion *mem) > { > char *nodename; > DeviceState *pl061_dev; > - hwaddr base = vms->memmap[VIRT_GPIO].base; > - hwaddr size = vms->memmap[VIRT_GPIO].size; > - int irq = vms->irqmap[VIRT_GPIO]; > + hwaddr base = vms->memmap[gpio].base; > + hwaddr size = vms->memmap[gpio].size; > + int irq = vms->irqmap[gpio]; > const char compat[] = "arm,pl061\0arm,primecell"; > + SysBusDevice *s; > > - pl061_dev = sysbus_create_simple("pl061", base, > - qdev_get_gpio_in(vms->gic, irq)); > + pl061_dev = qdev_new("pl061"); > + s = SYS_BUS_DEVICE(pl061_dev); > + sysbus_realize_and_unref(s, &error_fatal); > + memory_region_add_subregion(mem, base, sysbus_mmio_get_region(s, 0)); > + sysbus_connect_irq(s, 0, qdev_get_gpio_in(vms->gic, irq)); > > uint32_t phandle = qemu_fdt_alloc_phandle(vms->fdt); > nodename = g_strdup_printf("/pl061@%" PRIx64, base); > @@ -847,21 +873,17 @@ static void create_gpio(const VirtMachineState *vms) > qemu_fdt_setprop_string(vms->fdt, nodename, "clock-names", "apb_pclk"); > qemu_fdt_setprop_cell(vms->fdt, nodename, "phandle", phandle); > > - gpio_key_dev = sysbus_create_simple("gpio-key", -1, > - qdev_get_gpio_in(pl061_dev, 3)); > - qemu_fdt_add_subnode(vms->fdt, "/gpio-keys"); > - qemu_fdt_setprop_string(vms->fdt, "/gpio-keys", "compatible", "gpio-keys"); > - qemu_fdt_setprop_cell(vms->fdt, "/gpio-keys", "#size-cells", 0); > - qemu_fdt_setprop_cell(vms->fdt, "/gpio-keys", "#address-cells", 1); > - > - qemu_fdt_add_subnode(vms->fdt, "/gpio-keys/poweroff"); > - qemu_fdt_setprop_string(vms->fdt, "/gpio-keys/poweroff", > - "label", "GPIO Key Poweroff"); > - qemu_fdt_setprop_cell(vms->fdt, "/gpio-keys/poweroff", "linux,code", > - KEY_POWER); > - qemu_fdt_setprop_cells(vms->fdt, "/gpio-keys/poweroff", > - "gpios", phandle, 3, 0); > + if (gpio != VIRT_GPIO) { > + /* Mark as not usable by the normal world */ > + qemu_fdt_setprop_string(vms->fdt, nodename, "status", "disabled"); > + qemu_fdt_setprop_string(vms->fdt, nodename, "secure-status", "okay"); > + } nit: The above if-block could/should have waited until the next patch to be added. > g_free(nodename); > + > + /* Child gpio devices */ > + if (gpio == VIRT_GPIO) { Same nit as above, the next patch is where we should start conditionally doing stuff based on the gpio type. > + create_gpio_keys(vms, pl061_dev, phandle); > + } > } > > static void create_virtio_devices(const VirtMachineState *vms) > @@ -1990,7 +2012,7 @@ static void machvirt_init(MachineState *machine) > if (has_ged && aarch64 && firmware_loaded && virt_is_acpi_enabled(vms)) { > vms->acpi_dev = create_acpi_ged(vms); > } else { > - create_gpio(vms); > + create_gpio_devices(vms, VIRT_GPIO, sysmem); > } > > /* connect powerdown request */ > -- > 2.17.1 > > Reviewed-by: Andrew Jones Thanks, drew