git: 8934d3e7b9b9 - stable/13 - sdhci: fix dumping support in MMCCAM configuration
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 02 Feb 2022 06:51:22 UTC
The branch stable/13 has been updated by avg:
URL: https://cgit.FreeBSD.org/src/commit/?id=8934d3e7b9b9005150f39b9d0679821890009cf0
commit 8934d3e7b9b9005150f39b9d0679821890009cf0
Author: Andriy Gapon <avg@FreeBSD.org>
AuthorDate: 2022-01-26 07:16:31 +0000
Commit: Andriy Gapon <avg@FreeBSD.org>
CommitDate: 2022-02-02 06:51:13 +0000
sdhci: fix dumping support in MMCCAM configuration
This change fixes interaction with recently added sddadump.
(cherry picked from commit 94ff1d9cc8ffc2b88caafed35168a258f969915c)
---
sys/dev/sdhci/sdhci.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/sys/dev/sdhci/sdhci.c b/sys/dev/sdhci/sdhci.c
index 0441320d4b35..33a34b28b44d 100644
--- a/sys/dev/sdhci/sdhci.c
+++ b/sys/dev/sdhci/sdhci.c
@@ -2608,7 +2608,7 @@ sdhci_cam_action(struct cam_sim *sim, union ccb *ccb)
void
sdhci_cam_poll(struct cam_sim *sim)
{
- return;
+ sdhci_generic_intr(cam_sim_softc(sim));
}
static int
@@ -2769,12 +2769,6 @@ sdhci_cam_request(struct sdhci_slot *slot, union ccb *ccb)
slot->flags = 0;
sdhci_start(slot);
SDHCI_UNLOCK(slot);
- if (dumping) {
- while (slot->ccb != NULL) {
- sdhci_generic_intr(slot);
- DELAY(10);
- }
- }
return (0);
}
#endif /* MMCCAM */