[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/10] sdhci: add optional quirk property to disable
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 10/10] sdhci: add optional quirk property to disable card insertion/removal interrupts |
Date: |
Tue, 22 Dec 2015 16:54:20 +0800 |
From: Andrew Baumann <address@hidden>
This is needed for a quirk of the Raspberry Pi (bcm2835/6) MMC
controller, where the card insert bit is documented as unimplemented
(always reads zero, doesn't generate interrupts) but is in fact
observed on hardware as set at power on, but is cleared (and remains
clear) on subsequent controller resets.
Signed-off-by: Andrew Baumann <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
hw/sd/sdhci.c | 5 ++++-
include/hw/sd/sdhci.h | 1 +
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index dd83e89..7acb4d7 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -193,7 +193,9 @@ static void sdhci_reset(SDHCIState *s)
* initialization */
memset(&s->sdmasysad, 0, (uintptr_t)&s->capareg -
(uintptr_t)&s->sdmasysad);
- sd_set_cb(s->card, s->ro_cb, s->eject_cb);
+ if (!s->noeject_quirk) {
+ sd_set_cb(s->card, s->ro_cb, s->eject_cb);
+ }
s->data_count = 0;
s->stopped_state = sdhc_not_stopped;
}
@@ -1276,6 +1278,7 @@ static Property sdhci_sysbus_properties[] = {
DEFINE_PROP_UINT32("capareg", SDHCIState, capareg,
SDHC_CAPAB_REG_DEFAULT),
DEFINE_PROP_UINT32("maxcurr", SDHCIState, maxcurr, 0),
+ DEFINE_PROP_BOOL("noeject-quirk", SDHCIState, noeject_quirk, false),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h
index e78d938..ffd1f80 100644
--- a/include/hw/sd/sdhci.h
+++ b/include/hw/sd/sdhci.h
@@ -77,6 +77,7 @@ typedef struct SDHCIState {
uint32_t buf_maxsz;
uint16_t data_count; /* current element in FIFO buffer */
uint8_t stopped_state;/* Current SDHC state */
+ bool noeject_quirk;/* Quirk to disable card insert/remove interrupts */
/* Buffer Data Port Register - virtual access point to R and W buffers */
/* Software Reset Register - always reads as 0 */
/* Force Event Auto CMD12 Error Interrupt Reg - write only */
--
2.5.0
- [Qemu-devel] [PULL 00/10] Block patches, Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 01/10] virtio-blk: trivial code optimization, Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 02/10] block: add BlockLimits.max_iov field, Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 03/10] block-backend: add blk_get_max_iov(), Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 04/10] block: replace IOV_MAX with BlockLimits.max_iov, Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 05/10] block/mirror: replace IOV_MAX with blk_get_max_iov(), Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 06/10] parallels: add format spec, Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 07/10] scripts/gdb: Fix a python exception in mtree.py, Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 08/10] sd: sdhci: Delete over-zealous power check, Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 09/10] sdhci: don't raise a command index error for an unexpected response, Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 10/10] sdhci: add optional quirk property to disable card insertion/removal interrupts,
Stefan Hajnoczi <=
- Re: [Qemu-devel] [PULL 00/10] Block patches, Peter Maydell, 2015/12/22