提交 · ab53a571a4777c36324a030a632281daaf505118 · openanolis / cloud-kernel

27 10月, 2015 1 次提交

mtd: pxa3xx_nand: fix some compile issues on non-ARM arches · ab53a571

由 Antoine Ténart 提交于 10月 21, 2015

Using readsl() result in a build error on i386. Fix this by using
ioread32_rep() instead, to allow compile testing the pxa3xx nand driver
on other architectures later.
Suggested-by: NArnd Bergmann <arnd@arndb.de>
Signed-off-by: NAntoine Tenart <antoine.tenart@free-electrons.com>
Acked-by: NEzequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

ab53a571

20 10月, 2015 11 次提交

mtd: lpc32xx_mlc: fix warnings caused by enabling unprepared clock · 64862dbc

由 Vladimir Zapolskiy 提交于 10月 17, 2015

If common clock framework is configured, the driver generates a warning,
which is fixed by this change:

    WARNING: CPU: 0 PID: 1 at drivers/clk/clk.c:727 clk_core_enable+0x2c/0xa4()
    Modules linked in:
    CPU: 0 PID: 1 Comm: swapper Not tainted 4.3.0-rc2+ #206
    Hardware name: LPC32XX SoC (Flattened Device Tree)
    Backtrace:
    [<>] (dump_backtrace) from [<>] (show_stack+0x18/0x1c)
    [<>] (show_stack) from [<>] (dump_stack+0x20/0x28)
    [<>] (dump_stack) from [<>] (warn_slowpath_common+0x90/0xb8)
    [<>] (warn_slowpath_common) from [<>] (warn_slowpath_null+0x24/0x2c)
    [<>] (warn_slowpath_null) from [<>] (clk_core_enable+0x2c/0xa4)
    [<>] (clk_core_enable) from [<>] (clk_enable+0x24/0x38)
    [<>] (clk_enable) from [<>] (lpc32xx_nand_probe+0x208/0x248)
    [<>] (lpc32xx_nand_probe) from [<>] (platform_drv_probe+0x50/0xa0)
    [<>] (platform_drv_probe) from [<>] (driver_probe_device+0x18c/0x408)
    [<>] (driver_probe_device) from [<>] (__driver_attach+0x70/0x94)
    [<>] (__driver_attach) from [<>] (bus_for_each_dev+0x74/0x98)
    [<>] (bus_for_each_dev) from [<>] (driver_attach+0x20/0x28)
    [<>] (driver_attach) from [<>] (bus_add_driver+0x11c/0x248)
    [<>] (bus_add_driver) from [<>] (driver_register+0xa4/0xe8)
    [<>] (driver_register) from [<>] (__platform_driver_register+0x50/0x64)
    [<>] (__platform_driver_register) from [<>] (lpc32xx_nand_driver_init+0x18/0x20)
    [<>] (lpc32xx_nand_driver_init) from [<>] (do_one_initcall+0x11c/0x1dc)
    [<>] (do_one_initcall) from [<>] (kernel_init_freeable+0x10c/0x1d4)
    [<>] (kernel_init_freeable) from [<>] (kernel_init+0x10/0xec)
    [<>] (kernel_init) from [<>] (ret_from_fork+0x14/0x24)
Signed-off-by: NVladimir Zapolskiy <vz@mleia.com>
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

64862dbc

mtd: lpc32xx_slc: fix warnings caused by enabling unprepared clock · 44cab9c9

由 Vladimir Zapolskiy 提交于 10月 17, 2015

If common clock framework is configured, the driver generates a warning,
which is fixed by this change:

    WARNING: CPU: 0 PID: 1 at drivers/clk/clk.c:727 clk_core_enable+0x2c/0xa4()
    Modules linked in:
    CPU: 0 PID: 1 Comm: swapper Not tainted 4.3.0-rc2+ #201
    Hardware name: LPC32XX SoC (Flattened Device Tree)
    Backtrace:
    [<>] (dump_backtrace) from [<>] (show_stack+0x18/0x1c)
    [<>] (show_stack) from [<>] (dump_stack+0x20/0x28)
    [<>] (dump_stack) from [<>] (warn_slowpath_common+0x90/0xb8)
    [<>] (warn_slowpath_common) from [<>] (warn_slowpath_null+0x24/0x2c)
    [<>] (warn_slowpath_null) from [<>] (clk_core_enable+0x2c/0xa4)
    [<>] (clk_core_enable) from [<>] (clk_enable+0x24/0x38)
    [<>] (clk_enable) from [<>] (lpc32xx_nand_probe+0x290/0x568)
    [<>] (lpc32xx_nand_probe) from [<>] (platform_drv_probe+0x50/0xa0)
    [<>] (platform_drv_probe) from [<>] (driver_probe_device+0x18c/0x408)
    [<>] (driver_probe_device) from [<>] (__driver_attach+0x70/0x94)
    [<>] (__driver_attach) from [<>] (bus_for_each_dev+0x74/0x98)
    [<>] (bus_for_each_dev) from [<>] (driver_attach+0x20/0x28)
    [<>] (driver_attach) from [<>] (bus_add_driver+0x11c/0x248)
    [<>] (bus_add_driver) from [<>] (driver_register+0xa4/0xe8)
    [<>] (driver_register) from [<>] (__platform_driver_register+0x50/0x64)
    [<>] (__platform_driver_register) from [<>] (lpc32xx_nand_driver_init+0x18/0x20)
    [<>] (lpc32xx_nand_driver_init) from [<>] (do_one_initcall+0x11c/0x1dc)
    [<>] (do_one_initcall) from [<>] (kernel_init_freeable+0x10c/0x1d4)
    [<>] (kernel_init_freeable) from [<>] (kernel_init+0x10/0xec)
    [<>] (kernel_init) from [<>] (ret_from_fork+0x14/0x24)
Signed-off-by: NVladimir Zapolskiy <vz@mleia.com>
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

44cab9c9

mtd: maps: rbtx4939-flash: fix compile error · ff84d2b7

由 Brian Norris 提交于 10月 19, 2015

We got the syntax wrong here. Compile tested this time!

Error:

   drivers/mtd/maps/rbtx4939-flash.c: In function 'rbtx4939_flash_probe':
>> drivers/mtd/maps/rbtx4939-flash.c:99:11: error: request for member 'dev' in something not a structure or union
     info->mtd.dev.parent = &dev->dev;
              ^

Fixes: 9aa7e502 ("mtd: maps: rbtx4939-flash: show parent device in sysfs")
Reported-by: Nkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>
Cc: Frans Klaver <fransklaver@gmail.com>

ff84d2b7

mtd: mtd-user: remove stdint.h include · 137d36af

由 Mikko Rapeli 提交于 10月 15, 2015

Kernel headers should use linux/types.h instead.
Signed-off-by: NMikko Rapeli <mikko.rapeli@iki.fi>
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

137d36af

mtd: mtdram: check offs and len in mtdram->erase · ab84fce5

由 Dongsheng Yang 提交于 9月 30, 2015

We should prevent user to erasing mtd device with
an unaligned offset or length.
Signed-off-by: NDongsheng Yang <yangds.fnst@cn.fujitsu.com>
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

ab84fce5

mtd: pxa3xx_nand: switch to device PM · d3e94f3f

由 Brian Norris 提交于 10月 12, 2015

The old PM model is deprecated. This is equivalent.
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>
Tested-by: NEzequiel Garcia <ezequiel@vanguardiasur.com.ar>
Acked-by: NEzequiel Garcia <ezequiel@vanguardiasur.com.ar>

d3e94f3f

mtd: pxa3xx_nand: don't duplicate MTD suspend/resume · 2e17497c

由 Brian Norris 提交于 10月 12, 2015

mtd_{suspend,resume}() get called from mtdcore in a class suspend/resume
callback. We don't need to call them again here. In practice, this would
actually work OK, as nand_base actually handles nesting OK -- it just
might print warnings.

Untested, but there are few (no?) users of PM for this driver AFAIK.
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>
Tested-by: NEzequiel Garcia <ezequiel@vanguardiasur.com.ar>
Acked-by: NEzequiel Garcia <ezequiel@vanguardiasur.com.ar>

2e17497c

mtd: fsl-quadspi: Include <linux/sizes.h> to avoid build error · 01a3c625

由 Fabio Estevam 提交于 10月 14, 2015

Building for x86 results in the following build errors:

   drivers/mtd/spi-nor/fsl-quadspi.c: In function 'fsl_qspi_init_lut':
>> drivers/mtd/spi-nor/fsl-quadspi.c:355:21: error: 'SZ_16M' undeclared (first use in this function)
     if (q->nor_size <= SZ_16M) {
                        ^
   drivers/mtd/spi-nor/fsl-quadspi.c:355:21: note: each undeclared identifier is reported only once for each function it appears in
   drivers/mtd/spi-nor/fsl-quadspi.c: In function 'fsl_qspi_read':
>> drivers/mtd/spi-nor/fsl-quadspi.c:208:27: error: 'SZ_4M' undeclared (first use in this function)
    #define QUADSPI_MIN_IOMAP SZ_4M
                              ^
>> drivers/mtd/spi-nor/fsl-quadspi.c:845:25: note: in expansion of macro 'QUADSPI_MIN_IOMAP'
      q->memmap_len = len > QUADSPI_MIN_IOMAP ? len : QUADSPI_MIN_IOMAP;

Explicitly include <linux/sizes.h> to fix the problem.
Reported-by: Nkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: NFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

01a3c625

mtd: fsl-quadspi: allow building for other ARCHes with COMPILE_TEST · d26a22d0

由 Brian Norris 提交于 10月 12, 2015

This driver doesn't actually need ARCH_MXC to compile. Relax the
constraints.
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>
Acked-by: NHan xu <han.xu@freescale.com>

d26a22d0

mtd: fsl-quadspi: fix printk() format warning for size_t · a5c603a2

由 Brian Norris 提交于 10月 12, 2015

Seen when compile-testing on non-32-bit arch:

    CC      drivers/mtd/spi-nor/fsl-quadspi.o
  drivers/mtd/spi-nor/fsl-quadspi.c: In function 'fsl_qspi_read':
  drivers/mtd/spi-nor/fsl-quadspi.c:873:2: warning: format '%d' expects argument of type 'int', but argument 6 has type 'size_t' [-Wformat=]
    dev_dbg(q->dev, "cmd [%x],read from 0x%p, len:%d\n",
    ^

Also drop the '0x' prefixing to the '%p' formatter, since %p already
knows how to format pointers appropriately.
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>
Acked-by: NHan xu <han.xu@freescale.com>

a5c603a2

mtd: spi-nor: add DUAL_READ for w25q{32,64}dw · a23eb341

由 Brian Norris 提交于 9月 01, 2015

These flash support dual and quad read. Tested dual read on the 32 Mbit
version.
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

a23eb341

14 10月, 2015 28 次提交

B
mtd: spi-nor: disable protection for Winbond flash at startup · c6fc2171
由 Brian Norris 提交于 9月 01, 2015
```
In case the flash was locked at boot time.
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>
```
c6fc2171

mtd: spi-nor: support lock/unlock/is_locked for Winbond · 357ca38d

由 Brian Norris 提交于 9月 01, 2015

Many other flash share the same features as ST Micro. I've tested some
Winbond flash, so add them.
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

357ca38d

mtd: spi-nor: add mtd_is_locked() support · 5bf0e69b

由 Brian Norris 提交于 9月 01, 2015

This enables ioctl(MEMISLOCKED). Status can now be reported in the
mtdinfo or flash_lock utilities found in mtd-utils.
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

5bf0e69b

mtd: spi-nor: refactor block protection functions · 62593cf4

由 Brian Norris 提交于 9月 01, 2015

This code was a bit sloppy, would produce a lot of copy-and-paste, and
did not always provide a sensible interface:

 * It didn't validate the length for LOCK and the offset for UNLOCK, so
   we were essentially discarding half of the user-supplied data and
   assuming what they wanted to lock/unlock
 * It didn't do very good error checking
 * It didn't make use of the fact that this operation works on
   power-of-two dimensions

So, rewrite this to do proper bit arithmetic rather than a bunch of
hard-coded condition tables. Now we have:

 * More comments on how this was derived
 * Notes on what is (and isn't) supported
 * A more exendible function, so we could add support for other
   protection ranges
 * More accurate locking - e.g., suppose the top quadrant is locked (75%
   to 100%); then in the following cases, case (a) will succeed but (b)
   will not (return -EINVAL):
     (a) user requests lock 3rd quadrant (50% to 75%)
     (b) user requests lock 3rd quadrant, minus a few blocks (e.g., 50%
         to 73%)
   Case (b) *should* fail, since we'd have to lock blocks that weren't
   requested. But the old implementation didn't know the difference and
   would lock the entire second half (50% to 100%)

This refactoring work will also help enable the addition of
mtd_is_locked() support and potentially the support of bottom boot
protection (TB=1).
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

62593cf4

B
mtd: spi-nor: fixup kernel-doc for flash lock/unlock function pointers · f8900258
由 Brian Norris 提交于 9月 01, 2015
```
I got the names of these fields wrong.
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>
```
f8900258
B
mtd: spi-nor: use SNOR_MFR_* instead of CFI_MFR_* · f0d2448e
由 Brian Norris 提交于 9月 01, 2015
```
No functional change, just cosmetic.
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>
```
f0d2448e

mtd: spi-nor: add SPI NOR manufacturer IDs · db4745ed

由 Brian Norris 提交于 9月 01, 2015

These are often similar for CFI (parallel NOR) and for SPI NOR, but they
aren't always the same, for various reasons (different namespaces,
company acquisitions and renames, etc.). And some don't have CFI_MFR_*
entries at all.

So let's make a proper place to list the SPI NOR IDs, with all the SPI
NOR specific assumptions and comments.
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

db4745ed

mtd: spi-nor: make bitfield constants more consistent · a8a16454

由 Brian Norris 提交于 9月 01, 2015

These status bits use different ways of representing similar integer
constants -- some are decimal, some are hex. Make them more consistent.

At the same time, impose my own preference, since IMO it's clearer what
these are when using the BIT() macro.
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

a8a16454

mtd: spi-nor: make implicit <linux/bitops.h> dependency explicit · 801cf21b

由 Brian Norris 提交于 9月 01, 2015

We use BIT() in the header. No real problem for now, but it's better to
be accurate.
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

801cf21b

mtd: spi-nor: Add support for s25fl004k · 7c748f57

由 Sean Nyekjaer 提交于 10月 13, 2015

Signed-off-by: NSean Nyekjaer <sean.nyekjaer@prevas.dk>
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

7c748f57

mtd: spi-nor: s25fl204k supports dual I/0 · aada20cd

由 Sean Nyekjaer 提交于 10月 13, 2015

Signed-off-by: NSean Nyekjaer <sean.nyekjaer@prevas.dk>
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

aada20cd

mtd: nand: pass page number to ecc->write_xxx() methods · 45aaeff9

由 Boris BREZILLON 提交于 10月 13, 2015

The ->read_xxx() methods are all passed the page number the NAND controller
is supposed to read, but ->write_xxx() do not have such a parameter.

This is a problem if we want to properly implement data
scrambling/randomization in order to mitigate MLC sensibility to repeated
pattern: to prevent bitflips in adjacent pages in the same block we need
to avoid repeating the same pattern at the same offset in those pages,
hence the randomizer/scrambler engine need to be passed the page value
in order to adapt its seed accordingly.

Moreover, adding the page parameter to the ->write_xxx() methods add some
consistency to the current API.
Signed-off-by: NBoris Brezillon <boris.brezillon@free-electrons.com>
CC: Josh Wu <josh.wu@atmel.com>
CC: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
CC: Maxime Ripard <maxime.ripard@free-electrons.com>
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Huang Shijie <shijie.huang@arm.com>
CC: Stefan Agner <stefan@agner.ch>
CC: devel@driverdev.osuosl.org
CC: linux-arm-kernel@lists.infradead.org
CC: linux-kernel@vger.kernel.org
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>

45aaeff9

mtd: nand: txx9ndfmc: show parent device in sysfs · 693ad872