提交 · e576330033936d94a00068760a5744e27ce51a32 · openanolis / cloud-kernel

06 1月, 2016 4 次提交

mtd: merge MTD development from v4.4 into for-v4.5 development · e5763300

由 Brian Norris 提交于 1月 05, 2016

Small conflict between some bugfixes for 4.4 and some refactoring for
4.5.
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

e5763300

mtd: spi-nor: fix stm_is_locked_sr() parameters · a32d5b72

由 Brian Norris 提交于 12月 15, 2015

stm_is_locked_sr() takes the status register (SR) value as the last
parameter, not the second.
Reported-by: NBayi Cheng <bayi.cheng@mediatek.com>
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>
Cc: Bayi Cheng <bayi.cheng@mediatek.com>

a32d5b72

mtd: spi-nor: fix Spansion regressions (aliased with Winbond) · 67b9bcd3

由 Brian Norris 提交于 12月 15, 2015

Spansion and Winbond have occasionally used the same manufacturer ID,
and they don't support the same features. Particularly, writing SR=0
seems to break read access for Spansion's s25fl064k. Unfortunately, we
don't currently have a way to differentiate these Spansion and Winbond
parts, so rather than regressing support for these Spansion flash, let's
drop the new Winbond lock/unlock support for now. We can try to address
Winbond support during the next release cycle.

Original discussion:

http://patchwork.ozlabs.org/patch/549173/
http://patchwork.ozlabs.org/patch/553683/

Fixes: 357ca38d ("mtd: spi-nor: support lock/unlock/is_locked for Winbond")
Fixes: c6fc2171 ("mtd: spi-nor: disable protection for Winbond flash at startup")
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>
Reported-by: NFelix Fietkau <nbd@openwrt.org>
Cc: Felix Fietkau <nbd@openwrt.org>

67b9bcd3

mtd: nand: fix for drop unnecessary partition parser data · 887e9d3a

由 Stephen Rothwell 提交于 1月 04, 2016

From Stephen:

    Hi Brian,

    After merging the l2-mtd tree, today's linux-next build (powerpc
    ppc44x_defconfig) failed like this:

    drivers/mtd/nand/ndfc.c: In function 'ndfc_chip_init':
    drivers/mtd/nand/ndfc.c:177:2: error: 'ppdata' undeclared (first use in this function)
      ppdata.of_node = flash_np;
      ^

    Caused by commit

      a61ae81a ("mtd: nand: drop unnecessary partition parser data")

The flash node is already correctly assigned using the new helper
(nand_set_flash_node()) so the correct fix is indeed to simply drop this
line.

Fixes: a61ae81a ("mtd: nand: drop unnecessary partition parser data")
Signed-off-by: NStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

887e9d3a

05 1月, 2016 1 次提交

mtd: fix cmdlinepart parser, early naming for auto-filled MTD · 472b444e

由 Brian Norris 提交于 12月 11, 2015

Commit 807f16d4 ("mtd: core: set some defaults when dev.parent is
set") attempted to provide some default settings for MTDs that
 (a) assign the parent device and
 (b) don't provide their own name or owner

However, this isn't a perfect drop-in replacement for the boilerplate
found in some drivers, because the MTD name is used by partition
parsers like cmdlinepart, but the name isn't set until add_mtd_device(),
after the parsing is completed. This means cmdlinepart sees a NULL name
and therefore will not work properly.

Fix this by moving the default name and owner assignment to be first in
the MTD registration process.

[Note: this does not fix all reported issues, particularly with NAND
drivers. Will require an additional fix for drivers/mtd/nand/]

Fixes: 807f16d4 ("mtd: core: set some defaults when dev.parent is set")
Reported-by: NHeiko Schocher <hs@denx.de>
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>
Cc: Heiko Schocher <hs@denx.de>
Cc: Frans Klaver <fransklaver@gmail.com>

472b444e

19 12月, 2015 35 次提交

mtd: sh_flctl: pass FIFO as physical address · 1873315f

由 Arnd Bergmann 提交于 12月 08, 2015

By convention, the FIFO address we pass using dmaengine_slave_config
is a physical address in the form that is understood by the DMA
engine, as a dma_addr_t, phys_addr_t or resource_size_t.

The sh_flctl driver however passes a virtual __iomem address that
gets cast to dma_addr_t in the slave driver. This happens to work
on shmobile because that platform sets up an identity mapping for
its MMIO regions, but such code is not portable to other platforms,
and prevents us from ever changing the platform mapping or reusing
the driver on other architectures like ARM64 that might not have the
mapping.

We also get a warning about a type mismatch for the case that
dma_addr_t is wider than a pointer, i.e. when CONFIG_LPAE is set:

drivers/mtd/nand/sh_flctl.c: In function 'flctl_setup_dma':
drivers/mtd/nand/sh_flctl.c:163:17: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
  cfg.dst_addr = (dma_addr_t)FLDTFIFO(flctl);

This changes the driver to instead pass the physical address of
the FIFO that is extracted from the MMIO resource, making the
code more portable and avoiding the warning.
Signed-off-by: NArnd Bergmann <arnd@arndb.de>
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

1873315f

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

由 Masahiro Yamada 提交于 12月 16, 2015

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

0ed6ca3a

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

由 Helmut Schaa 提交于 4月 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: NHelmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

44991b3d

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

由 Fabian Frederick 提交于 6月 10, 2015

Use kernel.h macro definition.

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

6166a76f

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

由 Fabian Frederick 提交于 6月 10, 2015

Use kernel.h macro definition.

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

fdd9d27c

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

由 Bayi Cheng 提交于 12月 18, 2015

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

80e1ca69

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

由 Boris BREZILLON 提交于 12月 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: NBoris Brezillon <boris.brezillon@free-electrons.com>
Fixes: 711fdf62 ("[MTD] [NAND] platform NAND driver: add driver")
Cc: Vitaly Wool <vitalywool@gmail.com>
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

8142b47e

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

由 Boris BREZILLON 提交于 12月 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: NBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

29574ede

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

由 Boris BREZILLON 提交于 12月 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: NBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

7194a29a

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

由 Boris BREZILLON 提交于 12月 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: NBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

f12d86af

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

由 Boris BREZILLON 提交于 12月 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: NBoris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: NJesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

038a5380

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

由 Boris BREZILLON 提交于 12月 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: NBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

37f5a546

mtd: nand: update mtd_to_nand() · 2d3b77ba

由 Boris BREZILLON 提交于 12月 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: NBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

2d3b77ba

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

由 Boris BREZILLON 提交于 12月 11, 2015

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

442f201b

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

由 Boris BREZILLON 提交于 12月 11, 2015

a723bf6a

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

由 Boris BREZILLON 提交于 12月 10, 2015

17dd20bd

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

由 Boris BREZILLON 提交于 12月 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: NBoris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: NJesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

4883090b

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

由 Boris BREZILLON 提交于 12月 10, 2015

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

ba4ed860

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

由 Brian Norris 提交于 12月 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: NBrian Norris <computersforpeace@gmail.com>
Reviewed-by: NBoris Brezillon <boris.brezillon@free-electrons.com>

2d374394

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

由 Boris BREZILLON 提交于 12月 10, 2015

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

7208b997

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

由 Boris BREZILLON 提交于 12月 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: NBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

3eb064e4