qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH v3] hw/block/nand: Decommission the NAND museum


From: Philippe Mathieu-Daudé
Subject: [PATCH v3] hw/block/nand: Decommission the NAND museum
Date: Mon, 14 Dec 2020 01:26:20 +0100

This is the QEMU equivalent of this Linux commit (but 7 years later):
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f7025a43a9da2

    The MTD subsystem has its own small museum of ancient NANDs
    in a form of the CONFIG_MTD_NAND_MUSEUM_IDS configuration option.
    The museum contains stone age NANDs with 256 bytes pages, as well
    as iron age NANDs with 512 bytes per page and up to 8MiB page size.

    It is with great sorrow that I inform you that the museum is being
    decommissioned. The MTD subsystem is out of budget for Kconfig
    options and already has too many of them, and there is a general
    kernel trend to simplify the configuration menu.

    We remove the stone age exhibits along with closing the museum,
    but some of the iron age ones are transferred to the regular NAND
    depot. Namely, only those which have unique device IDs are
    transferred, and the ones which have conflicting device IDs are
    removed.

The machine using this device are:
- axis-dev88
- tosa (via tc6393xb_init)
- spitz based (akita, borzoi, terrier)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
v3: Do not manually convert tabs to space to avoid mistakes...

While this patch only *removes* lines, checkpatch still complains:

 ERROR: code indent should never use tabs
 #14: FILE: hw/block/nand.c:150:
 +    [0x6b] = { 4,^I8,^I9, 4, 0 },$

 ERROR: code indent should never use tabs
 #15: FILE: hw/block/nand.c:151:
 +    [0xe3] = { 4,^I8,^I9, 4, 0 },$

 ERROR: code indent should never use tabs
 #16: FILE: hw/block/nand.c:152:
 +    [0xe5] = { 4,^I8,^I9, 4, 0 },$

 ERROR: code indent should never use tabs
 #17: FILE: hw/block/nand.c:153:
 +    [0xd6] = { 8,^I8,^I9, 4, 0 },$

 ERROR: code indent should never use tabs
 #18: FILE: hw/block/nand.c:154:
 +    [0xe6] = { 8,^I8,^I9, 4, 0 },$
---
 hw/block/nand.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/hw/block/nand.c b/hw/block/nand.c
index 1d7a48a2ec2..9ed54a0a922 100644
--- a/hw/block/nand.c
+++ b/hw/block/nand.c
@@ -137,7 +137,7 @@ static void mem_and(uint8_t *dest, const uint8_t *src, 
size_t n)
 # define ADDR_SHIFT            16
 # include "nand.c"
 
-/* Information based on Linux drivers/mtd/nand/nand_ids.c */
+/* Information based on Linux drivers/mtd/nand/raw/nand_ids.c */
 static const struct {
     int size;
     int width;
@@ -147,21 +147,11 @@ static const struct {
 } nand_flash_ids[0x100] = {
     [0 ... 0xff] = { 0 },
 
-    [0x6e] = { 1,      8,      8, 4, 0 },
-    [0x64] = { 2,      8,      8, 4, 0 },
     [0x6b] = { 4,      8,      9, 4, 0 },
-    [0xe8] = { 1,      8,      8, 4, 0 },
-    [0xec] = { 1,      8,      8, 4, 0 },
-    [0xea] = { 2,      8,      8, 4, 0 },
-    [0xd5] = { 4,      8,      9, 4, 0 },
     [0xe3] = { 4,      8,      9, 4, 0 },
     [0xe5] = { 4,      8,      9, 4, 0 },
     [0xd6] = { 8,      8,      9, 4, 0 },
-
-    [0x39] = { 8,      8,      9, 4, 0 },
     [0xe6] = { 8,      8,      9, 4, 0 },
-    [0x49] = { 8,      16,     9, 4, NAND_BUSWIDTH_16 },
-    [0x59] = { 8,      16,     9, 4, NAND_BUSWIDTH_16 },
 
     [0x33] = { 16,     8,      9, 5, 0 },
     [0x73] = { 16,     8,      9, 5, 0 },
-- 
2.26.2




reply via email to

[Prev in Thread] Current Thread [Next in Thread]