Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 4b7cee533630202095748ecb396bd9eacf47ff3f

Authored by Pantelis Antoniou
1 parent 4641429695
Exists in v2017.01-smarct4x and in 37 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

mmc: Implement SD/MMC versioning properly 

The SD/MMC version scheme was buggy when dealing with standard
major.minor.change cases. Fix it by using something similar to
the linux's kernel versioning method.

Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Tested-by: Jaehoon Chung <jh80.chung@samsung.com>
Reported-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Stephen Warren <swarren@nvidia.com>

Showing 2 changed files with 43 additions and 21 deletions Side-by-side Diff

... ... @@ -85,8 +85,12 @@
85 85 printf("Tran Speed: %d\n", mmc->tran_speed);
86 86 printf("Rd Block Len: %d\n", mmc->read_bl_len);
87 87  
88   - printf("%s version %d.%d\n", IS_SD(mmc) ? "SD" : "MMC",
89   - (mmc->version >> 8) & 0xf, mmc->version & 0xff);
  88 + printf("%s version %d.%d", IS_SD(mmc) ? "SD" : "MMC",
  89 + EXTRACT_SDMMC_MAJOR_VERSION(mmc->version),
  90 + EXTRACT_SDMMC_MINOR_VERSION(mmc->version));
  91 + if (EXTRACT_SDMMC_CHANGE_VERSION(mmc->version) != 0)
  92 + printf(".%d", EXTRACT_SDMMC_CHANGE_VERSION(mmc->version));
  93 + printf("\n");
90 94  
91 95 printf("High Capacity: %s\n", mmc->high_capacity ? "Yes" : "No");
92 96 puts("Capacity: ");
... ... @@ -14,25 +14,42 @@
14 14 #include <linux/compiler.h>
15 15 #include <part.h>
16 16  
17   -#define SD_VERSION_SD 0x20000
18   -#define SD_VERSION_3 (SD_VERSION_SD | 0x300)
19   -#define SD_VERSION_2 (SD_VERSION_SD | 0x200)
20   -#define SD_VERSION_1_0 (SD_VERSION_SD | 0x100)
21   -#define SD_VERSION_1_10 (SD_VERSION_SD | 0x10a)
22   -#define MMC_VERSION_MMC 0x10000
23   -#define MMC_VERSION_UNKNOWN (MMC_VERSION_MMC)
24   -#define MMC_VERSION_1_2 (MMC_VERSION_MMC | 0x102)
25   -#define MMC_VERSION_1_4 (MMC_VERSION_MMC | 0x104)
26   -#define MMC_VERSION_2_2 (MMC_VERSION_MMC | 0x202)
27   -#define MMC_VERSION_3 (MMC_VERSION_MMC | 0x300)
28   -#define MMC_VERSION_4 (MMC_VERSION_MMC | 0x400)
29   -#define MMC_VERSION_4_1 (MMC_VERSION_MMC | 0x401)
30   -#define MMC_VERSION_4_2 (MMC_VERSION_MMC | 0x402)
31   -#define MMC_VERSION_4_3 (MMC_VERSION_MMC | 0x403)
32   -#define MMC_VERSION_4_41 (MMC_VERSION_MMC | 0x429)
33   -#define MMC_VERSION_4_5 (MMC_VERSION_MMC | 0x405)
34   -#define MMC_VERSION_5_0 (MMC_VERSION_MMC | 0x500)
  17 +/* SD/MMC version bits; 8 flags, 8 major, 8 minor, 8 change */
  18 +#define SD_VERSION_SD (1U << 31)
  19 +#define MMC_VERSION_MMC (1U << 30)
35 20  
  21 +#define MAKE_SDMMC_VERSION(a, b, c) \
  22 + ((((u32)(a)) << 16) | ((u32)(b) << 8) | (u32)(c))
  23 +#define MAKE_SD_VERSION(a, b, c) \
  24 + (SD_VERSION_SD | MAKE_SDMMC_VERSION(a, b, c))
  25 +#define MAKE_MMC_VERSION(a, b, c) \
  26 + (MMC_VERSION_MMC | MAKE_SDMMC_VERSION(a, b, c))
  27 +
  28 +#define EXTRACT_SDMMC_MAJOR_VERSION(x) \
  29 + (((u32)(x) >> 16) & 0xff)
  30 +#define EXTRACT_SDMMC_MINOR_VERSION(x) \
  31 + (((u32)(x) >> 8) & 0xff)
  32 +#define EXTRACT_SDMMC_CHANGE_VERSION(x) \
  33 + ((u32)(x) & 0xff)
  34 +
  35 +#define SD_VERSION_3 MAKE_SD_VERSION(3, 0, 0)
  36 +#define SD_VERSION_2 MAKE_SD_VERSION(2, 0, 0)
  37 +#define SD_VERSION_1_0 MAKE_SD_VERSION(1, 0, 0)
  38 +#define SD_VERSION_1_10 MAKE_SD_VERSION(1, 10, 0)
  39 +
  40 +#define MMC_VERSION_UNKNOWN MAKE_MMC_VERSION(0, 0, 0)
  41 +#define MMC_VERSION_1_2 MAKE_MMC_VERSION(1, 2, 0)
  42 +#define MMC_VERSION_1_4 MAKE_MMC_VERSION(1, 4, 0)
  43 +#define MMC_VERSION_2_2 MAKE_MMC_VERSION(2, 2, 0)
  44 +#define MMC_VERSION_3 MAKE_MMC_VERSION(3, 0, 0)
  45 +#define MMC_VERSION_4 MAKE_MMC_VERSION(4, 0, 0)
  46 +#define MMC_VERSION_4_1 MAKE_MMC_VERSION(4, 1, 0)
  47 +#define MMC_VERSION_4_2 MAKE_MMC_VERSION(4, 2, 0)
  48 +#define MMC_VERSION_4_3 MAKE_MMC_VERSION(4, 3, 0)
  49 +#define MMC_VERSION_4_41 MAKE_MMC_VERSION(4, 4, 1)
  50 +#define MMC_VERSION_4_5 MAKE_MMC_VERSION(4, 5, 0)
  51 +#define MMC_VERSION_5_0 MAKE_MMC_VERSION(5, 0, 0)
  52 +
36 53 #define MMC_MODE_HS (1 << 0)
37 54 #define MMC_MODE_HS_52MHz (1 << 1)
38 55 #define MMC_MODE_4BIT (1 << 2)
... ... @@ -43,7 +60,8 @@
43 60  
44 61 #define SD_DATA_4BIT 0x00040000
45 62  
46   -#define IS_SD(x) (x->version & SD_VERSION_SD)
  63 +#define IS_SD(x) ((x)->version & SD_VERSION_SD)
  64 +#define IS_MMC(x) ((x)->version & SD_VERSION_MMC)
47 65  
48 66 #define MMC_DATA_READ 1
49 67 #define MMC_DATA_WRITE 2