summaryrefslogtreecommitdiff
path: root/openwrt/target/linux/ar7-2.4/patches/001-flash_map.patch
blob: 0b58439c8bd5886c3ea63c4d383c380648c9707e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
diff -urN linux.old/drivers/mtd/maps/ar7-flash.c linux.dev/drivers/mtd/maps/ar7-flash.c
--- linux.old/drivers/mtd/maps/ar7-flash.c	1970-01-01 01:00:00.000000000 +0100
+++ linux.dev/drivers/mtd/maps/ar7-flash.c	2005-07-22 04:35:26.624453992 +0200
@@ -0,0 +1,267 @@
+/*
+ * $Id$
+ *
+ * Normal mappings of chips in physical memory
+ */
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <asm/io.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/map.h>
+#include <linux/config.h>
+#include <linux/mtd/partitions.h>
+#include <linux/squashfs_fs.h>
+
+#define WINDOW_ADDR CONFIG_MTD_AR7_START
+#define WINDOW_SIZE CONFIG_MTD_AR7_LEN
+#define BUSWIDTH CONFIG_MTD_AR7_BUSWIDTH
+
+#include <asm/mips-boards/prom.h>
+extern char *prom_getenv(char *name);
+
+static int create_mtd_partitions(void);
+static void __exit ar7_mtd_cleanup(void);
+	
+#define MAX_NUM_PARTITIONS 5
+static struct mtd_partition ar7_partinfo[MAX_NUM_PARTITIONS];
+
+static struct mtd_info *ar7_mtd_info;
+
+__u8 ar7_read8(struct map_info *map, unsigned long ofs)
+{
+	return __raw_readb(map->map_priv_1 + ofs);
+}
+
+__u16 ar7_read16(struct map_info *map, unsigned long ofs)
+{
+	return __raw_readw(map->map_priv_1 + ofs);
+}
+
+__u32 ar7_read32(struct map_info *map, unsigned long ofs)
+{
+	return __raw_readl(map->map_priv_1 + ofs);
+}
+
+void ar7_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
+{
+	memcpy_fromio(to, map->map_priv_1 + from, len);
+}
+
+void ar7_write8(struct map_info *map, __u8 d, unsigned long adr)
+{
+	__raw_writeb(d, map->map_priv_1 + adr);
+	mb();
+}
+
+void ar7_write16(struct map_info *map, __u16 d, unsigned long adr)
+{
+	__raw_writew(d, map->map_priv_1 + adr);
+	mb();
+}
+
+void ar7_write32(struct map_info *map, __u32 d, unsigned long adr)
+{
+	__raw_writel(d, map->map_priv_1 + adr);
+	mb();
+}
+
+void ar7_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len)
+{
+	memcpy_toio(map->map_priv_1 + to, from, len);
+}
+
+struct map_info ar7_map = {
+	name: "Physically mapped flash",
+	size: WINDOW_SIZE,
+	buswidth: BUSWIDTH,
+	read8: ar7_read8,
+	read16: ar7_read16,
+	read32: ar7_read32,
+	copy_from: ar7_copy_from,
+	write8: ar7_write8,
+	write16: ar7_write16,
+	write32: ar7_write32,
+	copy_to: ar7_copy_to
+};
+
+int __init ar7_mtd_init(void)
+{
+	int partitions;
+	
+       	printk(KERN_NOTICE "ar7 flash device: 0x%lx at 0x%lx.\n", (unsigned long)WINDOW_SIZE, (unsigned long)WINDOW_ADDR);
+	ar7_map.map_priv_1 = (unsigned long)ioremap_nocache(WINDOW_ADDR, WINDOW_SIZE);
+
+	if (!ar7_map.map_priv_1) {
+		printk("Failed to ioremap\n");
+		return -EIO;
+	}
+	
+	ar7_mtd_info = do_map_probe("cfi_probe", &ar7_map);
+	if (!ar7_mtd_info)
+	{
+		ar7_mtd_cleanup();
+		return -ENXIO;
+	}
+	
+	ar7_mtd_info->module = THIS_MODULE;
+
+	if (!(partitions = create_mtd_partitions()))
+		add_mtd_device(ar7_mtd_info);
+	else		
+		add_mtd_partitions(ar7_mtd_info, ar7_partinfo, partitions);
+
+	return 0;
+}
+
+static char *strdup(char *str)
+{
+	int n = strlen(str)+1;
+	char *s = kmalloc(n, GFP_KERNEL);
+	if (!s) return NULL;
+	return strcpy(s, str);
+}
+
+
+static int create_mtd_partitions(void)
+{
+	unsigned int offset;
+	unsigned int size;
+	unsigned int found = 0;
+	unsigned int p = 0;
+	unsigned char *flash_base;
+	unsigned char *flash_end;
+	char *env_ptr;
+	char *base_ptr;
+	char *end_ptr;
+	unsigned int adam2_size = 0x20000;
+	unsigned int config_offset = WINDOW_SIZE;
+	unsigned int rootfs_start = 0xe0000;
+
+	printk("Parsing ADAM2 partition map...\n");
+	
+	do {
+		char	env_name[20];
+
+		/* get base and end addresses of flash file system from environment */
+		sprintf(env_name, "mtd%1u", p);
+		printk("Looking for mtd device :%s:\n", env_name);
+
+		env_ptr = prom_getenv(env_name);
+		if(env_ptr == NULL) {
+			/* No more partitions to find */
+			break;
+		}
+
+		/* Extract the start and stop addresses of the partition */
+		base_ptr = strtok(env_ptr, ",");
+		end_ptr = strtok(NULL, ",");
+		if ((base_ptr == NULL) || (end_ptr == NULL)) {	
+			printk("ADAM2 partition error: Invalid %s start,end.\n", env_name);
+			break;
+		}
+
+		flash_base = (unsigned char*) simple_strtol(base_ptr, NULL, 0);
+		flash_end = (unsigned char*) simple_strtol(end_ptr, NULL, 0);
+		if((!flash_base) || (!flash_end)) {
+			printk("ADAM2 partition error: Invalid %s start,end.\n", env_name);
+			break;
+		}
+
+		offset = virt_to_bus(flash_base) - WINDOW_ADDR;
+		size = flash_end - flash_base;
+		printk("Found a %s image (0x%x), with size (0x%x).\n",env_name, offset, size);
+
+		
+		if (offset == 0) {
+			printk("Assuming adam2 size of 0x%x\n", size);
+			adam2_size = size; 			// boot loader
+		} else if (offset > 0x120000) {
+			if (config_offset > offset)
+				config_offset = offset;		// reserved at the end of the flash chip
+		} else if (offset > 0x30000) {
+			printk("Assuming default rootfs offset of 0x%x\n", offset);
+			rootfs_start = offset;			// probably root fs
+		}
+		
+		p++;
+	} while (p < MAX_NUM_PARTITIONS);
+	
+	p = 0;
+	
+	ar7_partinfo[p].name = strdup("adam2");
+	ar7_partinfo[p].offset = 0;
+	ar7_partinfo[p].size = adam2_size;
+	ar7_partinfo[p++].mask_flags = 0;
+
+	ar7_partinfo[p].name = strdup("linux");
+	ar7_partinfo[p].offset = adam2_size;
+	ar7_partinfo[p].size = config_offset - adam2_size;
+	ar7_partinfo[p++].mask_flags = 0;
+
+	if (ar7_read32(&ar7_map, adam2_size) == 0xfeedfa42) {
+		rootfs_start = ar7_read32(&ar7_map, adam2_size + 4) + adam2_size + 28;
+		printk("Setting new rootfs offset to %08x\n", rootfs_start);
+	}
+	
+	ar7_partinfo[p].name = strdup("rootfs");
+	ar7_partinfo[p].offset = rootfs_start;
+	ar7_partinfo[p].size = config_offset - rootfs_start;
+	
+	ar7_partinfo[p++].mask_flags = 0;
+
+	ar7_partinfo[p].name = strdup("config");
+	ar7_partinfo[p].offset = config_offset;
+	ar7_partinfo[p].size = WINDOW_SIZE - config_offset;
+	ar7_partinfo[p++].mask_flags = 0;
+
+	if (ar7_read32(&ar7_map, rootfs_start) == SQUASHFS_MAGIC) {
+		int newsize, newoffset;
+		struct squashfs_super_block sb;
+
+		ar7_copy_from(&ar7_map, &sb, rootfs_start, sizeof(sb));
+		printk("Squashfs detected (size = 0x%08x)\n", sb.bytes_used);
+		
+		newoffset = rootfs_start + sb.bytes_used;
+
+		if ((newoffset % ar7_mtd_info->erasesize) > 0)
+			newoffset += ar7_mtd_info->erasesize - (newoffset % ar7_mtd_info->erasesize);
+		
+		ar7_partinfo[p - 2].size = newoffset - rootfs_start;
+		
+		ar7_partinfo[p].name = strdup("OpenWrt");
+		ar7_partinfo[p].offset = newoffset;
+		ar7_partinfo[p].size = config_offset - newoffset;
+		ar7_partinfo[p++].mask_flags = 0;
+	} else {
+		printk("Unknown filesystem. Moving rootfs partition to next erase block");
+		if ((rootfs_start % ar7_mtd_info->erasesize) > 0) {
+			ar7_partinfo[p - 2].offset += ar7_mtd_info->erasesize - (rootfs_start % ar7_mtd_info->erasesize);
+			ar7_partinfo[p - 2].size -= ar7_mtd_info->erasesize - (rootfs_start % ar7_mtd_info->erasesize);
+		}
+	}
+
+	return p;
+}
+
+static void __exit ar7_mtd_cleanup(void)
+{
+	if (ar7_mtd_info) {
+		del_mtd_partitions(ar7_mtd_info);
+		del_mtd_device(ar7_mtd_info);
+		map_destroy(ar7_mtd_info);
+	}
+
+	if (ar7_map.map_priv_1) {
+		iounmap((void *)ar7_map.map_priv_1);
+		ar7_map.map_priv_1 = 0;
+	}
+}
+
+module_init(ar7_mtd_init);
+module_exit(ar7_mtd_cleanup);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Felix Fietkau");
+MODULE_DESCRIPTION("AR7 CFI map driver");
diff -urN linux.old/drivers/mtd/maps/Config.in linux.dev/drivers/mtd/maps/Config.in
--- linux.old/drivers/mtd/maps/Config.in	2005-07-21 05:36:32.414242296 +0200
+++ linux.dev/drivers/mtd/maps/Config.in	2005-07-21 06:29:04.067118232 +0200
@@ -48,6 +48,21 @@
 fi
 
 if [ "$CONFIG_MIPS" = "y" ]; then
+    if [ "$CONFIG_AR7" = "y" ]; then
+      dep_tristate '  Flash chip mapping on Texas Instruments AR7' CONFIG_MTD_AR7 $CONFIG_MTD_CFI $CONFIG_MTD_PARTITIONS
+      dep_bool     '    Use defaults for Texas Instruments AR7' CONFIG_MTD_AR7_DEFAULTS $CONFIG_MTD_AR7
+      if [ "$CONFIG_MTD_AR7" = "y" -o "$CONFIG_MTD_AR7" = "m" ]; then
+         if [ "$CONFIG_MTD_AR7_DEFAULTS" = "y" ]; then
+            define_hex CONFIG_MTD_AR7_START 0x10000000
+            define_hex CONFIG_MTD_AR7_LEN 0x400000
+            define_int CONFIG_MTD_AR7_BUSWIDTH 2
+         else
+            hex '      Physical start address of flash mapping' CONFIG_MTD_AR7_START 0x10000000
+            hex '      Physical length of flash mapping' CONFIG_MTD_AR7_LEN 0x400000
+            int '      Bus width in octets' CONFIG_MTD_AR7_BUSWIDTH 2
+         fi
+      fi
+   fi
    dep_tristate '  Pb1000 MTD support' CONFIG_MTD_PB1000 $CONFIG_MIPS_PB1000
    dep_tristate '  Pb1500 MTD support' CONFIG_MTD_PB1500 $CONFIG_MIPS_PB1500
    dep_tristate '  Pb1100 MTD support' CONFIG_MTD_PB1100 $CONFIG_MIPS_PB1100
diff -urN linux.old/drivers/mtd/maps/Makefile linux.dev/drivers/mtd/maps/Makefile
--- linux.old/drivers/mtd/maps/Makefile	2005-07-21 05:36:32.414242296 +0200
+++ linux.dev/drivers/mtd/maps/Makefile	2005-07-21 06:56:33.265401984 +0200
@@ -10,6 +10,7 @@
 endif
 
 # Chip mappings
+obj-$(CONFIG_MTD_AR7)		+= ar7-flash.o
 obj-$(CONFIG_MTD_CDB89712)	+= cdb89712.o
 obj-$(CONFIG_MTD_ARM_INTEGRATOR)+= integrator-flash.o
 obj-$(CONFIG_MTD_CFI_FLAGADM)	+= cfi_flagadm.o