Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit f4f51a8ff894d34eb332f0d11f6c73c7bf509848

Authored by Jagannadha Sutradharudu Teki
1 parent 54024c1566
Exists in master and in 53 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-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, 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_v2014.04_3.14.28_1.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, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, 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, v2017.01-smarct4x

sf: probe: Add support for erase sector selection flag 

SECT_4K, SECT_32K and SECT_64K opeartions are performed to
to specific flash by adding a SECT* flag on respective
spi_flash_params.flag param.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>

Showing 3 changed files with 100 additions and 84 deletions Side-by-side Diff

drivers/mtd/spi/spi_flash_ops.c
Diff comments   View file @ f4f51a8
... ... @@ -153,17 +153,13 @@
153 153 u8 cmd[4];
154 154 int ret = -1;
155 155  
156   - erase_size = flash->sector_size;
  156 + erase_size = flash->erase_size;
157 157 if (offset % erase_size || len % erase_size) {
158 158 debug("SF: Erase offset/length not multiple of erase size\n");
159 159 return -1;
160 160 }
161 161  
162   - if (erase_size == 4096)
163   - cmd[0] = CMD_ERASE_4K;
164   - else
165   - cmd[0] = CMD_ERASE_64K;
166   -
  162 + cmd[0] = flash->erase_cmd;
167 163 while (len) {
168 164 #ifdef CONFIG_SPI_FLASH_BAR
169 165 u8 bank_sel;
drivers/mtd/spi/spi_flash_probe.c
Diff comments   View file @ f4f51a8
... ... @@ -39,97 +39,97 @@
39 39  
40 40 static const struct spi_flash_params spi_flash_params_table[] = {
41 41 #ifdef CONFIG_SPI_FLASH_ATMEL /* ATMEL */
42   - {"AT45DB011D", 0x1f2200, 0x0, 64 * 1024, 4, 0},
43   - {"AT45DB021D", 0x1f2300, 0x0, 64 * 1024, 8, 0},
44   - {"AT45DB041D", 0x1f2400, 0x0, 64 * 1024, 8, 0},
45   - {"AT45DB081D", 0x1f2500, 0x0, 64 * 1024, 16, 0},
46   - {"AT45DB161D", 0x1f2600, 0x0, 64 * 1024, 32, 0},
47   - {"AT45DB321D", 0x1f2700, 0x0, 64 * 1024, 64, 0},
48   - {"AT45DB641D", 0x1f2800, 0x0, 64 * 1024, 128, 0},
  42 + {"AT45DB011D", 0x1f2200, 0x0, 64 * 1024, 4, SECT_4K},
  43 + {"AT45DB021D", 0x1f2300, 0x0, 64 * 1024, 8, SECT_4K},
  44 + {"AT45DB041D", 0x1f2400, 0x0, 64 * 1024, 8, SECT_4K},
  45 + {"AT45DB081D", 0x1f2500, 0x0, 64 * 1024, 16, SECT_4K},
  46 + {"AT45DB161D", 0x1f2600, 0x0, 64 * 1024, 32, SECT_4K},
  47 + {"AT45DB321D", 0x1f2700, 0x0, 64 * 1024, 64, SECT_4K},
  48 + {"AT45DB641D", 0x1f2800, 0x0, 64 * 1024, 128, SECT_4K},
49 49 #endif
50 50 #ifdef CONFIG_SPI_FLASH_EON /* EON */
51   - {"EN25Q32B", 0x1c3016, 0x0, 64 * 1024, 64, 0},
52   - {"EN25Q128B", 0x1c3018, 0x0, 64 * 1024, 256, 0},
  51 + {"EN25Q32B", 0x1c3016, 0x0, 64 * 1024, 64, 0},
  52 + {"EN25Q128B", 0x1c3018, 0x0, 64 * 1024, 256, 0},
53 53 #endif
54 54 #ifdef CONFIG_SPI_FLASH_GIGADEVICE /* GIGADEVICE */
55   - {"GD25Q64B", 0xc84017, 0x0, 64 * 1024, 128, 0},
56   - {"GD25LQ32", 0xc86016, 0x0, 64 * 1024, 64, 0},
  55 + {"GD25Q64B", 0xc84017, 0x0, 64 * 1024, 128, SECT_4K},
  56 + {"GD25LQ32", 0xc86016, 0x0, 64 * 1024, 64, SECT_4K},
57 57 #endif
58 58 #ifdef CONFIG_SPI_FLASH_MACRONIX /* MACRONIX */
59   - {"MX25L4005", 0xc22013, 0x0, 64 * 1024, 8, 0},
60   - {"MX25L8005", 0xc22014, 0x0, 64 * 1024, 16, 0},
61   - {"MX25L1605D", 0xc22015, 0x0, 64 * 1024, 32, 0},
62   - {"MX25L3205D", 0xc22016, 0x0, 64 * 1024, 64, 0},
63   - {"MX25L6405D", 0xc22017, 0x0, 64 * 1024, 128, 0},
64   - {"MX25L12805", 0xc22018, 0x0, 64 * 1024, 256, 0},
65   - {"MX25L12855E", 0xc22618, 0x0, 64 * 1024, 256, 0},
  59 + {"MX25L4005", 0xc22013, 0x0, 64 * 1024, 8, 0},
  60 + {"MX25L8005", 0xc22014, 0x0, 64 * 1024, 16, 0},
  61 + {"MX25L1605D", 0xc22015, 0x0, 64 * 1024, 32, 0},
  62 + {"MX25L3205D", 0xc22016, 0x0, 64 * 1024, 64, 0},
  63 + {"MX25L6405D", 0xc22017, 0x0, 64 * 1024, 128, 0},
  64 + {"MX25L12805", 0xc22018, 0x0, 64 * 1024, 256, 0},
  65 + {"MX25L12855E", 0xc22618, 0x0, 64 * 1024, 256, 0},
66 66 #endif
67 67 #ifdef CONFIG_SPI_FLASH_SPANSION /* SPANSION */
68   - {"S25FL008A", 0x010213, 0x0, 64 * 1024, 16, 0},
69   - {"S25FL016A", 0x010214, 0x0, 64 * 1024, 32, 0},
70   - {"S25FL032A", 0x010215, 0x0, 64 * 1024, 64, 0},
71   - {"S25FL064A", 0x010216, 0x0, 64 * 1024, 128, 0},
72   - {"S25FL128P_256K", 0x012018, 0x0300, 256 * 1024, 64, 0},
73   - {"S25FL128P_64K", 0x012018, 0x0301, 64 * 1024, 256, 0},
74   - {"S25FL032P", 0x010215, 0x4d00, 64 * 1024, 64, 0},
75   - {"S25FL064P", 0x010216, 0x4d00, 64 * 1024, 128, 0},
76   - {"S25FL128S_64K", 0x012018, 0x4d01, 64 * 1024, 256, 0},
77   - {"S25FL256S_64K", 0x010219, 0x4d01, 64 * 1024, 512, 0},
78   - {"S25FL512S_64K", 0x010220, 0x4d01, 64 * 1024, 1024, 0},
  68 + {"S25FL008A", 0x010213, 0x0, 64 * 1024, 16, 0},
  69 + {"S25FL016A", 0x010214, 0x0, 64 * 1024, 32, 0},
  70 + {"S25FL032A", 0x010215, 0x0, 64 * 1024, 64, 0},
  71 + {"S25FL064A", 0x010216, 0x0, 64 * 1024, 128, 0},
  72 + {"S25FL128P_256K", 0x012018, 0x0300, 256 * 1024, 64, 0},
  73 + {"S25FL128P_64K", 0x012018, 0x0301, 64 * 1024, 256, 0},
  74 + {"S25FL032P", 0x010215, 0x4d00, 64 * 1024, 64, 0},
  75 + {"S25FL064P", 0x010216, 0x4d00, 64 * 1024, 128, 0},
  76 + {"S25FL128S_64K", 0x012018, 0x4d01, 64 * 1024, 256, 0},
  77 + {"S25FL256S_64K", 0x010219, 0x4d01, 64 * 1024, 512, 0},
  78 + {"S25FL512S_64K", 0x010220, 0x4d01, 64 * 1024, 1024, 0},
79 79 #endif
80 80 #ifdef CONFIG_SPI_FLASH_STMICRO /* STMICRO */
81   - {"M25P10", 0x202011, 0x0, 32 * 1024, 4, 0},
82   - {"M25P20", 0x202012, 0x0, 64 * 1024, 4, 0},
83   - {"M25P40", 0x202013, 0x0, 64 * 1024, 8, 0},
84   - {"M25P80", 0x202014, 0x0, 64 * 1024, 16, 0},
85   - {"M25P16", 0x202015, 0x0, 64 * 1024, 32, 0},
86   - {"M25P32", 0x202016, 0x0, 64 * 1024, 64, 0},
87   - {"M25P64", 0x202017, 0x0, 64 * 1024, 128, 0},
88   - {"M25P128", 0x202018, 0x0, 256 * 1024, 64, 0},
89   - {"N25Q32", 0x20ba16, 0x0, 64 * 1024, 64, 0},
90   - {"N25Q32A", 0x20bb16, 0x0, 64 * 1024, 64, 0},
91   - {"N25Q64", 0x20ba17, 0x0, 64 * 1024, 128, 0},
92   - {"N25Q64A", 0x20bb17, 0x0, 64 * 1024, 128, 0},
93   - {"N25Q128", 0x20ba18, 0x0, 64 * 1024, 256, 0},
94   - {"N25Q128A", 0x20bb18, 0x0, 64 * 1024, 256, 0},
95   - {"N25Q256", 0x20ba19, 0x0, 64 * 1024, 512, 0},
96   - {"N25Q256A", 0x20bb19, 0x0, 64 * 1024, 512, 0},
97   - {"N25Q512", 0x20ba20, 0x0, 64 * 1024, 1024, 0},
98   - {"N25Q512A", 0x20bb20, 0x0, 64 * 1024, 1024, 0},
99   - {"N25Q1024", 0x20ba21, 0x0, 64 * 1024, 2048, 0},
100   - {"N25Q1024A", 0x20bb21, 0x0, 64 * 1024, 2048, 0},
  81 + {"M25P10", 0x202011, 0x0, 32 * 1024, 4, 0},
  82 + {"M25P20", 0x202012, 0x0, 64 * 1024, 4, 0},
  83 + {"M25P40", 0x202013, 0x0, 64 * 1024, 8, 0},
  84 + {"M25P80", 0x202014, 0x0, 64 * 1024, 16, 0},
  85 + {"M25P16", 0x202015, 0x0, 64 * 1024, 32, 0},
  86 + {"M25P32", 0x202016, 0x0, 64 * 1024, 64, 0},
  87 + {"M25P64", 0x202017, 0x0, 64 * 1024, 128, 0},
  88 + {"M25P128", 0x202018, 0x0, 256 * 1024, 64, 0},
  89 + {"N25Q32", 0x20ba16, 0x0, 64 * 1024, 64, SECT_4K},
  90 + {"N25Q32A", 0x20bb16, 0x0, 64 * 1024, 64, SECT_4K},
  91 + {"N25Q64", 0x20ba17, 0x0, 64 * 1024, 128, SECT_4K},
  92 + {"N25Q64A", 0x20bb17, 0x0, 64 * 1024, 128, SECT_4K},
  93 + {"N25Q128", 0x20ba18, 0x0, 64 * 1024, 256, SECT_4K},
  94 + {"N25Q128A", 0x20bb18, 0x0, 64 * 1024, 256, SECT_4K},
  95 + {"N25Q256", 0x20ba19, 0x0, 64 * 1024, 512, SECT_4K},
  96 + {"N25Q256A", 0x20bb19, 0x0, 64 * 1024, 512, SECT_4K},
  97 + {"N25Q512", 0x20ba20, 0x0, 64 * 1024, 1024, SECT_4K},
  98 + {"N25Q512A", 0x20bb20, 0x0, 64 * 1024, 1024, SECT_4K},
  99 + {"N25Q1024", 0x20ba21, 0x0, 64 * 1024, 2048, SECT_4K},
  100 + {"N25Q1024A", 0x20bb21, 0x0, 64 * 1024, 2048, SECT_4K},
101 101 #endif
102 102 #ifdef CONFIG_SPI_FLASH_SST /* SST */
103   - {"SST25VF040B", 0xbf258d, 0x0, 64 * 1024, 8, SST_WP},
104   - {"SST25VF080B", 0xbf258e, 0x0, 64 * 1024, 16, SST_WP},
105   - {"SST25VF016B", 0xbf2541, 0x0, 64 * 1024, 32, SST_WP},
106   - {"SST25VF032B", 0xbf254a, 0x0, 64 * 1024, 64, SST_WP},
107   - {"SST25VF064C", 0xbf254b, 0x0, 64 * 1024, 128, 0},
108   - {"SST25WF512", 0xbf2501, 0x0, 64 * 1024, 1, SST_WP},
109   - {"SST25WF010", 0xbf2502, 0x0, 64 * 1024, 2, SST_WP},
110   - {"SST25WF020", 0xbf2503, 0x0, 64 * 1024, 4, SST_WP},
111   - {"SST25WF040", 0xbf2504, 0x0, 64 * 1024, 8, SST_WP},
112   - {"SST25WF080", 0xbf2505, 0x0, 64 * 1024, 16, SST_WP},
  103 + {"SST25VF040B", 0xbf258d, 0x0, 64 * 1024, 8, SECT_4K | SST_WP},
  104 + {"SST25VF080B", 0xbf258e, 0x0, 64 * 1024, 16, SECT_4K | SST_WP},
  105 + {"SST25VF016B", 0xbf2541, 0x0, 64 * 1024, 32, SECT_4K | SST_WP},
  106 + {"SST25VF032B", 0xbf254a, 0x0, 64 * 1024, 64, SECT_4K | SST_WP},
  107 + {"SST25VF064C", 0xbf254b, 0x0, 64 * 1024, 128, SECT_4K},
  108 + {"SST25WF512", 0xbf2501, 0x0, 64 * 1024, 1, SECT_4K | SST_WP},
  109 + {"SST25WF010", 0xbf2502, 0x0, 64 * 1024, 2, SECT_4K | SST_WP},
  110 + {"SST25WF020", 0xbf2503, 0x0, 64 * 1024, 4, SECT_4K | SST_WP},
  111 + {"SST25WF040", 0xbf2504, 0x0, 64 * 1024, 8, SECT_4K | SST_WP},
  112 + {"SST25WF080", 0xbf2505, 0x0, 64 * 1024, 16, SECT_4K | SST_WP},
113 113 #endif
114 114 #ifdef CONFIG_SPI_FLASH_WINBOND /* WINBOND */
115   - {"W25P80", 0xef2014, 0x0, 64 * 1024, 16, 0},
116   - {"W25P16", 0xef2015, 0x0, 64 * 1024, 32, 0},
117   - {"W25P32", 0xef2016, 0x0, 64 * 1024, 64, 0},
118   - {"W25X40", 0xef3013, 0x0, 64 * 1024, 8, 0},
119   - {"W25X16", 0xef3015, 0x0, 64 * 1024, 32, 0},
120   - {"W25X32", 0xef3016, 0x0, 64 * 1024, 64, 0},
121   - {"W25X64", 0xef3017, 0x0, 64 * 1024, 128, 0},
122   - {"W25Q80BL", 0xef4014, 0x0, 64 * 1024, 16, 0},
123   - {"W25Q16CL", 0xef4015, 0x0, 64 * 1024, 32, 0},
124   - {"W25Q32BV", 0xef4016, 0x0, 64 * 1024, 64, 0},
125   - {"W25Q64CV", 0xef4017, 0x0, 64 * 1024, 128, 0},
126   - {"W25Q128BV", 0xef4018, 0x0, 64 * 1024, 256, 0},
127   - {"W25Q256", 0xef4019, 0x0, 64 * 1024, 512, 0},
128   - {"W25Q80BW", 0xef5014, 0x0, 64 * 1024, 16, 0},
129   - {"W25Q16DW", 0xef6015, 0x0, 64 * 1024, 32, 0},
130   - {"W25Q32DW", 0xef6016, 0x0, 64 * 1024, 64, 0},
131   - {"W25Q64DW", 0xef6017, 0x0, 64 * 1024, 128, 0},
132   - {"W25Q128FW", 0xef6018, 0x0, 64 * 1024, 256, 0},
  115 + {"W25P80", 0xef2014, 0x0, 64 * 1024, 16, 0},
  116 + {"W25P16", 0xef2015, 0x0, 64 * 1024, 32, 0},
  117 + {"W25P32", 0xef2016, 0x0, 64 * 1024, 64, 0},
  118 + {"W25X40", 0xef3013, 0x0, 64 * 1024, 8, SECT_4K},
  119 + {"W25X16", 0xef3015, 0x0, 64 * 1024, 32, SECT_4K},
  120 + {"W25X32", 0xef3016, 0x0, 64 * 1024, 64, SECT_4K},
  121 + {"W25X64", 0xef3017, 0x0, 64 * 1024, 128, SECT_4K},
  122 + {"W25Q80BL", 0xef4014, 0x0, 64 * 1024, 16, SECT_4K},
  123 + {"W25Q16CL", 0xef4015, 0x0, 64 * 1024, 32, SECT_4K},
  124 + {"W25Q32BV", 0xef4016, 0x0, 64 * 1024, 64, SECT_4K},
  125 + {"W25Q64CV", 0xef4017, 0x0, 64 * 1024, 128, SECT_4K},
  126 + {"W25Q128BV", 0xef4018, 0x0, 64 * 1024, 256, SECT_4K},
  127 + {"W25Q256", 0xef4019, 0x0, 64 * 1024, 512, SECT_4K},
  128 + {"W25Q80BW", 0xef5014, 0x0, 64 * 1024, 16, SECT_4K},
  129 + {"W25Q16DW", 0xef6015, 0x0, 64 * 1024, 32, SECT_4K},
  130 + {"W25Q32DW", 0xef6016, 0x0, 64 * 1024, 64, SECT_4K},
  131 + {"W25Q64DW", 0xef6017, 0x0, 64 * 1024, 128, SECT_4K},
  132 + {"W25Q128FW", 0xef6018, 0x0, 64 * 1024, 256, SECT_4K},
133 133 #endif
134 134 /*
135 135 * Note:
... ... @@ -202,6 +202,18 @@
202 202 flash->page_size = 256;
203 203 flash->sector_size = params->sector_size;
204 204 flash->size = flash->sector_size * params->nr_sectors;
  205 +
  206 + /* Compute erase sector and command */
  207 + if (params->flags & SECT_4K) {
  208 + flash->erase_cmd = CMD_ERASE_4K;
  209 + flash->erase_size = 4096;
  210 + } else if (params->flags & SECT_32K) {
  211 + flash->erase_cmd = CMD_ERASE_32K;
  212 + flash->erase_size = 32768;
  213 + } else {
  214 + flash->erase_cmd = CMD_ERASE_64K;
  215 + flash->erase_size = flash->sector_size;
  216 + }
205 217  
206 218 /* Flash powers up read-only, so clear BP# bits */
207 219 #if defined(CONFIG_SPI_FLASH_ATMEL) || \
... ... @@ -17,6 +17,10 @@
17 17 #include <linux/types.h>
18 18 #include <linux/compiler.h>
19 19  
  20 +/* SECT flags */
  21 +#define SECT_4K (1 << 1)
  22 +#define SECT_32K (1 << 2)
  23 +
20 24 /* SST specific macros */
21 25 #ifdef CONFIG_SPI_FLASH_SST
22 26 # define SST_WP 0x01 /* Supports AAI word program */
23 27  
... ... @@ -33,8 +37,10 @@
33 37 u32 size;
34 38 /* Write (page) size */
35 39 u32 page_size;
36   - /* Erase (sector) size */
  40 + /* Sector size */
37 41 u32 sector_size;
  42 + /* Erase size */
  43 + u32 erase_size;
38 44 #ifdef CONFIG_SPI_FLASH_BAR
39 45 /* Bank read cmd */
40 46 u8 bank_read_cmd;
... ... @@ -45,6 +51,8 @@
45 51 #endif
46 52 /* Poll cmd - for flash erase/program */
47 53 u8 poll_cmd;
  54 + /* Erase cmd 4K, 32K, 64K */
  55 + u8 erase_cmd;
48 56  
49 57 void *memory_map; /* Address of read-only SPI flash access */
50 58 int (*read)(struct spi_flash *flash, u32 offset,