aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrea Adami <andrea.adami@gmail.com>2017-05-13 17:49:12 +0200
committerAndrea Adami <andrea.adami@gmail.com>2017-05-14 01:33:14 +0200
commit41c303516d75ec57779749dfa1949a0ff2bd8cc3 (patch)
treebeea7ab59d1b8fc8e4085b50cb2b213b433e8c53
parent4f002e1360cd355c5d215625b94d2fda25cc5c50 (diff)
downloadmeta-handheld-41c303516d75ec57779749dfa1949a0ff2bd8cc3.tar.gz
meta-handheld-41c303516d75ec57779749dfa1949a0ff2bd8cc3.tar.bz2
meta-handheld-41c303516d75ec57779749dfa1949a0ff2bd8cc3.zip
linux-handheld(-kexecboot)_4.4: update to 4.4.67 and introduce sharpslpart
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
-rw-r--r--recipes-kernel/linux/linux-handheld-4.4/akita/defconfig1
-rw-r--r--recipes-kernel/linux/linux-handheld-4.4/c7x0/defconfig1
-rw-r--r--recipes-kernel/linux/linux-handheld-4.4/poodle/defconfig1
-rw-r--r--recipes-kernel/linux/linux-handheld-4.4/sharpslpart/0001-mtd-sharpsl-add-sharpslpart-MTD-partition-parser.patch510
-rw-r--r--recipes-kernel/linux/linux-handheld-4.4/sharpslpart/0002-mtd-nand-sharpsl.c-prefer-sharpslpart-MTD-partition-.patch38
-rw-r--r--recipes-kernel/linux/linux-handheld-4.4/sharpslpart/0003-mtd-nand-tmio_nand.c-prefer-sharpslpart-MTD-partitio.patch38
-rw-r--r--recipes-kernel/linux/linux-handheld-4.4/spitz/defconfig1
-rw-r--r--recipes-kernel/linux/linux-handheld-4.4/tosa/defconfig1
-rw-r--r--recipes-kernel/linux/linux-handheld_4.4.bb9
-rw-r--r--recipes-kernel/linux/linux-kexecboot-4.4/akita/defconfig1
-rw-r--r--recipes-kernel/linux/linux-kexecboot-4.4/c7x0/defconfig1
-rw-r--r--recipes-kernel/linux/linux-kexecboot-4.4/poodle/defconfig1
-rw-r--r--recipes-kernel/linux/linux-kexecboot-4.4/spitz/defconfig1
-rw-r--r--recipes-kernel/linux/linux-kexecboot-4.4/tosa/defconfig1
14 files changed, 602 insertions, 3 deletions
diff --git a/recipes-kernel/linux/linux-handheld-4.4/akita/defconfig b/recipes-kernel/linux/linux-handheld-4.4/akita/defconfig
index f6b8468..e061aa3 100644
--- a/recipes-kernel/linux/linux-handheld-4.4/akita/defconfig
+++ b/recipes-kernel/linux/linux-handheld-4.4/akita/defconfig
@@ -161,6 +161,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_SHARPSL=y
+CONFIG_MTD_SHARPSL_PARTS=y
CONFIG_MTD_UBI=y
CONFIG_BLK_DEV_LOOP=m
CONFIG_BLK_DEV_CRYPTOLOOP=m
diff --git a/recipes-kernel/linux/linux-handheld-4.4/c7x0/defconfig b/recipes-kernel/linux/linux-handheld-4.4/c7x0/defconfig
index d4ad4d6..1eedf9c 100644
--- a/recipes-kernel/linux/linux-handheld-4.4/c7x0/defconfig
+++ b/recipes-kernel/linux/linux-handheld-4.4/c7x0/defconfig
@@ -157,6 +157,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_SHARPSL=y
+CONFIG_MTD_SHARPSL_PARTS=y
CONFIG_MTD_UBI=y
CONFIG_BLK_DEV_LOOP=m
CONFIG_BLK_DEV_CRYPTOLOOP=m
diff --git a/recipes-kernel/linux/linux-handheld-4.4/poodle/defconfig b/recipes-kernel/linux/linux-handheld-4.4/poodle/defconfig
index e0cc494..da2ef8e 100644
--- a/recipes-kernel/linux/linux-handheld-4.4/poodle/defconfig
+++ b/recipes-kernel/linux/linux-handheld-4.4/poodle/defconfig
@@ -156,6 +156,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_SHARPSL=y
+CONFIG_MTD_SHARPSL_PARTS=y
CONFIG_MTD_UBI=y
CONFIG_BLK_DEV_LOOP=m
CONFIG_BLK_DEV_CRYPTOLOOP=m
diff --git a/recipes-kernel/linux/linux-handheld-4.4/sharpslpart/0001-mtd-sharpsl-add-sharpslpart-MTD-partition-parser.patch b/recipes-kernel/linux/linux-handheld-4.4/sharpslpart/0001-mtd-sharpsl-add-sharpslpart-MTD-partition-parser.patch
new file mode 100644
index 0000000..23406c1
--- /dev/null
+++ b/recipes-kernel/linux/linux-handheld-4.4/sharpslpart/0001-mtd-sharpsl-add-sharpslpart-MTD-partition-parser.patch
@@ -0,0 +1,510 @@
+From a1a11c67f538d1c8bc58506cdba5c5cac6b7477e Mon Sep 17 00:00:00 2001
+From: Andrea Adami <andrea.adami@gmail.com>
+Date: Sat, 13 May 2017 01:16:21 +0200
+Subject: [PATCH 1/3] mtd: sharpsl: add sharpslpart MTD partition parser
+
+The Sharp SL Series (Zaurus) PXA handhelds have 16/64/128M of NAND flash
+and share the same layout of the first 7M partition, managed by Sharp FTL.
+
+The purpose of this self-contained patch is to add a common parser and
+remove the hardcoded sizes in the board files (these devices are not yet
+converted to devicetree).
+Users will have benefits because the mtdparts= tag will not be necessary
+anymore and they will be free to repartition the little sized flash.
+
+The obsolete bootloader can not pass the partitioning info to modern
+kernels anymore so it has to be read from flash at known logical addresses.
+(see http://www.h5.dion.ne.jp/~rimemoon/zaurus/memo_006.htm )
+
+In kernel, under arch/arm/mach-pxa we have already 8 machines:
+MACH_POODLE, MACH_CORGI, MACH_SHEPERD, MACH_HUSKY, MACH_AKITA, MACH_SPITZ,
+MACH_BORZOI, MACH_TOSA.
+Lost after the 2.4 vendor kernel are MACH_BOXER and MACH_TERRIER.
+
+Almost every model has different factory partitioning: add to this the
+units can be repartitioned by users with userspace tools (nandlogical)
+and installers for popular (back then) linux distributions.
+
+The Parameter Area in the first (boot) partition extends from 0x00040000 to
+0x0007bfff (176k) and contains two copies of the partition table:
+...
+0x00060000: Partition Info1 16k
+0x00064000: Partition Info2 16k
+0x00668000: Model 16k
+...
+
+The first 7M partition is managed by the Sharp FTL reserving 5% + 1 blocks
+for wear-leveling: some blocks are remapped and one layer of translation
+(logical to physical) is necessary.
+
+There isn't much documentation about this FTL in the 2.4 sources, just the
+MTD methods for reading and writing using logical addresses and the block
+management (wear-leveling, use counter).
+For the purpose of the MTD parser only the read part of the code was taken.
+
+The NAND drivers that can use this parser are sharpsl.c and tmio_nand.c.
+
+Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
+---
+ drivers/mtd/Kconfig | 8 ++
+ drivers/mtd/Makefile | 2 +
+ drivers/mtd/sharpsl_ftl.c | 219 ++++++++++++++++++++++++++++++++++++++++++++++
+ drivers/mtd/sharpsl_ftl.h | 34 +++++++
+ drivers/mtd/sharpslpart.c | 146 +++++++++++++++++++++++++++++++
+ 5 files changed, 409 insertions(+)
+ create mode 100644 drivers/mtd/sharpsl_ftl.c
+ create mode 100644 drivers/mtd/sharpsl_ftl.h
+ create mode 100644 drivers/mtd/sharpslpart.c
+
+diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
+index a03ad29..6989bf0 100644
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -155,6 +155,14 @@ config MTD_BCM47XX_PARTS
+ This provides partitions parser for devices based on BCM47xx
+ boards.
+
++config MTD_SHARPSL_PARTS
++ tristate "Sharp SL Series NAND flash partition parser"
++ depends on MTD_NAND_SHARPSL || MTD_NAND_TMIO
++ help
++ This provides the read-only FTL logic necessary to read the partition
++ table from the NAND flash of Sharp SL Series (Zaurus) and the MTD
++ partition parser using this code.
++
+ comment "User Modules And Translation Layers"
+
+ #
+diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
+index 99bb9a1..89f707b 100644
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
+@@ -13,6 +13,8 @@ obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
+ obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o
+ obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o
+ obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o
++obj-$(CONFIG_MTD_SHARPSL_PARTS) += sharpsl-part.o
++sharpsl-part-objs := sharpsl_ftl.o sharpslpart.o
+
+ # 'Users' - code which presents functionality to userspace.
+ obj-$(CONFIG_MTD_BLKDEVS) += mtd_blkdevs.o
+diff --git a/drivers/mtd/sharpsl_ftl.c b/drivers/mtd/sharpsl_ftl.c
+new file mode 100644
+index 0000000..6b82144
+--- /dev/null
++++ b/drivers/mtd/sharpsl_ftl.c
+@@ -0,0 +1,219 @@
++/*
++ * MTD method for NAND accessing via logical address (SHARP FTL)
++ *
++ * Copyright (C) 2017 Andrea Adami <andrea.adami@gmail.com>
++ *
++ * Based on 2.4 sources: drivers/mtd/nand/sharp_sl_logical.c
++ * Copyright (C) 2002 SHARP
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ */
++
++#include <linux/kernel.h>
++#include <linux/slab.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/mtd/mtd.h>
++#include <linux/mtd/partitions.h>
++#include "sharpsl_ftl.h"
++
++/* oob structure */
++#define NAND_NOOB_LOGADDR_00 8
++#define NAND_NOOB_LOGADDR_01 9
++#define NAND_NOOB_LOGADDR_10 10
++#define NAND_NOOB_LOGADDR_11 11
++#define NAND_NOOB_LOGADDR_20 12
++#define NAND_NOOB_LOGADDR_21 13
++
++/* Logical Table */
++struct mtd_logical {
++ u32 size; /* size of the handled partition */
++ int index; /* mtd->index */
++ u_int phymax; /* physical blocks */
++ u_int logmax; /* logical blocks */
++ u_int *log2phy; /* the logical-to-physical table */
++};
++
++static struct mtd_logical *sharpsl_mtd_logical;
++
++/* wrapper */
++static int sharpsl_nand_read_oob(struct mtd_info *mtd, loff_t offs, size_t len,
++ uint8_t *buf)
++{
++ loff_t mask = mtd->writesize - 1;
++ struct mtd_oob_ops ops;
++ int ret;
++
++ ops.mode = MTD_OPS_PLACE_OOB;
++ ops.ooboffs = offs & mask;
++ ops.ooblen = len;
++ ops.oobbuf = buf;
++ ops.datbuf = NULL;
++
++ ret = mtd_read_oob(mtd, offs & ~mask, &ops);
++ if (ret != 0 || len != ops.oobretlen)
++ return -1;
++
++ return 0;
++}
++
++/* utility */
++static u_int sharpsl_nand_get_logical_num(u_char *oob)
++{
++ u16 us;
++ int good0, good1;
++
++ if (oob[NAND_NOOB_LOGADDR_00] == oob[NAND_NOOB_LOGADDR_10] &&
++ oob[NAND_NOOB_LOGADDR_01] == oob[NAND_NOOB_LOGADDR_11]) {
++ good0 = NAND_NOOB_LOGADDR_00;
++ good1 = NAND_NOOB_LOGADDR_01;
++ } else if (oob[NAND_NOOB_LOGADDR_10] == oob[NAND_NOOB_LOGADDR_20] &&
++ oob[NAND_NOOB_LOGADDR_11] == oob[NAND_NOOB_LOGADDR_21]) {
++ good0 = NAND_NOOB_LOGADDR_10;
++ good1 = NAND_NOOB_LOGADDR_11;
++ } else if (oob[NAND_NOOB_LOGADDR_20] == oob[NAND_NOOB_LOGADDR_00] &&
++ oob[NAND_NOOB_LOGADDR_21] == oob[NAND_NOOB_LOGADDR_01]) {
++ good0 = NAND_NOOB_LOGADDR_20;
++ good1 = NAND_NOOB_LOGADDR_21;
++ } else {
++ return UINT_MAX;
++ }
++
++ us = oob[good0] | oob[good1] << 8;
++
++ /* parity check */
++ if (hweight16(us) & 1)
++ return (UINT_MAX - 1);
++
++ /* reserved */
++ if (us == 0xffff)
++ return 0xffff;
++ else
++ return (us & 0x07fe) >> 1;
++}
++
++int sharpsl_nand_init_logical(struct mtd_info *mtd, u32 partition_size)
++{
++ struct mtd_logical *logical = NULL;
++ u_int block_num, log_num;
++ loff_t block_adr;
++ u_char *oob = NULL;
++ int i, readretry;
++
++ logical = kzalloc(sizeof(*logical), GFP_KERNEL);
++ if (!logical)
++ return -ENOMEM;
++
++ oob = kzalloc(mtd->oobsize, GFP_KERNEL);
++ if (!oob) {
++ kfree(logical);
++ return -ENOMEM;
++ }
++
++ /* initialize management structure */
++ logical->size = partition_size;
++ logical->index = mtd->index;
++ logical->phymax = (partition_size / mtd->erasesize);
++
++ /* FTL reserves 5% of the blocks + 1 spare */
++ logical->logmax = ((logical->phymax * 95) / 100) - 1;
++
++ logical->log2phy = NULL;
++ logical->log2phy = kcalloc(logical->logmax, sizeof(u_int), GFP_KERNEL);
++ if (!logical->log2phy) {
++ kfree(logical);
++ kfree(oob);
++ return -ENOMEM;
++ }
++
++ /* initialize logical->log2phy */
++ for (i = 0; i < logical->logmax; i++)
++ logical->log2phy[i] = UINT_MAX;
++
++ /* create physical-logical table */
++ for (block_num = 0; block_num < logical->phymax; block_num++) {
++ block_adr = block_num * mtd->erasesize;
++
++ if (mtd_block_isbad(mtd, block_adr))
++ continue;
++
++ readretry = 3;
++read_retry:
++ if (sharpsl_nand_read_oob(mtd, block_adr, mtd->oobsize, oob))
++ continue;
++
++ /* get logical block */
++ log_num = sharpsl_nand_get_logical_num(oob);
++
++ /* skip out of range and not unique values */
++ if ((int)log_num >= 0 && (log_num < logical->logmax)) {
++ if (logical->log2phy[log_num] == UINT_MAX)
++ logical->log2phy[log_num] = block_num;
++ } else {
++ readretry--;
++ if (readretry)
++ goto read_retry;
++ }
++ }
++ kfree(oob);
++ sharpsl_mtd_logical = logical;
++
++ pr_info("Sharp SL FTL: %d blocks used (%d logical, %d reserved)\n",
++ logical->phymax, logical->logmax,
++ logical->phymax - logical->logmax);
++
++ return 0;
++}
++
++void sharpsl_nand_cleanup_logical(void)
++{
++ struct mtd_logical *logical = sharpsl_mtd_logical;
++
++ sharpsl_mtd_logical = NULL;
++
++ kfree(logical->log2phy);
++ logical->log2phy = NULL;
++ kfree(logical);
++ logical = NULL;
++}
++
++/* MTD METHOD */
++int sharpsl_nand_read_laddr(struct mtd_info *mtd,
++ loff_t from,
++ size_t len,
++ u_char *buf)
++{
++ struct mtd_logical *logical;
++ u_int log_num, log_new;
++ u_int block_num;
++ loff_t block_adr;
++ loff_t block_ofs;
++ size_t retlen;
++ int ret;
++
++ logical = sharpsl_mtd_logical;
++ log_num = (u32)from / mtd->erasesize;
++ log_new = ((u32)from + len - 1) / mtd->erasesize;
++
++ if (len <= 0 || log_num >= logical->logmax || log_new > log_num)
++ return -EINVAL;
++
++ block_num = logical->log2phy[log_num];
++ block_adr = block_num * mtd->erasesize;
++ block_ofs = (u32)from % mtd->erasesize;
++
++ ret = mtd_read(mtd, block_adr + block_ofs, len, &retlen, buf);
++ if (ret != 0 || len != retlen)
++ return -EINVAL;
++
++ return 0;
++}
+diff --git a/drivers/mtd/sharpsl_ftl.h b/drivers/mtd/sharpsl_ftl.h
+new file mode 100644
+index 0000000..2880cbe
+--- /dev/null
++++ b/drivers/mtd/sharpsl_ftl.h
+@@ -0,0 +1,34 @@
++/*
++ * Header file for NAND accessing via logical address (SHARP FTL)
++ *
++ * Copyright (C) 2017 Andrea Adami <andrea.adami@gmail.com>
++ *
++ * Based on 2.4 sources: linux/include/asm-arm/sharp_nand_logical.h
++ * Copyright (C) 2002 SHARP
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ */
++
++#ifndef __SHARPSL_NAND_LOGICAL_H__
++#define __SHARPSL_NAND_LOGICAL_H__
++
++#include <linux/types.h>
++#include <linux/mtd/mtd.h>
++
++int sharpsl_nand_init_logical(struct mtd_info *mtd, u32 partition_size);
++
++void sharpsl_nand_cleanup_logical(void);
++
++int sharpsl_nand_read_laddr(struct mtd_info *mtd, loff_t from, size_t len,
++ u_char *buf);
++
++#endif
+diff --git a/drivers/mtd/sharpslpart.c b/drivers/mtd/sharpslpart.c
+new file mode 100644
+index 0000000..2448b00
+--- /dev/null
++++ b/drivers/mtd/sharpslpart.c
+@@ -0,0 +1,146 @@
++/*
++ * MTD partition parser for NAND flash on Sharp SL Series
++ *
++ * Copyright (C) 2017 Andrea Adami <andrea.adami@gmail.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ */
++
++#include <linux/kernel.h>
++#include <linux/slab.h>
++#include <linux/module.h>
++#include <linux/mtd/mtd.h>
++#include <linux/mtd/partitions.h>
++#include "sharpsl_ftl.h"
++
++/* factory defaults */
++#define SHARPSL_NAND_PARTS 3
++#define SHARPSL_FTL_PARTITION_SIZE (7 * 1024 * 1024)
++#define PARAM_BLOCK_PARTITIONINFO1 0x00060000
++#define PARAM_BLOCK_PARTITIONINFO2 0x00064000
++
++#define BOOT_MAGIC be32_to_cpu(0x424f4f54) /* BOOT */
++#define FSRO_MAGIC be32_to_cpu(0x4653524f) /* FSRO */
++#define FSRW_MAGIC be32_to_cpu(0x46535257) /* FSRW */
++
++/*
++ * Sample values read from SL-C860
++ *
++ * # cat /proc/mtd
++ * dev: size erasesize name
++ * mtd0: 006d0000 00020000 "Filesystem"
++ * mtd1: 00700000 00004000 "smf"
++ * mtd2: 03500000 00004000 "root"
++ * mtd3: 04400000 00004000 "home"
++ *
++ * PARTITIONINFO1
++ * 0x00060000: 00 00 00 00 00 00 70 00 42 4f 4f 54 00 00 00 00 ......p.BOOT....
++ * 0x00060010: 00 00 70 00 00 00 c0 03 46 53 52 4f 00 00 00 00 ..p.....FSRO....
++ * 0x00060020: 00 00 c0 03 00 00 00 04 46 53 52 57 00 00 00 00 ........FSRW....
++ * 0x00060030: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ................
++ *
++ */
++
++struct sharpsl_nand_partitioninfo {
++ u32 start;
++ u32 end;
++ u32 magic;
++ u32 reserved;
++};
++
++static int sharpsl_parse_mtd_partitions(struct mtd_info *master,
++ struct mtd_partition **pparts,
++ struct mtd_part_parser_data *data)
++{
++ struct sharpsl_nand_partitioninfo buf1[SHARPSL_NAND_PARTS];
++ struct sharpsl_nand_partitioninfo buf2[SHARPSL_NAND_PARTS];
++ struct mtd_partition *sharpsl_nand_parts;
++
++ /* init logical mgmt (FTL) */
++ if (sharpsl_nand_init_logical(master, SHARPSL_FTL_PARTITION_SIZE))
++ return -EINVAL;
++
++ /* read the two partition tables */
++ if (sharpsl_nand_read_laddr(master,
++ PARAM_BLOCK_PARTITIONINFO1,
++ sizeof(buf1), (u_char *)&buf1) ||
++ sharpsl_nand_read_laddr(master,
++ PARAM_BLOCK_PARTITIONINFO2,
++ sizeof(buf2), (u_char *)&buf2))
++ return -EINVAL;
++
++ /* cleanup logical mgmt (FTL) */
++ sharpsl_nand_cleanup_logical();
++
++ /* compare the two buffers */
++ if (memcmp(&buf1, &buf2, sizeof(buf1))) {
++ pr_err("sharpslpart: PARTITIONINFO 1,2 differ. Quit parser.\n");
++ return -EINVAL;
++ }
++
++ /* check for magics (just in the first) */
++ if (buf1[0].magic != BOOT_MAGIC ||
++ buf1[1].magic != FSRO_MAGIC ||
++ buf1[2].magic != FSRW_MAGIC) {
++ pr_err("sharpslpart: magic values mismatch. Quit parser.\n");
++ return -EINVAL;
++ }
++
++ sharpsl_nand_parts = kzalloc(sizeof(*sharpsl_nand_parts) *
++ SHARPSL_NAND_PARTS, GFP_KERNEL);
++ if (!sharpsl_nand_parts)
++ return -ENOMEM;
++
++ /* original names */
++ sharpsl_nand_parts[0].name = "smf";
++ sharpsl_nand_parts[0].offset = buf1[0].start;
++ sharpsl_nand_parts[0].size = buf1[0].end - buf1[0].start;
++ sharpsl_nand_parts[0].mask_flags = 0;
++
++ sharpsl_nand_parts[1].name = "root";
++ sharpsl_nand_parts[1].offset = buf1[1].start;
++ sharpsl_nand_parts[1].size = buf1[1].end - buf1[1].start;
++ sharpsl_nand_parts[1].mask_flags = 0;
++
++ sharpsl_nand_parts[2].name = "home";
++ sharpsl_nand_parts[2].offset = buf1[2].start;
++ /* discard buf1[2].end, was for older models with 64M flash */
++ sharpsl_nand_parts[2].size = master->size - buf1[2].start;
++ sharpsl_nand_parts[2].mask_flags = 0;
++
++ *pparts = sharpsl_nand_parts;
++ return SHARPSL_NAND_PARTS;
++}
++
++static struct mtd_part_parser sharpsl_mtd_parser = {
++ .owner = THIS_MODULE,
++ .parse_fn = sharpsl_parse_mtd_partitions,
++ .name = "sharpslpart",
++};
++
++static int __init sharpsl_mtd_parser_init(void)
++{
++ register_mtd_parser(&sharpsl_mtd_parser);
++ return 0;
++}
++
++static void __exit sharpsl_mtd_parser_exit(void)
++{
++ deregister_mtd_parser(&sharpsl_mtd_parser);
++}
++
++module_init(sharpsl_mtd_parser_init);
++module_exit(sharpsl_mtd_parser_exit);
++
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Andrea Adami <andrea.adami@gmail.com>");
++MODULE_DESCRIPTION("MTD partitioning for NAND flash on Sharp SL Series");
+--
+2.7.4
+
diff --git a/recipes-kernel/linux/linux-handheld-4.4/sharpslpart/0002-mtd-nand-sharpsl.c-prefer-sharpslpart-MTD-partition-.patch b/recipes-kernel/linux/linux-handheld-4.4/sharpslpart/0002-mtd-nand-sharpsl.c-prefer-sharpslpart-MTD-partition-.patch
new file mode 100644
index 0000000..7f47c82
--- /dev/null
+++ b/recipes-kernel/linux/linux-handheld-4.4/sharpslpart/0002-mtd-nand-sharpsl.c-prefer-sharpslpart-MTD-partition-.patch
@@ -0,0 +1,38 @@
+From 888060fb9aa78dee4b103dd241f3058a2b69f93e Mon Sep 17 00:00:00 2001
+From: Andrea Adami <andrea.adami@gmail.com>
+Date: Sat, 13 May 2017 00:16:29 +0200
+Subject: [PATCH 2/3] mtd: nand: sharpsl.c: prefer sharpslpart MTD partition
+ parser
+
+This is the specific parser for Sharp SL Series (Zaurus).
+
+Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
+---
+ drivers/mtd/nand/sharpsl.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/mtd/nand/sharpsl.c b/drivers/mtd/nand/sharpsl.c
+index 082b600..9a515c6 100644
+--- a/drivers/mtd/nand/sharpsl.c
++++ b/drivers/mtd/nand/sharpsl.c
+@@ -106,6 +106,8 @@ static int sharpsl_nand_calculate_ecc(struct mtd_info *mtd, const u_char * dat,
+ /*
+ * Main initialization routine
+ */
++static const char * const probes[] = { "sharpslpart", NULL };
++
+ static int sharpsl_nand_probe(struct platform_device *pdev)
+ {
+ struct nand_chip *this;
+@@ -180,7 +182,7 @@ static int sharpsl_nand_probe(struct platform_device *pdev)
+ /* Register the partitions */
+ sharpsl->mtd.name = "sharpsl-nand";
+
+- err = mtd_device_parse_register(&sharpsl->mtd, NULL, NULL,
++ err = mtd_device_parse_register(&sharpsl->mtd, probes, NULL,
+ data->partitions, data->nr_partitions);
+ if (err)
+ goto err_add;
+--
+2.7.4
+
diff --git a/recipes-kernel/linux/linux-handheld-4.4/sharpslpart/0003-mtd-nand-tmio_nand.c-prefer-sharpslpart-MTD-partitio.patch b/recipes-kernel/linux/linux-handheld-4.4/sharpslpart/0003-mtd-nand-tmio_nand.c-prefer-sharpslpart-MTD-partitio.patch
new file mode 100644
index 0000000..6388348
--- /dev/null
+++ b/recipes-kernel/linux/linux-handheld-4.4/sharpslpart/0003-mtd-nand-tmio_nand.c-prefer-sharpslpart-MTD-partitio.patch
@@ -0,0 +1,38 @@
+From b91aeb1f3caf962389ddef2a4cb362c8183f8d9f Mon Sep 17 00:00:00 2001
+From: Andrea Adami <andrea.adami@gmail.com>
+Date: Sat, 13 May 2017 00:18:56 +0200
+Subject: [PATCH 3/3] mtd: nand: tmio_nand.c: prefer sharpslpart MTD partition
+ parser
+
+This is the specific parser for Sharp SL Series (Zaurus)
+
+Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
+---
+ drivers/mtd/nand/tmio_nand.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/mtd/nand/tmio_nand.c b/drivers/mtd/nand/tmio_nand.c
+index befddf0..9f77f96 100644
+--- a/drivers/mtd/nand/tmio_nand.c
++++ b/drivers/mtd/nand/tmio_nand.c
+@@ -355,6 +355,8 @@ static void tmio_hw_stop(struct platform_device *dev, struct tmio_nand *tmio)
+ cell->disable(dev);
+ }
+
++static const char * const probes[] = { "sharpslpart", NULL };
++
+ static int tmio_probe(struct platform_device *dev)
+ {
+ struct tmio_nand_data *data = dev_get_platdata(&dev->dev);
+@@ -439,7 +441,7 @@ static int tmio_probe(struct platform_device *dev)
+ goto err_irq;
+ }
+ /* Register the partitions */
+- retval = mtd_device_parse_register(mtd, NULL, NULL,
++ retval = mtd_device_parse_register(mtd, probes, NULL,
+ data ? data->partition : NULL,
+ data ? data->num_partitions : 0);
+ if (!retval)
+--
+2.7.4
+
diff --git a/recipes-kernel/linux/linux-handheld-4.4/spitz/defconfig b/recipes-kernel/linux/linux-handheld-4.4/spitz/defconfig
index f6b8468..e061aa3 100644
--- a/recipes-kernel/linux/linux-handheld-4.4/spitz/defconfig
+++ b/recipes-kernel/linux/linux-handheld-4.4/spitz/defconfig
@@ -161,6 +161,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_SHARPSL=y
+CONFIG_MTD_SHARPSL_PARTS=y
CONFIG_MTD_UBI=y
CONFIG_BLK_DEV_LOOP=m
CONFIG_BLK_DEV_CRYPTOLOOP=m
diff --git a/recipes-kernel/linux/linux-handheld-4.4/tosa/defconfig b/recipes-kernel/linux/linux-handheld-4.4/tosa/defconfig
index b5d303c..0512ec3 100644
--- a/recipes-kernel/linux/linux-handheld-4.4/tosa/defconfig
+++ b/recipes-kernel/linux/linux-handheld-4.4/tosa/defconfig
@@ -162,6 +162,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_TMIO=y
+CONFIG_MTD_SHARPSL_PARTS=y
CONFIG_MTD_UBI=y
CONFIG_BLK_DEV_LOOP=m
CONFIG_BLK_DEV_CRYPTOLOOP=m
diff --git a/recipes-kernel/linux/linux-handheld_4.4.bb b/recipes-kernel/linux/linux-handheld_4.4.bb
index 1c97e6c..2d7500a 100644
--- a/recipes-kernel/linux/linux-handheld_4.4.bb
+++ b/recipes-kernel/linux/linux-handheld_4.4.bb
@@ -6,16 +6,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
COMPATIBLE_MACHINE = "akita|c7x0|collie|h3600|hx4700|poodle|spitz|tosa"
SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/v4.x/linux-${PV}.tar.xz;name=kernel \
- ${KERNELORG_MIRROR}/linux/kernel/v4.x/patch-${PV}.66.xz;apply=yes;name=stablepatch \
+ ${KERNELORG_MIRROR}/linux/kernel/v4.x/patch-${PV}.67.xz;apply=yes;name=stablepatch \
"
SRC_URI[kernel.md5sum] = "9a78fa2eb6c68ca5a40ed5af08142599"
SRC_URI[kernel.sha256sum] = "401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2"
-SRC_URI[stablepatch.md5sum] = "7a4add56481e23ffb7d4e5a18e1f7731"
-SRC_URI[stablepatch.sha256sum] = "ecb99a1731914a93cde9d49d4bad35f32f7fa6d57de110c2e12ee9ad9e44f5fb"
+SRC_URI[stablepatch.md5sum] = "4f6755081c5ccf50a4c5a174f1aedc87"
+SRC_URI[stablepatch.sha256sum] = "144dc49cc81552dc42a3f5052e23feffdd635bb909801352caa7a09f44d368c8"
SRC_URI += "\
file://ASoC-pxa-fix-module-autoload-for-platform-drivers.patch \
file://dmaengine-mmp-pdma-add-number-of-requestors.patch \
+ file://sharpslpart/0001-mtd-sharpsl-add-sharpslpart-MTD-partition-parser.patch \
+ file://sharpslpart/0002-mtd-nand-sharpsl.c-prefer-sharpslpart-MTD-partition-.patch \
+ file://sharpslpart/0003-mtd-nand-tmio_nand.c-prefer-sharpslpart-MTD-partitio.patch \
"
LOCOMO_PATCHES = "\
diff --git a/recipes-kernel/linux/linux-kexecboot-4.4/akita/defconfig b/recipes-kernel/linux/linux-kexecboot-4.4/akita/defconfig
index 25aef77..59d9ee5 100644
--- a/recipes-kernel/linux/linux-kexecboot-4.4/akita/defconfig
+++ b/recipes-kernel/linux/linux-kexecboot-4.4/akita/defconfig
@@ -69,6 +69,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_SHARPSL=y
+CONFIG_MTD_SHARPSL_PARTS=y
CONFIG_MTD_UBI=y
CONFIG_BLK_DEV_LOOP=y
# CONFIG_SCSI_PROC_FS is not set
diff --git a/recipes-kernel/linux/linux-kexecboot-4.4/c7x0/defconfig b/recipes-kernel/linux/linux-kexecboot-4.4/c7x0/defconfig
index fb362f0..714a5ab 100644
--- a/recipes-kernel/linux/linux-kexecboot-4.4/c7x0/defconfig
+++ b/recipes-kernel/linux/linux-kexecboot-4.4/c7x0/defconfig
@@ -70,6 +70,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_SHARPSL=y
+CONFIG_MTD_SHARPSL_PARTS=y
CONFIG_MTD_UBI=y
CONFIG_BLK_DEV_LOOP=y
# CONFIG_SCSI_PROC_FS is not set
diff --git a/recipes-kernel/linux/linux-kexecboot-4.4/poodle/defconfig b/recipes-kernel/linux/linux-kexecboot-4.4/poodle/defconfig
index 8e7fcd1..537fbc3 100644
--- a/recipes-kernel/linux/linux-kexecboot-4.4/poodle/defconfig
+++ b/recipes-kernel/linux/linux-kexecboot-4.4/poodle/defconfig
@@ -69,6 +69,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_SHARPSL=y
+CONFIG_MTD_SHARPSL_PARTS=y
CONFIG_MTD_UBI=y
CONFIG_BLK_DEV_LOOP=y
# CONFIG_SCSI_PROC_FS is not set
diff --git a/recipes-kernel/linux/linux-kexecboot-4.4/spitz/defconfig b/recipes-kernel/linux/linux-kexecboot-4.4/spitz/defconfig
index 25aef77..59d9ee5 100644
--- a/recipes-kernel/linux/linux-kexecboot-4.4/spitz/defconfig
+++ b/recipes-kernel/linux/linux-kexecboot-4.4/spitz/defconfig
@@ -69,6 +69,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_SHARPSL=y
+CONFIG_MTD_SHARPSL_PARTS=y
CONFIG_MTD_UBI=y
CONFIG_BLK_DEV_LOOP=y
# CONFIG_SCSI_PROC_FS is not set
diff --git a/recipes-kernel/linux/linux-kexecboot-4.4/tosa/defconfig b/recipes-kernel/linux/linux-kexecboot-4.4/tosa/defconfig
index 6857f85..daec416 100644
--- a/recipes-kernel/linux/linux-kexecboot-4.4/tosa/defconfig
+++ b/recipes-kernel/linux/linux-kexecboot-4.4/tosa/defconfig
@@ -69,6 +69,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_TMIO=y
+CONFIG_MTD_SHARPSL_PARTS=y
CONFIG_MTD_UBI=y
CONFIG_BLK_DEV_LOOP=y
# CONFIG_SCSI_PROC_FS is not set