[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 10/17] sdhci: add a GPIO for the 'access control'
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v5 10/17] sdhci: add a GPIO for the 'access control' LED |
Date: |
Wed, 3 Jan 2018 15:07:58 -0300 |
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é <address@hidden>
Acked-by: Alistair Francis <address@hidden>
---
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 a781cc5211..de9c4e5a83 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -203,6 +203,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)
@@ -1051,6 +1061,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)) {
@@ -1163,6 +1174,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);
}
@@ -1193,6 +1205,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
- [Qemu-devel] [PATCH v5 04/17] sdhci: refactor same sysbus/pci properties into a common one, (continued)
- [Qemu-devel] [PATCH v5 04/17] sdhci: refactor same sysbus/pci properties into a common one, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v5 05/17] sdhci: refactor common sysbus/pci class_init() into sdhci_common_class_init(), Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v5 06/17] sdhci: refactor common sysbus/pci realize() into sdhci_common_realize(), Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v5 08/17] sdhci: use qemu_log_mask(UNIMP) instead of fprintf(), Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v5 07/17] sdhci: refactor common sysbus/pci unrealize() into sdhci_common_unrealize(), Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v5 09/17] sdhci: convert the DPRINT() calls into trace events, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v5 10/17] sdhci: add a GPIO for the 'access control' LED,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v5 11/17] sdhci: move MASK_TRNMOD with other SDHC_TRN* defines in "sd-internal.h", Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v5 12/17] sdhci: use FIELD_DP32() macro for the WRITE_PROTECT flag, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v5 13/17] sdhci: rename the SDHC_CAPAB register, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v5 14/17] sdhci: fix CAPAB/MAXCURR registers, both are 64bit and read-only, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v5 15/17] sdhci: Implement write method of ACMD12ERRSTS register, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v5 16/17] sdhci: use deposit64() on admasysaddr, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v5 17/17] sdhci: add a "dma-memory" property, Philippe Mathieu-Daudé, 2018/01/03