sd: sdhci: Implement basic vendor specific register support
cover sd: sdhci: Implement basic vendor specific register support
The Linux kernel's IMX code now uses vendor specific commands. This results in endless warnings when booting the Linux kernel.
sdhci-esdhc-imx 2194000.usdhc: esdhc_wait_for_card_clock_gate_off:
card clock still not gate off in 100us!.
Implement support for the vendor specific command implemented in IMX SDHCI hardware to be able to avoid this warning.
Patch 1/2 implements vendor specific command support in the SDHCI core code. At this time, only IMX vendor command support is implemented, but the implementation is written with expandability in mind.
Patch 2/2 enables IMX SDHCI vendor extensions for all affected emulations.
----------------------------------------------------------------
Guenter Roeck (2):
sd: sdhci: Implement basic vendor specific register support
hw: arm: Set vendor property for IMX SDHCI emulations
hw/arm/fsl-imx25.c | 2 ++ hw/arm/fsl-imx6.c | 2 ++ hw/arm/fsl-imx6ul.c | 2 ++ hw/arm/fsl-imx7.c | 2 ++ hw/sd/sdhci-internal.h | 5 +++++ hw/sd/sdhci.c | 18 +++++++++++++++++- include/hw/sd/sdhci.h | 5 +++++ 7 files changed, 35 insertions(+), 1 deletion(-)
PATCH 1/2 sd: sdhci: Implement basic vendor specific register support
The Linux kernel's IMX code now uses vendor specific commands. This results in endless warnings when booting the Linux kernel.
sdhci-esdhc-imx 2194000.usdhc: esdhc_wait_for_card_clock_gate_off:
card clock still not gate off in 100us!.
Implement support for the vendor specific command implemented in IMX hardware to be able to avoid this warning.
--- hw/sd/sdhci-internal.h | 5 +++++ hw/sd/sdhci.c | 18 +++++++++++++++++- include/hw/sd/sdhci.h | 5 +++++ 3 files changed, 27 insertions(+), 1 deletion(-)
hw/sd/sdhci-internal.h +5 -0
@@ -75,6 +75,7 @@#define SDHC_CMD_INHIBIT 0x00000001#define SDHC_DATA_INHIBIT 0x00000002#define SDHC_DAT_LINE_ACTIVE 0x00000004 +#define SDHC_IMX_CLOCK_GATE_OFF 0x00000080#define SDHC_DOING_WRITE 0x00000100#define SDHC_DOING_READ 0x00000200#define SDHC_SPACE_AVAILABLE 0x00000400
@@ -289,7 +290,10 @@ extern const VMStateDescription sdhci_vmstate;#define ESDHC_MIX_CTRL 0x48 +#define ESDHC_VENDOR_SPEC 0xc0 +#define ESDHC_IMX_FRC_SDCLK_ON (1 << 8) +#define ESDHC_DLL_CTRL 0x60#define ESDHC_TUNING_CTRL 0xcc
@@ -326,6 +330,7 @@ extern const VMStateDescription sdhci_vmstate;#define DEFINE_SDHCI_COMMON_PROPERTIES (_state) \ DEFINE_PROP_UINT8("sd-spec-version", _state, sd_spec_version, 2), \ DEFINE_PROP_UINT8("uhs", _state, uhs_mode, UHS_NOT_SUPPORTED), \ + DEFINE_PROP_UINT8("vendor", _state, vendor, SDHCI_VENDOR_NONE), \ \/* Capabilities registers provide information on supported * features of this specific host controller implementation */ \
hw/sd/sdhci.c +17 -1
@@ -1569,11 +1569,13 @@ static uint64_t usdhc_read(void *opaque, hwaddr offset, unsigned size) }break ; +case ESDHC_VENDOR_SPEC : + ret = s->vendor_spec; +break ;case ESDHC_DLL_CTRL :case ESDHC_TUNE_CTRL_STATUS :case ESDHC_UNDOCUMENTED_REG27 :case ESDHC_TUNING_CTRL : -case ESDHC_VENDOR_SPEC :case ESDHC_MIX_CTRL :case ESDHC_WTMK_LVL : ret =0 ;
@@ -1596,7 +1598,21 @@ usdhc_write(void *opaque, hwaddr offset, uint64_t val, unsigned size)case ESDHC_UNDOCUMENTED_REG27 :case ESDHC_TUNING_CTRL :case ESDHC_WTMK_LVL : +break ; +case ESDHC_VENDOR_SPEC : + s->vendor_spec = value; +switch (s->vendor) { +case SDHCI_VENDOR_IMX : +if (value &ESDHC_IMX_FRC_SDCLK_ON ) { + s->prnsts &= ~SDHC_IMX_CLOCK_GATE_OFF ; + }else { + s->prnsts |=SDHC_IMX_CLOCK_GATE_OFF ; + } +break ; +default : +break ; + }break ;case SDHC_HOSTCTL :
include/hw/sd/sdhci.h +5 -0
@@ -74,6 +74,7 @@ typedef struct SDHCIState {uint16_t acmd12errsts;/* Auto CMD12 error status register */ uint16_t hostctl2;/* Host Control 2 */ uint64_t admasysaddr;/* ADMA System Address Register */ +uint16_t vendor_spec;/* Vendor specific register */ /* Read-only registers */ uint64_t capareg;/* Capabilities Register */
@@ -96,8 +97,12 @@ typedef struct SDHCIState {uint32_t quirks;uint8_t sd_spec_version;uint8_t uhs_mode; +uint8_t vendor;/* For vendor specific functionality */ } SDHCIState; +#define SDHCI_VENDOR_NONE 0 +#define SDHCI_VENDOR_IMX 1 +/* * Controller does not provide transfer-complete interrupt when not * busy.
Signature · 1 line
2.17.1
PATCH 2/2 hw: arm: Set vendor property for IMX SDHCI emulations
In reply to Guenter RoeckSet vendor property to IMX to enable IMX specific functionality in sdhci code.
--- hw/arm/fsl-imx25.c | 2 ++ hw/arm/fsl-imx6.c | 2 ++ hw/arm/fsl-imx6ul.c | 2 ++ hw/arm/fsl-imx7.c | 2 ++ 4 files changed, 8 insertions(+)
hw/arm/fsl-imx25.c +2 -0
@@ -274,6 +274,8 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp) &err);object_property_set_uint (OBJECT (&s->esdhc[i]),IMX25_ESDHC_CAPABILITIES ,"capareg" , &err); +object_property_set_uint (OBJECT (&s->esdhc[i]),SDHCI_VENDOR_IMX , +"vendor" , &err);object_property_set_bool (OBJECT (&s->esdhc[i]), true,"realized" , &err);if (err) {error_propagate (errp, err);
hw/arm/fsl-imx6.c +2 -0
@@ -350,6 +350,8 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) &err);object_property_set_uint (OBJECT (&s->esdhc[i]),IMX6_ESDHC_CAPABILITIES ,"capareg" , &err); +object_property_set_uint (OBJECT (&s->esdhc[i]),SDHCI_VENDOR_IMX , +"vendor" , &err);object_property_set_bool (OBJECT (&s->esdhc[i]), true,"realized" , &err);if (err) {error_propagate (errp, err);
hw/arm/fsl-imx6ul.c +2 -0
@@ -505,6 +505,8 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)FSL_IMX6UL_USDHC2_IRQ , }; +object_property_set_uint (OBJECT (&s->usdhc[i]),SDHCI_VENDOR_IMX , +"vendor" , &error_abort);object_property_set_bool (OBJECT (&s->usdhc[i]), true,"realized" , &error_abort);
hw/arm/fsl-imx7.c +2 -0
@@ -416,6 +416,8 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)FSL_IMX7_USDHC3_IRQ , }; +object_property_set_uint (OBJECT (&s->usdhc[i]),SDHCI_VENDOR_IMX , +"vendor" , &error_abort);object_property_set_bool (OBJECT (&s->usdhc[i]), true,"realized" , &error_abort);
Signature · 1 line
2.17.1
Re: [PATCH 2/2] hw: arm: Set vendor property for IMX SDHCI emulations
Hi Guenter,
Quoted 16 lines · Guenter Roeck
Set vendor property to IMX to enable IMX specific functionality in sdhci code.
Signed-off-by Guenter Roeck <[email protected]>--- hw/arm/fsl-imx25.c | 2 ++ hw/arm/fsl-imx6.c | 2 ++ hw/arm/fsl-imx6ul.c | 2 ++ hw/arm/fsl-imx7.c | 2 ++ 4 files changed, 8 insertions(+)hw/arm/fsl-imx25.c +0
-0
hw/arm/fsl-imx25.c static void fsl_imx25_realize(DeviceState *dev, Error **errp) · line 278
Quoted 5 lines
hw/arm/fsl-imx25.c +2
-0@@ -274,6 +274,8 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp) &err);object_property_set_uint (OBJECT (&s->esdhc[i]),IMX25_ESDHC_CAPABILITIES ,"capareg" , &err); +object_property_set_uint (OBJECT (&s->esdhc[i]),SDHCI_VENDOR_IMX , +"vendor" , &err);
Either check &err, or use &error_abort.
You can see a fix here:
https://www.mail-archive.com/[email protected]/msg695544.html
Otherwise:
Quoted 43 lines
hw/arm/fsl-imx25.c +0
-0object_property_set_bool (OBJECT (&s->esdhc[i]), true,"realized" , &err);if (err) {error_propagate (errp, err);hw/arm/fsl-imx6.c +2
-0@@ -350,6 +350,8 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) &err);object_property_set_uint (OBJECT (&s->esdhc[i]),IMX6_ESDHC_CAPABILITIES ,"capareg" , &err); +object_property_set_uint (OBJECT (&s->esdhc[i]),SDHCI_VENDOR_IMX , +"vendor" , &err);object_property_set_bool (OBJECT (&s->esdhc[i]), true,"realized" , &err);if (err) {error_propagate (errp, err);hw/arm/fsl-imx6ul.c +2
-0@@ -505,6 +505,8 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)FSL_IMX6UL_USDHC2_IRQ , }; +object_property_set_uint (OBJECT (&s->usdhc[i]),SDHCI_VENDOR_IMX , +"vendor" , &error_abort);object_property_set_bool (OBJECT (&s->usdhc[i]), true,"realized" , &error_abort);hw/arm/fsl-imx7.c +2
-0@@ -416,6 +416,8 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)FSL_IMX7_USDHC3_IRQ , }; +object_property_set_uint (OBJECT (&s->usdhc[i]),SDHCI_VENDOR_IMX , +"vendor" , &error_abort);object_property_set_bool (OBJECT (&s->usdhc[i]), true,"realized" , &error_abort);
Hi Guenter,
Quoted 29 lines · Guenter Roeck
The Linux kernel's IMX code now uses vendor specific commands. This results in endless warnings when booting the Linux kernel.
sdhci-esdhc-imx 2194000.usdhc:
esdhc_wait_for_card_clock_gate_off:
card clock still not gate off in 100us!.Implement support for the vendor specific command implemented in IMX hardware to be able to avoid this warning.
Signed-off-by Guenter Roeck <[email protected]>--- hw/sd/sdhci-internal.h | 5 +++++ hw/sd/sdhci.c | 18 +++++++++++++++++- include/hw/sd/sdhci.h | 5 +++++ 3 files changed, 27 insertions(+), 1 deletion(-)hw/sd/sdhci-internal.h +1
-0@@ -75,6 +75,7 @@#define SDHC_CMD_INHIBIT 0x00000001#define SDHC_DATA_INHIBIT 0x00000002#define SDHC_DAT_LINE_ACTIVE 0x00000004 +#define SDHC_IMX_CLOCK_GATE_OFF 0x00000080#define SDHC_DOING_WRITE 0x00000100#define SDHC_DOING_READ 0x00000200#define SDHC_SPACE_AVAILABLE 0x00000400
hw/sd/sdhci-internal.h extern const VMStateDescription sdhci_vmstate; · line 295
Quoted 6 lines
hw/sd/sdhci-internal.h +2
-0@@ -289,7 +290,10 @@ extern const VMStateDescription sdhci_vmstate;#define ESDHC_MIX_CTRL 0x48 +#define ESDHC_VENDOR_SPEC 0xc0 +#define ESDHC_IMX_FRC_SDCLK_ON (1 << 8)
I searched for the datasheet but couldn't find any, so I suppose it is only available under NDA. I can not review much (in particular I wanted to check the register sizes), anyway the overall looks OK:
Also:
Quoted 79 lines
hw/sd/sdhci-internal.h +2
-0+#define ESDHC_DLL_CTRL 0x60#define ESDHC_TUNING_CTRL 0xcc@@ -326,6 +330,7 @@ extern const VMStateDescription sdhci_vmstate;#define DEFINE_SDHCI_COMMON_PROPERTIES (_state) \ DEFINE_PROP_UINT8("sd-spec-version", _state, sd_spec_version, 2), \ DEFINE_PROP_UINT8("uhs", _state, uhs_mode, UHS_NOT_SUPPORTED), \ + DEFINE_PROP_UINT8("vendor", _state, vendor, SDHCI_VENDOR_NONE), \ \/* Capabilities registers provide information on supported * features of this specific host controller implementation */ \hw/sd/sdhci.c +17
-1@@ -1569,11 +1569,13 @@ static uint64_t usdhc_read(void *opaque, hwaddr offset, unsigned size) }break ; +case ESDHC_VENDOR_SPEC : + ret = s->vendor_spec; +break ;case ESDHC_DLL_CTRL :case ESDHC_TUNE_CTRL_STATUS :case ESDHC_UNDOCUMENTED_REG27 :case ESDHC_TUNING_CTRL : -case ESDHC_VENDOR_SPEC :case ESDHC_MIX_CTRL :case ESDHC_WTMK_LVL : ret =0 ;@@ -1596,7 +1598,21 @@ usdhc_write(void *opaque, hwaddr offset, uint64_t val, unsigned size)case ESDHC_UNDOCUMENTED_REG27 :case ESDHC_TUNING_CTRL :case ESDHC_WTMK_LVL : +break ; +case ESDHC_VENDOR_SPEC : + s->vendor_spec = value; +switch (s->vendor) { +case SDHCI_VENDOR_IMX : +if (value &ESDHC_IMX_FRC_SDCLK_ON ) { + s->prnsts &= ~SDHC_IMX_CLOCK_GATE_OFF ; + }else { + s->prnsts |=SDHC_IMX_CLOCK_GATE_OFF ; + } +break ; +default : +break ; + }break ;case SDHC_HOSTCTL :include/hw/sd/sdhci.h +5
-0@@ -74,6 +74,7 @@ typedef struct SDHCIState {uint16_t acmd12errsts;/* Auto CMD12 error status register */ uint16_t hostctl2;/* Host Control 2 */ uint64_t admasysaddr;/* ADMA System Address Register */ +uint16_t vendor_spec;/* Vendor specific register */ /* Read-only registers */ uint64_t capareg;/* Capabilities Register */ @@ -96,8 +97,12 @@ typedef struct SDHCIState {uint32_t quirks;uint8_t sd_spec_version;uint8_t uhs_mode; +uint8_t vendor;/* For vendor specific functionality */ } SDHCIState; +#define SDHCI_VENDOR_NONE 0 +#define SDHCI_VENDOR_IMX 1 +/* * Controller does not provide transfer-complete interrupt when not * busy.
Quoted 34 lines · Philippe Mathieu-Daudé
Hi Guenter,
Quoted 31 lines · Guenter Roeck
The Linux kernel's IMX code now uses vendor specific commands. This results in endless warnings when booting the Linux kernel.
sdhci-esdhc-imx 2194000.usdhc:
esdhc_wait_for_card_clock_gate_off:
card clock still not gate off in 100us!.Implement support for the vendor specific command implemented in IMX hardware to be able to avoid this warning.
Signed-off-by Guenter Roeck <[email protected]>--- hw/sd/sdhci-internal.h | 5 +++++ hw/sd/sdhci.c | 18 +++++++++++++++++- include/hw/sd/sdhci.h | 5 +++++ 3 files changed, 27 insertions(+), 1 deletion(-)hw/sd/sdhci-internal.h +1
-0@@ -75,6 +75,7 @@#define SDHC_CMD_INHIBIT 0x00000001#define SDHC_DATA_INHIBIT 0x00000002#define SDHC_DAT_LINE_ACTIVE 0x00000004 +#define SDHC_IMX_CLOCK_GATE_OFF 0x00000080#define SDHC_DOING_WRITE 0x00000100#define SDHC_DOING_READ 0x00000200#define SDHC_SPACE_AVAILABLE 0x00000400@@ -289,7 +290,10 @@ extern const VMStateDescription sdhci_vmstate;
Quoted 9 lines
hw/sd/sdhci-internal.h extern const VMStateDescription sdhci_vmstate; · line 295
Quoted 4 lines
hw/sd/sdhci-internal.h +2
-0#define ESDHC_MIX_CTRL 0x48 +#define ESDHC_VENDOR_SPEC 0xc0 +#define ESDHC_IMX_FRC_SDCLK_ON (1 << 8)I searched for the datasheet but couldn't find any, so I suppose it is only available under NDA. I can not review much (in particular I wanted to check the register sizes), anyway the overall looks OK:
Actually, I only had to register an account to be able to download the datasheets from NXP. Register width is 32 bit.
Quoted 6 lines
Also:
Thanks!
Guenter
Quoted 80 lines
Quoted 79 lines
hw/sd/sdhci-internal.h +2
-0+#define ESDHC_DLL_CTRL 0x60#define ESDHC_TUNING_CTRL 0xcc@@ -326,6 +330,7 @@ extern const VMStateDescription sdhci_vmstate;#define DEFINE_SDHCI_COMMON_PROPERTIES (_state) \ DEFINE_PROP_UINT8("sd-spec-version", _state, sd_spec_version, 2), \ DEFINE_PROP_UINT8("uhs", _state, uhs_mode, UHS_NOT_SUPPORTED), \ + DEFINE_PROP_UINT8("vendor", _state, vendor, SDHCI_VENDOR_NONE), \ \/* Capabilities registers provide information on supported * features of this specific host controller implementation */ \hw/sd/sdhci.c +17
-1@@ -1569,11 +1569,13 @@ static uint64_t usdhc_read(void *opaque, hwaddr offset, unsigned size) }break ; +case ESDHC_VENDOR_SPEC : + ret = s->vendor_spec; +break ;case ESDHC_DLL_CTRL :case ESDHC_TUNE_CTRL_STATUS :case ESDHC_UNDOCUMENTED_REG27 :case ESDHC_TUNING_CTRL : -case ESDHC_VENDOR_SPEC :case ESDHC_MIX_CTRL :case ESDHC_WTMK_LVL : ret =0 ;@@ -1596,7 +1598,21 @@ usdhc_write(void *opaque, hwaddr offset, uint64_t val, unsigned size)case ESDHC_UNDOCUMENTED_REG27 :case ESDHC_TUNING_CTRL :case ESDHC_WTMK_LVL : +break ; +case ESDHC_VENDOR_SPEC : + s->vendor_spec = value; +switch (s->vendor) { +case SDHCI_VENDOR_IMX : +if (value &ESDHC_IMX_FRC_SDCLK_ON ) { + s->prnsts &= ~SDHC_IMX_CLOCK_GATE_OFF ; + }else { + s->prnsts |=SDHC_IMX_CLOCK_GATE_OFF ; + } +break ; +default : +break ; + }break ;case SDHC_HOSTCTL :include/hw/sd/sdhci.h +5
-0@@ -74,6 +74,7 @@ typedef struct SDHCIState {uint16_t acmd12errsts;/* Auto CMD12 error status register */ uint16_t hostctl2;/* Host Control 2 */ uint64_t admasysaddr;/* ADMA System Address Register */ +uint16_t vendor_spec;/* Vendor specific register */ /* Read-only registers */ uint64_t capareg;/* Capabilities Register */ @@ -96,8 +97,12 @@ typedef struct SDHCIState {uint32_t quirks;uint8_t sd_spec_version;uint8_t uhs_mode; +uint8_t vendor;/* For vendor specific functionality */ } SDHCIState; +#define SDHCI_VENDOR_NONE 0 +#define SDHCI_VENDOR_IMX 1 +/* * Controller does not provide transfer-complete interrupt when not * busy.
Re: [PATCH 2/2] hw: arm: Set vendor property for IMX SDHCI emulations
In reply to Philippe Mathieu-DaudéQuoted 14 lines · Philippe Mathieu-Daudé
Hi Guenter,
Quoted 11 lines · Guenter Roeck
Set vendor property to IMX to enable IMX specific functionality in sdhci code.
Signed-off-by Guenter Roeck <[email protected]>--- hw/arm/fsl-imx25.c | 2 ++ hw/arm/fsl-imx6.c | 2 ++ hw/arm/fsl-imx6ul.c | 2 ++ hw/arm/fsl-imx7.c | 2 ++ 4 files changed, 8 insertions(+)
Quoted 13 lines
hw/arm/fsl-imx25.c static void fsl_imx25_realize(DeviceState *dev, Error **errp) · line 278
Quoted 10 lines
hw/arm/fsl-imx25.c +2
-0@@ -274,6 +274,8 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp) &err);object_property_set_uint (OBJECT (&s->esdhc[i]),IMX25_ESDHC_CAPABILITIES ,"capareg" , &err); +object_property_set_uint (OBJECT (&s->esdhc[i]),SDHCI_VENDOR_IMX , +"vendor" , &err);Either check &err, or use
&error_abort.
Ok, I'll follow the guidance from the patch pointed to below and add the error check.
Thanks,
Guenter
Quoted 51 lines
You can see a fix here:
https://www.mail-archive.com/[email protected]/msg695544.htmlOtherwise:
Quoted 43 lines
hw/arm/fsl-imx25.c +0
-0object_property_set_bool (OBJECT (&s->esdhc[i]), true,"realized" , &err);if (err) {error_propagate (errp, err);hw/arm/fsl-imx6.c +2
-0@@ -350,6 +350,8 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) &err);object_property_set_uint (OBJECT (&s->esdhc[i]),IMX6_ESDHC_CAPABILITIES ,"capareg" , &err); +object_property_set_uint (OBJECT (&s->esdhc[i]),SDHCI_VENDOR_IMX , +"vendor" , &err);object_property_set_bool (OBJECT (&s->esdhc[i]), true,"realized" , &err);if (err) {error_propagate (errp, err);hw/arm/fsl-imx6ul.c +2
-0@@ -505,6 +505,8 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)FSL_IMX6UL_USDHC2_IRQ , }; +object_property_set_uint (OBJECT (&s->usdhc[i]),SDHCI_VENDOR_IMX , +"vendor" , &error_abort);object_property_set_bool (OBJECT (&s->usdhc[i]), true,"realized" , &error_abort);hw/arm/fsl-imx7.c +2
-0@@ -416,6 +416,8 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)FSL_IMX7_USDHC3_IRQ , }; +object_property_set_uint (OBJECT (&s->usdhc[i]),SDHCI_VENDOR_IMX , +"vendor" , &error_abort);object_property_set_bool (OBJECT (&s->usdhc[i]), true,"realized" , &error_abort);
Philippe Mathieu-Daudé
Reviewed-byQuoted 45 lines · Guenter Roeck
Quoted 34 lines · Philippe Mathieu-Daudé
Hi Guenter,
Quoted 31 lines · Guenter Roeck
The Linux kernel's IMX code now uses vendor specific commands. This results in endless warnings when booting the Linux kernel.
sdhci-esdhc-imx 2194000.usdhc:
esdhc_wait_for_card_clock_gate_off:
card clock still not gate off in 100us!.Implement support for the vendor specific command implemented in IMX hardware to be able to avoid this warning.
Signed-off-by Guenter Roeck <[email protected]>--- hw/sd/sdhci-internal.h | 5 +++++ hw/sd/sdhci.c | 18 +++++++++++++++++- include/hw/sd/sdhci.h | 5 +++++ 3 files changed, 27 insertions(+), 1 deletion(-)hw/sd/sdhci-internal.h +1
-0@@ -75,6 +75,7 @@#define SDHC_CMD_INHIBIT 0x00000001#define SDHC_DATA_INHIBIT 0x00000002#define SDHC_DAT_LINE_ACTIVE 0x00000004 +#define SDHC_IMX_CLOCK_GATE_OFF 0x00000080#define SDHC_DOING_WRITE 0x00000100#define SDHC_DOING_READ 0x00000200#define SDHC_SPACE_AVAILABLE 0x00000400@@ -289,7 +290,10 @@ extern const VMStateDescription sdhci_vmstate;Quoted 9 lines
hw/sd/sdhci-internal.h extern const VMStateDescription sdhci_vmstate; · line 295
Quoted 4 lines
hw/sd/sdhci-internal.h +2
-0#define ESDHC_MIX_CTRL 0x48 +#define ESDHC_VENDOR_SPEC 0xc0 +#define ESDHC_IMX_FRC_SDCLK_ON (1 << 8)I searched for the datasheet but couldn't find any, so I suppose it is only available under NDA. I can not review much (in particular I wanted to check the register sizes), anyway the overall looks OK:
Quoted 2 lines
Actually, I only had to register an account to be able to download the datasheets from NXP. Register width is 32 bit.
Yes, thanks for the tip!
"10.3.8.28 Vendor Specific Register (uSDHCx_VEND_SPEC)"
Quoted 2 lines
Quoted 2 lines
^ this can be changed by:
Quoted 91 lines
Quoted 5 lines
Also:
Thanks!
Guenter
Quoted 80 lines
Quoted 79 lines
hw/sd/sdhci-internal.h +2
-0+#define ESDHC_DLL_CTRL 0x60#define ESDHC_TUNING_CTRL 0xcc@@ -326,6 +330,7 @@ extern const VMStateDescription sdhci_vmstate;#define DEFINE_SDHCI_COMMON_PROPERTIES (_state) \ DEFINE_PROP_UINT8("sd-spec-version", _state, sd_spec_version, 2), \ DEFINE_PROP_UINT8("uhs", _state, uhs_mode, UHS_NOT_SUPPORTED), \ + DEFINE_PROP_UINT8("vendor", _state, vendor, SDHCI_VENDOR_NONE), \ \/* Capabilities registers provide information on supported * features of this specific host controller implementation */ \hw/sd/sdhci.c +17
-1@@ -1569,11 +1569,13 @@ static uint64_t usdhc_read(void *opaque, hwaddr offset, unsigned size) }break ; +case ESDHC_VENDOR_SPEC : + ret = s->vendor_spec; +break ;case ESDHC_DLL_CTRL :case ESDHC_TUNE_CTRL_STATUS :case ESDHC_UNDOCUMENTED_REG27 :case ESDHC_TUNING_CTRL : -case ESDHC_VENDOR_SPEC :case ESDHC_MIX_CTRL :case ESDHC_WTMK_LVL : ret =0 ;@@ -1596,7 +1598,21 @@ usdhc_write(void *opaque, hwaddr offset, uint64_t val, unsigned size)case ESDHC_UNDOCUMENTED_REG27 :case ESDHC_TUNING_CTRL :case ESDHC_WTMK_LVL : +break ; +case ESDHC_VENDOR_SPEC : + s->vendor_spec = value; +switch (s->vendor) { +case SDHCI_VENDOR_IMX : +if (value &ESDHC_IMX_FRC_SDCLK_ON ) { + s->prnsts &= ~SDHC_IMX_CLOCK_GATE_OFF ; + }else { + s->prnsts |=SDHC_IMX_CLOCK_GATE_OFF ; + } +break ; +default : +break ; + }break ;case SDHC_HOSTCTL :include/hw/sd/sdhci.h +5
-0@@ -74,6 +74,7 @@ typedef struct SDHCIState {uint16_t acmd12errsts;/* Auto CMD12 error status register */ uint16_t hostctl2;/* Host Control 2 */ uint64_t admasysaddr;/* ADMA System Address Register */ +uint16_t vendor_spec;/* Vendor specific register */ /* Read-only registers */ uint64_t capareg;/* Capabilities Register */ @@ -96,8 +97,12 @@ typedef struct SDHCIState {uint32_t quirks;uint8_t sd_spec_version;uint8_t uhs_mode; +uint8_t vendor;/* For vendor specific functionality */ } SDHCIState; +#define SDHCI_VENDOR_NONE 0 +#define SDHCI_VENDOR_IMX 1 +/* * Controller does not provide transfer-complete interrupt when not * busy.