Skip to content

Commit 0420872

Browse files
miquelraynalmiquelraynal
committed
mtd: spinand: Create distinct fast and slow read from cache variants
So far, the SPINAND_PAGE_READ_FROM_CACHE_OP macro was taking a first argument, "fast", which was inducing the possibility to support higher bus frequencies than with the normal (slower) read from cache alternative. In practice, without frequency change on the bus, this was likely without effect, besides perhaps allowing another variant of the same command, that could run at the default highest speed. If we want to support this fully, we need to add a frequency parameter to the slowest command. But before we do that, let's drop the "fast" boolean from the macro and duplicate it, this will further help supporting having different frequencies allowed for each variant. The change is also of course propagated to all users. It has the nice effect to have all macros aligned on the same pattern. Reviewed-by: Tudor Ambarus <[email protected]> Signed-off-by: Miquel Raynal <[email protected]>
1 parent fc4378b commit 0420872

File tree

12 files changed

+46
-34
lines changed

12 files changed

+46
-34
lines changed

‎drivers/mtd/nand/spi/alliancememory.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ static SPINAND_OP_VARIANTS(read_cache_variants,
2121
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
2222
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
2323
SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
24-
SPINAND_PAGE_READ_FROM_CACHE_OP(true, 0, 1, NULL, 0),
25-
SPINAND_PAGE_READ_FROM_CACHE_OP(false, 0, 1, NULL, 0));
24+
SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
25+
SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
2626

2727
static SPINAND_OP_VARIANTS(write_cache_variants,
2828
SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),

‎drivers/mtd/nand/spi/ato.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
static SPINAND_OP_VARIANTS(read_cache_variants,
1717
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
18-
SPINAND_PAGE_READ_FROM_CACHE_OP(true, 0, 1, NULL, 0),
19-
SPINAND_PAGE_READ_FROM_CACHE_OP(false, 0, 1, NULL, 0));
18+
SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
19+
SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
2020

2121
static SPINAND_OP_VARIANTS(write_cache_variants,
2222
SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),

‎drivers/mtd/nand/spi/esmt.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
static SPINAND_OP_VARIANTS(read_cache_variants,
1616
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
1717
SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
18-
SPINAND_PAGE_READ_FROM_CACHE_OP(true, 0, 1, NULL, 0),
19-
SPINAND_PAGE_READ_FROM_CACHE_OP(false, 0, 1, NULL, 0));
18+
SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
19+
SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
2020

2121
static SPINAND_OP_VARIANTS(write_cache_variants,
2222
SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),

‎drivers/mtd/nand/spi/foresee.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
static SPINAND_OP_VARIANTS(read_cache_variants,
1515
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
1616
SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
17-
SPINAND_PAGE_READ_FROM_CACHE_OP(true, 0, 1, NULL, 0),
18-
SPINAND_PAGE_READ_FROM_CACHE_OP(false, 0, 1, NULL, 0));
17+
SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
18+
SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
1919

2020
static SPINAND_OP_VARIANTS(write_cache_variants,
2121
SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),

‎drivers/mtd/nand/spi/gigadevice.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,32 +28,32 @@ static SPINAND_OP_VARIANTS(read_cache_variants,
2828
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
2929
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
3030
SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
31-
SPINAND_PAGE_READ_FROM_CACHE_OP(true, 0, 1, NULL, 0),
32-
SPINAND_PAGE_READ_FROM_CACHE_OP(false, 0, 1, NULL, 0));
31+
SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
32+
SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
3333

3434
static SPINAND_OP_VARIANTS(read_cache_variants_f,
3535
SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 1, NULL, 0),
3636
SPINAND_PAGE_READ_FROM_CACHE_X4_OP_3A(0, 1, NULL, 0),
3737
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
3838
SPINAND_PAGE_READ_FROM_CACHE_X2_OP_3A(0, 1, NULL, 0),
39-
SPINAND_PAGE_READ_FROM_CACHE_OP_3A(true, 0, 1, NULL, 0),
40-
SPINAND_PAGE_READ_FROM_CACHE_OP_3A(false, 0, 0, NULL, 0));
39+
SPINAND_PAGE_READ_FROM_CACHE_FAST_OP_3A(0, 1, NULL, 0),
40+
SPINAND_PAGE_READ_FROM_CACHE_OP_3A(0, 0, NULL, 0));
4141

4242
static SPINAND_OP_VARIANTS(read_cache_variants_1gq5,
4343
SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
4444
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
4545
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
4646
SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
47-
SPINAND_PAGE_READ_FROM_CACHE_OP(true, 0, 1, NULL, 0),
48-
SPINAND_PAGE_READ_FROM_CACHE_OP(false, 0, 1, NULL, 0));
47+
SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
48+
SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
4949

5050
static SPINAND_OP_VARIANTS(read_cache_variants_2gq5,
5151
SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 4, NULL, 0),
5252
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
5353
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 2, NULL, 0),
5454
SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
55-
SPINAND_PAGE_READ_FROM_CACHE_OP(true, 0, 1, NULL, 0),
56-
SPINAND_PAGE_READ_FROM_CACHE_OP(false, 0, 1, NULL, 0));
55+
SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
56+
SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
5757

5858
static SPINAND_OP_VARIANTS(write_cache_variants,
5959
SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),

‎drivers/mtd/nand/spi/macronix.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ struct macronix_priv {
2828
static SPINAND_OP_VARIANTS(read_cache_variants,
2929
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
3030
SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
31-
SPINAND_PAGE_READ_FROM_CACHE_OP(true, 0, 1, NULL, 0),
32-
SPINAND_PAGE_READ_FROM_CACHE_OP(false, 0, 1, NULL, 0));
31+
SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
32+
SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
3333

3434
static SPINAND_OP_VARIANTS(write_cache_variants,
3535
SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),

‎drivers/mtd/nand/spi/micron.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ static SPINAND_OP_VARIANTS(quadio_read_cache_variants,
3333
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
3434
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
3535
SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
36-
SPINAND_PAGE_READ_FROM_CACHE_OP(true, 0, 1, NULL, 0),
37-
SPINAND_PAGE_READ_FROM_CACHE_OP(false, 0, 1, NULL, 0));
36+
SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
37+
SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
3838

3939
static SPINAND_OP_VARIANTS(x4_write_cache_variants,
4040
SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),
@@ -48,8 +48,8 @@ static SPINAND_OP_VARIANTS(x4_update_cache_variants,
4848
static SPINAND_OP_VARIANTS(x4_read_cache_variants,
4949
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
5050
SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
51-
SPINAND_PAGE_READ_FROM_CACHE_OP(true, 0, 1, NULL, 0),
52-
SPINAND_PAGE_READ_FROM_CACHE_OP(false, 0, 1, NULL, 0));
51+
SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
52+
SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
5353

5454
static SPINAND_OP_VARIANTS(x1_write_cache_variants,
5555
SPINAND_PROG_LOAD(true, 0, NULL, 0));

‎drivers/mtd/nand/spi/paragon.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ static SPINAND_OP_VARIANTS(read_cache_variants,
2626
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
2727
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
2828
SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
29-
SPINAND_PAGE_READ_FROM_CACHE_OP(true, 0, 1, NULL, 0),
30-
SPINAND_PAGE_READ_FROM_CACHE_OP(false, 0, 1, NULL, 0));
29+
SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
30+
SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
3131

3232
static SPINAND_OP_VARIANTS(write_cache_variants,
3333
SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),

‎drivers/mtd/nand/spi/toshiba.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
static SPINAND_OP_VARIANTS(read_cache_variants,
1818
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
1919
SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
20-
SPINAND_PAGE_READ_FROM_CACHE_OP(true, 0, 1, NULL, 0),
21-
SPINAND_PAGE_READ_FROM_CACHE_OP(false, 0, 1, NULL, 0));
20+
SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
21+
SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
2222

2323
static SPINAND_OP_VARIANTS(write_cache_x4_variants,
2424
SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),

‎drivers/mtd/nand/spi/winbond.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ static SPINAND_OP_VARIANTS(read_cache_variants,
2222
SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
2323
SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
2424
SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
25-
SPINAND_PAGE_READ_FROM_CACHE_OP(true, 0, 1, NULL, 0),
26-
SPINAND_PAGE_READ_FROM_CACHE_OP(false, 0, 1, NULL, 0));
25+
SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
26+
SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
2727

2828
static SPINAND_OP_VARIANTS(write_cache_variants,
2929
SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),

0 commit comments

Comments
 (0)