Module Name: src
Committed By: jmcneill
Date: Fri Oct 14 07:54:49 UTC 2022
Modified Files:
src/sys/dev/pci: sdhc_pci.c
src/sys/dev/sdmmc: sdhc.c sdhcvar.h
Log Message:
Disable ADMA2 on Ricoh SDHCI controllers.
PR# 57015
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/sdhc_pci.c
cvs rdiff -u -r1.115 -r1.116 src/sys/dev/sdmmc/sdhc.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/sdmmc/sdhcvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/sdhc_pci.c
diff -u src/sys/dev/pci/sdhc_pci.c:1.18 src/sys/dev/pci/sdhc_pci.c:1.19
--- src/sys/dev/pci/sdhc_pci.c:1.18 Wed Nov 10 14:36:28 2021
+++ src/sys/dev/pci/sdhc_pci.c Fri Oct 14 07:54:49 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc_pci.c,v 1.18 2021/11/10 14:36:28 msaitoh Exp $ */
+/* $NetBSD: sdhc_pci.c,v 1.19 2022/10/14 07:54:49 jmcneill Exp $ */
/* $OpenBSD: sdhc_pci.c,v 1.7 2007/10/30 18:13:45 chl Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdhc_pci.c,v 1.18 2021/11/10 14:36:28 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc_pci.c,v 1.19 2022/10/14 07:54:49 jmcneill Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -88,6 +88,7 @@ static const struct sdhc_pci_quirk {
#define SDHC_PCI_QUIRK_RICOH_SLOW_SDR50_HACK __BIT(4)
#define SDHC_PCI_QUIRK_INTEL_EMMC_HW_RESET __BIT(5)
#define SDHC_PCI_QUIRK_SINGLE_POWER_WRITE __BIT(6)
+#define SDHC_PCI_QUIRK_BROKEN_ADMA __BIT(7)
} sdhc_pci_quirk_table[] = {
{
PCI_VENDOR_TI,
@@ -123,6 +124,7 @@ static const struct sdhc_pci_quirk {
0,
SDHC_PCI_QUIRK_RICOH_SLOW_SDR50_HACK
| SDHC_PCI_QUIRK_SINGLE_POWER_WRITE
+ | SDHC_PCI_QUIRK_BROKEN_ADMA
},
{
PCI_VENDOR_RICOH,
@@ -131,6 +133,7 @@ static const struct sdhc_pci_quirk {
0xffff,
~0,
SDHC_PCI_QUIRK_FORCE_DMA
+ | SDHC_PCI_QUIRK_BROKEN_ADMA
},
{
@@ -140,6 +143,7 @@ static const struct sdhc_pci_quirk {
0xffff,
~0,
SDHC_PCI_QUIRK_FORCE_DMA
+ | SDHC_PCI_QUIRK_BROKEN_ADMA
},
{
@@ -273,6 +277,8 @@ sdhc_pci_attach(device_t parent, device_
SET(sc->sc.sc_flags, SDHC_FLAG_SINGLE_POWER_WRITE);
if (ISSET(flags, SDHC_PCI_QUIRK_NO_PWR0))
SET(sc->sc.sc_flags, SDHC_FLAG_NO_PWR0);
+ if (ISSET(flags, SDHC_PCI_QUIRK_BROKEN_ADMA))
+ SET(sc->sc.sc_flags, SDHC_FLAG_BROKEN_ADMA);
if (ISSET(flags, SDHC_PCI_QUIRK_RICOH_LOWER_FREQ_HACK))
sdhc_pci_quirk_ricoh_lower_freq_hack(pa);
if (ISSET(flags, SDHC_PCI_QUIRK_RICOH_SLOW_SDR50_HACK))
Index: src/sys/dev/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.115 src/sys/dev/sdmmc/sdhc.c:1.116
--- src/sys/dev/sdmmc/sdhc.c:1.115 Sun Feb 6 15:52:20 2022
+++ src/sys/dev/sdmmc/sdhc.c Fri Oct 14 07:54:49 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.115 2022/02/06 15:52:20 jmcneill Exp $ */
+/* $NetBSD: sdhc.c,v 1.116 2022/10/14 07:54:49 jmcneill Exp $ */
/* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.115 2022/02/06 15:52:20 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.116 2022/10/14 07:54:49 jmcneill Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -415,7 +415,8 @@ sdhc_host_found(struct sdhc_softc *sc, b
ISSET(caps, SDHC_DMA_SUPPORT)))) {
SET(hp->flags, SHF_USE_DMA);
- if (ISSET(caps, SDHC_ADMA2_SUPP)) {
+ if (ISSET(caps, SDHC_ADMA2_SUPP) &&
+ !ISSET(sc->sc_flags, SDHC_FLAG_BROKEN_ADMA)) {
SET(hp->flags, SHF_MODE_DMAEN);
/*
* 64-bit mode was present in the 2.00 spec, removed
Index: src/sys/dev/sdmmc/sdhcvar.h
diff -u src/sys/dev/sdmmc/sdhcvar.h:1.32 src/sys/dev/sdmmc/sdhcvar.h:1.33
--- src/sys/dev/sdmmc/sdhcvar.h:1.32 Sun Feb 6 15:52:20 2022
+++ src/sys/dev/sdmmc/sdhcvar.h Fri Oct 14 07:54:49 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhcvar.h,v 1.32 2022/02/06 15:52:20 jmcneill Exp $ */
+/* $NetBSD: sdhcvar.h,v 1.33 2022/10/14 07:54:49 jmcneill Exp $ */
/* $OpenBSD: sdhcvar.h,v 1.3 2007/09/06 08:01:01 jsg Exp $ */
/*
@@ -66,6 +66,7 @@ struct sdhc_softc {
* Can't 64K Byte data transfer
*/
#define SDHC_FLAG_NO_1_8_V 0x08000000 /* No 1.8V supply */
+#define SDHC_FLAG_BROKEN_ADMA 0x10000000 /* ADMA engine does not work */
uint32_t sc_clkbase;
int sc_clkmsk; /* Mask for SDCLK */
