From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: Alistair Francis <alistair.francis@xilinx.com>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
qemu-devel@nongnu.org, "Fam Zheng" <famz@redhat.com>,
"Edgar E . Iglesias" <edgar.iglesias@xilinx.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Andrey Smirnov" <andrew.smirnov@gmail.com>,
"Eduardo Habkost" <ehabkost@redhat.com>
Subject: [Qemu-devel] [PATCH v4 10/17] sdhci: add a GPIO for the 'access control' LED
Date: Wed, 3 Jan 2018 08:01:19 -0300 [thread overview]
Message-ID: <20180103110126.29209-11-f4bug@amsat.org> (raw)
In-Reply-To: <20180103110126.29209-1-f4bug@amsat.org>
It blinks to caution the user not to remove the card while the SD card is
being accessed.
So far it only emits a trace event.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Alistair Francis <alistair.francis@xilinx.com>
---
include/hw/sd/sdhci.h | 2 ++
hw/sd/sdhci.c | 14 ++++++++++++++
hw/sd/trace-events | 1 +
3 files changed, 17 insertions(+)
diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h
index a6fe064f51..da943a6562 100644
--- a/include/hw/sd/sdhci.h
+++ b/include/hw/sd/sdhci.h
@@ -45,6 +45,8 @@ typedef struct SDHCIState {
QEMUTimer *insert_timer; /* timer for 'changing' sd card. */
QEMUTimer *transfer_timer;
qemu_irq irq;
+ qemu_irq access_led;
+ int access_led_level;
/* Registers cleared on reset */
/* 0x00 */
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 26a98d999a..3f550bc7df 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -204,6 +204,16 @@ static void sdhci_poweron_reset(DeviceState *dev)
}
}
+static void sdhci_led_handler(void *opaque, int line, int level)
+{
+ SDHCIState *s = (SDHCIState *)opaque;
+
+ if (s->access_led_level != level) {
+ trace_sdhci_led(level);
+ s->access_led_level = level;
+ }
+}
+
static void sdhci_data_transfer(void *opaque);
static void sdhci_send_command(SDHCIState *s)
@@ -1052,6 +1062,7 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size)
!(s->capareg & (1 << (31 - ((s->pwrcon >> 1) & 0x7))))) {
s->pwrcon &= ~SDHC_POWER_ON;
}
+ qemu_set_irq(s->access_led, s->hostctl & 1);
break;
case SDHC_CLKCON:
if (!(mask & 0xFF000000)) {
@@ -1164,6 +1175,7 @@ static void sdhci_initfn(SDHCIState *s)
qbus_create_inplace(&s->sdbus, sizeof(s->sdbus),
TYPE_SDHCI_BUS, DEVICE(s), "sd-bus");
+ s->access_led = qemu_allocate_irq(sdhci_led_handler, s, 0);
s->insert_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, sdhci_raise_insertion_irq, s);
s->transfer_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, sdhci_data_transfer, s);
}
@@ -1194,6 +1206,8 @@ static void sdhci_uninitfn(SDHCIState *s)
timer_free(s->insert_timer);
timer_del(s->transfer_timer);
timer_free(s->transfer_timer);
+
+ qemu_free_irq(s->access_led);
}
static bool sdhci_pending_insert_vmstate_needed(void *opaque)
diff --git a/hw/sd/trace-events b/hw/sd/trace-events
index e4e26c6d73..f821db2046 100644
--- a/hw/sd/trace-events
+++ b/hw/sd/trace-events
@@ -13,6 +13,7 @@ sdhci_adma_transfer_completed(void) "ADMA transfer completed"
sdhci_access(const char *access, unsigned int size, uint64_t offset, const char *dir, uint64_t val, uint64_t val2) "%s %ub: addr[0x%04" PRIx64 "] %s %" PRIu64 "(0x%" PRIx64 ")"
sdhci_read_dataport(uint16_t data_count) "all %u bytes of data have been read from input buffer"
sdhci_write_dataport(uint16_t data_count) "write buffer filled with %u bytes of data"
+sdhci_led(bool state) "LED: %u"
# hw/sd/milkymist-memcard.c
milkymist_memcard_memory_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"
--
2.15.1
next prev parent reply other threads:[~2018-01-03 11:02 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-03 11:01 [Qemu-devel] [PATCH v4 00/17] SDHCI: housekeeping Philippe Mathieu-Daudé
2018-01-03 11:01 ` [Qemu-devel] [PATCH v4 01/17] sdhci: clean up includes Philippe Mathieu-Daudé
2018-01-03 11:01 ` [Qemu-devel] [PATCH v4 02/17] sdhci: sort registers comments Philippe Mathieu-Daudé
2018-01-03 11:01 ` [Qemu-devel] [PATCH v4 03/17] sdhci: remove dead code Philippe Mathieu-Daudé
2018-01-03 11:01 ` [Qemu-devel] [PATCH v4 04/17] sdhci: refactor same sysbus/pci properties into a common one Philippe Mathieu-Daudé
2018-01-03 11:01 ` [Qemu-devel] [PATCH v4 05/17] sdhci: refactor common sysbus/pci class_init() into sdhci_class_init() Philippe Mathieu-Daudé
2018-01-03 11:01 ` [Qemu-devel] [PATCH v4 06/17] sdhci: refactor common sysbus/pci realize() into sdhci_realizefn() Philippe Mathieu-Daudé
2018-01-03 17:41 ` Philippe Mathieu-Daudé
2018-01-03 11:01 ` [Qemu-devel] [PATCH v4 07/17] sdhci: refactor common sysbus/pci unrealize() into sdhci_unrealizefn() Philippe Mathieu-Daudé
2018-01-03 11:01 ` [Qemu-devel] [PATCH v4 08/17] sdhci: use qemu_log_mask(UNIMP) instead of fprintf() Philippe Mathieu-Daudé
2018-01-03 11:01 ` [Qemu-devel] [PATCH v4 09/17] sdhci: convert the DPRINT() calls into trace events Philippe Mathieu-Daudé
2018-01-03 11:01 ` Philippe Mathieu-Daudé [this message]
2018-01-03 11:01 ` [Qemu-devel] [PATCH v4 11/17] sdhci: move MASK_TRNMOD with other SDHC_TRN* defines in "sd-internal.h" Philippe Mathieu-Daudé
2018-01-03 11:01 ` [Qemu-devel] [PATCH v4 12/17] sdhci: use FIELD_DP32() macro for the WRITE_PROTECT flag Philippe Mathieu-Daudé
2018-01-03 11:01 ` [Qemu-devel] [PATCH v4 13/17] sdhci: rename the SDHC_CAPAB register Philippe Mathieu-Daudé
2018-01-03 11:01 ` [Qemu-devel] [PATCH v4 14/17] sdhci: fix CAPAB/MAXCURR registers, both are 64bit and read-only Philippe Mathieu-Daudé
2018-01-03 11:01 ` [Qemu-devel] [PATCH v4 15/17] sdhci: Implement write method of ACMD12ERRSTS register Philippe Mathieu-Daudé
2018-01-03 11:01 ` [Qemu-devel] [PATCH v4 16/17] sdhci: use deposit64() on admasysaddr Philippe Mathieu-Daudé
2018-01-03 11:01 ` [Qemu-devel] [PATCH v4 17/17] sdhci: add a "dma-memory" property Philippe Mathieu-Daudé
2018-01-03 11:25 ` [Qemu-devel] [PATCH v4 00/17] SDHCI: housekeeping no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180103110126.29209-11-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=alistair.francis@xilinx.com \
--cc=andrew.smirnov@gmail.com \
--cc=edgar.iglesias@xilinx.com \
--cc=ehabkost@redhat.com \
--cc=famz@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).