[RESEND] mtd: cfi_cmdset_0001.c: add support for Sharp LH28F640BF NOR

Hi,

this one was part of a patchset composed of 3 patches, see
https://lkml.org/lkml/2014/6/3/763

The other two have been merged in 3.16-rc3:
9218310  ARM: 8084/1: sa1100: collie: revert back to cfi_probe
3abe742 ARM: 8085/1: sa1100: collie: add top boot mtd partition

Now the actual situation with 3.16-rc3 is bad, the nor is locked at
boot and buffer write is broken.

Ideally the present patch should be sent upstream as fix for the next -rc.

Thanks

Andrea

---------- Forwarded message ----------
From: Andrea Adami <andrea.adami@gmail.com>
Date: Mon, Jun 2, 2014 at 11:38 PM
Subject: [RESEND PATCH] mtd: cfi_cmdset_0001.c: add support for Sharp
LH28F640BF NOR
To: linux-mtd@lists.infradead.org
Cc: Andrea Adami <andrea.adami@gmail.com>


This family of chips was long ago supported by the pre-cfi driver.
CFI code tested on several Zaurus SL-5500 (Collie) 2x16 on 32 bit bus.

Function is_LH28F640BF() mimics is_m29ew() from cmdset_0002.c

Buffer write fixes as seen in 2007 patch c/o
Anti Sullin <anti.sullin <at> artecdesign.ee>
http://comments.gmane.org/gmane.linux.ports.arm.kernel/36733

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 drivers/mtd/chips/cfi_cmdset_0001.c | 43 +++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

 static int cfi_intelext_write_words(struct mtd_info *, loff_t,
size_t, size_t *, const u_char *);
@@ -258,6 +263,36 @@ static void fixup_st_m28w320cb(struct mtd_info *mtd)
                (cfi->cfiq->EraseRegionInfo[1] & 0xffff0000) | 0x3e;
 };

+static int is_LH28F640BF(struct cfi_private *cfi)
+{
+       /* Sharp LH28F640BF Family */
+       if (cfi->mfr == CFI_MFR_SHARP && (
+           cfi->id == LH28F640BFHE_PTTL90 || cfi->id == LH28F640BFHE_PBTL90 ||
+           cfi->id == LH28F640BFHE_PTTL70A || cfi->id == LH28F640BFHE_PBTL70A))
+               return 1;
+       return 0;
+}
+
+static void fixup_LH28F640BF(struct mtd_info *mtd)
+{
+       struct map_info *map = mtd->priv;
+       struct cfi_private *cfi = map->fldrv_priv;
+       struct cfi_pri_intelext *extp = cfi->cmdset_priv;
+
+       /* Reset the Partition Configuration Register on LH28F640BF
+        * to a single partition (PCR = 0x000): PCR is embedded into A0-A15. */
+       if (is_LH28F640BF(cfi)) {
+               printk(KERN_INFO "Reset Partition Config. Register: 1
Partition of 4 planes\n");
+               map_write(map, CMD(0x60), 0);
+               map_write(map, CMD(0x04), 0);
+
+               /* We have set one single partition thus
+                * Simultaneous Operations are not allowed */
+               printk(KERN_INFO "cfi_cmdset_0001: Simultaneous
Operations disabled\n");
+               extp->FeatureSupport &= ~512;
+       }
+}
+
 static void fixup_use_point(struct mtd_info *mtd)
 {
        struct map_info *map = mtd->priv;
@@ -309,6 +344,8 @@ static struct cfi_fixup cfi_fixup_table[] = {
        { CFI_MFR_ST, 0x00ba, /* M28W320CT */ fixup_st_m28w320ct },
        { CFI_MFR_ST, 0x00bb, /* M28W320CB */ fixup_st_m28w320cb },
        { CFI_MFR_INTEL, CFI_ID_ANY, fixup_unlock_powerup_lock },
+       { CFI_MFR_SHARP, CFI_ID_ANY, fixup_unlock_powerup_lock },
+       { CFI_MFR_SHARP, CFI_ID_ANY, fixup_LH28F640BF },
        { 0, 0, NULL }
 };

@@ -1649,6 +1686,12 @@ static int __xipram do_write_buffer(struct
map_info *map, struct flchip *chip,
        initial_adr = adr;
        cmd_adr = adr & ~(wbufsize-1);

+       /* Sharp LH28F640BF chips need the first address for the
+        * Page Buffer Program command. See Table 5 of
+        * LH28F320BF, LH28F640BF, LH28F128BF Series (Appendix FUM00701) */
+       if (is_LH28F640BF(cfi))
+               cmd_adr = adr;
+
        /* Let's determine this according to the interleave only once */
        write_cmd = (cfi->cfiq->P_ID != P_ID_INTEL_PERFORMANCE) ?
CMD(0xe8) : CMD(0xe9);

--
1.9.1

Hi Andrea,

On Thu, Jul 03, 2014 at 09:42:31AM +0200, Andrea Adami wrote:
> this one was part of a patchset composed of 3 patches, see
> https://lkml.org/lkml/2014/6/3/763
> 
> The other two have been merged in 3.16-rc3:
> 9218310  ARM: 8084/1: sa1100: collie: revert back to cfi_probe
> 3abe742 ARM: 8085/1: sa1100: collie: add top boot mtd partition
> 
> Now the actual situation with 3.16-rc3 is bad, the nor is locked at
> boot and buffer write is broken.
> 
> Ideally the present patch should be sent upstream as fix for the next -rc.

Hmm, I'll see what I can do about this. In the future, you should
probably ensure that the dependent patch gets merged before trying to
make use of it in another subsystem.

Applied to l2-mtd.git. It looks pretty targeted, so I'll queue it up
with a few other -stable fixes that are going out in the next week.

Brian