From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53883) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePgUV-00061n-5N for qemu-devel@nongnu.org; Thu, 14 Dec 2017 22:16:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePgUS-0001J2-0c for qemu-devel@nongnu.org; Thu, 14 Dec 2017 22:16:51 -0500 Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Fri, 15 Dec 2017 00:15:37 -0300 Message-Id: <20171215031547.31006-11-f4bug@amsat.org> In-Reply-To: <20171215031547.31006-1-f4bug@amsat.org> References: <20171215031547.31006-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v2 10/20] sdhci: add a GPIO for the access control LED List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alistair Francis , "Edgar E . Iglesias" , Peter Maydell , Michael Walle , Andrzej Zaborowski , Andrew Baumann , Andrey Smirnov , Andrey Yurovsky Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, qemu-arm@nongnu.org, Prasad J Pandit , Peter Crosthwaite , Sai Pavan Boddu It blinks to caution the user not to remove the card while the SD card is being accessed. So far it only emit a trace event. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/sd/sdhci.h | 2 ++ hw/sd/sdhci.c | 13 +++++++++++++ hw/sd/trace-events | 1 + 3 files changed, 16 insertions(+) diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 1b6a98d578..5391430c59 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -47,6 +47,8 @@ typedef struct SDHCIState { qemu_irq eject_cb; qemu_irq ro_cb; qemu_irq irq; + qemu_irq access_led; + int access_led_level; uint32_t sdmasysad; /* SDMA System Address register */ uint16_t blksize; /* Host DMA Buff Boundary and Transfer BlkSize Reg */ diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index ba3afddcf2..866be44db5 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -202,6 +202,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) @@ -1050,6 +1060,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)) { @@ -1160,6 +1171,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); } @@ -1185,6 +1197,7 @@ static void sdhci_uninitfn(SDHCIState *s) timer_del(s->transfer_timer); timer_free(s->transfer_timer); + qemu_free_irq(s->access_led); qemu_free_irq(s->eject_cb); qemu_free_irq(s->ro_cb); } 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