hw/sd/sdcard: Deprecate support for spec v1.10
cover hw/sd/sdcard: Deprecate support for spec v1.10
Deprecate SD spec v1.10, use v3.01 as new default.
Philippe Mathieu-Daudé (3):
hw/sd/sdcard: Deprecate support for spec v1.10
hw/sd/sdcard: Use spec v3.01 by default
hw/sd/sdcard: Remove support for spec v1.10
docs/about/removed-features.rst | 5 +++++ include/hw/sd/sd.h | 1 - hw/sd/sd.c | 14 +++----------- 3 files changed, 8 insertions(+), 12 deletions(-)
Signature · 1 line
2.41.0
PATCH 1/3 hw/sd/sdcard: Deprecate support for spec v1.10
We use the v2.00 spec by default since commit 2f0939c234 ("sdcard: Add a 'spec_version' property, default to Spec v2.00"). Time to deprecate the v1.10 which doesn't bring much, and is not tested.
--- docs/about/deprecated.rst | 6 ++++++ 1 file changed, 6 insertions(+)
docs/about/deprecated.rst +6 -0
@@ -362,6 +362,12 @@ recommending to switch to their stable counterparts: - "Zve64f" should be replaced with "zve64f" - "Zve64d" should be replaced with "zve64d" +``-device sd-card,spec_version=1`` (since 9.1) +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +SD physical layer specification v2.00 supersedes the v1.10 one. +v2.00 is the default since QEMU 3.0.0. + Block device options ''''''''''''''''''''
Signature · 1 line
2.41.0
Quoted 6 lines · Philippe Mathieu-Daudé
We use the v2.00 spec by default since commit
2f0939c234("sdcard: Add a 'spec_version' property, default to Spec v2.00"). Time to deprecate the v1.10 which doesn't bring much, and is not tested.Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Thanks,
C.
Quoted 21 lines
--- docs/about/deprecated.rst | 6 ++++++ 1 file changed, 6 insertions(+)docs/about/deprecated.rst +6
-0@@ -362,6 +362,12 @@ recommending to switch to their stable counterparts: - "Zve64f" should be replaced with "zve64f" - "Zve64d" should be replaced with "zve64d" +``-device sd-card,spec_version=1`` (since 9.1) +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +SD physical layer specification v2.00 supersedes the v1.10 one. +v2.00 is the default since QEMU 3.0.0. + Block device options ''''''''''''''''''''
PATCH 2/3 hw/sd/sdcard: Use spec v3.01 by default
In reply to Philippe Mathieu-DaudéRecent SDHCI expect cards to support the v3.01 spec to negociate lower I/O voltage. Select it by default.
--- hw/sd/sd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/sd/sd.c +1 -1
@@ -2280,7 +2280,7 @@ static void sd_realize(DeviceState *dev, Error **errp)static Property sd_properties[] = {DEFINE_PROP_UINT8 ("spec_version" , SDState, - spec_version, SD_PHY_SPECv2_00_VERS), + spec_version, SD_PHY_SPECv3_01_VERS),DEFINE_PROP_DRIVE ("drive" , SDState, blk),/* We do not model the chip select pin, so allow the board to select * whether card should be in SSI or MMC/SD mode. It is also up to the
Signature · 1 line
2.41.0
Re: [PATCH 2/3] hw/sd/sdcard: Use spec v3.01 by default
Quoted 4 lines · Philippe Mathieu-Daudé
Recent SDHCI expect cards to support the v3.01 spec to negociate lower I/O voltage. Select it by default.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Thanks,
C.
Quoted 17 lines
--- hw/sd/sd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/sd/sd.c +1
-1@@ -2280,7 +2280,7 @@ static void sd_realize(DeviceState *dev, Error **errp)static Property sd_properties[] = {DEFINE_PROP_UINT8 ("spec_version" , SDState, - spec_version, SD_PHY_SPECv2_00_VERS), + spec_version, SD_PHY_SPECv3_01_VERS),DEFINE_PROP_DRIVE ("drive" , SDState, blk),/* We do not model the chip select pin, so allow the board to select * whether card should be in SSI or MMC/SD mode. It is also up to the
PATCH 3/3 hw/sd/sdcard: Remove support for spec v1.10
In reply to Philippe Mathieu-DaudéSupport for spec v1.10 was deprecated in QEMU v9.1.
--- docs/about/deprecated.rst | 6 ------ docs/about/removed-features.rst | 5 +++++ include/hw/sd/sd.h | 1 - hw/sd/sd.c | 12 ++---------- 4 files changed, 7 insertions(+), 17 deletions(-)
docs/about/deprecated.rst +0 -6
@@ -362,12 +362,6 @@ recommending to switch to their stable counterparts: - "Zve64f" should be replaced with "zve64f" - "Zve64d" should be replaced with "zve64d" -``-device sd-card,spec_version=1`` (since 9.1) -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -SD physical layer specification v2.00 supersedes the v1.10 one. -v2.00 is the default since QEMU 3.0.0. - Block device options ''''''''''''''''''''
docs/about/removed-features.rst +5 -0
@@ -1056,6 +1056,11 @@ by using ``-machine graphics=off``. The 'pvrdma' device and the whole RDMA subsystem have been removed. +``-device sd-card,spec_version=1`` (since 10.0) +''''''''''''''''''''''''''''''''''''''''''''''' + +SD physical layer specification v2.00 supersedes the v1.10 one. + Related binaries ----------------
include/hw/sd/sd.h +0 -1
@@ -56,7 +56,6 @@#define AKE_SEQ_ERROR (1 << 3)enum SDPhySpecificationVersion { - SD_PHY_SPECv1_10_VERS =1 , SD_PHY_SPECv2_00_VERS =2 , SD_PHY_SPECv3_01_VERS =3 , };
hw/sd/sd.c +2 -10
@@ -168,7 +168,6 @@ static bool sd_is_spi(SDState *sd)static const char *sd_version_str (enum SDPhySpecificationVersion version) {static const char *sdphy_version[] = { - [SD_PHY_SPECv1_10_VERS] ="v1.10" , [SD_PHY_SPECv2_00_VERS] ="v2.00" , [SD_PHY_SPECv3_01_VERS] ="v3.01" , };
@@ -371,11 +370,7 @@ static void sd_set_ocr(SDState *sd)static void sd_set_scr (SDState *sd) { sd->scr[0 ] =0 <<4 ;/* SCR structure version 1.0 */ -if (sd->spec_version == SD_PHY_SPECv1_10_VERS) { - sd->scr[0 ] |=1 ;/* Spec Version 1.10 */ - }else { - sd->scr[0 ] |=2 ;/* Spec Version 2.00 or Version 3.0X */ - } + sd->scr[0 ] |=2 ;/* Spec Version 2.00 or Version 3.0X */ sd->scr[1 ] = (2 <<4 )/* SDSC Card (Security Version 1.01) */ |0b0101 ;/* 1-bit or 4-bit width bus modes */ sd->scr[2 ] =0x00 ;/* Extended Security is not supported. */
@@ -1241,9 +1236,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)break ;case 8 :/* CMD8: SEND_IF_COND */ -if (sd->spec_version < SD_PHY_SPECv2_00_VERS) { -break ; - }if (sd->state != sd_idle_state) {break ; }
@@ -2231,7 +2223,7 @@ static void sd_realize(DeviceState *dev, Error **errp)int ret;switch (sd->spec_version) { -case SD_PHY_SPECv1_10_VERS +case SD_PHY_SPECv2_00_VERS ... SD_PHY_SPECv3_01_VERS:break ;default :
Signature · 1 line
2.41.0
Re: [PATCH-for-10.0 3/3] hw/sd/sdcard: Remove support for spec v1.10
Kind ping :)
Quoted 99 lines · Philippe Mathieu-Daudé
Support for spec v1.10 was deprecated in QEMU v9.1.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- docs/about/deprecated.rst | 6 ------ docs/about/removed-features.rst | 5 +++++ include/hw/sd/sd.h | 1 - hw/sd/sd.c | 12 ++---------- 4 files changed, 7 insertions(+), 17 deletions(-)docs/about/deprecated.rst +0
-6@@ -362,12 +362,6 @@ recommending to switch to their stable counterparts: - "Zve64f" should be replaced with "zve64f" - "Zve64d" should be replaced with "zve64d" -``-device sd-card,spec_version=1`` (since 9.1) -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -SD physical layer specification v2.00 supersedes the v1.10 one. -v2.00 is the default since QEMU 3.0.0. - Block device options ''''''''''''''''''''docs/about/removed-features.rst +5
-0@@ -1056,6 +1056,11 @@ by using ``-machine graphics=off``. The 'pvrdma' device and the whole RDMA subsystem have been removed. +``-device sd-card,spec_version=1`` (since 10.0) +''''''''''''''''''''''''''''''''''''''''''''''' + +SD physical layer specification v2.00 supersedes the v1.10 one. + Related binaries ----------------include/hw/sd/sd.h +0
-1@@ -56,7 +56,6 @@#define AKE_SEQ_ERROR (1 << 3)enum SDPhySpecificationVersion { - SD_PHY_SPECv1_10_VERS =1 , SD_PHY_SPECv2_00_VERS =2 , SD_PHY_SPECv3_01_VERS =3 , };hw/sd/sd.c +2
-10@@ -168,7 +168,6 @@ static bool sd_is_spi(SDState *sd)static const char *sd_version_str (enum SDPhySpecificationVersion version) {static const char *sdphy_version[] = { - [SD_PHY_SPECv1_10_VERS] ="v1.10" , [SD_PHY_SPECv2_00_VERS] ="v2.00" , [SD_PHY_SPECv3_01_VERS] ="v3.01" , };@@ -371,11 +370,7 @@ static void sd_set_ocr(SDState *sd)static void sd_set_scr (SDState *sd) { sd->scr[0 ] =0 <<4 ;/* SCR structure version 1.0 */ -if (sd->spec_version == SD_PHY_SPECv1_10_VERS) { - sd->scr[0 ] |=1 ;/* Spec Version 1.10 */ - }else { - sd->scr[0 ] |=2 ;/* Spec Version 2.00 or Version 3.0X */ - } + sd->scr[0 ] |=2 ;/* Spec Version 2.00 or Version 3.0X */ sd->scr[1 ] = (2 <<4 )/* SDSC Card (Security Version 1.01) */ |0b0101 ;/* 1-bit or 4-bit width bus modes */ sd->scr[2 ] =0x00 ;/* Extended Security is not supported. */ @@ -1241,9 +1236,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)break ;case 8 :/* CMD8: SEND_IF_COND */ -if (sd->spec_version < SD_PHY_SPECv2_00_VERS) { -break ; - }if (sd->state != sd_idle_state) {break ; }@@ -2231,7 +2223,7 @@ static void sd_realize(DeviceState *dev, Error **errp)int ret;switch (sd->spec_version) { -case SD_PHY_SPECv1_10_VERS +case SD_PHY_SPECv2_00_VERS ... SD_PHY_SPECv3_01_VERS:break ;default :
Re: [PATCH-for-10.0 3/3] hw/sd/sdcard: Remove support for spec v1.10
Quoted 27 lines · Philippe Mathieu-Daudé
Kind ping :)
Quoted 24 lines · Philippe Mathieu-Daudé
Support for spec v1.10 was deprecated in QEMU v9.1.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
docs/about/deprecated.rst | 6 ------docs/about/removed-features.rst| 5 +++++ include/hw/sd/sd.h | 1 - hw/sd/sd.c | 12 ++----------4 files changed, 7 insertions(+), 17 deletions(-)docs/about/deprecated.rst +0
-0@@ -362,12 +362,6 @@ recommending to switch to their stable counterparts:- "Zve64f" should be replaced with "zve64f"
- "Zve64d" should be replaced with "zve64d"
-``-device sd-card,spec_version=1`` (since 9.1)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^docs/about/deprecated.rst +0
-4- -SD physical layer specification v2.00 supersedes the v1.10 one. -v2.00 is the default since QEMU 3.0.0. -Block device options
Quoted 8 lines
Quoted 8 lines
''''''''''''''''''''
docs/about/removed-features.rst +0
-0@@ -1056,6 +1056,11 @@ by using ``-machine graphics=off``.The 'pvrdma' device and the whole RDMA subsystem have been removed. +``-device sd-card,spec_version=1`` (since 10.0)
Updated to "10.2".
Quoted 62 lines
Quoted 61 lines
+'''''''''''''''''''''''''''''''''''''''''''''''
docs/about/removed-features.rst +3
-0+ +SD physical layer specification v2.00 supersedes the v1.10 one. +Related binaries
----------------include/hw/sd/sd.h +0
-1@@ -56,7 +56,6 @@ #define AKE_SEQ_ERROR (1 << 3) enum SDPhySpecificationVersion { - SD_PHY_SPECv1_10_VERS = 1, SD_PHY_SPECv2_00_VERS = 2, SD_PHY_SPECv3_01_VERS = 3, };hw/sd/sd.c +0
-1@@ -168,7 +168,6 @@ static bool sd_is_spi(SDState *sd) static const char *sd_version_str(enum SDPhySpecificationVersion version) { static const char *sdphy_version[] = { - [SD_PHY_SPECv1_10_VERS] = "v1.10", [SD_PHY_SPECv2_00_VERS] = "v2.00", [SD_PHY_SPECv3_01_VERS] = "v3.01", };@@ -371,11 +370,7 @@ static void sd_set_ocr(SDState *sd) static void sd_set_scr(SDState *sd) {sd->scr[0] = 0 << 4; /* SCR structure version 1.0 */ - if (
sd->spec_version==SD_PHY_SPECv1_10_VERS) {
- sd->scr[0] |= 1; /* Spec Version 1.10 */
- } else {
- sd->scr[0] |= 2; /* Spec Version 2.00 or Version 3.0X */ - }
+ sd->scr[0] |= 2; /* Spec Version 2.00 or Version 3.0X */ sd->scr[1] = (2 << 4) /* SDSC Card (Security Version 1.01) */ | 0b0101; /* 1-bit or 4-bit width bus modes */ sd->scr[2] = 0x00; /* Extended Security is not supported. */hw/sd/sd.c +0
-0@@ -1241,9 +1236,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) break;case 8: /* CMD8:
SEND_IF_COND*/
- if (sd->spec_version<SD_PHY_SPECv2_00_VERS) { - break;
- }
if (sd->state!=sd_idle_state) { break;
}hw/sd/sd.c +1
-1@@ -2231,7 +2223,7 @@ static void sd_realize(DeviceState *dev, Error **errp) int ret; switch (sd->spec_version) { - case SD_PHY_SPECv1_10_VERS + case SD_PHY_SPECv2_00_VERS...
SD_PHY_SPECv3_01_VERS:
break;
default:
Philippe Mathieu-Daudé
Reviewed-by Pierrick BouvierRe: [PATCH-for-10.0 3/3] hw/sd/sdcard: Remove support for spec v1.10
Quoted 31 lines · Philippe Mathieu-Daudé
Quoted 30 lines · Philippe Mathieu-Daudé
Kind ping :)
Quoted 27 lines · Philippe Mathieu-Daudé
Support for spec v1.10 was deprecated in QEMU v9.1.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
docs/about/deprecated.rst | 6 ------docs/about/removed-features.rst| 5 +++++ include/hw/sd/sd.h | 1 - hw/sd/sd.c | 12 ++----------4 files changed, 7 insertions(+), 17 deletions(-)docs/about/deprecated.rst +0
-0@@ -362,12 +362,6 @@ recommending to switch to their stablecounterparts:
- "Zve64f" should be replaced with "zve64f"
- "Zve64d" should be replaced with "zve64d"
-``-device sd-card,spec_version=1`` (since 9.1)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^docs/about/deprecated.rst +0
-4- -SD physical layer specification v2.00 supersedes the v1.10 one. -v2.00 is the default since QEMU 3.0.0. -Block device options
''''''''''''''''''''docs/about/removed- features.rst renamed from docs/about/removed-features.rst +0
-0
Quoted 8 lines
Quoted 6 lines
Quoted 6 lines
index
fc7b28e637..dfe04b0555100644docs/about/removed-features.rst +0
-0@@ -1056,6 +1056,11 @@ by using ``-machine graphics=off``.The 'pvrdma' device and the whole RDMA subsystem have been removed. +``-device sd-card,spec_version=1`` (since 10.0)
Updated to "10.2".
As discussed with Pierrick during online review:
Quoted 5 lines · Philippe Mathieu-Daudé
Deprecate SD spec v1.10, use v3.01 as new default.
Philippe Mathieu-Daudé (3):
hw/sd/sdcard: Deprecate support for spec v1.10
hw/sd/sdcard: Use spec v3.01 by default
The first 2 patches are already merged,
Quoted 1 line
hw/sd/sdcard: Remove support for spec v1.10
queuing the last one.