Commits · 0ed6ca3a22f871fdb7335194f6488d14b2dad96a · nexedi / linux

19 Dec, 2015 4 commits

mtd: denali: make MTD_NAND_DENALI_DT dependent on OF · 0ed6ca3a

Masahiro Yamada authored Dec 16, 2015

The build passes even if CONFIG_OF is undefined, but it makes sense
to let it depend on OF.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

0ed6ca3a

mtd: nand: Disable subpage writes for drivers without ecc->hwctl · 44991b3d

Helmut Schaa authored Apr 09, 2014

nand_write_subpage_hwecc causes a crash if the driver did not register
ecc->hwctl or ecc->calculate. Fix this by disabling subpage writes if
ecc->hwctl or ecc->calculate is not provided by the driver.

This behavior was introduced in commit 837a6ba4
"mtd: nand: subpage write support for hardware based ECC schemes".

This fixes a crash with fsl_elbc_nand and maybe others:

Unable to handle kernel paging request for instruction fetch
Faulting instruction address: 0x00000000
Oops: Kernel access of bad area, sig: 11 [#1]
SMP NR_CPUS=2 P1020 RDB
Modules linked in: ath9k ath9k_common pppoe ppp_async option iptable_nat ath9k_hw ath usb_wwan pppox ppp_generic nf_nat_ipv4 nf_conntrack_ipv4 mac80211 ipt_MASQUERADE cfg80211 xt_time xt_tcpudp xt_state xt_quota xt_policy xt_pkttype xt_owner xt_nat xt_multiport xt_mh
CPU: 1 PID: 2161 Comm: ubiformat Not tainted 3.10.26 #6
task: efbc2700 ti: c7950000 task.ti: c7950000
NIP: 00000000 LR: c01a495c CTR: 00000000
REGS: c7951cb0 TRAP: 0400   Not tainted  (3.10.26)
MSR: 00029000 <CE,EE,ME>  CR: 24002028  XER: 00000000

GPR00: c01a4b6c c7951d60 efbc2700 ef84b000 00000001 00000000 000001ff c7800500
GPR08: 00000000 00000000 efae5e40 c01a4ae4 24002022 10023418 c7951e5c c7800500
GPR16: c017b6a8 00000000 0000003f c053404c 00000000 00000004 00000000 00000003
GPR24: 00000010 00000200 ef84b000 c7800d00 c7800000 c7800500 ef84b1c8 00000000
NIP [00000000]   (null)
LR [c01a495c] nand_write_subpage_hwecc+0x74/0x174
Call Trace:
[c7951d60] [c7951d64] 0xc7951d64 (unreliable)
[c7951da0] [c01a4b6c] nand_write_page+0x88/0x198
[c7951dd0] [c01a5f7c] nand_do_write_ops+0x2f4/0x39c
[c7951e40] [c01a61e0] nand_write+0x58/0x84
[c7951e80] [c019e29c] mtdchar_write+0x1dc/0x28c
[c7951ef0] [c00aba84] vfs_write+0xcc/0x1ac
[c7951f10] [c00ac04c] SyS_write+0x4c/0x90
[c7951f40] [c000cd84] ret_from_syscall+0x0/0x3c
 --- Exception: c01 at 0x48050ed8
     LR = 0x100071b8
 Instruction dump:
 XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX
 XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX
 ---[ end trace 161d3c65a2a15cb8 ]---

Kernel panic - not syncing: Fatal exception

[Brian: editorial note - we've applied a previous fix for the driver in
question (fsl_elbc_nand) long ago:
commit f034d87d ("mtd: eLBC NAND: fix subpage write support")
but this still makes sense, and it could solve issues on some other
unforseen driver.]

Cc: Pekon Gupta <pekon.gupta@gmail.com>
Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Cc: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

44991b3d

mtd: ftl: use swap() in copy_erase_unit() · 6166a76f

Fabian Frederick authored Jun 10, 2015

Use kernel.h macro definition.

Thanks to Julia Lawall for Coccinelle scripting support.
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

6166a76f

mtd: cfi_cmdset_0002: use swap() in cfi_cmdset_0002() · fdd9d27c

Fabian Frederick authored Jun 10, 2015

Use kernel.h macro definition.

Thanks to Julia Lawall for Coccinelle scripting support.
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

fdd9d27c

18 Dec, 2015 36 commits

mtd: mtk-nor: adjust sequence of trigger function and assignment function · 80e1ca69

Bayi Cheng authored Dec 18, 2015

Move write data register before excute command to avoid
missing first byte write to nor flash
Signed-off-by: Bayi Cheng <bayi.cheng@mediatek.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

80e1ca69

mtd: nand: remove unused and buggy get_platform_nandchip() helper function · 8142b47e

Boris BREZILLON authored Dec 14, 2015

Nobody uses the get_platform_nandchip() helper function which is supposed
to return a pointer to a platform_nand_chip struct from an mtd_info
pointer.
Moreover, this function is buggy since the introduction of the plat_nand
layer (chip->priv is now storing a pointer to an intermediate
plat_nand_data structure allocated in plat_nand_probe(), and we have no
way to retrieve a pointer to the provided platform_nand_chip struct from
this plat_nand_data pointer).

While we are at it, remove the useless (and buggy, since it's pointing to
something stored on the stack) data->chip.priv assignment.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Fixes: 711fdf62 ("[MTD] [NAND] platform NAND driver: add driver")
Cc: Vitaly Wool <vitalywool@gmail.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

8142b47e

mtd: nand: kill the chip->flash_node field · 29574ede

Boris BREZILLON authored Dec 10, 2015

Now that the nand_chip struct directly embeds an mtd_info struct we can
get rid of the ->flash_node field and forward set/get_flash_node requests
to the MTD layer.

As a side effect, we no longer need the mtd_set_of_node() call done in
nand_dt_init().
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

29574ede

mtd: nand: simplify nand_dt_init() usage · 7194a29a

Boris BREZILLON authored Dec 10, 2015

nand_dt_init() function requires 3 arguments where it actually needs one
(dn and mtd can both be retrieved from chip). Drop these parameters.

Testing for dn != NULL inside nand_dt_init() also helps simplifying the
caller code.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

7194a29a

staging: mt29f_spinand: remove useless mtd->priv = chip assignment · f12d86af

Boris BREZILLON authored Dec 10, 2015

mtd_to_nand() now uses the container_of() approach to transform an
mtd_info pointer into a nand_chip one. Drop useless mtd->priv
assignments from NAND controller drivers.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

f12d86af

cris: nand: remove useless mtd->priv = chip assignments · 038a5380

Boris BREZILLON authored Dec 10, 2015

mtd_to_nand() now uses the container_of() approach to transform an
mtd_info pointer into a nand_chip one. Drop useless mtd->priv
assignments from NAND controller drivers.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

038a5380

mtd: nand: remove useless mtd->priv = chip assignments · 37f5a546

Boris BREZILLON authored Dec 10, 2015

mtd_to_nand() now uses the container_of() approach to transform an
mtd_info pointer into a nand_chip one. Drop useless mtd->priv
assignments from NAND controller drivers.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

37f5a546

mtd: nand: update mtd_to_nand() · 2d3b77ba

Boris BREZILLON authored Dec 10, 2015

Now that all drivers are using the mtd instance embedded in the nand_chip
struct we can safely update the mtd_to_nand() implementation to use
the container_of macro instead of returning the content of mtd->priv.
This will allow us to remove mtd->priv = chip assignments done in all
NAND controller drivers.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

2d3b77ba

mtd: nand: denali: use the mtd instance embedded in struct nand_chip · 442f201b

Boris BREZILLON authored Dec 11, 2015

struct nand_chip now embeds an mtd device. Make use of this mtd instance.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

442f201b

mtd: nand: socrates: use the mtd instance embedded in struct nand_chip · a723bf6a

Boris BREZILLON authored Dec 11, 2015

struct nand_chip now embeds an mtd device. Make use of this mtd instance.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

a723bf6a

mtd: nand: bcm47xx: use the mtd instance embedded in struct nand_chip · 17dd20bd

Boris BREZILLON authored Dec 10, 2015

struct nand_chip now embeds an mtd device. Make use of this mtd instance.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

17dd20bd

cris: nand: use the mtd instance embedded in struct nand_chip · 4883090b

Boris BREZILLON authored Dec 10, 2015

struct nand_chip now embeds an mtd device. Patch all drivers to make use
of this mtd instance instead of using the instance embedded in their
private struct or dynamically allocated.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

4883090b

staging: mt29f_spinand: use the mtd instance embedded in struct nand_chip · ba4ed860

Boris BREZILLON authored Dec 10, 2015

struct nand_chip now embeds an mtd device, use it instead of allocating
a new one.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

ba4ed860

mtd: nand: docg4: simplify error case · 2d374394

Brian Norris authored Dec 18, 2015

Other refactorings have left the 'fail' label much simpler, so it
shouldn't have to handle the failed allocation case.

This also fixes a -Wshadow warning.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>

2d374394

mtd: nand: s3c2410: use the mtd instance embedded in struct nand_chip · 7208b997

Boris BREZILLON authored Dec 10, 2015

struct nand_chip now embeds an mtd device. Make use of this mtd instance.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

7208b997

mtd: nand: update the documentation to reflect framework changes · 3eb064e4

Boris BREZILLON authored Dec 10, 2015

The MTD device is now directly embedded in the nand_chip struct. Update the
mtdnand documentation to mention this aspect and fix the different
examples.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

3eb064e4

mtd: nand: vf610: use the mtd instance embedded in struct nand_chip · 960823a2

Boris BREZILLON authored Dec 10, 2015

struct nand_chip now embeds an mtd device. Make use of this mtd instance.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

960823a2

mtd: nand: txx9ndfmc: use the mtd instance embedded in struct nand_chip · a3f54377

Boris BREZILLON authored Dec 10, 2015

struct nand_chip now embeds an mtd device. Make use of this mtd instance.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

a3f54377

mtd: nand: tmio: use the mtd instance embedded in struct nand_chip · 66c9595d

Boris BREZILLON authored Dec 10, 2015

struct nand_chip now embeds an mtd device. Make use of this mtd instance.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

66c9595d

mtd: nand: sunxi: use the mtd instance embedded in struct nand_chip · 32e9f2d8

Boris BREZILLON authored Dec 10, 2015

struct nand_chip now embeds an mtd device. Make use of this mtd instance.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

32e9f2d8

mtd: nand: sharpsl: use the mtd instance embedded in struct nand_chip · 0324e646

Boris BREZILLON authored Dec 10, 2015

struct nand_chip now embeds an mtd device. Make use of this mtd instance.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

0324e646

mtd: nand: sh_flctl: use the mtd instance embedded in struct nand_chip · 9c9eef89

Boris BREZILLON authored Dec 10, 2015

struct nand_chip now embeds an mtd device. Make use of this mtd instance.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

9c9eef89

mtd: nand: r852: use the mtd instance embedded in struct nand_chip · de9f56f9

Boris BREZILLON authored Dec 10, 2015

struct nand_chip now embeds an mtd device. Make use of this mtd instance.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

de9f56f9

mtd: nand: pxa3xx: use the mtd instance embedded in struct nand_chip · 063294a3

Boris BREZILLON authored Dec 10, 2015

struct nand_chip now embeds an mtd device. Make use of this mtd instance.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

063294a3

mtd: nand: plat: use the mtd instance embedded in struct nand_chip · a0260d21

Boris BREZILLON authored Dec 10, 2015

struct nand_chip now embeds an mtd device. Make use of this mtd instance.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

a0260d21

mtd: nand: pasemi: use the mtd instance embedded in struct nand_chip · 4e3b6d17

Boris BREZILLON authored Dec 10, 2015

struct nand_chip now embeds an mtd device. Make use of this mtd instance.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

4e3b6d17

mtd: nand: orion: use the mtd instance embedded in struct nand_chip · 53cd2681

Boris BREZILLON authored Dec 10, 2015

struct nand_chip now embeds an mtd device. Make use of this mtd instance.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

53cd2681

mtd: nand: omap2: use the mtd instance embedded in struct nand_chip · 432420c0

Boris BREZILLON authored Dec 10, 2015

struct nand_chip now embeds an mtd device. Make use of this mtd instance.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

432420c0

mtd: nand: nuc900: use the mtd instance embedded in struct nand_chip · 396a9c43

Boris BREZILLON authored Dec 10, 2015

struct nand_chip now embeds an mtd device. Make use of this mtd instance.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

396a9c43

mtd: nand: ndfc: use the mtd instance embedded in struct nand_chip · ca921b53

Boris BREZILLON authored Dec 10, 2015

struct nand_chip now embeds an mtd device. Make use of this mtd instance.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

ca921b53

mtd: nand: nandsim: use the mtd instance embedded in struct nand_chip · ed10f165

Boris BREZILLON authored Dec 10, 2015

struct nand_chip now embeds an mtd device. Make use of this mtd instance.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

ed10f165

mtd: nand: mxc: use the mtd instance embedded in struct nand_chip · a008deb1

Boris BREZILLON authored Dec 10, 2015

struct nand_chip now embeds an mtd device. Make use of this mtd instance.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

a008deb1

mtd: nand: mpc5121: use the mtd instance embedded in struct nand_chip · 5a9f23ff

Boris BREZILLON authored Dec 10, 2015

struct nand_chip now embeds an mtd device. Make use of this mtd instance.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

5a9f23ff

mtd: nand: lpc32xx: use the mtd instance embedded in struct nand_chip · 0faf8c39

Boris BREZILLON authored Dec 10, 2015

struct nand_chip now embeds an mtd device. Make use of this mtd instance.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

0faf8c39

mtd: nand: jz4740: use the mtd instance embedded in struct nand_chip · d25cc7ab

Boris BREZILLON authored Dec 10, 2015

struct nand_chip now embeds an mtd device. Make use of this mtd instance.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

d25cc7ab

mtd: nand: hisi504: use the mtd instance embedded in struct nand_chip · fa100163

Boris BREZILLON authored Dec 10, 2015

struct nand_chip now embeds an mtd device. Make use of this mtd instance.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

fa100163