From nobody Mon Nov 17 12:05:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.218.54 as permitted sender) client-ip=209.85.218.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1603750019; cv=none; d=zohomail.com; s=zohoarc; b=Ghu2pnd/+4QVtN0S+TMsMf6aLulLW4t7pI1ZktHi5T9p2FYjocbW+nhB8g5oFXRWz4buyU7MslryleOgNOwa9fK7F8uMMGtDLZmsJNlrNtacTKFyslXy1waErukQJ5rUKgJhosT7u7OLpNQbPPMbRZ4z5nzpo4wgUia7at/pmIg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603750019; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oZ59K3EUFY4um2tzgzmnbro06kh/DapJGr61n3bGzJU=; b=X0OJQmYFJEFkvjIQ4bIWLz6soujg85LATg61wPNrJ3O3QCUV2c5hY/ncTQ2Nzr7cuGevZ8ZEAT8lDAxVgky9IpjBjzdlnKmpyHXVXV8PX/lxOTt53fKdx9m5F42ARUCPYglAiRFyoSVRonxTa2YuaMExhebWnfFEpU/I2nG9G2A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by mx.zohomail.com with SMTPS id 1603750019020527.2525030837968; Mon, 26 Oct 2020 15:06:59 -0700 (PDT) Received: by mail-ej1-f54.google.com with SMTP id c15so16121813ejs.0 for ; Mon, 26 Oct 2020 15:06:58 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id c14sm5869102edy.13.2020.10.26.15.06.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 15:06:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oZ59K3EUFY4um2tzgzmnbro06kh/DapJGr61n3bGzJU=; b=hs55KhvKDi4acDEDW1Tmk98gdFW6cYfhLJBI4NLLJG1xfLWBSJxQ0g4gdepB3K4pIz FwKo5HQx0Mqd0vF+jJ/LjjSJe3gv4JAMShsMnG8YCJSaBfjTJwpsVi3Gb6wl86GjuAWQ 8+RhkaC5U9Mxut9UXgPlCHA7cHala162JyT2yrKXHoJFFrKUgSmxN/Nu+RXUbsoreaus ZD3+8S0z4h1DyD3gJ+W3763W+te2fcWfqmhN/2TiE4YTaSo19AhSnItS6drAI1sCbeCi BnJKcpiqU13Y/8xMbJNPBXV5J7PF2OSAhkgw54pbT9M/G2Iu7QY2LYY5GQd9c/+qIteU s5NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=oZ59K3EUFY4um2tzgzmnbro06kh/DapJGr61n3bGzJU=; b=NbDM1Q7g8YVUKbkmShnhCEjSb5DEyBXwrjNZobj2NTl+w6aL18+WaUn+cIUnACn4gc 39HmZVskwAq/d6xK4wMTxHn7ZTyvOjuU0NtprD69OYsB6OOcPg1mjixaX1DEN10Ob0Of blI43ojr+hB9cBcYYWClcX1ybii04ws3PWLESfPBjNTFWv0snobdvcgi07Cac+QvaLID mbuRsLH+ULAFdExQ4P9t1P1pHBX60XqokxEXvs0AWdUX5fPGTRBcRZxCUTcChaCC8Wsm l0+9gA/SEBnzSR9oQ04iNcB6iVuParw1Gysxa6nGLEF5L+2Z94JXqHX1v3rK2orAM5Dp eBbA== X-Gm-Message-State: AOAM533McCpXHoVtjxTx6B2vIqvPy7qrXudftNVIhQUDRpYCF384LAz+ 2WD7QhdDL8LW/geutkxwNCo= X-Google-Smtp-Source: ABdhPJzi+Xn6EHR1mnORqwvxk/3IbGO9WdS6dc6tM7syNjnepocKBXGThx96c7EO9sxvo4NKyms4tg== X-Received: by 2002:a17:906:802:: with SMTP id e2mr17454358ejd.294.1603750016997; Mon, 26 Oct 2020 15:06:56 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Andrew Jeffery , Joel Stanley , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Andrzej Zaborowski , qemu-arm@nongnu.org, Paolo Bonzini , Peter Maydell , Richard Henderson , Luc Michel Subject: [PULL 5/7] hw/misc/mps2-fpgaio: Use the LED device Date: Mon, 26 Oct 2020 23:06:22 +0100 Message-Id: <20201026220624.60878-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201026220624.60878-1-f4bug@amsat.org> References: <20201026220624.60878-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Per the 'ARM MPS2 and MPS2+ FPGA Prototyping Boards Technical Reference Manual' (100112_0200_07_en): 2.1 Overview of the MPS2 and MPS2+ hardware The MPS2 and MPS2+ FPGA Prototyping Boards contain the following components and interfaces: * User switches and user LEDs: - Two green LEDs and two push buttons that connect to the FPGA. - Eight green LEDs and one 8-way dip switch that connect to the MCC. Add the 2 LEDs connected to the FPGA. This replaces the 'mps2_fpgaio_leds' trace events by the generic 'led_set_intensity' event. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Luc Michel Message-Id: <20200912134041.946260-6-f4bug@amsat.org> --- include/hw/misc/mps2-fpgaio.h | 2 ++ hw/misc/mps2-fpgaio.c | 23 ++++++++++++++++++----- hw/misc/Kconfig | 1 + hw/misc/trace-events | 1 - 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/include/hw/misc/mps2-fpgaio.h b/include/hw/misc/mps2-fpgaio.h index 80f9227aa66..a010fdb2b6d 100644 --- a/include/hw/misc/mps2-fpgaio.h +++ b/include/hw/misc/mps2-fpgaio.h @@ -22,6 +22,7 @@ #define MPS2_FPGAIO_H =20 #include "hw/sysbus.h" +#include "hw/misc/led.h" #include "qom/object.h" =20 #define TYPE_MPS2_FPGAIO "mps2-fpgaio" @@ -33,6 +34,7 @@ struct MPS2FPGAIO { =20 /*< public >*/ MemoryRegion iomem; + LEDState *led[2]; =20 uint32_t led0; uint32_t prescale; diff --git a/hw/misc/mps2-fpgaio.c b/hw/misc/mps2-fpgaio.c index 2f3fbeef348..6af0e8f837a 100644 --- a/hw/misc/mps2-fpgaio.c +++ b/hw/misc/mps2-fpgaio.c @@ -24,6 +24,7 @@ #include "migration/vmstate.h" #include "hw/registerfields.h" #include "hw/misc/mps2-fpgaio.h" +#include "hw/misc/led.h" #include "hw/qdev-properties.h" #include "qemu/timer.h" =20 @@ -176,12 +177,9 @@ static void mps2_fpgaio_write(void *opaque, hwaddr off= set, uint64_t value, =20 switch (offset) { case A_LED0: - /* LED bits [1:0] control board LEDs. We don't currently have - * a mechanism for displaying this graphically, so use a trace eve= nt. - */ - trace_mps2_fpgaio_leds(value & 0x02 ? '*' : '.', - value & 0x01 ? '*' : '.'); s->led0 =3D value & 0x3; + led_set_state(s->led[0], value & 0x01); + led_set_state(s->led[1], value & 0x02); break; case A_PRESCALE: resync_counter(s); @@ -239,6 +237,10 @@ static void mps2_fpgaio_reset(DeviceState *dev) s->counter =3D 0; s->pscntr =3D 0; s->pscntr_sync_ticks =3D now; + + for (size_t i =3D 0; i < ARRAY_SIZE(s->led); i++) { + device_cold_reset(DEVICE(s->led[i])); + } } =20 static void mps2_fpgaio_init(Object *obj) @@ -251,6 +253,16 @@ static void mps2_fpgaio_init(Object *obj) sysbus_init_mmio(sbd, &s->iomem); } =20 +static void mps2_fpgaio_realize(DeviceState *dev, Error **errp) +{ + MPS2FPGAIO *s =3D MPS2_FPGAIO(dev); + + s->led[0] =3D led_create_simple(OBJECT(dev), GPIO_POLARITY_ACTIVE_HIGH, + LED_COLOR_GREEN, "USERLED0"); + s->led[1] =3D led_create_simple(OBJECT(dev), GPIO_POLARITY_ACTIVE_HIGH, + LED_COLOR_GREEN, "USERLED1"); +} + static bool mps2_fpgaio_counters_needed(void *opaque) { /* Currently vmstate.c insists all subsections have a 'needed' functio= n */ @@ -299,6 +311,7 @@ static void mps2_fpgaio_class_init(ObjectClass *klass, = void *data) DeviceClass *dc =3D DEVICE_CLASS(klass); =20 dc->vmsd =3D &mps2_fpgaio_vmstate; + dc->realize =3D mps2_fpgaio_realize; dc->reset =3D mps2_fpgaio_reset; device_class_set_props(dc, mps2_fpgaio_properties); } diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index e4d059591ad..7e9a8a443a5 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -93,6 +93,7 @@ config MIPS_ITU =20 config MPS2_FPGAIO bool + select LED =20 config MPS2_SCC bool diff --git a/hw/misc/trace-events b/hw/misc/trace-events index 6bf7ce863fb..52e637bf4c3 100644 --- a/hw/misc/trace-events +++ b/hw/misc/trace-events @@ -92,7 +92,6 @@ mps2_scc_cfg_read(unsigned function, unsigned device, uin= t32_t value) "MPS2 SCC mps2_fpgaio_read(uint64_t offset, uint64_t data, unsigned size) "MPS2 FPGA= IO read: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u" mps2_fpgaio_write(uint64_t offset, uint64_t data, unsigned size) "MPS2 FPG= AIO write: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u" mps2_fpgaio_reset(void) "MPS2 FPGAIO: reset" -mps2_fpgaio_leds(char led1, char led0) "MPS2 FPGAIO LEDs: %c%c" =20 # msf2-sysreg.c msf2_sysreg_write(uint64_t offset, uint32_t val, uint32_t prev) "msf2-sysr= eg write: addr 0x%08" PRIx64 " data 0x%" PRIx32 " prev 0x%" PRIx32 --=20 2.26.2