[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 10/20] sdhci: add a GPIO for the access control L
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v2 10/20] sdhci: add a GPIO for the access control LED |
Date: |
Fri, 15 Dec 2017 00:15:37 -0300 |
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é <address@hidden>
---
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
- Re: [Qemu-devel] [PATCH v2 02/20] sdhci: use deposit64(), (continued)
- [Qemu-devel] [PATCH v2 03/20] sdhci: move MASK_TRNMOD with other SDHC_TRN* defines in "sd-internal.h", Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 04/20] sdhci: refactor same sysbus/pci properties into a common one, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 05/20] sdhci: refactor common sysbus/pci realize() into sdhci_realizefn(), Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 06/20] sdhci: refactor common sysbus/pci class_init() into sdhci_class_init(), Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 07/20] sdhci: refactor common sysbus/pci unrealize() into sdhci_unrealizefn(), Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 08/20] sdhci: use qemu_log_mask(UNIMP) instead of fprintf(), Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 09/20] sdhci: convert the DPRINT() calls into trace events, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 10/20] sdhci: add a GPIO for the access control LED,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v2 11/20] sdhci: add a "dma-memory" property, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 12/20] sdhci: fix CAPAB/MAXCURR registers, both are 64bit and read-only, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 13/20] sdhci: Implement write method of ACMD12ERRSTS register, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 14/20] sdhci: add a "sd-spec-version" property, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 15/20] sdhci: some ARM boards do support SD_HOST_SPECv3_VERS, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 16/20] sdhci: add qtest to check the SD Spec version, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 17/20] sdhci: add check_capab_readonly() qtest, Philippe Mathieu-Daudé, 2017/12/14