diff options
| author | Andrew Baumann | 2016-02-25 22:35:29 +0100 |
|---|---|---|
| committer | Peter Maydell | 2016-02-26 16:09:42 +0100 |
| commit | 5c1bc9a234704c3d2001e7751b2d33145202a35f (patch) | |
| tree | 9cd67196640281515fce91ab304830f1aec4ab5a /hw/sd | |
| parent | MAINTAINERS: Add some missing ARM related header files (diff) | |
| download | qemu-5c1bc9a234704c3d2001e7751b2d33145202a35f.tar.gz qemu-5c1bc9a234704c3d2001e7751b2d33145202a35f.tar.xz qemu-5c1bc9a234704c3d2001e7751b2d33145202a35f.zip | |
sdhci: Revert "add optional quirk property to disable card insertion/removal interrupts"
This reverts commit 723697551a7e926abe7d3c7f2966012b8075143d.
This change was poorly tested on my part. It squelched card insertion
interrupts on reset, but that was not necessary because sdhci_reset()
clears all the registers (via the call to memset), so the subsequent
sdhci_insert_eject_cb() call never sees the card insert interrupt
enabled. However, not calling the insert_eject_cb results in prnsts
remaining 0, when it actually needs to be updated to indicate card
presence and R/O status.
Signed-off-by: Andrew Baumann <Andrew.Baumann@microsoft.com>
Message-id: 1456436130-7048-2-git-send-email-Andrew.Baumann@microsoft.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/sd')
| -rw-r--r-- | hw/sd/sdhci.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 73e7c87fbf..f175b3041e 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -198,11 +198,9 @@ static void sdhci_reset(SDHCIState *s) * initialization */ memset(&s->sdmasysad, 0, (uintptr_t)&s->capareg - (uintptr_t)&s->sdmasysad); - if (!s->noeject_quirk) { - /* Reset other state based on current card insertion/readonly status */ - sdhci_set_inserted(dev, sdbus_get_inserted(&s->sdbus)); - sdhci_set_readonly(dev, sdbus_get_readonly(&s->sdbus)); - } + /* Reset other state based on current card insertion/readonly status */ + sdhci_set_inserted(dev, sdbus_get_inserted(&s->sdbus)); + sdhci_set_readonly(dev, sdbus_get_readonly(&s->sdbus)); s->data_count = 0; s->stopped_state = sdhc_not_stopped; @@ -1275,7 +1273,6 @@ 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(), }; |