From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Alexander Bulekov" <alxndr@bu.edu>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PULL 06/13] hw/sd/sdhci: Let sdhci_update_irq() return if IRQ was delivered
Date: Wed, 21 Oct 2020 19:34:43 +0200 [thread overview]
Message-ID: <20201021173450.2616910-7-f4bug@amsat.org> (raw)
In-Reply-To: <20201021173450.2616910-1-f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Alexander Bulekov <alxndr@bu.edu>
Message-Id: <20200903172806.489710-4-f4bug@amsat.org>
---
hw/sd/sdhci.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 4db77decf87..b93ecefd20c 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -218,9 +218,14 @@ static uint8_t sdhci_slotint(SDHCIState *s)
((s->norintsts & SDHC_NIS_REMOVE) && (s->wakcon & SDHC_WKUP_ON_RMV));
}
-static inline void sdhci_update_irq(SDHCIState *s)
+/* Return true if IRQ was pending and delivered */
+static bool sdhci_update_irq(SDHCIState *s)
{
- qemu_set_irq(s->irq, sdhci_slotint(s));
+ bool pending = sdhci_slotint(s);
+
+ qemu_set_irq(s->irq, pending);
+
+ return pending;
}
static void sdhci_raise_insertion_irq(void *opaque)
--
2.26.2
next prev parent reply other threads:[~2020-10-21 17:45 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-21 17:34 [PULL 00/13] SD/MMC patches for 2020-10-21 Philippe Mathieu-Daudé
2020-10-21 17:34 ` [PULL 01/13] hw/sd/sdhci: Fix qemu_log_mask() format string Philippe Mathieu-Daudé
2020-10-21 17:34 ` [PULL 02/13] hw/sd/sdhci: Document the datasheet used Philippe Mathieu-Daudé
2020-10-21 17:34 ` [PULL 03/13] hw/sd/sdhci: Fix DMA Transfer Block Size field Philippe Mathieu-Daudé
2020-10-21 17:34 ` [PULL 04/13] hw/sd/sdhci: Stop multiple transfers when block count is cleared Philippe Mathieu-Daudé
2020-10-21 17:34 ` [PULL 05/13] hw/sd/sdhci: Resume pending DMA transfers on MMIO accesses Philippe Mathieu-Daudé
2020-10-21 17:34 ` Philippe Mathieu-Daudé [this message]
2020-10-21 17:34 ` [PULL 07/13] hw/sd/sdhci: Yield if interrupt delivered during multiple transfer Philippe Mathieu-Daudé
2020-10-21 17:34 ` [PULL 08/13] hw/sd/sdcard: Add trace event for ERASE command (CMD38) Philippe Mathieu-Daudé
2020-10-21 17:34 ` [PULL 09/13] hw/sd/sdcard: Introduce the INVALID_ADDRESS definition Philippe Mathieu-Daudé
2020-10-21 17:34 ` [PULL 10/13] hw/sd/sdcard: Do not use legal address '0' for INVALID_ADDRESS Philippe Mathieu-Daudé
2020-10-21 17:34 ` [PULL 11/13] hw/sd/sdcard: Reset both start/end addresses on error Philippe Mathieu-Daudé
2020-10-21 17:34 ` [PULL 12/13] hw/sd/sdcard: Do not attempt to erase out of range addresses Philippe Mathieu-Daudé
2020-10-21 17:34 ` [PULL 13/13] hw/sd/sdcard: Assert if accessing an illegal group Philippe Mathieu-Daudé
2020-10-22 11:33 ` [PULL 00/13] SD/MMC patches for 2020-10-21 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201021173450.2616910-7-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=alxndr@bu.edu \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).