Skip to contentSkip to conversation

fixes for Zaurus collie

PATCH New Andrea Adami 1 participant 7 messages Nov 8, 2013

lore
Share & tools
lore
#0 lore raw

cover fixes for Zaurus collie

This set of patches fixes the CFI MTD detection so that the NOR flash is unlocked on boot.
Still investigating about the cause of the misdetection...

Flash was Read Only with jedec detection, now booting from flash is possible again.

Andrea Adami (6):
linux-yocto: remove POWER_SUPPLY_DEBUG as default
linux-yocto: collie: set MTD geometry
linux-yocto: collie: revert jedec_probe patch
linux-yocto: collie: force CFI detection (temporary HACK)
linux-yocto: collie: resize MTD to SZ_16M
linux-yocto: collie: force flash unlock on boot

 .../linux/linux-yocto-3.10/collie/collie.cfg       | 14 +++++++-
 .../linux/linux-yocto-3.10/collie/collie.scc       |  5 ++-
 .../patches/patches-mtd/collie-force-cfi.patch     | 30 ++++++++++++++++
 .../patches/patches-mtd/collie-force-unlock.patch  | 22 ++++++++++++
 .../patches/patches-mtd/collie-mtd-resize.patch    | 41 ++++++++++++++++++++++
 .../linux/linux-yocto-3.10/zaurus-hardware.cfg     |  1 -
 6 files changed, 110 insertions(+), 3 deletions(-)
 create mode 100644 recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-force-cfi.patch
 create mode 100644 recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-force-unlock.patch
 create mode 100644 recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-mtd-resize.patch
Signature · 1 line
1.8.1.5
#1 lore raw

PATCH 1/6 linux-yocto: remove POWER_SUPPLY_DEBUG as default

---
 recipes-kernel/linux/linux-yocto-3.10/zaurus-hardware.cfg | 1 -
 1 file changed, 1 deletion(-)
recipes-kernel/linux/linux-yocto-3.10/zaurus-hardware.cfg +0 -1
index 9973944..903b810 100644
@@ -148,7 +148,6 @@ CONFIG_GPIO_SYSFS=y
 # MODULbus GPIO expanders:
 #
 CONFIG_POWER_SUPPLY=y
-CONFIG_POWER_SUPPLY_DEBUG=y
 CONFIG_PDA_POWER=y
 CONFIG_APM_POWER=y
 CONFIG_HWMON=y
Signature · 1 line
1.8.1.5
#2 lore raw

PATCH 2/6 linux-yocto: collie: set MTD geometry

In reply to Andrea Adami

Explicitly disable unwanted mtd geometry options
Add OTP support (warning!)

---
 recipes-kernel/linux/linux-yocto-3.10/collie/collie.cfg | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
recipes-kernel/linux/linux-yocto-3.10/collie/collie.cfg +13 -1
index c334774..5238c69 100644
@@ -53,16 +53,28 @@ CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 mem=64M fbcon=rotate:1 logl
 # RAM/ROM/Flash chip drivers
 #
 CONFIG_MTD_CFI=y
-CONFIG_MTD_JEDECPROBE=y
+# CONFIG_MTD_JEDECPROBE is not set
 CONFIG_MTD_GEN_PROBE=y
 CONFIG_MTD_CFI_ADV_OPTIONS=y
 CONFIG_MTD_CFI_NOSWAP=y
 CONFIG_MTD_CFI_GEOMETRY=y
+
+# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_2 is not set
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+
+# CONFIG_MTD_CFI_I1 is not set
 CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
 CONFIG_MTD_CFI_INTELEXT=y
 CONFIG_MTD_CFI_UTIL=y
 
+CONFIG_MTD_OTP=y
+
 #
 # Mapping drivers for chip access
 #
Signature · 1 line
1.8.1.5
#3 lore raw

PATCH 3/6 linux-yocto: collie: revert jedec_probe patch

In reply to Andrea Adami
---
 recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc +1 -1
index 2ce8650..4f60d81 100644
@@ -6,5 +6,5 @@ patch ../patches/patches-locomokbd/locomo_kbd_tweak-r2.patch
 patch ../patches/patches-power/collie_battery-dev-pm.patch
 patch ../patches/patches-mfd/mcp-device.patch
 patch ../patches/patches-mfd/ucb1x00-device.patch
-patch ../patches/patches-mtd/collie-jedec-probe.patch
+//patch ../patches/patches-mtd/collie-jedec-probe.patch
 patch ../patches/patches-mtd/collie-eraseinfo.patch
Signature · 1 line
1.8.1.5
#4 lore raw

PATCH 4/6 linux-yocto: collie: force CFI detection (temporary HACK)

In reply to Andrea Adami

The CFI detection fails but all other reads can be done correctly Enjoy this hack until the (mis)detection is fixed.

---
 .../linux/linux-yocto-3.10/collie/collie.scc       |  1 +
 .../patches/patches-mtd/collie-force-cfi.patch     | 30 ++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-force-cfi.patch
recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc +1 -0
index 4f60d81..536f4b1 100644
@@ -8,3 +8,4 @@ patch ../patches/patches-mfd/mcp-device.patch
 patch ../patches/patches-mfd/ucb1x00-device.patch
 //patch ../patches/patches-mtd/collie-jedec-probe.patch
 patch ../patches/patches-mtd/collie-eraseinfo.patch
+patch ../patches/patches-mtd/collie-force-cfi.patch
recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-force-cfi.patch new file +30 -0
new file mode 100644
index 0000000..958fce7
@@ -0,0 +1,30 @@
+From c39115ed52359eb5f0475ea2b4a2e71acb5da54b Mon Sep 17 00:00:00 2001
+From: Andrea Adami <[email protected]>
+Date: Thu, 7 Nov 2013 23:17:36 +0100
+Subject: [PATCH] cfi_util.c: force CFI detection even if Q R Y test
+ fails
+
+Signed-off-by: Andrea Adami <[email protected]>
+---
+ drivers/mtd/chips/cfi_util.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/mtd/chips/cfi_util.c b/drivers/mtd/chips/cfi_util.c
+index f992418..bdee7b9 100644
+--- a/drivers/mtd/chips/cfi_util.c
++++ b/drivers/mtd/chips/cfi_util.c
+@@ -85,7 +85,10 @@ int __xipram cfi_qry_mode_on(uint32_t base, struct map_info *map,
+ 	if (cfi_qry_present(map, base, cfi))
+ 		return 1;
+ 	/* QRY not found */
+-	return 0;
++/*	return 0; */
++
++/*	FIXME: UGLY HACK: FORCE DETECTION */
++	return 1;
+ }
+ EXPORT_SYMBOL_GPL(cfi_qry_mode_on);
+ 
+-- 
+1.8.1.5
+
Signature · 1 line
1.8.1.5
#5 lore raw

PATCH 5/6 linux-yocto: collie: resize MTD to SZ_16M

In reply to Andrea Adami
---
 .../linux/linux-yocto-3.10/collie/collie.scc       |  1 +
 .../patches/patches-mtd/collie-mtd-resize.patch    | 41 ++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-mtd-resize.patch
recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc +1 -0
index 536f4b1..fb904ed 100644
@@ -9,3 +9,4 @@ patch ../patches/patches-mfd/ucb1x00-device.patch
 //patch ../patches/patches-mtd/collie-jedec-probe.patch
 patch ../patches/patches-mtd/collie-eraseinfo.patch
 patch ../patches/patches-mtd/collie-force-cfi.patch
+patch ../patches/patches-mtd/collie-mtd-resize.patch
recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-mtd-resize.patch new file +41 -0

41 lines not on this page · raw message

Signature · 1 line
1.8.1.5
#6 lore raw

PATCH 6/6 linux-yocto: collie: force flash unlock on boot

In reply to Andrea Adami
---
 .../linux/linux-yocto-3.10/collie/collie.scc       |  1 +
 .../patches/patches-mtd/collie-force-unlock.patch  | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-force-unlock.patch
recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc +1 -0
index fb904ed..3b9b55a 100644
@@ -10,3 +10,4 @@ patch ../patches/patches-mfd/ucb1x00-device.patch
 patch ../patches/patches-mtd/collie-eraseinfo.patch
 patch ../patches/patches-mtd/collie-force-cfi.patch
 patch ../patches/patches-mtd/collie-mtd-resize.patch
+patch ../patches/patches-mtd/collie-force-unlock.patch
recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-force-unlock.patch new file +22 -0
new file mode 100644
index 0000000..d599d1d
@@ -0,0 +1,22 @@
+From c39115ed52359eb5f0475ea2b4a2e71acb5da54b Mon Sep 17 00:00:00 2001
+From: Andrea Adami <[email protected]>
+Date: Thu, 7 Nov 2013 23:17:36 +0100
+Subject: [PATCH] collie: force flash unlock on boot
+
+Signed-off-by: Andrea Adami <[email protected]>
+---
+ drivers/mtd/chips/cfi_cmdset_0001.c | 1 +
+ 1 file changed, 1 insertions(+), 0 deletion(-)
+
+diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
+index 7751443..d9d6f0e 100644
+--- a/drivers/mtd/chips/cfi_cmdset_0001.c
++++ b/drivers/mtd/chips/cfi_cmdset_0001.c
+@@ -310,6 +310,7 @@ 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, 0x00b0, fixup_unlock_powerup_lock },
+ 	{ 0, 0, NULL }
+ };
+ 
Signature · 1 line
1.8.1.5