summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-11-18 23:00:12 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-11-18 23:00:12 +0100
commitf0fccb1a7386ca01b5bccf03e4a5c0b1c0d491fa (patch)
tree5eea9c2ab750bbd8162f31c56183df2cdc793ea1
parent0ea272dc798cc9a853b1e43871e992f6ced45d14 (diff)
parente2bff9d3ecca84e5688b9a3e9762a22046c042ca (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat
-rw-r--r--target/linux/patches/2.6.36/yaffs2.patch22259
-rw-r--r--target/rb4xx/kernel.config103
-rw-r--r--target/rb4xx/patches/ar71xx.patch19165
-rw-r--r--target/rb532/kernel.config215
4 files changed, 13985 insertions, 27757 deletions
diff --git a/target/linux/patches/2.6.36/yaffs2.patch b/target/linux/patches/2.6.36/yaffs2.patch
index 5d0d7ba6f..ab8924e0f 100644
--- a/target/linux/patches/2.6.36/yaffs2.patch
+++ b/target/linux/patches/2.6.36/yaffs2.patch
@@ -1,361 +1,26 @@
-diff -Nur linux-2.6.34.orig/fs/Kconfig linux-2.6.34/fs/Kconfig
---- linux-2.6.34.orig/fs/Kconfig 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/fs/Kconfig 2010-05-20 20:16:22.261614078 +0200
-@@ -174,6 +174,10 @@
+diff -Nur linux-2.6.36.orig/fs/Kconfig linux-2.6.36/fs/Kconfig
+--- linux-2.6.36.orig/fs/Kconfig 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/fs/Kconfig 2010-11-18 18:15:51.000000000 +0100
+@@ -174,6 +174,7 @@
source "fs/befs/Kconfig"
source "fs/bfs/Kconfig"
source "fs/efs/Kconfig"
-+
-+# Patched by YAFFS
+source "fs/yaffs2/Kconfig"
-+
source "fs/jffs2/Kconfig"
# UBIFS File system configuration
source "fs/ubifs/Kconfig"
-diff -Nur linux-2.6.34.orig/fs/Makefile linux-2.6.34/fs/Makefile
---- linux-2.6.34.orig/fs/Makefile 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/fs/Makefile 2010-05-20 20:16:56.351613526 +0200
-@@ -124,5 +124,6 @@
- obj-$(CONFIG_OCFS2_FS) += ocfs2/
- obj-$(CONFIG_BTRFS_FS) += btrfs/
+diff -Nur linux-2.6.36.orig/fs/Makefile linux-2.6.36/fs/Makefile
+--- linux-2.6.36.orig/fs/Makefile 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/fs/Makefile 2010-11-18 18:15:51.000000000 +0100
+@@ -126,3 +126,4 @@
obj-$(CONFIG_GFS2_FS) += gfs2/
-+obj-$(CONFIG_YAFFS_FS) += yaffs2/
obj-$(CONFIG_EXOFS_FS) += exofs/
obj-$(CONFIG_CEPH_FS) += ceph/
-diff -Nur linux-2.6.34.orig/fs/Makefile.pre.yaffs linux-2.6.34/fs/Makefile.pre.yaffs
---- linux-2.6.34.orig/fs/Makefile.pre.yaffs 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/Makefile.pre.yaffs 2010-05-20 20:16:22.271612558 +0200
-@@ -0,0 +1,126 @@
-+#
-+# Makefile for the Linux filesystems.
-+#
-+# 14 Sep 2000, Christoph Hellwig <hch@infradead.org>
-+# Rewritten to use lists instead of if-statements.
-+#
-+
-+obj-y := open.o read_write.o file_table.o super.o \
-+ char_dev.o stat.o exec.o pipe.o namei.o fcntl.o \
-+ ioctl.o readdir.o select.o fifo.o dcache.o inode.o \
-+ attr.o bad_inode.o file.o filesystems.o namespace.o \
-+ seq_file.o xattr.o libfs.o fs-writeback.o \
-+ pnode.o drop_caches.o splice.o sync.o utimes.o \
-+ stack.o
-+
-+ifeq ($(CONFIG_BLOCK),y)
-+obj-y += buffer.o bio.o block_dev.o direct-io.o mpage.o ioprio.o
-+else
-+obj-y += no-block.o
-+endif
-+
-+obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o
-+obj-y += notify/
-+obj-$(CONFIG_EPOLL) += eventpoll.o
-+obj-$(CONFIG_ANON_INODES) += anon_inodes.o
-+obj-$(CONFIG_SIGNALFD) += signalfd.o
-+obj-$(CONFIG_TIMERFD) += timerfd.o
-+obj-$(CONFIG_EVENTFD) += eventfd.o
-+obj-$(CONFIG_AIO) += aio.o
-+obj-$(CONFIG_FILE_LOCKING) += locks.o
-+obj-$(CONFIG_COMPAT) += compat.o compat_ioctl.o
-+
-+nfsd-$(CONFIG_NFSD) := nfsctl.o
-+obj-y += $(nfsd-y) $(nfsd-m)
-+
-+obj-$(CONFIG_BINFMT_AOUT) += binfmt_aout.o
-+obj-$(CONFIG_BINFMT_EM86) += binfmt_em86.o
-+obj-$(CONFIG_BINFMT_MISC) += binfmt_misc.o
-+
-+# binfmt_script is always there
-+obj-y += binfmt_script.o
-+
-+obj-$(CONFIG_BINFMT_ELF) += binfmt_elf.o
-+obj-$(CONFIG_COMPAT_BINFMT_ELF) += compat_binfmt_elf.o
-+obj-$(CONFIG_BINFMT_ELF_FDPIC) += binfmt_elf_fdpic.o
-+obj-$(CONFIG_BINFMT_SOM) += binfmt_som.o
-+obj-$(CONFIG_BINFMT_FLAT) += binfmt_flat.o
-+
-+obj-$(CONFIG_FS_MBCACHE) += mbcache.o
-+obj-$(CONFIG_FS_POSIX_ACL) += posix_acl.o xattr_acl.o
-+obj-$(CONFIG_NFS_COMMON) += nfs_common/
-+obj-$(CONFIG_GENERIC_ACL) += generic_acl.o
-+
-+obj-$(CONFIG_QUOTA) += dquot.o
-+obj-$(CONFIG_QFMT_V1) += quota_v1.o
-+obj-$(CONFIG_QFMT_V2) += quota_v2.o
-+obj-$(CONFIG_QUOTA_TREE) += quota_tree.o
-+obj-$(CONFIG_QUOTACTL) += quota.o
-+
-+obj-$(CONFIG_PROC_FS) += proc/
-+obj-y += partitions/
-+obj-$(CONFIG_SYSFS) += sysfs/
-+obj-$(CONFIG_CONFIGFS_FS) += configfs/
-+obj-y += devpts/
-+
-+obj-$(CONFIG_PROFILING) += dcookies.o
-+obj-$(CONFIG_DLM) += dlm/
-+
-+# Do not add any filesystems before this line
-+obj-$(CONFIG_REISERFS_FS) += reiserfs/
-+obj-$(CONFIG_EXT3_FS) += ext3/ # Before ext2 so root fs can be ext3
-+obj-$(CONFIG_EXT2_FS) += ext2/
-+# We place ext4 after ext2 so plain ext2 root fs's are mounted using ext2
-+# unless explicitly requested by rootfstype
-+obj-$(CONFIG_EXT4_FS) += ext4/
-+obj-$(CONFIG_JBD) += jbd/
-+obj-$(CONFIG_JBD2) += jbd2/
-+obj-$(CONFIG_CRAMFS) += cramfs/
-+obj-$(CONFIG_SQUASHFS) += squashfs/
-+obj-y += ramfs/
-+obj-$(CONFIG_HUGETLBFS) += hugetlbfs/
-+obj-$(CONFIG_CODA_FS) += coda/
-+obj-$(CONFIG_MINIX_FS) += minix/
-+obj-$(CONFIG_FAT_FS) += fat/
-+obj-$(CONFIG_BFS_FS) += bfs/
-+obj-$(CONFIG_ISO9660_FS) += isofs/
-+obj-$(CONFIG_HFSPLUS_FS) += hfsplus/ # Before hfs to find wrapped HFS+
-+obj-$(CONFIG_HFS_FS) += hfs/
-+obj-$(CONFIG_ECRYPT_FS) += ecryptfs/
-+obj-$(CONFIG_VXFS_FS) += freevxfs/
-+obj-$(CONFIG_NFS_FS) += nfs/
-+obj-$(CONFIG_EXPORTFS) += exportfs/
-+obj-$(CONFIG_NFSD) += nfsd/
-+obj-$(CONFIG_LOCKD) += lockd/
-+obj-$(CONFIG_NLS) += nls/
-+obj-$(CONFIG_SYSV_FS) += sysv/
-+obj-$(CONFIG_SMB_FS) += smbfs/
-+obj-$(CONFIG_CIFS) += cifs/
-+obj-$(CONFIG_NCP_FS) += ncpfs/
-+obj-$(CONFIG_HPFS_FS) += hpfs/
-+obj-$(CONFIG_NTFS_FS) += ntfs/
-+obj-$(CONFIG_UFS_FS) += ufs/
-+obj-$(CONFIG_EFS_FS) += efs/
-+obj-$(CONFIG_JFFS2_FS) += jffs2/
-+obj-$(CONFIG_UBIFS_FS) += ubifs/
-+obj-$(CONFIG_AFFS_FS) += affs/
-+obj-$(CONFIG_ROMFS_FS) += romfs/
-+obj-$(CONFIG_QNX4FS_FS) += qnx4/
-+obj-$(CONFIG_AUTOFS_FS) += autofs/
-+obj-$(CONFIG_AUTOFS4_FS) += autofs4/
-+obj-$(CONFIG_ADFS_FS) += adfs/
-+obj-$(CONFIG_FUSE_FS) += fuse/
-+obj-$(CONFIG_UDF_FS) += udf/
-+obj-$(CONFIG_SUN_OPENPROMFS) += openpromfs/
-+obj-$(CONFIG_OMFS_FS) += omfs/
-+obj-$(CONFIG_JFS_FS) += jfs/
-+obj-$(CONFIG_XFS_FS) += xfs/
-+obj-$(CONFIG_9P_FS) += 9p/
-+obj-$(CONFIG_AFS_FS) += afs/
-+obj-$(CONFIG_BEFS_FS) += befs/
-+obj-$(CONFIG_HOSTFS) += hostfs/
-+obj-$(CONFIG_HPPFS) += hppfs/
-+obj-$(CONFIG_DEBUG_FS) += debugfs/
-+obj-$(CONFIG_OCFS2_FS) += ocfs2/
-+obj-$(CONFIG_BTRFS_FS) += btrfs/
-+obj-$(CONFIG_GFS2_FS) += gfs2/
-diff -Nur linux-2.6.34.orig/fs/yaffs2/devextras.h linux-2.6.34/fs/yaffs2/devextras.h
---- linux-2.6.34.orig/fs/yaffs2/devextras.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/devextras.h 2010-05-20 20:16:22.271612558 +0200
-@@ -0,0 +1,196 @@
-+/*
-+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
-+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
-+ * for Toby Churchill Ltd and Brightstar Engineering
-+ *
-+ * Created by Charles Manning <charles@aleph1.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 2.1 as
-+ * published by the Free Software Foundation.
-+ *
-+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
-+ */
-+
-+/*
-+ * This file is just holds extra declarations of macros that would normally
-+ * be providesd in the Linux kernel. These macros have been written from
-+ * scratch but are functionally equivalent to the Linux ones.
-+ *
-+ */
-+
-+#ifndef __EXTRAS_H__
-+#define __EXTRAS_H__
-+
-+
-+#if !(defined __KERNEL__)
-+
-+/* Definition of types */
-+typedef unsigned char __u8;
-+typedef unsigned short __u16;
-+typedef unsigned __u32;
-+
-+#endif
-+
-+/*
-+ * This is a simple doubly linked list implementation that matches the
-+ * way the Linux kernel doubly linked list implementation works.
-+ */
-+
-+struct ylist_head {
-+ struct ylist_head *next; /* next in chain */
-+ struct ylist_head *prev; /* previous in chain */
-+};
-+
-+
-+/* Initialise a static list */
-+#define YLIST_HEAD(name) \
-+struct ylist_head name = { &(name), &(name)}
-+
-+
-+
-+/* Initialise a list head to an empty list */
-+#define YINIT_LIST_HEAD(p) \
-+do { \
-+ (p)->next = (p);\
-+ (p)->prev = (p); \
-+} while (0)
-+
-+
-+/* Add an element to a list */
-+static __inline__ void ylist_add(struct ylist_head *newEntry,
-+ struct ylist_head *list)
-+{
-+ struct ylist_head *listNext = list->next;
-+
-+ list->next = newEntry;
-+ newEntry->prev = list;
-+ newEntry->next = listNext;
-+ listNext->prev = newEntry;
-+
-+}
-+
-+static __inline__ void ylist_add_tail(struct ylist_head *newEntry,
-+ struct ylist_head *list)
-+{
-+ struct ylist_head *listPrev = list->prev;
-+
-+ list->prev = newEntry;
-+ newEntry->next = list;
-+ newEntry->prev = listPrev;
-+ listPrev->next = newEntry;
-+
-+}
-+
-+
-+/* Take an element out of its current list, with or without
-+ * reinitialising the links.of the entry*/
-+static __inline__ void ylist_del(struct ylist_head *entry)
-+{
-+ struct ylist_head *listNext = entry->next;
-+ struct ylist_head *listPrev = entry->prev;
-+
-+ listNext->prev = listPrev;
-+ listPrev->next = listNext;
-+
-+}
-+
-+static __inline__ void ylist_del_init(struct ylist_head *entry)
-+{
-+ ylist_del(entry);
-+ entry->next = entry->prev = entry;
-+}
-+
-+
-+/* Test if the list is empty */
-+static __inline__ int ylist_empty(struct ylist_head *entry)
-+{
-+ return (entry->next == entry);
-+}
-+
-+
-+/* ylist_entry takes a pointer to a list entry and offsets it to that
-+ * we can find a pointer to the object it is embedded in.
-+ */
-+
-+
-+#define ylist_entry(entry, type, member) \
-+ ((type *)((char *)(entry)-(unsigned long)(&((type *)NULL)->member)))
-+
-+
-+/* ylist_for_each and list_for_each_safe iterate over lists.
-+ * ylist_for_each_safe uses temporary storage to make the list delete safe
-+ */
-+
-+#define ylist_for_each(itervar, list) \
-+ for (itervar = (list)->next; itervar != (list); itervar = itervar->next)
-+
-+#define ylist_for_each_safe(itervar, saveVar, list) \
-+ for (itervar = (list)->next, saveVar = (list)->next->next; \
-+ itervar != (list); itervar = saveVar, saveVar = saveVar->next)
-+
-+
-+#if !(defined __KERNEL__)
-+
-+
-+#ifndef WIN32
-+#include <sys/stat.h>
-+#endif
-+
-+
-+#ifdef CONFIG_YAFFS_PROVIDE_DEFS
-+/* File types */
-+
-+
-+#define DT_UNKNOWN 0
-+#define DT_FIFO 1
-+#define DT_CHR 2
-+#define DT_DIR 4
-+#define DT_BLK 6
-+#define DT_REG 8
-+#define DT_LNK 10
-+#define DT_SOCK 12
-+#define DT_WHT 14
-+
-+
-+#ifndef WIN32
-+#include <sys/stat.h>
-+#endif
-+
-+/*
-+ * Attribute flags. These should be or-ed together to figure out what
-+ * has been changed!
-+ */
-+#define ATTR_MODE 1
-+#define ATTR_UID 2
-+#define ATTR_GID 4
-+#define ATTR_SIZE 8
-+#define ATTR_ATIME 16
-+#define ATTR_MTIME 32
-+#define ATTR_CTIME 64
-+
-+struct iattr {
-+ unsigned int ia_valid;
-+ unsigned ia_mode;
-+ unsigned ia_uid;
-+ unsigned ia_gid;
-+ unsigned ia_size;
-+ unsigned ia_atime;
-+ unsigned ia_mtime;
-+ unsigned ia_ctime;
-+ unsigned int ia_attr_flags;
-+};
-+
-+#endif
-+
-+#else
-+
-+#include <linux/types.h>
-+#include <linux/fs.h>
-+#include <linux/stat.h>
-+
-+#endif
-+
-+
-+#endif
-diff -Nur linux-2.6.34.orig/fs/yaffs2/Kconfig linux-2.6.34/fs/yaffs2/Kconfig
---- linux-2.6.34.orig/fs/yaffs2/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/Kconfig 2010-05-20 20:16:22.271612558 +0200
-@@ -0,0 +1,156 @@
++obj-$(CONFIG_YAFFS_FS) += yaffs2/
+diff -Nur linux-2.6.36.orig/fs/yaffs2/Kconfig linux-2.6.36/fs/yaffs2/Kconfig
+--- linux-2.6.36.orig/fs/yaffs2/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/Kconfig 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,161 @@
+#
+# YAFFS file system configurations
+#
@@ -448,39 +113,15 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/Kconfig linux-2.6.34/fs/yaffs2/Kconfig
+
+ If unsure, say Y.
+
-+config YAFFS_DISABLE_LAZY_LOAD
-+ bool "Disable lazy loading"
-+ depends on YAFFS_YAFFS2
++config YAFFS_DISABLE_TAGS_ECC
++ bool "Disable YAFFS from doing ECC on tags by default"
++ depends on YAFFS_FS && YAFFS_YAFFS2
+ default n
+ help
-+ "Lazy loading" defers loading file details until they are
-+ required. This saves mount time, but makes the first look-up
-+ a bit longer.
-+
-+ Lazy loading will only happen if enabled by this option being 'n'
-+ and if the appropriate tags are available, else yaffs2 will
-+ automatically fall back to immediate loading and do the right
-+ thing.
-+
-+ Lazy laoding will be required by checkpointing.
-+
-+ Setting this to 'y' will disable lazy loading.
-+
-+ If unsure, say N.
-+
-+
-+config YAFFS_DISABLE_WIDE_TNODES
-+ bool "Turn off wide tnodes"
-+ depends on YAFFS_FS
-+ default n
-+ help
-+ Wide tnodes are only used for NAND arrays >=32MB for 512-byte
-+ page devices and >=128MB for 2k page devices. They use slightly
-+ more RAM but are faster since they eliminate chunk group
-+ searching.
-+
-+ Setting this to 'y' will force tnode width to 16 bits and save
-+ memory but make large arrays slower.
++ This defaults Yaffs to using its own ECC calculations on tags instead of
++ just relying on the MTD.
++ This behavior can also be overridden with tags_ecc_on and
++ tags_ecc_off mount options.
+
+ If unsure, say N.
+
@@ -502,38 +143,74 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/Kconfig linux-2.6.34/fs/yaffs2/Kconfig
+
+ If unsure, say Y.
+
-+config YAFFS_SHORT_NAMES_IN_RAM
-+ bool "Cache short names in RAM"
++config YAFFS_EMPTY_LOST_AND_FOUND
++ bool "Empty lost and found on boot"
+ depends on YAFFS_FS
-+ default y
++ default n
+ help
-+ If this config is set, then short names are stored with the
-+ yaffs_Object. This costs an extra 16 bytes of RAM per object,
-+ but makes look-ups faster.
++ If this is enabled then the contents of lost and found is
++ automatically dumped at mount.
+
-+ If unsure, say Y.
-diff -Nur linux-2.6.34.orig/fs/yaffs2/Makefile linux-2.6.34/fs/yaffs2/Makefile
---- linux-2.6.34.orig/fs/yaffs2/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/Makefile 2010-05-20 20:16:22.271612558 +0200
-@@ -0,0 +1,10 @@
++ If unsure, say N.
++
++config YAFFS_DISABLE_BLOCK_REFRESHING
++ bool "Disable yaffs2 block refreshing"
++ depends on YAFFS_FS
++ default n
++ help
++ If this is set, then block refreshing is disabled.
++ Block refreshing infrequently refreshes the oldest block in
++ a yaffs2 file system. This mechanism helps to refresh flash to
++ mitigate against data loss. This is particularly useful for MLC.
++
++ If unsure, say N.
++
++config YAFFS_DISABLE_BACKGROUND
++ bool "Disable yaffs2 background processing"
++ depends on YAFFS_FS
++ default n
++ help
++ If this is set, then background processing is disabled.
++ Background processing makes many foreground activities faster.
++
++ If unsure, say N.
++
++config YAFFS_XATTR
++ bool "Enable yaffs2 xattr support"
++ depends on YAFFS_FS
++ default y
++ help
++ If this is set then yaffs2 will provide xattr support.
++ If unsure, say Y.
+diff -Nur linux-2.6.36.orig/fs/yaffs2/Makefile linux-2.6.36/fs/yaffs2/Makefile
+--- linux-2.6.36.orig/fs/yaffs2/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/Makefile 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,17 @@
+#
+# Makefile for the linux YAFFS filesystem routines.
+#
+
+obj-$(CONFIG_YAFFS_FS) += yaffs.o
+
-+yaffs-y := yaffs_ecc.o yaffs_fs.o yaffs_guts.o yaffs_checkptrw.o
-+yaffs-y += yaffs_packedtags1.o yaffs_packedtags2.o yaffs_nand.o yaffs_qsort.o
++yaffs-y := yaffs_ecc.o yaffs_vfs.o yaffs_guts.o yaffs_checkptrw.o
++yaffs-y += yaffs_packedtags1.o yaffs_packedtags2.o yaffs_nand.o
+yaffs-y += yaffs_tagscompat.o yaffs_tagsvalidity.o
+yaffs-y += yaffs_mtdif.o yaffs_mtdif1.o yaffs_mtdif2.o
-diff -Nur linux-2.6.34.orig/fs/yaffs2/moduleconfig.h linux-2.6.34/fs/yaffs2/moduleconfig.h
---- linux-2.6.34.orig/fs/yaffs2/moduleconfig.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/moduleconfig.h 2010-05-20 20:16:22.281614392 +0200
-@@ -0,0 +1,65 @@
++yaffs-y += yaffs_nameval.o yaffs_attribs.o
++yaffs-y += yaffs_allocator.o
++yaffs-y += yaffs_yaffs1.o
++yaffs-y += yaffs_yaffs2.o
++yaffs-y += yaffs_bitmap.o
++yaffs-y += yaffs_verify.o
++
+diff -Nur linux-2.6.36.orig/fs/yaffs2/moduleconfig.h linux-2.6.36/fs/yaffs2/moduleconfig.h
+--- linux-2.6.36.orig/fs/yaffs2/moduleconfig.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/moduleconfig.h 2010-11-18 18:49:02.000000000 +0100
+@@ -0,0 +1,81 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
++ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Martin Fouts <Martin.Fouts@palmsource.com>
@@ -561,25 +238,41 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/moduleconfig.h linux-2.6.34/fs/yaffs2/modu
+/* Meaning: Yaffs does its own ECC, rather than using MTD ECC */
+/* #define CONFIG_YAFFS_DOES_ECC */
+
++/* Default: Selected */
++/* Meaning: Yaffs does its own ECC on tags for packed tags rather than use mtd */
++#define CONFIG_YAFFS_DOES_TAGS_ECC
++
+/* Default: Not selected */
+/* Meaning: ECC byte order is 'wrong'. Only meaningful if */
+/* CONFIG_YAFFS_DOES_ECC is set */
+/* #define CONFIG_YAFFS_ECC_WRONG_ORDER */
+
-+/* Default: Selected */
-+/* Meaning: Disables testing whether chunks are erased before writing to them*/
-+#define CONFIG_YAFFS_DISABLE_CHUNK_ERASED_CHECK
++/* Default: Not selected */
++/* Meaning: Always test whether chunks are erased before writing to them.
++ Use during mtd debugging and init. */
++/* #define CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED */
+
-+/* Default: Selected */
-+/* Meaning: Cache short names, taking more RAM, but faster look-ups */
-+#define CONFIG_YAFFS_SHORT_NAMES_IN_RAM
++/* Default: Not Selected */
++/* Meaning: At mount automatically empty all files from lost and found. */
++/* This is done to fix an old problem where rmdir was not checking for an */
++/* empty directory. This can also be achieved with a mount option. */
++#define CONFIG_YAFFS_EMPTY_LOST_AND_FOUND
++
++/* Default: Unselected */
++/* Meaning: Select to disable block refreshing. */
++/* Block Refreshing periodically rewrites the oldest block. */
++/* #define CONFIG_DISABLE_BLOCK_REFRESHING */
+
-+/* Default: 10 */
-+/* Meaning: set the count of blocks to reserve for checkpointing */
-+#define CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS 10
++/* Default: Unselected */
++/* Meaning: Select to disable background processing */
++/* #define CONFIG_DISABLE_BACKGROUND */
++
++/* Default: Selected */
++/* Meaning: Enable XATTR support */
++#define CONFIG_YAFFS_XATTR
+
+/*
-+Older-style on-NAND data format has a "pageStatus" byte to record
++Older-style on-NAND data format has a "page_status" byte to record
+chunk/page state. This byte is zeroed when the page is discarded.
+Choose this option if you have existing on-NAND data in this format
+that you need to continue to support. New data written also uses the
@@ -589,20 +282,20 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/moduleconfig.h linux-2.6.34/fs/yaffs2/modu
+MTD versions in yaffs_mtdif1.c.
+*/
+/* Default: Not selected */
-+/* Meaning: Use older-style on-NAND data format with pageStatus byte */
++/* Meaning: Use older-style on-NAND data format with page_status byte */
+/* #define CONFIG_YAFFS_9BYTE_TAGS */
+
+#endif /* YAFFS_OUT_OF_TREE */
+
+#endif /* __YAFFS_CONFIG_H__ */
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_checkptrw.c linux-2.6.34/fs/yaffs2/yaffs_checkptrw.c
---- linux-2.6.34.orig/fs/yaffs2/yaffs_checkptrw.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffs_checkptrw.c 2010-05-20 20:16:22.281614392 +0200
-@@ -0,0 +1,394 @@
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_allocator.c linux-2.6.36/fs/yaffs2/yaffs_allocator.c
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_allocator.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_allocator.c 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,397 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
++ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
@@ -612,395 +305,1161 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_checkptrw.c linux-2.6.34/fs/yaffs2/y
+ * published by the Free Software Foundation.
+ */
+
-+const char *yaffs_checkptrw_c_version =
-+ "$Id: yaffs_checkptrw.c,v 1.18 2009-03-06 17:20:49 wookey Exp $";
++#include "yaffs_allocator.h"
++#include "yaffs_guts.h"
++#include "yaffs_trace.h"
++#include "yportenv.h"
++
++#ifdef CONFIG_YAFFS_YMALLOC_ALLOCATOR
++
++void yaffs_deinit_raw_tnodes_and_objs(struct yaffs_dev *dev)
++{
++ dev = dev;
++}
++
++void yaffs_init_raw_tnodes_and_objs(struct yaffs_dev *dev)
++{
++ dev = dev;
++}
++
++struct yaffs_tnode *yaffs_alloc_raw_tnode(struct yaffs_dev *dev)
++{
++ return (struct yaffs_tnode *)YMALLOC(dev->tnode_size);
++}
++
++void yaffs_free_raw_tnode(struct yaffs_dev *dev, struct yaffs_tnode *tn)
++{
++ dev = dev;
++ YFREE(tn);
++}
++
++void yaffs_init_raw_objs(struct yaffs_dev *dev)
++{
++ dev = dev;
++}
++
++void yaffs_deinit_raw_objs(struct yaffs_dev *dev)
++{
++ dev = dev;
++}
++
++struct yaffs_obj *yaffs_alloc_raw_obj(struct yaffs_dev *dev)
++{
++ dev = dev;
++ return (struct yaffs_obj *)YMALLOC(sizeof(struct yaffs_obj));
++}
++
++void yaffs_free_raw_obj(struct yaffs_dev *dev, struct yaffs_obj *obj)
++{
++
++ dev = dev;
++ YFREE(obj);
++}
++
++#else
++
++struct yaffs_tnode_list {
++ struct yaffs_tnode_list *next;
++ struct yaffs_tnode *tnodes;
++};
++
++struct yaffs_obj_list {
++ struct yaffs_obj_list *next;
++ struct yaffs_obj *objects;
++};
++
++struct yaffs_allocator {
++ int n_tnodes_created;
++ struct yaffs_tnode *free_tnodes;
++ int n_free_tnodes;
++ struct yaffs_tnode_list *alloc_tnode_list;
++
++ int n_obj_created;
++ struct yaffs_obj *free_objs;
++ int n_free_objects;
++
++ struct yaffs_obj_list *allocated_obj_list;
++};
++
++static void yaffs_deinit_raw_tnodes(struct yaffs_dev *dev)
++{
++
++ struct yaffs_allocator *allocator =
++ (struct yaffs_allocator *)dev->allocator;
++
++ struct yaffs_tnode_list *tmp;
++
++ if (!allocator) {
++ YBUG();
++ return;
++ }
++
++ while (allocator->alloc_tnode_list) {
++ tmp = allocator->alloc_tnode_list->next;
++
++ YFREE(allocator->alloc_tnode_list->tnodes);
++ YFREE(allocator->alloc_tnode_list);
++ allocator->alloc_tnode_list = tmp;
++
++ }
++
++ allocator->free_tnodes = NULL;
++ allocator->n_free_tnodes = 0;
++ allocator->n_tnodes_created = 0;
++}
++
++static void yaffs_init_raw_tnodes(struct yaffs_dev *dev)
++{
++ struct yaffs_allocator *allocator = dev->allocator;
++
++ if (allocator) {
++ allocator->alloc_tnode_list = NULL;
++ allocator->free_tnodes = NULL;
++ allocator->n_free_tnodes = 0;
++ allocator->n_tnodes_created = 0;
++ } else {
++ YBUG();
++ }
++}
++
++static int yaffs_create_tnodes(struct yaffs_dev *dev, int n_tnodes)
++{
++ struct yaffs_allocator *allocator =
++ (struct yaffs_allocator *)dev->allocator;
++ int i;
++ struct yaffs_tnode *new_tnodes;
++ u8 *mem;
++ struct yaffs_tnode *curr;
++ struct yaffs_tnode *next;
++ struct yaffs_tnode_list *tnl;
++
++ if (!allocator) {
++ YBUG();
++ return YAFFS_FAIL;
++ }
++
++ if (n_tnodes < 1)
++ return YAFFS_OK;
++
++ /* make these things */
++
++ new_tnodes = YMALLOC(n_tnodes * dev->tnode_size);
++ mem = (u8 *) new_tnodes;
++
++ if (!new_tnodes) {
++ T(YAFFS_TRACE_ERROR,
++ (TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
++ return YAFFS_FAIL;
++ }
++
++ /* New hookup for wide tnodes */
++ for (i = 0; i < n_tnodes - 1; i++) {
++ curr = (struct yaffs_tnode *)&mem[i * dev->tnode_size];
++ next = (struct yaffs_tnode *)&mem[(i + 1) * dev->tnode_size];
++ curr->internal[0] = next;
++ }
++
++ curr = (struct yaffs_tnode *)&mem[(n_tnodes - 1) * dev->tnode_size];
++ curr->internal[0] = allocator->free_tnodes;
++ allocator->free_tnodes = (struct yaffs_tnode *)mem;
++
++ allocator->n_free_tnodes += n_tnodes;
++ allocator->n_tnodes_created += n_tnodes;
++
++ /* Now add this bunch of tnodes to a list for freeing up.
++ * NB If we can't add this to the management list it isn't fatal
++ * but it just means we can't free this bunch of tnodes later.
++ */
++
++ tnl = YMALLOC(sizeof(struct yaffs_tnode_list));
++ if (!tnl) {
++ T(YAFFS_TRACE_ERROR,
++ (TSTR
++ ("yaffs: Could not add tnodes to management list" TENDSTR)));
++ return YAFFS_FAIL;
++ } else {
++ tnl->tnodes = new_tnodes;
++ tnl->next = allocator->alloc_tnode_list;
++ allocator->alloc_tnode_list = tnl;
++ }
++
++ T(YAFFS_TRACE_ALLOCATE, (TSTR("yaffs: Tnodes added" TENDSTR)));
++
++ return YAFFS_OK;
++}
++
++struct yaffs_tnode *yaffs_alloc_raw_tnode(struct yaffs_dev *dev)
++{
++ struct yaffs_allocator *allocator =
++ (struct yaffs_allocator *)dev->allocator;
++ struct yaffs_tnode *tn = NULL;
++
++ if (!allocator) {
++ YBUG();
++ return NULL;
++ }
++
++ /* If there are none left make more */
++ if (!allocator->free_tnodes)
++ yaffs_create_tnodes(dev, YAFFS_ALLOCATION_NTNODES);
++
++ if (allocator->free_tnodes) {
++ tn = allocator->free_tnodes;
++ allocator->free_tnodes = allocator->free_tnodes->internal[0];
++ allocator->n_free_tnodes--;
++ }
++
++ return tn;
++}
++
++/* FreeTnode frees up a tnode and puts it back on the free list */
++void yaffs_free_raw_tnode(struct yaffs_dev *dev, struct yaffs_tnode *tn)
++{
++ struct yaffs_allocator *allocator = dev->allocator;
++
++ if (!allocator) {
++ YBUG();
++ return;
++ }
++
++ if (tn) {
++ tn->internal[0] = allocator->free_tnodes;
++ allocator->free_tnodes = tn;
++ allocator->n_free_tnodes++;
++ }
++ dev->checkpoint_blocks_required = 0; /* force recalculation */
++}
++
++static void yaffs_init_raw_objs(struct yaffs_dev *dev)
++{
++ struct yaffs_allocator *allocator = dev->allocator;
++
++ if (allocator) {
++ allocator->allocated_obj_list = NULL;
++ allocator->free_objs = NULL;
++ allocator->n_free_objects = 0;
++ } else {
++ YBUG();
++ }
++}
++
++static void yaffs_deinit_raw_objs(struct yaffs_dev *dev)
++{
++ struct yaffs_allocator *allocator = dev->allocator;
++ struct yaffs_obj_list *tmp;
++
++ if (!allocator) {
++ YBUG();
++ return;
++ }
++
++ while (allocator->allocated_obj_list) {
++ tmp = allocator->allocated_obj_list->next;
++ YFREE(allocator->allocated_obj_list->objects);
++ YFREE(allocator->allocated_obj_list);
++
++ allocator->allocated_obj_list = tmp;
++ }
++
++ allocator->free_objs = NULL;
++ allocator->n_free_objects = 0;
++ allocator->n_obj_created = 0;
++}
++
++static int yaffs_create_free_objs(struct yaffs_dev *dev, int n_obj)
++{
++ struct yaffs_allocator *allocator = dev->allocator;
++
++ int i;
++ struct yaffs_obj *new_objs;
++ struct yaffs_obj_list *list;
++
++ if (!allocator) {
++ YBUG();
++ return YAFFS_FAIL;
++ }
++
++ if (n_obj < 1)
++ return YAFFS_OK;
++
++ /* make these things */
++ new_objs = YMALLOC(n_obj * sizeof(struct yaffs_obj));
++ list = YMALLOC(sizeof(struct yaffs_obj_list));
++
++ if (!new_objs || !list) {
++ if (new_objs) {
++ YFREE(new_objs);
++ new_objs = NULL;
++ }
++ if (list) {
++ YFREE(list);
++ list = NULL;
++ }
++ T(YAFFS_TRACE_ALLOCATE,
++ (TSTR("yaffs: Could not allocate more objects" TENDSTR)));
++ return YAFFS_FAIL;
++ }
++
++ /* Hook them into the free list */
++ for (i = 0; i < n_obj - 1; i++) {
++ new_objs[i].siblings.next =
++ (struct list_head *)(&new_objs[i + 1]);
++ }
++
++ new_objs[n_obj - 1].siblings.next = (void *)allocator->free_objs;
++ allocator->free_objs = new_objs;
++ allocator->n_free_objects += n_obj;
++ allocator->n_obj_created += n_obj;
++
++ /* Now add this bunch of Objects to a list for freeing up. */
++
++ list->objects = new_objs;
++ list->next = allocator->allocated_obj_list;
++ allocator->allocated_obj_list = list;
++
++ return YAFFS_OK;
++}
++
++struct yaffs_obj *yaffs_alloc_raw_obj(struct yaffs_dev *dev)
++{
++ struct yaffs_obj *obj = NULL;
++ struct yaffs_allocator *allocator = dev->allocator;
++
++ if (!allocator) {
++ YBUG();
++ return obj;
++ }
++
++ /* If there are none left make more */
++ if (!allocator->free_objs)
++ yaffs_create_free_objs(dev, YAFFS_ALLOCATION_NOBJECTS);
++
++ if (allocator->free_objs) {
++ obj = allocator->free_objs;
++ allocator->free_objs =
++ (struct yaffs_obj *)(allocator->free_objs->siblings.next);
++ allocator->n_free_objects--;
++ }
++
++ return obj;
++}
++
++void yaffs_free_raw_obj(struct yaffs_dev *dev, struct yaffs_obj *obj)
++{
++
++ struct yaffs_allocator *allocator = dev->allocator;
++
++ if (!allocator)
++ YBUG();
++ else {
++ /* Link into the free list. */
++ obj->siblings.next = (struct list_head *)(allocator->free_objs);
++ allocator->free_objs = obj;
++ allocator->n_free_objects++;
++ }
++}
++
++void yaffs_deinit_raw_tnodes_and_objs(struct yaffs_dev *dev)
++{
++ if (dev->allocator) {
++ yaffs_deinit_raw_tnodes(dev);
++ yaffs_deinit_raw_objs(dev);
++
++ YFREE(dev->allocator);
++ dev->allocator = NULL;
++ } else {
++ YBUG();
++ }
++}
++
++void yaffs_init_raw_tnodes_and_objs(struct yaffs_dev *dev)
++{
++ struct yaffs_allocator *allocator;
++
++ if (!dev->allocator) {
++ allocator = YMALLOC(sizeof(struct yaffs_allocator));
++ if (allocator) {
++ dev->allocator = allocator;
++ yaffs_init_raw_tnodes(dev);
++ yaffs_init_raw_objs(dev);
++ }
++ } else {
++ YBUG();
++ }
++}
++
++#endif
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_allocator.h linux-2.6.36/fs/yaffs2/yaffs_allocator.h
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_allocator.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_allocator.h 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,30 @@
++/*
++ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
++ *
++ * Copyright (C) 2002-2010 Aleph One Ltd.
++ * for Toby Churchill Ltd and Brightstar Engineering
++ *
++ * Created by Charles Manning <charles@aleph1.co.uk>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 2.1 as
++ * published by the Free Software Foundation.
++ *
++ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
++ */
++
++#ifndef __YAFFS_ALLOCATOR_H__
++#define __YAFFS_ALLOCATOR_H__
++
++#include "yaffs_guts.h"
++
++void yaffs_init_raw_tnodes_and_objs(struct yaffs_dev *dev);
++void yaffs_deinit_raw_tnodes_and_objs(struct yaffs_dev *dev);
++
++struct yaffs_tnode *yaffs_alloc_raw_tnode(struct yaffs_dev *dev);
++void yaffs_free_raw_tnode(struct yaffs_dev *dev, struct yaffs_tnode *tn);
++
++struct yaffs_obj *yaffs_alloc_raw_obj(struct yaffs_dev *dev);
++void yaffs_free_raw_obj(struct yaffs_dev *dev, struct yaffs_obj *obj);
++
++#endif
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_attribs.c linux-2.6.36/fs/yaffs2/yaffs_attribs.c
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_attribs.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_attribs.c 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,124 @@
++/*
++ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
++ *
++ * Copyright (C) 2002-2010 Aleph One Ltd.
++ * for Toby Churchill Ltd and Brightstar Engineering
++ *
++ * Created by Charles Manning <charles@aleph1.co.uk>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include "yaffs_guts.h"
++#include "yaffs_attribs.h"
++
++void yaffs_load_attribs(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh)
++{
++ obj->yst_uid = oh->yst_uid;
++ obj->yst_gid = oh->yst_gid;
++ obj->yst_atime = oh->yst_atime;
++ obj->yst_mtime = oh->yst_mtime;
++ obj->yst_ctime = oh->yst_ctime;
++ obj->yst_rdev = oh->yst_rdev;
++}
++
++void yaffs_load_attribs_oh(struct yaffs_obj_hdr *oh, struct yaffs_obj *obj)
++{
++ oh->yst_uid = obj->yst_uid;
++ oh->yst_gid = obj->yst_gid;
++ oh->yst_atime = obj->yst_atime;
++ oh->yst_mtime = obj->yst_mtime;
++ oh->yst_ctime = obj->yst_ctime;
++ oh->yst_rdev = obj->yst_rdev;
++
++}
++
++void yaffs_load_current_time(struct yaffs_obj *obj, int do_a, int do_c)
++{
++ obj->yst_mtime = Y_CURRENT_TIME;
++ if (do_a)
++ obj->yst_atime = obj->yst_atime;
++ if (do_c)
++ obj->yst_ctime = obj->yst_atime;
++}
++
++void yaffs_attribs_init(struct yaffs_obj *obj, u32 gid, u32 uid, u32 rdev)
++{
++ yaffs_load_current_time(obj, 1, 1);
++ obj->yst_rdev = rdev;
++ obj->yst_uid = uid;
++ obj->yst_gid = gid;
++}
++
++loff_t yaffs_get_file_size(struct yaffs_obj *obj)
++{
++ YCHAR *alias = NULL;
++ obj = yaffs_get_equivalent_obj(obj);
++
++ switch (obj->variant_type) {
++ case YAFFS_OBJECT_TYPE_FILE:
++ return obj->variant.file_variant.file_size;
++ case YAFFS_OBJECT_TYPE_SYMLINK:
++ alias = obj->variant.symlink_variant.alias;
++ if (!alias)
++ return 0;
++ return yaffs_strnlen(alias, YAFFS_MAX_ALIAS_LENGTH);
++ default:
++ return 0;
++ }
++}
++
++int yaffs_set_attribs(struct yaffs_obj *obj, struct iattr *attr)
++{
++ unsigned int valid = attr->ia_valid;
++
++ if (valid & ATTR_MODE)
++ obj->yst_mode = attr->ia_mode;
++ if (valid & ATTR_UID)
++ obj->yst_uid = attr->ia_uid;
++ if (valid & ATTR_GID)
++ obj->yst_gid = attr->ia_gid;
++
++ if (valid & ATTR_ATIME)
++ obj->yst_atime = Y_TIME_CONVERT(attr->ia_atime);
++ if (valid & ATTR_CTIME)
++ obj->yst_ctime = Y_TIME_CONVERT(attr->ia_ctime);
++ if (valid & ATTR_MTIME)
++ obj->yst_mtime = Y_TIME_CONVERT(attr->ia_mtime);
++
++ if (valid & ATTR_SIZE)
++ yaffs_resize_file(obj, attr->ia_size);
++
++ yaffs_update_oh(obj, NULL, 1, 0, 0, NULL);
++
++ return YAFFS_OK;
++
++}
++
++int yaffs_get_attribs(struct yaffs_obj *obj, struct iattr *attr)
++{
++ unsigned int valid = 0;
++
++ attr->ia_mode = obj->yst_mode;
++ valid |= ATTR_MODE;
++ attr->ia_uid = obj->yst_uid;
++ valid |= ATTR_UID;
++ attr->ia_gid = obj->yst_gid;
++ valid |= ATTR_GID;
++
++ Y_TIME_CONVERT(attr->ia_atime) = obj->yst_atime;
++ valid |= ATTR_ATIME;
++ Y_TIME_CONVERT(attr->ia_ctime) = obj->yst_ctime;
++ valid |= ATTR_CTIME;
++ Y_TIME_CONVERT(attr->ia_mtime) = obj->yst_mtime;
++ valid |= ATTR_MTIME;
++
++ attr->ia_size = yaffs_get_file_size(obj);
++ valid |= ATTR_SIZE;
++
++ attr->ia_valid = valid;
++
++ return YAFFS_OK;
++}
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_attribs.h linux-2.6.36/fs/yaffs2/yaffs_attribs.h
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_attribs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_attribs.h 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,28 @@
++/*
++ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
++ *
++ * Copyright (C) 2002-2010 Aleph One Ltd.
++ * for Toby Churchill Ltd and Brightstar Engineering
++ *
++ * Created by Charles Manning <charles@aleph1.co.uk>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 2.1 as
++ * published by the Free Software Foundation.
++ *
++ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
++ */
++
++#ifndef __YAFFS_ATTRIBS_H__
++#define __YAFFS_ATTRIBS_H__
++
++#include "yaffs_guts.h"
++
++void yaffs_load_attribs(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh);
++void yaffs_load_attribs_oh(struct yaffs_obj_hdr *oh, struct yaffs_obj *obj);
++void yaffs_attribs_init(struct yaffs_obj *obj, u32 gid, u32 uid, u32 rdev);
++void yaffs_load_current_time(struct yaffs_obj *obj, int do_a, int do_c);
++int yaffs_set_attribs(struct yaffs_obj *obj, struct iattr *attr);
++int yaffs_get_attribs(struct yaffs_obj *obj, struct iattr *attr);
++
++#endif
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_bitmap.c linux-2.6.36/fs/yaffs2/yaffs_bitmap.c
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_bitmap.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_bitmap.c 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,104 @@
++/*
++ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
++ *
++ * Copyright (C) 2002-2010 Aleph One Ltd.
++ * for Toby Churchill Ltd and Brightstar Engineering
++ *
++ * Created by Charles Manning <charles@aleph1.co.uk>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include "yaffs_bitmap.h"
++#include "yaffs_trace.h"
++/*
++ * Chunk bitmap manipulations
++ */
++
++static Y_INLINE u8 *yaffs_block_bits(struct yaffs_dev *dev, int blk)
++{
++ if (blk < dev->internal_start_block || blk > dev->internal_end_block) {
++ T(YAFFS_TRACE_ERROR,
++ (TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
++ blk));
++ YBUG();
++ }
++ return dev->chunk_bits +
++ (dev->chunk_bit_stride * (blk - dev->internal_start_block));
++}
++
++void yaffs_verify_chunk_bit_id(struct yaffs_dev *dev, int blk, int chunk)
++{
++ if (blk < dev->internal_start_block || blk > dev->internal_end_block ||
++ chunk < 0 || chunk >= dev->param.chunks_per_block) {
++ T(YAFFS_TRACE_ERROR,
++ (TSTR("**>> yaffs: Chunk Id (%d:%d) invalid" TENDSTR),
++ blk, chunk));
++ YBUG();
++ }
++}
++
++void yaffs_clear_chunk_bits(struct yaffs_dev *dev, int blk)
++{
++ u8 *blk_bits = yaffs_block_bits(dev, blk);
++
++ memset(blk_bits, 0, dev->chunk_bit_stride);
++}
++
++void yaffs_clear_chunk_bit(struct yaffs_dev *dev, int blk, int chunk)
++{
++ u8 *blk_bits = yaffs_block_bits(dev, blk);
++
++ yaffs_verify_chunk_bit_id(dev, blk, chunk);
++
++ blk_bits[chunk / 8] &= ~(1 << (chunk & 7));
++}
++
++void yaffs_set_chunk_bit(struct yaffs_dev *dev, int blk, int chunk)
++{
++ u8 *blk_bits = yaffs_block_bits(dev, blk);
++
++ yaffs_verify_chunk_bit_id(dev, blk, chunk);
++
++ blk_bits[chunk / 8] |= (1 << (chunk & 7));
++}
++
++int yaffs_check_chunk_bit(struct yaffs_dev *dev, int blk, int chunk)
++{
++ u8 *blk_bits = yaffs_block_bits(dev, blk);
++ yaffs_verify_chunk_bit_id(dev, blk, chunk);
++
++ return (blk_bits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
++}
++
++int yaffs_still_some_chunks(struct yaffs_dev *dev, int blk)
++{
++ u8 *blk_bits = yaffs_block_bits(dev, blk);
++ int i;
++ for (i = 0; i < dev->chunk_bit_stride; i++) {
++ if (*blk_bits)
++ return 1;
++ blk_bits++;
++ }
++ return 0;
++}
++
++int yaffs_count_chunk_bits(struct yaffs_dev *dev, int blk)
++{
++ u8 *blk_bits = yaffs_block_bits(dev, blk);
++ int i;
++ int n = 0;
++ for (i = 0; i < dev->chunk_bit_stride; i++) {
++ u8 x = *blk_bits;
++ while (x) {
++ if (x & 1)
++ n++;
++ x >>= 1;
++ }
++
++ blk_bits++;
++ }
++ return n;
++}
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_bitmap.h linux-2.6.36/fs/yaffs2/yaffs_bitmap.h
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_bitmap.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_bitmap.h 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,33 @@
++/*
++ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
++ *
++ * Copyright (C) 2002-2010 Aleph One Ltd.
++ * for Toby Churchill Ltd and Brightstar Engineering
++ *
++ * Created by Charles Manning <charles@aleph1.co.uk>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 2.1 as
++ * published by the Free Software Foundation.
++ *
++ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
++ */
++
++/*
++ * Chunk bitmap manipulations
++ */
+
++#ifndef __YAFFS_BITMAP_H__
++#define __YAFFS_BITMAP_H__
++
++#include "yaffs_guts.h"
++
++void yaffs_verify_chunk_bit_id(struct yaffs_dev *dev, int blk, int chunk);
++void yaffs_clear_chunk_bits(struct yaffs_dev *dev, int blk);
++void yaffs_clear_chunk_bit(struct yaffs_dev *dev, int blk, int chunk);
++void yaffs_set_chunk_bit(struct yaffs_dev *dev, int blk, int chunk);
++int yaffs_check_chunk_bit(struct yaffs_dev *dev, int blk, int chunk);
++int yaffs_still_some_chunks(struct yaffs_dev *dev, int blk);
++int yaffs_count_chunk_bits(struct yaffs_dev *dev, int blk);
++
++#endif
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_checkptrw.c linux-2.6.36/fs/yaffs2/yaffs_checkptrw.c
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_checkptrw.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_checkptrw.c 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,420 @@
++/*
++ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
++ *
++ * Copyright (C) 2002-2010 Aleph One Ltd.
++ * for Toby Churchill Ltd and Brightstar Engineering
++ *
++ * Created by Charles Manning <charles@aleph1.co.uk>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
+
+#include "yaffs_checkptrw.h"
+#include "yaffs_getblockinfo.h"
+
-+static int yaffs_CheckpointSpaceOk(yaffs_Device *dev)
++static int yaffs2_checkpt_space_ok(struct yaffs_dev *dev)
+{
-+ int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
++ int blocks_avail = dev->n_erased_blocks - dev->param.n_reserved_blocks;
+
+ T(YAFFS_TRACE_CHECKPOINT,
-+ (TSTR("checkpt blocks available = %d" TENDSTR),
-+ blocksAvailable));
++ (TSTR("checkpt blocks available = %d" TENDSTR), blocks_avail));
+
-+ return (blocksAvailable <= 0) ? 0 : 1;
++ return (blocks_avail <= 0) ? 0 : 1;
+}
+
-+
-+static int yaffs_CheckpointErase(yaffs_Device *dev)
++static int yaffs_checkpt_erase(struct yaffs_dev *dev)
+{
+ int i;
+
-+ if (!dev->eraseBlockInNAND)
++ if (!dev->param.erase_fn)
+ return 0;
-+ T(YAFFS_TRACE_CHECKPOINT, (TSTR("checking blocks %d to %d"TENDSTR),
-+ dev->internalStartBlock, dev->internalEndBlock));
-+
-+ for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-+ yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+ if (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT) {
-+ T(YAFFS_TRACE_CHECKPOINT, (TSTR("erasing checkpt block %d"TENDSTR), i));
-+ if (dev->eraseBlockInNAND(dev, i - dev->blockOffset /* realign */)) {
-+ bi->blockState = YAFFS_BLOCK_STATE_EMPTY;
-+ dev->nErasedBlocks++;
-+ dev->nFreeChunks += dev->nChunksPerBlock;
++ T(YAFFS_TRACE_CHECKPOINT, (TSTR("checking blocks %d to %d" TENDSTR),
++ dev->internal_start_block,
++ dev->internal_end_block));
++
++ for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
++ struct yaffs_block_info *bi = yaffs_get_block_info(dev, i);
++ if (bi->block_state == YAFFS_BLOCK_STATE_CHECKPOINT) {
++ T(YAFFS_TRACE_CHECKPOINT,
++ (TSTR("erasing checkpt block %d" TENDSTR), i));
++
++ dev->n_erasures++;
++
++ if (dev->param.
++ erase_fn(dev,
++ i - dev->block_offset /* realign */ )) {
++ bi->block_state = YAFFS_BLOCK_STATE_EMPTY;
++ dev->n_erased_blocks++;
++ dev->n_free_chunks +=
++ dev->param.chunks_per_block;
+ } else {
-+ dev->markNANDBlockBad(dev, i);
-+ bi->blockState = YAFFS_BLOCK_STATE_DEAD;
++ dev->param.bad_block_fn(dev, i);
++ bi->block_state = YAFFS_BLOCK_STATE_DEAD;
+ }
+ }
+ }
+
-+ dev->blocksInCheckpoint = 0;
++ dev->blocks_in_checkpt = 0;
+
+ return 1;
+}
+
-+
-+static void yaffs_CheckpointFindNextErasedBlock(yaffs_Device *dev)
++static void yaffs2_checkpt_find_erased_block(struct yaffs_dev *dev)
+{
-+ int i;
-+ int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
++ int i;
++ int blocks_avail = dev->n_erased_blocks - dev->param.n_reserved_blocks;
+ T(YAFFS_TRACE_CHECKPOINT,
-+ (TSTR("allocating checkpt block: erased %d reserved %d avail %d next %d "TENDSTR),
-+ dev->nErasedBlocks, dev->nReservedBlocks, blocksAvailable, dev->checkpointNextBlock));
-+
-+ if (dev->checkpointNextBlock >= 0 &&
-+ dev->checkpointNextBlock <= dev->internalEndBlock &&
-+ blocksAvailable > 0) {
-+
-+ for (i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++) {
-+ yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+ if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY) {
-+ dev->checkpointNextBlock = i + 1;
-+ dev->checkpointCurrentBlock = i;
-+ T(YAFFS_TRACE_CHECKPOINT, (TSTR("allocating checkpt block %d"TENDSTR), i));
++ (TSTR
++ ("allocating checkpt block: erased %d reserved %d avail %d next %d "
++ TENDSTR), dev->n_erased_blocks, dev->param.n_reserved_blocks,
++ blocks_avail, dev->checkpt_next_block));
++
++ if (dev->checkpt_next_block >= 0 &&
++ dev->checkpt_next_block <= dev->internal_end_block &&
++ blocks_avail > 0) {
++
++ for (i = dev->checkpt_next_block; i <= dev->internal_end_block;
++ i++) {
++ struct yaffs_block_info *bi =
++ yaffs_get_block_info(dev, i);
++ if (bi->block_state == YAFFS_BLOCK_STATE_EMPTY) {
++ dev->checkpt_next_block = i + 1;
++ dev->checkpt_cur_block = i;
++ T(YAFFS_TRACE_CHECKPOINT,
++ (TSTR("allocating checkpt block %d" TENDSTR),
++ i));
+ return;
+ }
+ }
+ }
-+ T(YAFFS_TRACE_CHECKPOINT, (TSTR("out of checkpt blocks"TENDSTR)));
++ T(YAFFS_TRACE_CHECKPOINT, (TSTR("out of checkpt blocks" TENDSTR)));
+
-+ dev->checkpointNextBlock = -1;
-+ dev->checkpointCurrentBlock = -1;
++ dev->checkpt_next_block = -1;
++ dev->checkpt_cur_block = -1;
+}
+
-+static void yaffs_CheckpointFindNextCheckpointBlock(yaffs_Device *dev)
++static void yaffs2_checkpt_find_block(struct yaffs_dev *dev)
+{
-+ int i;
-+ yaffs_ExtendedTags tags;
-+
-+ T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: start: blocks %d next %d" TENDSTR),
-+ dev->blocksInCheckpoint, dev->checkpointNextBlock));
-+
-+ if (dev->blocksInCheckpoint < dev->checkpointMaxBlocks)
-+ for (i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++) {
-+ int chunk = i * dev->nChunksPerBlock;
-+ int realignedChunk = chunk - dev->chunkOffset;
++ int i;
++ struct yaffs_ext_tags tags;
+
-+ dev->readChunkWithTagsFromNAND(dev, realignedChunk,
-+ NULL, &tags);
-+ T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR),
-+ i, tags.objectId, tags.sequenceNumber, tags.eccResult));
++ T(YAFFS_TRACE_CHECKPOINT,
++ (TSTR("find next checkpt block: start: blocks %d next %d" TENDSTR),
++ dev->blocks_in_checkpt, dev->checkpt_next_block));
++
++ if (dev->blocks_in_checkpt < dev->checkpt_max_blocks)
++ for (i = dev->checkpt_next_block; i <= dev->internal_end_block;
++ i++) {
++ int chunk = i * dev->param.chunks_per_block;
++ int realigned_chunk = chunk - dev->chunk_offset;
++
++ dev->param.read_chunk_tags_fn(dev, realigned_chunk,
++ NULL, &tags);
++ T(YAFFS_TRACE_CHECKPOINT,
++ (TSTR
++ ("find next checkpt block: search: block %d oid %d seq %d eccr %d"
++ TENDSTR), i, tags.obj_id, tags.seq_number,
++ tags.ecc_result));
+
-+ if (tags.sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA) {
++ if (tags.seq_number == YAFFS_SEQUENCE_CHECKPOINT_DATA) {
+ /* Right kind of block */
-+ dev->checkpointNextBlock = tags.objectId;
-+ dev->checkpointCurrentBlock = i;
-+ dev->checkpointBlockList[dev->blocksInCheckpoint] = i;
-+ dev->blocksInCheckpoint++;
-+ T(YAFFS_TRACE_CHECKPOINT, (TSTR("found checkpt block %d"TENDSTR), i));
++ dev->checkpt_next_block = tags.obj_id;
++ dev->checkpt_cur_block = i;
++ dev->checkpt_block_list[dev->
++ blocks_in_checkpt] = i;
++ dev->blocks_in_checkpt++;
++ T(YAFFS_TRACE_CHECKPOINT,
++ (TSTR("found checkpt block %d" TENDSTR), i));
+ return;
+ }
+ }
+
-+ T(YAFFS_TRACE_CHECKPOINT, (TSTR("found no more checkpt blocks"TENDSTR)));
++ T(YAFFS_TRACE_CHECKPOINT,
++ (TSTR("found no more checkpt blocks" TENDSTR)));
+
-+ dev->checkpointNextBlock = -1;
-+ dev->checkpointCurrentBlock = -1;
++ dev->checkpt_next_block = -1;
++ dev->checkpt_cur_block = -1;
+}
+
-+
-+int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting)
++int yaffs2_checkpt_open(struct yaffs_dev *dev, int writing)
+{
+
++ dev->checkpt_open_write = writing;
++
+ /* Got the functions we need? */
-+ if (!dev->writeChunkWithTagsToNAND ||
-+ !dev->readChunkWithTagsFromNAND ||
-+ !dev->eraseBlockInNAND ||
-+ !dev->markNANDBlockBad)
++ if (!dev->param.write_chunk_tags_fn ||
++ !dev->param.read_chunk_tags_fn ||
++ !dev->param.erase_fn || !dev->param.bad_block_fn)
+ return 0;
+
-+ if (forWriting && !yaffs_CheckpointSpaceOk(dev))
++ if (writing && !yaffs2_checkpt_space_ok(dev))
+ return 0;
+
-+ if (!dev->checkpointBuffer)
-+ dev->checkpointBuffer = YMALLOC_DMA(dev->totalBytesPerChunk);
-+ if (!dev->checkpointBuffer)
++ if (!dev->checkpt_buffer)
++ dev->checkpt_buffer =
++ YMALLOC_DMA(dev->param.total_bytes_per_chunk);
++ if (!dev->checkpt_buffer)
+ return 0;
+
-+
-+ dev->checkpointPageSequence = 0;
-+
-+ dev->checkpointOpenForWrite = forWriting;
-+
-+ dev->checkpointByteCount = 0;
-+ dev->checkpointSum = 0;
-+ dev->checkpointXor = 0;
-+ dev->checkpointCurrentBlock = -1;
-+ dev->checkpointCurrentChunk = -1;
-+ dev->checkpointNextBlock = dev->internalStartBlock;
++ dev->checkpt_page_seq = 0;
++ dev->checkpt_byte_count = 0;
++ dev->checkpt_sum = 0;
++ dev->checkpt_xor = 0;
++ dev->checkpt_cur_block = -1;
++ dev->checkpt_cur_chunk = -1;
++ dev->checkpt_next_block = dev->internal_start_block;
+
+ /* Erase all the blocks in the checkpoint area */
-+ if (forWriting) {
-+ memset(dev->checkpointBuffer, 0, dev->nDataBytesPerChunk);
-+ dev->checkpointByteOffset = 0;
-+ return yaffs_CheckpointErase(dev);
++ if (writing) {
++ memset(dev->checkpt_buffer, 0, dev->data_bytes_per_chunk);
++ dev->checkpt_byte_offs = 0;
++ return yaffs_checkpt_erase(dev);
+ } else {
+ int i;
+ /* Set to a value that will kick off a read */
-+ dev->checkpointByteOffset = dev->nDataBytesPerChunk;
++ dev->checkpt_byte_offs = dev->data_bytes_per_chunk;
+ /* A checkpoint block list of 1 checkpoint block per 16 block is (hopefully)
+ * going to be way more than we need */
-+ dev->blocksInCheckpoint = 0;
-+ dev->checkpointMaxBlocks = (dev->internalEndBlock - dev->internalStartBlock)/16 + 2;
-+ dev->checkpointBlockList = YMALLOC(sizeof(int) * dev->checkpointMaxBlocks);
-+ for (i = 0; i < dev->checkpointMaxBlocks; i++)
-+ dev->checkpointBlockList[i] = -1;
++ dev->blocks_in_checkpt = 0;
++ dev->checkpt_max_blocks =
++ (dev->internal_end_block - dev->internal_start_block) / 16 +
++ 2;
++ dev->checkpt_block_list =
++ YMALLOC(sizeof(int) * dev->checkpt_max_blocks);
++ if (!dev->checkpt_block_list)
++ return 0;
++
++ for (i = 0; i < dev->checkpt_max_blocks; i++)
++ dev->checkpt_block_list[i] = -1;
+ }
+
+ return 1;
+}
+
-+int yaffs_GetCheckpointSum(yaffs_Device *dev, __u32 *sum)
++int yaffs2_get_checkpt_sum(struct yaffs_dev *dev, u32 * sum)
+{
-+ __u32 compositeSum;
-+ compositeSum = (dev->checkpointSum << 8) | (dev->checkpointXor & 0xFF);
-+ *sum = compositeSum;
++ u32 composite_sum;
++ composite_sum = (dev->checkpt_sum << 8) | (dev->checkpt_xor & 0xFF);
++ *sum = composite_sum;
+ return 1;
+}
+
-+static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
++static int yaffs2_checkpt_flush_buffer(struct yaffs_dev *dev)
+{
+ int chunk;
-+ int realignedChunk;
++ int realigned_chunk;
+
-+ yaffs_ExtendedTags tags;
++ struct yaffs_ext_tags tags;
+
-+ if (dev->checkpointCurrentBlock < 0) {
-+ yaffs_CheckpointFindNextErasedBlock(dev);
-+ dev->checkpointCurrentChunk = 0;
++ if (dev->checkpt_cur_block < 0) {
++ yaffs2_checkpt_find_erased_block(dev);
++ dev->checkpt_cur_chunk = 0;
+ }
+
-+ if (dev->checkpointCurrentBlock < 0)
++ if (dev->checkpt_cur_block < 0)
+ return 0;
+
-+ tags.chunkDeleted = 0;
-+ tags.objectId = dev->checkpointNextBlock; /* Hint to next place to look */
-+ tags.chunkId = dev->checkpointPageSequence + 1;
-+ tags.sequenceNumber = YAFFS_SEQUENCE_CHECKPOINT_DATA;
-+ tags.byteCount = dev->nDataBytesPerChunk;
-+ if (dev->checkpointCurrentChunk == 0) {
++ tags.is_deleted = 0;
++ tags.obj_id = dev->checkpt_next_block; /* Hint to next place to look */
++ tags.chunk_id = dev->checkpt_page_seq + 1;
++ tags.seq_number = YAFFS_SEQUENCE_CHECKPOINT_DATA;
++ tags.n_bytes = dev->data_bytes_per_chunk;
++ if (dev->checkpt_cur_chunk == 0) {
+ /* First chunk we write for the block? Set block state to
+ checkpoint */
-+ yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->checkpointCurrentBlock);
-+ bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
-+ dev->blocksInCheckpoint++;
++ struct yaffs_block_info *bi =
++ yaffs_get_block_info(dev, dev->checkpt_cur_block);
++ bi->block_state = YAFFS_BLOCK_STATE_CHECKPOINT;
++ dev->blocks_in_checkpt++;
+ }
+
-+ chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock + dev->checkpointCurrentChunk;
++ chunk =
++ dev->checkpt_cur_block * dev->param.chunks_per_block +
++ dev->checkpt_cur_chunk;
+
++ T(YAFFS_TRACE_CHECKPOINT,
++ (TSTR
++ ("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
++ chunk, dev->checkpt_cur_block, dev->checkpt_cur_chunk, tags.obj_id,
++ tags.chunk_id));
+
-+ T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
-+ chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk, tags.objectId, tags.chunkId));
++ realigned_chunk = chunk - dev->chunk_offset;
+
-+ realignedChunk = chunk - dev->chunkOffset;
++ dev->n_page_writes++;
+
-+ dev->writeChunkWithTagsToNAND(dev, realignedChunk,
-+ dev->checkpointBuffer, &tags);
-+ dev->checkpointByteOffset = 0;
-+ dev->checkpointPageSequence++;
-+ dev->checkpointCurrentChunk++;
-+ if (dev->checkpointCurrentChunk >= dev->nChunksPerBlock) {
-+ dev->checkpointCurrentChunk = 0;
-+ dev->checkpointCurrentBlock = -1;
++ dev->param.write_chunk_tags_fn(dev, realigned_chunk,
++ dev->checkpt_buffer, &tags);
++ dev->checkpt_byte_offs = 0;
++ dev->checkpt_page_seq++;
++ dev->checkpt_cur_chunk++;
++ if (dev->checkpt_cur_chunk >= dev->param.chunks_per_block) {
++ dev->checkpt_cur_chunk = 0;
++ dev->checkpt_cur_block = -1;
+ }
-+ memset(dev->checkpointBuffer, 0, dev->nDataBytesPerChunk);
++ memset(dev->checkpt_buffer, 0, dev->data_bytes_per_chunk);
+
+ return 1;
+}
+
-+
-+int yaffs_CheckpointWrite(yaffs_Device *dev, const void *data, int nBytes)
++int yaffs2_checkpt_wr(struct yaffs_dev *dev, const void *data, int n_bytes)
+{
+ int i = 0;
+ int ok = 1;
+
++ u8 *data_bytes = (u8 *) data;
+
-+ __u8 * dataBytes = (__u8 *)data;
-+
-+
-+
-+ if (!dev->checkpointBuffer)
++ if (!dev->checkpt_buffer)
+ return 0;
+
-+ if (!dev->checkpointOpenForWrite)
++ if (!dev->checkpt_open_write)
+ return -1;
+
-+ while (i < nBytes && ok) {
-+ dev->checkpointBuffer[dev->checkpointByteOffset] = *dataBytes;
-+ dev->checkpointSum += *dataBytes;
-+ dev->checkpointXor ^= *dataBytes;
++ while (i < n_bytes && ok) {
++ dev->checkpt_buffer[dev->checkpt_byte_offs] = *data_bytes;
++ dev->checkpt_sum += *data_bytes;
++ dev->checkpt_xor ^= *data_bytes;
+
-+ dev->checkpointByteOffset++;
++ dev->checkpt_byte_offs++;
+ i++;
-+ dataBytes++;
-+ dev->checkpointByteCount++;
++ data_bytes++;
++ dev->checkpt_byte_count++;
+
-+
-+ if (dev->checkpointByteOffset < 0 ||
-+ dev->checkpointByteOffset >= dev->nDataBytesPerChunk)
-+ ok = yaffs_CheckpointFlushBuffer(dev);
++ if (dev->checkpt_byte_offs < 0 ||
++ dev->checkpt_byte_offs >= dev->data_bytes_per_chunk)
++ ok = yaffs2_checkpt_flush_buffer(dev);
+ }
+
+ return i;
+}
+
-+int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes)
++int yaffs2_checkpt_rd(struct yaffs_dev *dev, void *data, int n_bytes)
+{
+ int i = 0;
+ int ok = 1;
-+ yaffs_ExtendedTags tags;
-+
++ struct yaffs_ext_tags tags;
+
+ int chunk;
-+ int realignedChunk;
++ int realigned_chunk;
+
-+ __u8 *dataBytes = (__u8 *)data;
++ u8 *data_bytes = (u8 *) data;
+
-+ if (!dev->checkpointBuffer)
++ if (!dev->checkpt_buffer)
+ return 0;
+
-+ if (dev->checkpointOpenForWrite)
++ if (dev->checkpt_open_write)
+ return -1;
+
-+ while (i < nBytes && ok) {
-+
++ while (i < n_bytes && ok) {
+
-+ if (dev->checkpointByteOffset < 0 ||
-+ dev->checkpointByteOffset >= dev->nDataBytesPerChunk) {
++ if (dev->checkpt_byte_offs < 0 ||
++ dev->checkpt_byte_offs >= dev->data_bytes_per_chunk) {
+
-+ if (dev->checkpointCurrentBlock < 0) {
-+ yaffs_CheckpointFindNextCheckpointBlock(dev);
-+ dev->checkpointCurrentChunk = 0;
++ if (dev->checkpt_cur_block < 0) {
++ yaffs2_checkpt_find_block(dev);
++ dev->checkpt_cur_chunk = 0;
+ }
+
-+ if (dev->checkpointCurrentBlock < 0)
++ if (dev->checkpt_cur_block < 0)
+ ok = 0;
+ else {
-+ chunk = dev->checkpointCurrentBlock *
-+ dev->nChunksPerBlock +
-+ dev->checkpointCurrentChunk;
++ chunk = dev->checkpt_cur_block *
++ dev->param.chunks_per_block +
++ dev->checkpt_cur_chunk;
+
-+ realignedChunk = chunk - dev->chunkOffset;
++ realigned_chunk = chunk - dev->chunk_offset;
++
++ dev->n_page_reads++;
+
+ /* read in the next chunk */
-+ /* printf("read checkpoint page %d\n",dev->checkpointPage); */
-+ dev->readChunkWithTagsFromNAND(dev,
-+ realignedChunk,
-+ dev->checkpointBuffer,
-+ &tags);
-+
-+ if (tags.chunkId != (dev->checkpointPageSequence + 1) ||
-+ tags.eccResult > YAFFS_ECC_RESULT_FIXED ||
-+ tags.sequenceNumber != YAFFS_SEQUENCE_CHECKPOINT_DATA)
++ dev->param.read_chunk_tags_fn(dev,
++ realigned_chunk,
++ dev->
++ checkpt_buffer,
++ &tags);
++
++ if (tags.chunk_id != (dev->checkpt_page_seq + 1)
++ || tags.ecc_result > YAFFS_ECC_RESULT_FIXED
++ || tags.seq_number !=
++ YAFFS_SEQUENCE_CHECKPOINT_DATA)
+ ok = 0;
+
-+ dev->checkpointByteOffset = 0;
-+ dev->checkpointPageSequence++;
-+ dev->checkpointCurrentChunk++;
++ dev->checkpt_byte_offs = 0;
++ dev->checkpt_page_seq++;
++ dev->checkpt_cur_chunk++;
+
-+ if (dev->checkpointCurrentChunk >= dev->nChunksPerBlock)
-+ dev->checkpointCurrentBlock = -1;
++ if (dev->checkpt_cur_chunk >=
++ dev->param.chunks_per_block)
++ dev->checkpt_cur_block = -1;
+ }
+ }
+
+ if (ok) {
-+ *dataBytes = dev->checkpointBuffer[dev->checkpointByteOffset];
-+ dev->checkpointSum += *dataBytes;
-+ dev->checkpointXor ^= *dataBytes;
-+ dev->checkpointByteOffset++;
++ *data_bytes =
++ dev->checkpt_buffer[dev->checkpt_byte_offs];
++ dev->checkpt_sum += *data_bytes;
++ dev->checkpt_xor ^= *data_bytes;
++ dev->checkpt_byte_offs++;
+ i++;
-+ dataBytes++;
-+ dev->checkpointByteCount++;
++ data_bytes++;
++ dev->checkpt_byte_count++;
+ }
+ }
+
-+ return i;
++ return i;
+}
+
-+int yaffs_CheckpointClose(yaffs_Device *dev)
++int yaffs_checkpt_close(struct yaffs_dev *dev)
+{
+
-+ if (dev->checkpointOpenForWrite) {
-+ if (dev->checkpointByteOffset != 0)
-+ yaffs_CheckpointFlushBuffer(dev);
-+ } else {
++ if (dev->checkpt_open_write) {
++ if (dev->checkpt_byte_offs != 0)
++ yaffs2_checkpt_flush_buffer(dev);
++ } else if (dev->checkpt_block_list) {
+ int i;
-+ for (i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++) {
-+ yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->checkpointBlockList[i]);
-+ if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY)
-+ bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
++ for (i = 0;
++ i < dev->blocks_in_checkpt
++ && dev->checkpt_block_list[i] >= 0; i++) {
++ int blk = dev->checkpt_block_list[i];
++ struct yaffs_block_info *bi = NULL;
++ if (dev->internal_start_block <= blk
++ && blk <= dev->internal_end_block)
++ bi = yaffs_get_block_info(dev, blk);
++ if (bi && bi->block_state == YAFFS_BLOCK_STATE_EMPTY)
++ bi->block_state = YAFFS_BLOCK_STATE_CHECKPOINT;
+ else {
+ /* Todo this looks odd... */
+ }
+ }
-+ YFREE(dev->checkpointBlockList);
-+ dev->checkpointBlockList = NULL;
++ YFREE(dev->checkpt_block_list);
++ dev->checkpt_block_list = NULL;
+ }
+
-+ dev->nFreeChunks -= dev->blocksInCheckpoint * dev->nChunksPerBlock;
-+ dev->nErasedBlocks -= dev->blocksInCheckpoint;
-+
++ dev->n_free_chunks -=
++ dev->blocks_in_checkpt * dev->param.chunks_per_block;
++ dev->n_erased_blocks -= dev->blocks_in_checkpt;
+
+ T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint byte count %d" TENDSTR),
-+ dev->checkpointByteCount));
++ dev->checkpt_byte_count));
+
-+ if (dev->checkpointBuffer) {
++ if (dev->checkpt_buffer) {
+ /* free the buffer */
-+ YFREE(dev->checkpointBuffer);
-+ dev->checkpointBuffer = NULL;
++ YFREE(dev->checkpt_buffer);
++ dev->checkpt_buffer = NULL;
+ return 1;
-+ } else
++ } else {
+ return 0;
++ }
+}
+
-+int yaffs_CheckpointInvalidateStream(yaffs_Device *dev)
++int yaffs2_checkpt_invalidate_stream(struct yaffs_dev *dev)
+{
-+ /* Erase the first checksum block */
-+
-+ T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint invalidate"TENDSTR)));
++ /* Erase the checkpoint data */
+
-+ if (!yaffs_CheckpointSpaceOk(dev))
-+ return 0;
++ T(YAFFS_TRACE_CHECKPOINT,
++ (TSTR("checkpoint invalidate of %d blocks" TENDSTR),
++ dev->blocks_in_checkpt));
+
-+ return yaffs_CheckpointErase(dev);
++ return yaffs_checkpt_erase(dev);
+}
-+
-+
-+
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_checkptrw.h linux-2.6.34/fs/yaffs2/yaffs_checkptrw.h
---- linux-2.6.34.orig/fs/yaffs2/yaffs_checkptrw.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffs_checkptrw.h 2010-05-20 20:16:22.281614392 +0200
-@@ -0,0 +1,35 @@
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_checkptrw.h linux-2.6.36/fs/yaffs2/yaffs_checkptrw.h
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_checkptrw.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_checkptrw.h 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,33 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
++ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
@@ -1017,29 +1476,27 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_checkptrw.h linux-2.6.34/fs/yaffs2/y
+
+#include "yaffs_guts.h"
+
-+int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting);
++int yaffs2_checkpt_open(struct yaffs_dev *dev, int writing);
+
-+int yaffs_CheckpointWrite(yaffs_Device *dev, const void *data, int nBytes);
++int yaffs2_checkpt_wr(struct yaffs_dev *dev, const void *data, int n_bytes);
+
-+int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes);
++int yaffs2_checkpt_rd(struct yaffs_dev *dev, void *data, int n_bytes);
+
-+int yaffs_GetCheckpointSum(yaffs_Device *dev, __u32 *sum);
++int yaffs2_get_checkpt_sum(struct yaffs_dev *dev, u32 * sum);
+
-+int yaffs_CheckpointClose(yaffs_Device *dev);
-+
-+int yaffs_CheckpointInvalidateStream(yaffs_Device *dev);
++int yaffs_checkpt_close(struct yaffs_dev *dev);
+
++int yaffs2_checkpt_invalidate_stream(struct yaffs_dev *dev);
+
+#endif
-+
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_ecc.c linux-2.6.34/fs/yaffs2/yaffs_ecc.c
---- linux-2.6.34.orig/fs/yaffs2/yaffs_ecc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffs_ecc.c 2010-05-20 20:16:22.281614392 +0200
-@@ -0,0 +1,326 @@
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_ecc.c linux-2.6.36/fs/yaffs2/yaffs_ecc.c
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_ecc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_ecc.c 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,322 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
++ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
@@ -1066,9 +1523,6 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_ecc.c linux-2.6.34/fs/yaffs2/yaffs_e
+ * this bytes influence on the line parity.
+ */
+
-+const char *yaffs_ecc_c_version =
-+ "$Id: yaffs_ecc.c,v 1.11 2009-03-06 17:20:50 wookey Exp $";
-+
+#include "yportenv.h"
+
+#include "yaffs_ecc.h"
@@ -1110,7 +1564,7 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_ecc.c linux-2.6.34/fs/yaffs2/yaffs_e
+
+/* Count the bits in an unsigned char or a U32 */
+
-+static int yaffs_CountBits(unsigned char x)
++static int yaffs_count_bits(unsigned char x)
+{
+ int r = 0;
+ while (x) {
@@ -1121,7 +1575,7 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_ecc.c linux-2.6.34/fs/yaffs2/yaffs_e
+ return r;
+}
+
-+static int yaffs_CountBits32(unsigned x)
++static int yaffs_count_bits32(unsigned x)
+{
+ int r = 0;
+ while (x) {
@@ -1133,7 +1587,7 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_ecc.c linux-2.6.34/fs/yaffs2/yaffs_e
+}
+
+/* Calculate the ECC for a 256-byte block of data */
-+void yaffs_ECCCalculate(const unsigned char *data, unsigned char *ecc)
++void yaffs_ecc_cacl(const unsigned char *data, unsigned char *ecc)
+{
+ unsigned int i;
+
@@ -1147,7 +1601,7 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_ecc.c linux-2.6.34/fs/yaffs2/yaffs_e
+ b = column_parity_table[*data++];
+ col_parity ^= b;
+
-+ if (b & 0x01) { /* odd number of bits in the byte */
++ if (b & 0x01) { /* odd number of bits in the byte */
+ line_parity ^= i;
+ line_parity_prime ^= ~i;
+ }
@@ -1201,11 +1655,10 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_ecc.c linux-2.6.34/fs/yaffs2/yaffs_e
+#endif
+}
+
-+
+/* Correct the ECC on a 256 byte block of data */
+
-+int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc,
-+ const unsigned char *test_ecc)
++int yaffs_ecc_correct(unsigned char *data, unsigned char *read_ecc,
++ const unsigned char *test_ecc)
+{
+ unsigned char d0, d1, d2; /* deltas */
+
@@ -1214,7 +1667,7 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_ecc.c linux-2.6.34/fs/yaffs2/yaffs_e
+ d2 = read_ecc[2] ^ test_ecc[2];
+
+ if ((d0 | d1 | d2) == 0)
-+ return 0; /* no error */
++ return 0; /* no error */
+
+ if (((d0 ^ (d0 >> 1)) & 0x55) == 0x55 &&
+ ((d1 ^ (d1 >> 1)) & 0x55) == 0x55 &&
@@ -1261,19 +1714,18 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_ecc.c linux-2.6.34/fs/yaffs2/yaffs_e
+
+ data[byte] ^= (1 << bit);
+
-+ return 1; /* Corrected the error */
++ return 1; /* Corrected the error */
+ }
+
-+ if ((yaffs_CountBits(d0) +
-+ yaffs_CountBits(d1) +
-+ yaffs_CountBits(d2)) == 1) {
++ if ((yaffs_count_bits(d0) +
++ yaffs_count_bits(d1) + yaffs_count_bits(d2)) == 1) {
+ /* Reccoverable error in ecc */
+
+ read_ecc[0] = test_ecc[0];
+ read_ecc[1] = test_ecc[1];
+ read_ecc[2] = test_ecc[2];
+
-+ return 1; /* Corrected the error */
++ return 1; /* Corrected the error */
+ }
+
+ /* Unrecoverable error */
@@ -1282,12 +1734,11 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_ecc.c linux-2.6.34/fs/yaffs2/yaffs_e
+
+}
+
-+
+/*
+ * ECCxxxOther does ECC calcs on arbitrary n bytes of data
+ */
-+void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
-+ yaffs_ECCOther *eccOther)
++void yaffs_ecc_calc_other(const unsigned char *data, unsigned n_bytes,
++ struct yaffs_ecc_other *ecc_other)
+{
+ unsigned int i;
+
@@ -1296,11 +1747,11 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_ecc.c linux-2.6.34/fs/yaffs2/yaffs_e
+ unsigned line_parity_prime = 0;
+ unsigned char b;
+
-+ for (i = 0; i < nBytes; i++) {
++ for (i = 0; i < n_bytes; i++) {
+ b = column_parity_table[*data++];
+ col_parity ^= b;
+
-+ if (b & 0x01) {
++ if (b & 0x01) {
+ /* odd number of bits in the byte */
+ line_parity ^= i;
+ line_parity_prime ^= ~i;
@@ -1308,68 +1759,70 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_ecc.c linux-2.6.34/fs/yaffs2/yaffs_e
+
+ }
+
-+ eccOther->colParity = (col_parity >> 2) & 0x3f;
-+ eccOther->lineParity = line_parity;
-+ eccOther->lineParityPrime = line_parity_prime;
++ ecc_other->col_parity = (col_parity >> 2) & 0x3f;
++ ecc_other->line_parity = line_parity;
++ ecc_other->line_parity_prime = line_parity_prime;
+}
+
-+int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
-+ yaffs_ECCOther *read_ecc,
-+ const yaffs_ECCOther *test_ecc)
++int yaffs_ecc_correct_other(unsigned char *data, unsigned n_bytes,
++ struct yaffs_ecc_other *read_ecc,
++ const struct yaffs_ecc_other *test_ecc)
+{
-+ unsigned char cDelta; /* column parity delta */
-+ unsigned lDelta; /* line parity delta */
-+ unsigned lDeltaPrime; /* line parity delta */
++ unsigned char delta_col; /* column parity delta */
++ unsigned delta_line; /* line parity delta */
++ unsigned delta_line_prime; /* line parity delta */
+ unsigned bit;
+
-+ cDelta = read_ecc->colParity ^ test_ecc->colParity;
-+ lDelta = read_ecc->lineParity ^ test_ecc->lineParity;
-+ lDeltaPrime = read_ecc->lineParityPrime ^ test_ecc->lineParityPrime;
++ delta_col = read_ecc->col_parity ^ test_ecc->col_parity;
++ delta_line = read_ecc->line_parity ^ test_ecc->line_parity;
++ delta_line_prime =
++ read_ecc->line_parity_prime ^ test_ecc->line_parity_prime;
+
-+ if ((cDelta | lDelta | lDeltaPrime) == 0)
-+ return 0; /* no error */
++ if ((delta_col | delta_line | delta_line_prime) == 0)
++ return 0; /* no error */
+
-+ if (lDelta == ~lDeltaPrime &&
-+ (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15)) {
++ if (delta_line == ~delta_line_prime &&
++ (((delta_col ^ (delta_col >> 1)) & 0x15) == 0x15)) {
+ /* Single bit (recoverable) error in data */
+
+ bit = 0;
+
-+ if (cDelta & 0x20)
++ if (delta_col & 0x20)
+ bit |= 0x04;
-+ if (cDelta & 0x08)
++ if (delta_col & 0x08)
+ bit |= 0x02;
-+ if (cDelta & 0x02)
++ if (delta_col & 0x02)
+ bit |= 0x01;
+
-+ if (lDelta >= nBytes)
++ if (delta_line >= n_bytes)
+ return -1;
+
-+ data[lDelta] ^= (1 << bit);
++ data[delta_line] ^= (1 << bit);
+
-+ return 1; /* corrected */
++ return 1; /* corrected */
+ }
+
-+ if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) +
-+ yaffs_CountBits(cDelta)) == 1) {
++ if ((yaffs_count_bits32(delta_line) +
++ yaffs_count_bits32(delta_line_prime) +
++ yaffs_count_bits(delta_col)) == 1) {
+ /* Reccoverable error in ecc */
+
+ *read_ecc = *test_ecc;
-+ return 1; /* corrected */
++ return 1; /* corrected */
+ }
+
+ /* Unrecoverable error */
+
+ return -1;
+}
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_ecc.h linux-2.6.34/fs/yaffs2/yaffs_ecc.h
---- linux-2.6.34.orig/fs/yaffs2/yaffs_ecc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffs_ecc.h 2010-05-20 20:16:22.281614392 +0200
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_ecc.h linux-2.6.36/fs/yaffs2/yaffs_ecc.h
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_ecc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_ecc.h 2010-11-18 18:15:51.000000000 +0100
@@ -0,0 +1,44 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
++ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
@@ -1394,2563 +1847,30 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_ecc.h linux-2.6.34/fs/yaffs2/yaffs_e
+#ifndef __YAFFS_ECC_H__
+#define __YAFFS_ECC_H__
+
-+typedef struct {
-+ unsigned char colParity;
-+ unsigned lineParity;
-+ unsigned lineParityPrime;
-+} yaffs_ECCOther;
-+
-+void yaffs_ECCCalculate(const unsigned char *data, unsigned char *ecc);
-+int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc,
-+ const unsigned char *test_ecc);
-+
-+void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
-+ yaffs_ECCOther *ecc);
-+int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
-+ yaffs_ECCOther *read_ecc,
-+ const yaffs_ECCOther *test_ecc);
-+#endif
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_fs.c linux-2.6.34/fs/yaffs2/yaffs_fs.c
---- linux-2.6.34.orig/fs/yaffs2/yaffs_fs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffs_fs.c 2010-05-20 20:16:22.281614392 +0200
-@@ -0,0 +1,2529 @@
-+/*
-+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
-+ *
-+ * Copyright (C) 2002-2009 Aleph One Ltd.
-+ * for Toby Churchill Ltd and Brightstar Engineering
-+ *
-+ * Created by Charles Manning <charles@aleph1.co.uk>
-+ * Acknowledgements:
-+ * Luc van OostenRyck for numerous patches.
-+ * Nick Bane for numerous patches.
-+ * Nick Bane for 2.5/2.6 integration.
-+ * Andras Toth for mknod rdev issue.
-+ * Michael Fischer for finding the problem with inode inconsistency.
-+ * Some code bodily lifted from JFFS
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+/*
-+ *
-+ * This is the file system front-end to YAFFS that hooks it up to
-+ * the VFS.
-+ *
-+ * Special notes:
-+ * >> 2.4: sb->u.generic_sbp points to the yaffs_Device associated with
-+ * this superblock
-+ * >> 2.6: sb->s_fs_info points to the yaffs_Device associated with this
-+ * superblock
-+ * >> inode->u.generic_ip points to the associated yaffs_Object.
-+ */
-+
-+const char *yaffs_fs_c_version =
-+ "$Id: yaffs_fs.c,v 1.79 2009-03-17 01:12:00 wookey Exp $";
-+extern const char *yaffs_guts_c_version;
-+
-+#include <linux/version.h>
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
-+#include <linux/config.h>
-+#endif
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/slab.h>
-+#include <linux/init.h>
-+#include <linux/fs.h>
-+#include <linux/proc_fs.h>
-+#include <linux/smp_lock.h>
-+#include <linux/pagemap.h>
-+#include <linux/mtd/mtd.h>
-+#include <linux/interrupt.h>
-+#include <linux/string.h>
-+#include <linux/ctype.h>
-+
-+#include "asm/div64.h"
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+
-+#include <linux/statfs.h> /* Added NCB 15-8-2003 */
-+#include <linux/statfs.h>
-+#define UnlockPage(p) unlock_page(p)
-+#define Page_Uptodate(page) test_bit(PG_uptodate, &(page)->flags)
-+
-+/* FIXME: use sb->s_id instead ? */
-+#define yaffs_devname(sb, buf) bdevname(sb->s_bdev, buf)
-+
-+#else
-+
-+#include <linux/locks.h>
-+#define BDEVNAME_SIZE 0
-+#define yaffs_devname(sb, buf) kdevname(sb->s_dev)
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0))
-+/* added NCB 26/5/2006 for 2.4.25-vrs2-tcl1 kernel */
-+#define __user
-+#endif
-+
-+#endif
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26))
-+#define YPROC_ROOT (&proc_root)
-+#else
-+#define YPROC_ROOT NULL
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+#define WRITE_SIZE_STR "writesize"
-+#define WRITE_SIZE(mtd) ((mtd)->writesize)
-+#else
-+#define WRITE_SIZE_STR "oobblock"
-+#define WRITE_SIZE(mtd) ((mtd)->oobblock)
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 27))
-+#define YAFFS_USE_WRITE_BEGIN_END 1
-+#else
-+#define YAFFS_USE_WRITE_BEGIN_END 0
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28))
-+static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size)
-+{
-+ uint64_t result = partition_size;
-+ do_div(result, block_size);
-+ return (uint32_t)result;
-+}
-+#else
-+#define YCALCBLOCKS(s, b) ((s)/(b))
-+#endif
-+
-+#include <linux/uaccess.h>
-+
-+#include "yportenv.h"
-+#include "yaffs_guts.h"
-+
-+#include <linux/mtd/mtd.h>
-+#include "yaffs_mtdif.h"
-+#include "yaffs_mtdif1.h"
-+#include "yaffs_mtdif2.h"
-+
-+unsigned int yaffs_traceMask = YAFFS_TRACE_BAD_BLOCKS;
-+unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS;
-+unsigned int yaffs_auto_checkpoint = 1;
-+
-+/* Module Parameters */
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+module_param(yaffs_traceMask, uint, 0644);
-+module_param(yaffs_wr_attempts, uint, 0644);
-+module_param(yaffs_auto_checkpoint, uint, 0644);
-+#else
-+MODULE_PARM(yaffs_traceMask, "i");
-+MODULE_PARM(yaffs_wr_attempts, "i");
-+MODULE_PARM(yaffs_auto_checkpoint, "i");
-+#endif
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25))
-+/* use iget and read_inode */
-+#define Y_IGET(sb, inum) iget((sb), (inum))
-+static void yaffs_read_inode(struct inode *inode);
-+
-+#else
-+/* Call local equivalent */
-+#define YAFFS_USE_OWN_IGET
-+#define Y_IGET(sb, inum) yaffs_iget((sb), (inum))
-+
-+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino);
-+#endif
-+
-+/*#define T(x) printk x */
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
-+#define yaffs_InodeToObjectLV(iptr) ((iptr)->i_private)
-+#else
-+#define yaffs_InodeToObjectLV(iptr) ((iptr)->u.generic_ip)
-+#endif
-+
-+#define yaffs_InodeToObject(iptr) ((yaffs_Object *)(yaffs_InodeToObjectLV(iptr)))
-+#define yaffs_DentryToObject(dptr) yaffs_InodeToObject((dptr)->d_inode)
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+#define yaffs_SuperToDevice(sb) ((yaffs_Device *)sb->s_fs_info)
-+#else
-+#define yaffs_SuperToDevice(sb) ((yaffs_Device *)sb->u.generic_sbp)
-+#endif
-+
-+static void yaffs_put_super(struct super_block *sb);
-+
-+static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
-+ loff_t *pos);
-+static ssize_t yaffs_hold_space(struct file *f);
-+static void yaffs_release_space(struct file *f);
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+static int yaffs_file_flush(struct file *file, fl_owner_t id);
-+#else
-+static int yaffs_file_flush(struct file *file);
-+#endif
-+
-+static int yaffs_sync_object(struct file *file, struct dentry *dentry,
-+ int datasync);
-+
-+static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir);
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
-+ struct nameidata *n);
-+static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
-+ struct nameidata *n);
-+#else
-+static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode);
-+static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry);
-+#endif
-+static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
-+ struct dentry *dentry);
-+static int yaffs_unlink(struct inode *dir, struct dentry *dentry);
-+static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
-+ const char *symname);
-+static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode);
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
-+ dev_t dev);
-+#else
-+static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
-+ int dev);
-+#endif
-+static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
-+ struct inode *new_dir, struct dentry *new_dentry);
-+static int yaffs_setattr(struct dentry *dentry, struct iattr *attr);
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+static int yaffs_sync_fs(struct super_block *sb, int wait);
-+static void yaffs_write_super(struct super_block *sb);
-+#else
-+static int yaffs_sync_fs(struct super_block *sb);
-+static int yaffs_write_super(struct super_block *sb);
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf);
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf);
-+#else
-+static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
-+#endif
-+
-+#ifdef YAFFS_HAS_PUT_INODE
-+static void yaffs_put_inode(struct inode *inode);
-+#endif
-+
-+static void yaffs_delete_inode(struct inode *);
-+static void yaffs_clear_inode(struct inode *);
-+
-+static int yaffs_readpage(struct file *file, struct page *page);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+static int yaffs_writepage(struct page *page, struct writeback_control *wbc);
-+#else
-+static int yaffs_writepage(struct page *page);
-+#endif
-+
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END != 0)
-+static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
-+ loff_t pos, unsigned len, unsigned flags,
-+ struct page **pagep, void **fsdata);
-+static int yaffs_write_end(struct file *filp, struct address_space *mapping,
-+ loff_t pos, unsigned len, unsigned copied,
-+ struct page *pg, void *fsdadata);
-+#else
-+static int yaffs_prepare_write(struct file *f, struct page *pg,
-+ unsigned offset, unsigned to);
-+static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
-+ unsigned to);
-+
-+#endif
-+
-+static int yaffs_readlink(struct dentry *dentry, char __user *buffer,
-+ int buflen);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
-+static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
-+#else
-+static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
-+#endif
-+
-+static struct address_space_operations yaffs_file_address_operations = {
-+ .readpage = yaffs_readpage,
-+ .writepage = yaffs_writepage,
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+ .write_begin = yaffs_write_begin,
-+ .write_end = yaffs_write_end,
-+#else
-+ .prepare_write = yaffs_prepare_write,
-+ .commit_write = yaffs_commit_write,
-+#endif
-+};
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22))
-+static const struct file_operations yaffs_file_operations = {
-+ .read = do_sync_read,
-+ .write = do_sync_write,
-+ .aio_read = generic_file_aio_read,
-+ .aio_write = generic_file_aio_write,
-+ .mmap = generic_file_mmap,
-+ .flush = yaffs_file_flush,
-+ .fsync = yaffs_sync_object,
-+ .splice_read = generic_file_splice_read,
-+ .splice_write = generic_file_splice_write,
-+ .llseek = generic_file_llseek,
-+};
-+
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
-+
-+static const struct file_operations yaffs_file_operations = {
-+ .read = do_sync_read,
-+ .write = do_sync_write,
-+ .aio_read = generic_file_aio_read,
-+ .aio_write = generic_file_aio_write,
-+ .mmap = generic_file_mmap,
-+ .flush = yaffs_file_flush,
-+ .fsync = yaffs_sync_object,
-+ .sendfile = generic_file_sendfile,
-+};
-+
-+#else
-+
-+static const struct file_operations yaffs_file_operations = {
-+ .read = generic_file_read,
-+ .write = generic_file_write,
-+ .mmap = generic_file_mmap,
-+ .flush = yaffs_file_flush,
-+ .fsync = yaffs_sync_object,
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+ .sendfile = generic_file_sendfile,
-+#endif
-+};
-+#endif
-+
-+static const struct inode_operations yaffs_file_inode_operations = {
-+ .setattr = yaffs_setattr,
-+};
-+
-+static const struct inode_operations yaffs_symlink_inode_operations = {
-+ .readlink = yaffs_readlink,
-+ .follow_link = yaffs_follow_link,
-+ .setattr = yaffs_setattr,
-+};
-+
-+static const struct inode_operations yaffs_dir_inode_operations = {
-+ .create = yaffs_create,
-+ .lookup = yaffs_lookup,
-+ .link = yaffs_link,
-+ .unlink = yaffs_unlink,
-+ .symlink = yaffs_symlink,
-+ .mkdir = yaffs_mkdir,
-+ .rmdir = yaffs_unlink,
-+ .mknod = yaffs_mknod,
-+ .rename = yaffs_rename,
-+ .setattr = yaffs_setattr,
-+};
-+
-+static const struct file_operations yaffs_dir_operations = {
-+ .read = generic_read_dir,
-+ .readdir = yaffs_readdir,
-+ .fsync = yaffs_sync_object,
-+};
-+
-+static const struct super_operations yaffs_super_ops = {
-+ .statfs = yaffs_statfs,
-+
-+#ifndef YAFFS_USE_OWN_IGET
-+ .read_inode = yaffs_read_inode,
-+#endif
-+#ifdef YAFFS_HAS_PUT_INODE
-+ .put_inode = yaffs_put_inode,
-+#endif
-+ .put_super = yaffs_put_super,
-+ .delete_inode = yaffs_delete_inode,
-+ .clear_inode = yaffs_clear_inode,
-+ .sync_fs = yaffs_sync_fs,
-+ .write_super = yaffs_write_super,
-+};
-+
-+static void yaffs_GrossLock(yaffs_Device *dev)
-+{
-+ T(YAFFS_TRACE_OS, ("yaffs locking %p\n", current));
-+ down(&dev->grossLock);
-+ T(YAFFS_TRACE_OS, ("yaffs locked %p\n", current));
-+}
-+
-+static void yaffs_GrossUnlock(yaffs_Device *dev)
-+{
-+ T(YAFFS_TRACE_OS, ("yaffs unlocking %p\n", current));
-+ up(&dev->grossLock);
-+}
-+
-+static int yaffs_readlink(struct dentry *dentry, char __user *buffer,
-+ int buflen)
-+{
-+ unsigned char *alias;
-+ int ret;
-+
-+ yaffs_Device *dev = yaffs_DentryToObject(dentry)->myDev;
-+
-+ yaffs_GrossLock(dev);
-+
-+ alias = yaffs_GetSymlinkAlias(yaffs_DentryToObject(dentry));
-+
-+ yaffs_GrossUnlock(dev);
-+
-+ if (!alias)
-+ return -ENOMEM;
-+
-+ ret = vfs_readlink(dentry, buffer, buflen, alias);
-+ kfree(alias);
-+ return ret;
-+}
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
-+static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
-+#else
-+static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
-+#endif
-+{
-+ unsigned char *alias;
-+ int ret;
-+ yaffs_Device *dev = yaffs_DentryToObject(dentry)->myDev;
-+
-+ yaffs_GrossLock(dev);
-+
-+ alias = yaffs_GetSymlinkAlias(yaffs_DentryToObject(dentry));
-+
-+ yaffs_GrossUnlock(dev);
-+
-+ if (!alias) {
-+ ret = -ENOMEM;
-+ goto out;
-+ }
-+
-+ ret = vfs_follow_link(nd, alias);
-+ kfree(alias);
-+out:
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
-+ return ERR_PTR(ret);
-+#else
-+ return ret;
-+#endif
-+}
-+
-+struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
-+ yaffs_Object *obj);
-+
-+/*
-+ * Lookup is used to find objects in the fs
-+ */
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+
-+static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
-+ struct nameidata *n)
-+#else
-+static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
-+#endif
-+{
-+ yaffs_Object *obj;
-+ struct inode *inode = NULL; /* NCB 2.5/2.6 needs NULL here */
-+
-+ yaffs_Device *dev = yaffs_InodeToObject(dir)->myDev;
-+
-+ yaffs_GrossLock(dev);
-+
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_lookup for %d:%s\n",
-+ yaffs_InodeToObject(dir)->objectId, dentry->d_name.name));
-+
-+ obj = yaffs_FindObjectByName(yaffs_InodeToObject(dir),
-+ dentry->d_name.name);
-+
-+ obj = yaffs_GetEquivalentObject(obj); /* in case it was a hardlink */
-+
-+ /* Can't hold gross lock when calling yaffs_get_inode() */
-+ yaffs_GrossUnlock(dev);
-+
-+ if (obj) {
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_lookup found %d\n", obj->objectId));
-+
-+ inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
-+
-+ if (inode) {
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_loookup dentry \n"));
-+/* #if 0 asserted by NCB for 2.5/6 compatability - falls through to
-+ * d_add even if NULL inode */
-+#if 0
-+ /*dget(dentry); // try to solve directory bug */
-+ d_add(dentry, inode);
-+
-+ /* return dentry; */
-+ return NULL;
-+#endif
-+ }
-+
-+ } else {
-+ T(YAFFS_TRACE_OS, ("yaffs_lookup not found\n"));
-+
-+ }
-+
-+/* added NCB for 2.5/6 compatability - forces add even if inode is
-+ * NULL which creates dentry hash */
-+ d_add(dentry, inode);
-+
-+ return NULL;
-+}
-+
-+
-+#ifdef YAFFS_HAS_PUT_INODE
-+
-+/* For now put inode is just for debugging
-+ * Put inode is called when the inode **structure** is put.
-+ */
-+static void yaffs_put_inode(struct inode *inode)
-+{
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_put_inode: ino %d, count %d\n", (int)inode->i_ino,
-+ atomic_read(&inode->i_count)));
-+
-+}
-+#endif
-+
-+/* clear is called to tell the fs to release any per-inode data it holds */
-+static void yaffs_clear_inode(struct inode *inode)
-+{
-+ yaffs_Object *obj;
-+ yaffs_Device *dev;
-+
-+ obj = yaffs_InodeToObject(inode);
-+
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_clear_inode: ino %d, count %d %s\n", (int)inode->i_ino,
-+ atomic_read(&inode->i_count),
-+ obj ? "object exists" : "null object"));
-+
-+ if (obj) {
-+ dev = obj->myDev;
-+ yaffs_GrossLock(dev);
-+
-+ /* Clear the association between the inode and
-+ * the yaffs_Object.
-+ */
-+ obj->myInode = NULL;
-+ yaffs_InodeToObjectLV(inode) = NULL;
-+
-+ /* If the object freeing was deferred, then the real
-+ * free happens now.
-+ * This should fix the inode inconsistency problem.
-+ */
-+
-+ yaffs_HandleDeferedFree(obj);
-+
-+ yaffs_GrossUnlock(dev);
-+ }
-+
-+}
-+
-+/* delete is called when the link count is zero and the inode
-+ * is put (ie. nobody wants to know about it anymore, time to
-+ * delete the file).
-+ * NB Must call clear_inode()
-+ */
-+static void yaffs_delete_inode(struct inode *inode)
-+{
-+ yaffs_Object *obj = yaffs_InodeToObject(inode);
-+ yaffs_Device *dev;
-+
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_delete_inode: ino %d, count %d %s\n", (int)inode->i_ino,
-+ atomic_read(&inode->i_count),
-+ obj ? "object exists" : "null object"));
-+
-+ if (obj) {
-+ dev = obj->myDev;
-+ yaffs_GrossLock(dev);
-+ yaffs_DeleteObject(obj);
-+ yaffs_GrossUnlock(dev);
-+ }
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
-+ truncate_inode_pages(&inode->i_data, 0);
-+#endif
-+ clear_inode(inode);
-+}
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+static int yaffs_file_flush(struct file *file, fl_owner_t id)
-+#else
-+static int yaffs_file_flush(struct file *file)
-+#endif
-+{
-+ yaffs_Object *obj = yaffs_DentryToObject(file->f_dentry);
-+
-+ yaffs_Device *dev = obj->myDev;
-+
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_file_flush object %d (%s)\n", obj->objectId,
-+ obj->dirty ? "dirty" : "clean"));
-+
-+ yaffs_GrossLock(dev);
-+
-+ yaffs_FlushFile(obj, 1);
-+
-+ yaffs_GrossUnlock(dev);
-+
-+ return 0;
-+}
-+
-+static int yaffs_readpage_nolock(struct file *f, struct page *pg)
-+{
-+ /* Lifted from jffs2 */
-+
-+ yaffs_Object *obj;
-+ unsigned char *pg_buf;
-+ int ret;
-+
-+ yaffs_Device *dev;
-+
-+ T(YAFFS_TRACE_OS, ("yaffs_readpage at %08x, size %08x\n",
-+ (unsigned)(pg->index << PAGE_CACHE_SHIFT),
-+ (unsigned)PAGE_CACHE_SIZE));
-+
-+ obj = yaffs_DentryToObject(f->f_dentry);
-+
-+ dev = obj->myDev;
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+ BUG_ON(!PageLocked(pg));
-+#else
-+ if (!PageLocked(pg))
-+ PAGE_BUG(pg);
-+#endif
-+
-+ pg_buf = kmap(pg);
-+ /* FIXME: Can kmap fail? */
-+
-+ yaffs_GrossLock(dev);
-+
-+ ret = yaffs_ReadDataFromFile(obj, pg_buf,
-+ pg->index << PAGE_CACHE_SHIFT,
-+ PAGE_CACHE_SIZE);
-+
-+ yaffs_GrossUnlock(dev);
-+
-+ if (ret >= 0)
-+ ret = 0;
-+
-+ if (ret) {
-+ ClearPageUptodate(pg);
-+ SetPageError(pg);
-+ } else {
-+ SetPageUptodate(pg);
-+ ClearPageError(pg);
-+ }
-+
-+ flush_dcache_page(pg);
-+ kunmap(pg);
-+
-+ T(YAFFS_TRACE_OS, ("yaffs_readpage done\n"));
-+ return ret;
-+}
-+
-+static int yaffs_readpage_unlock(struct file *f, struct page *pg)
-+{
-+ int ret = yaffs_readpage_nolock(f, pg);
-+ UnlockPage(pg);
-+ return ret;
-+}
-+
-+static int yaffs_readpage(struct file *f, struct page *pg)
-+{
-+ return yaffs_readpage_unlock(f, pg);
-+}
-+
-+/* writepage inspired by/stolen from smbfs */
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+static int yaffs_writepage(struct page *page, struct writeback_control *wbc)
-+#else
-+static int yaffs_writepage(struct page *page)
-+#endif
-+{
-+ struct address_space *mapping = page->mapping;
-+ loff_t offset = (loff_t) page->index << PAGE_CACHE_SHIFT;
-+ struct inode *inode;
-+ unsigned long end_index;
-+ char *buffer;
-+ yaffs_Object *obj;
-+ int nWritten = 0;
-+ unsigned nBytes;
-+
-+ if (!mapping)
-+ BUG();
-+ inode = mapping->host;
-+ if (!inode)
-+ BUG();
-+
-+ if (offset > inode->i_size) {
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_writepage at %08x, inode size = %08x!!!\n",
-+ (unsigned)(page->index << PAGE_CACHE_SHIFT),
-+ (unsigned)inode->i_size));
-+ T(YAFFS_TRACE_OS,
-+ (" -> don't care!!\n"));
-+ unlock_page(page);
-+ return 0;
-+ }
-+
-+ end_index = inode->i_size >> PAGE_CACHE_SHIFT;
-+
-+ /* easy case */
-+ if (page->index < end_index)
-+ nBytes = PAGE_CACHE_SIZE;
-+ else
-+ nBytes = inode->i_size & (PAGE_CACHE_SIZE - 1);
-+
-+ get_page(page);
-+
-+ buffer = kmap(page);
-+
-+ obj = yaffs_InodeToObject(inode);
-+ yaffs_GrossLock(obj->myDev);
-+
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_writepage at %08x, size %08x\n",
-+ (unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes));
-+ T(YAFFS_TRACE_OS,
-+ ("writepag0: obj = %05x, ino = %05x\n",
-+ (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
-+
-+ nWritten = yaffs_WriteDataToFile(obj, buffer,
-+ page->index << PAGE_CACHE_SHIFT, nBytes, 0);
-+
-+ T(YAFFS_TRACE_OS,
-+ ("writepag1: obj = %05x, ino = %05x\n",
-+ (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
-+
-+ yaffs_GrossUnlock(obj->myDev);
-+
-+ kunmap(page);
-+ SetPageUptodate(page);
-+ UnlockPage(page);
-+ put_page(page);
-+
-+ return (nWritten == nBytes) ? 0 : -ENOSPC;
-+}
-+
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
-+ loff_t pos, unsigned len, unsigned flags,
-+ struct page **pagep, void **fsdata)
-+{
-+ struct page *pg = NULL;
-+ pgoff_t index = pos >> PAGE_CACHE_SHIFT;
-+ uint32_t offset = pos & (PAGE_CACHE_SIZE - 1);
-+ uint32_t to = offset + len;
-+
-+ int ret = 0;
-+ int space_held = 0;
-+
-+ T(YAFFS_TRACE_OS, ("start yaffs_write_begin\n"));
-+ /* Get a page */
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28)
-+ pg = grab_cache_page_write_begin(mapping, index, flags);
-+#else
-+ pg = __grab_cache_page(mapping, index);
-+#endif
-+
-+ *pagep = pg;
-+ if (!pg) {
-+ ret = -ENOMEM;
-+ goto out;
-+ }
-+ /* Get fs space */
-+ space_held = yaffs_hold_space(filp);
-+
-+ if (!space_held) {
-+ ret = -ENOSPC;
-+ goto out;
-+ }
-+
-+ /* Update page if required */
-+
-+ if (!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE))
-+ ret = yaffs_readpage_nolock(filp, pg);
-+
-+ if (ret)
-+ goto out;
-+
-+ /* Happy path return */
-+ T(YAFFS_TRACE_OS, ("end yaffs_write_begin - ok\n"));
-+
-+ return 0;
-+
-+out:
-+ T(YAFFS_TRACE_OS, ("end yaffs_write_begin fail returning %d\n", ret));
-+ if (space_held)
-+ yaffs_release_space(filp);
-+ if (pg) {
-+ unlock_page(pg);
-+ page_cache_release(pg);
-+ }
-+ return ret;
-+}
-+
-+#else
-+
-+static int yaffs_prepare_write(struct file *f, struct page *pg,
-+ unsigned offset, unsigned to)
-+{
-+ T(YAFFS_TRACE_OS, ("yaffs_prepair_write\n"));
-+
-+ if (!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE))
-+ return yaffs_readpage_nolock(f, pg);
-+ return 0;
-+}
-+#endif
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+static int yaffs_write_end(struct file *filp, struct address_space *mapping,
-+ loff_t pos, unsigned len, unsigned copied,
-+ struct page *pg, void *fsdadata)
-+{
-+ int ret = 0;
-+ void *addr, *kva;
-+ uint32_t offset_into_page = pos & (PAGE_CACHE_SIZE - 1);
-+
-+ kva = kmap(pg);
-+ addr = kva + offset_into_page;
-+
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_write_end addr %x pos %x nBytes %d\n",
-+ (unsigned) addr,
-+ (int)pos, copied));
-+
-+ ret = yaffs_file_write(filp, addr, copied, &pos);
-+
-+ if (ret != copied) {
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_write_end not same size ret %d copied %d\n",
-+ ret, copied));
-+ SetPageError(pg);
-+ ClearPageUptodate(pg);
-+ } else {
-+ SetPageUptodate(pg);
-+ }
-+
-+ kunmap(pg);
-+
-+ yaffs_release_space(filp);
-+ unlock_page(pg);
-+ page_cache_release(pg);
-+ return ret;
-+}
-+#else
-+
-+static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
-+ unsigned to)
-+{
-+ void *addr, *kva;
-+
-+ loff_t pos = (((loff_t) pg->index) << PAGE_CACHE_SHIFT) + offset;
-+ int nBytes = to - offset;
-+ int nWritten;
-+
-+ unsigned spos = pos;
-+ unsigned saddr;
-+
-+ kva = kmap(pg);
-+ addr = kva + offset;
-+
-+ saddr = (unsigned) addr;
-+
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_commit_write addr %x pos %x nBytes %d\n",
-+ saddr, spos, nBytes));
-+
-+ nWritten = yaffs_file_write(f, addr, nBytes, &pos);
-+
-+ if (nWritten != nBytes) {
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_commit_write not same size nWritten %d nBytes %d\n",
-+ nWritten, nBytes));
-+ SetPageError(pg);
-+ ClearPageUptodate(pg);
-+ } else {
-+ SetPageUptodate(pg);
-+ }
-+
-+ kunmap(pg);
-+
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_commit_write returning %d\n",
-+ nWritten == nBytes ? 0 : nWritten));
-+
-+ return nWritten == nBytes ? 0 : nWritten;
-+}
-+#endif
-+
-+
-+static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj)
-+{
-+ if (inode && obj) {
-+
-+
-+ /* Check mode against the variant type and attempt to repair if broken. */
-+ __u32 mode = obj->yst_mode;
-+ switch (obj->variantType) {
-+ case YAFFS_OBJECT_TYPE_FILE:
-+ if (!S_ISREG(mode)) {
-+ obj->yst_mode &= ~S_IFMT;
-+ obj->yst_mode |= S_IFREG;
-+ }
-+
-+ break;
-+ case YAFFS_OBJECT_TYPE_SYMLINK:
-+ if (!S_ISLNK(mode)) {
-+ obj->yst_mode &= ~S_IFMT;
-+ obj->yst_mode |= S_IFLNK;
-+ }
-+
-+ break;
-+ case YAFFS_OBJECT_TYPE_DIRECTORY:
-+ if (!S_ISDIR(mode)) {
-+ obj->yst_mode &= ~S_IFMT;
-+ obj->yst_mode |= S_IFDIR;
-+ }
-+
-+ break;
-+ case YAFFS_OBJECT_TYPE_UNKNOWN:
-+ case YAFFS_OBJECT_TYPE_HARDLINK:
-+ case YAFFS_OBJECT_TYPE_SPECIAL:
-+ default:
-+ /* TODO? */
-+ break;
-+ }
-+
-+ inode->i_flags |= S_NOATIME;
-+
-+ inode->i_ino = obj->objectId;
-+ inode->i_mode = obj->yst_mode;
-+ inode->i_uid = obj->yst_uid;
-+ inode->i_gid = obj->yst_gid;
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
-+ inode->i_blksize = inode->i_sb->s_blocksize;
-+#endif
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+
-+ inode->i_rdev = old_decode_dev(obj->yst_rdev);
-+ inode->i_atime.tv_sec = (time_t) (obj->yst_atime);
-+ inode->i_atime.tv_nsec = 0;
-+ inode->i_mtime.tv_sec = (time_t) obj->yst_mtime;
-+ inode->i_mtime.tv_nsec = 0;
-+ inode->i_ctime.tv_sec = (time_t) obj->yst_ctime;
-+ inode->i_ctime.tv_nsec = 0;
-+#else
-+ inode->i_rdev = obj->yst_rdev;
-+ inode->i_atime = obj->yst_atime;
-+ inode->i_mtime = obj->yst_mtime;
-+ inode->i_ctime = obj->yst_ctime;
-+#endif
-+ inode->i_size = yaffs_GetObjectFileLength(obj);
-+ inode->i_blocks = (inode->i_size + 511) >> 9;
-+
-+ inode->i_nlink = yaffs_GetObjectLinkCount(obj);
-+
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_FillInode mode %x uid %d gid %d size %d count %d\n",
-+ inode->i_mode, inode->i_uid, inode->i_gid,
-+ (int)inode->i_size, atomic_read(&inode->i_count)));
-+
-+ switch (obj->yst_mode & S_IFMT) {
-+ default: /* fifo, device or socket */
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+ init_special_inode(inode, obj->yst_mode,
-+ old_decode_dev(obj->yst_rdev));
-+#else
-+ init_special_inode(inode, obj->yst_mode,
-+ (dev_t) (obj->yst_rdev));
-+#endif
-+ break;
-+ case S_IFREG: /* file */
-+ inode->i_op = &yaffs_file_inode_operations;
-+ inode->i_fop = &yaffs_file_operations;
-+ inode->i_mapping->a_ops =
-+ &yaffs_file_address_operations;
-+ break;
-+ case S_IFDIR: /* directory */
-+ inode->i_op = &yaffs_dir_inode_operations;
-+ inode->i_fop = &yaffs_dir_operations;
-+ break;
-+ case S_IFLNK: /* symlink */
-+ inode->i_op = &yaffs_symlink_inode_operations;
-+ break;
-+ }
-+
-+ yaffs_InodeToObjectLV(inode) = obj;
-+
-+ obj->myInode = inode;
-+
-+ } else {
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_FileInode invalid parameters\n"));
-+ }
-+
-+}
-+
-+struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
-+ yaffs_Object *obj)
-+{
-+ struct inode *inode;
-+
-+ if (!sb) {
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_get_inode for NULL super_block!!\n"));
-+ return NULL;
-+
-+ }
-+
-+ if (!obj) {
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_get_inode for NULL object!!\n"));
-+ return NULL;
-+
-+ }
-+
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_get_inode for object %d\n", obj->objectId));
-+
-+ inode = Y_IGET(sb, obj->objectId);
-+ if (IS_ERR(inode))
-+ return NULL;
-+
-+ /* NB Side effect: iget calls back to yaffs_read_inode(). */
-+ /* iget also increments the inode's i_count */
-+ /* NB You can't be holding grossLock or deadlock will happen! */
-+
-+ return inode;
-+}
-+
-+static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
-+ loff_t *pos)
-+{
-+ yaffs_Object *obj;
-+ int nWritten, ipos;
-+ struct inode *inode;
-+ yaffs_Device *dev;
-+
-+ obj = yaffs_DentryToObject(f->f_dentry);
-+
-+ dev = obj->myDev;
-+
-+ yaffs_GrossLock(dev);
-+
-+ inode = f->f_dentry->d_inode;
-+
-+ if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND)
-+ ipos = inode->i_size;
-+ else
-+ ipos = *pos;
-+
-+ if (!obj)
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_file_write: hey obj is null!\n"));
-+ else
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_file_write about to write writing %zu bytes"
-+ "to object %d at %d\n",
-+ n, obj->objectId, ipos));
-+
-+ nWritten = yaffs_WriteDataToFile(obj, buf, ipos, n, 0);
-+
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_file_write writing %zu bytes, %d written at %d\n",
-+ n, nWritten, ipos));
-+
-+ if (nWritten > 0) {
-+ ipos += nWritten;
-+ *pos = ipos;
-+ if (ipos > inode->i_size) {
-+ inode->i_size = ipos;
-+ inode->i_blocks = (ipos + 511) >> 9;
-+
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_file_write size updated to %d bytes, "
-+ "%d blocks\n",
-+ ipos, (int)(inode->i_blocks)));
-+ }
-+
-+ }
-+ yaffs_GrossUnlock(dev);
-+ return nWritten == 0 ? -ENOSPC : nWritten;
-+}
-+
-+/* Space holding and freeing is done to ensure we have space available for write_begin/end */
-+/* For now we just assume few parallel writes and check against a small number. */
-+/* Todo: need to do this with a counter to handle parallel reads better */
-+
-+static ssize_t yaffs_hold_space(struct file *f)
-+{
-+ yaffs_Object *obj;
-+ yaffs_Device *dev;
-+
-+ int nFreeChunks;
-+
-+
-+ obj = yaffs_DentryToObject(f->f_dentry);
-+
-+ dev = obj->myDev;
-+
-+ yaffs_GrossLock(dev);
-+
-+ nFreeChunks = yaffs_GetNumberOfFreeChunks(dev);
-+
-+ yaffs_GrossUnlock(dev);
-+
-+ return (nFreeChunks > 20) ? 1 : 0;
-+}
-+
-+static void yaffs_release_space(struct file *f)
-+{
-+ yaffs_Object *obj;
-+ yaffs_Device *dev;
-+
-+
-+ obj = yaffs_DentryToObject(f->f_dentry);
-+
-+ dev = obj->myDev;
-+
-+ yaffs_GrossLock(dev);
-+
-+
-+ yaffs_GrossUnlock(dev);
-+}
-+
-+static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
-+{
-+ yaffs_Object *obj;
-+ yaffs_Device *dev;
-+ struct inode *inode = f->f_dentry->d_inode;
-+ unsigned long offset, curoffs;
-+ struct ylist_head *i;
-+ yaffs_Object *l;
-+
-+ char name[YAFFS_MAX_NAME_LENGTH + 1];
-+
-+ obj = yaffs_DentryToObject(f->f_dentry);
-+ dev = obj->myDev;
-+
-+ yaffs_GrossLock(dev);
-+
-+ offset = f->f_pos;
-+
-+ T(YAFFS_TRACE_OS, ("yaffs_readdir: starting at %d\n", (int)offset));
-+
-+ if (offset == 0) {
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_readdir: entry . ino %d \n",
-+ (int)inode->i_ino));
-+ if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR) < 0)
-+ goto out;
-+ offset++;
-+ f->f_pos++;
-+ }
-+ if (offset == 1) {
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_readdir: entry .. ino %d \n",
-+ (int)f->f_dentry->d_parent->d_inode->i_ino));
-+ if (filldir(dirent, "..", 2, offset,
-+ f->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0)
-+ goto out;
-+ offset++;
-+ f->f_pos++;
-+ }
-+
-+ curoffs = 1;
-+
-+ /* If the directory has changed since the open or last call to
-+ readdir, rewind to after the 2 canned entries. */
-+
-+ if (f->f_version != inode->i_version) {
-+ offset = 2;
-+ f->f_pos = offset;
-+ f->f_version = inode->i_version;
-+ }
-+
-+ ylist_for_each(i, &obj->variant.directoryVariant.children) {
-+ curoffs++;
-+ if (curoffs >= offset) {
-+ l = ylist_entry(i, yaffs_Object, siblings);
-+
-+ yaffs_GetObjectName(l, name,
-+ YAFFS_MAX_NAME_LENGTH + 1);
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_readdir: %s inode %d\n", name,
-+ yaffs_GetObjectInode(l)));
-+
-+ if (filldir(dirent,
-+ name,
-+ strlen(name),
-+ offset,
-+ yaffs_GetObjectInode(l),
-+ yaffs_GetObjectType(l)) < 0)
-+ goto up_and_out;
-+
-+ offset++;
-+ f->f_pos++;
-+ }
-+ }
-+
-+up_and_out:
-+out:
-+ yaffs_GrossUnlock(dev);
-+
-+ return 0;
-+}
-+
-+/*
-+ * File creation. Allocate an inode, and we're done..
-+ */
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-+#define YCRED(x) x
-+#else
-+#define YCRED(x) (x->cred)
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
-+ dev_t rdev)
-+#else
-+static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
-+ int rdev)
-+#endif
-+{
-+ struct inode *inode;
-+
-+ yaffs_Object *obj = NULL;
-+ yaffs_Device *dev;
-+
-+ yaffs_Object *parent = yaffs_InodeToObject(dir);
-+
-+ int error = -ENOSPC;
-+ uid_t uid = YCRED(current)->fsuid;
-+ gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
-+
-+ if ((dir->i_mode & S_ISGID) && S_ISDIR(mode))
-+ mode |= S_ISGID;
-+
-+ if (parent) {
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_mknod: parent object %d type %d\n",
-+ parent->objectId, parent->variantType));
-+ } else {
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_mknod: could not get parent object\n"));
-+ return -EPERM;
-+ }
-+
-+ T(YAFFS_TRACE_OS, ("yaffs_mknod: making oject for %s, "
-+ "mode %x dev %x\n",
-+ dentry->d_name.name, mode, rdev));
-+
-+ dev = parent->myDev;
-+
-+ yaffs_GrossLock(dev);
-+
-+ switch (mode & S_IFMT) {
-+ default:
-+ /* Special (socket, fifo, device...) */
-+ T(YAFFS_TRACE_OS, ("yaffs_mknod: making special\n"));
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+ obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
-+ gid, old_encode_dev(rdev));
-+#else
-+ obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
-+ gid, rdev);
-+#endif
-+ break;
-+ case S_IFREG: /* file */
-+ T(YAFFS_TRACE_OS, ("yaffs_mknod: making file\n"));
-+ obj = yaffs_MknodFile(parent, dentry->d_name.name, mode, uid,
-+ gid);
-+ break;
-+ case S_IFDIR: /* directory */
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_mknod: making directory\n"));
-+ obj = yaffs_MknodDirectory(parent, dentry->d_name.name, mode,
-+ uid, gid);
-+ break;
-+ case S_IFLNK: /* symlink */
-+ T(YAFFS_TRACE_OS, ("yaffs_mknod: making symlink\n"));
-+ obj = NULL; /* Do we ever get here? */
-+ break;
-+ }
-+
-+ /* Can not call yaffs_get_inode() with gross lock held */
-+ yaffs_GrossUnlock(dev);
-+
-+ if (obj) {
-+ inode = yaffs_get_inode(dir->i_sb, mode, rdev, obj);
-+ d_instantiate(dentry, inode);
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_mknod created object %d count = %d\n",
-+ obj->objectId, atomic_read(&inode->i_count)));
-+ error = 0;
-+ } else {
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_mknod failed making object\n"));
-+ error = -ENOMEM;
-+ }
-+
-+ return error;
-+}
-+
-+static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
-+{
-+ int retVal;
-+ T(YAFFS_TRACE_OS, ("yaffs_mkdir\n"));
-+ retVal = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0);
-+ return retVal;
-+}
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
-+ struct nameidata *n)
-+#else
-+static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode)
-+#endif
-+{
-+ T(YAFFS_TRACE_OS, ("yaffs_create\n"));
-+ return yaffs_mknod(dir, dentry, mode | S_IFREG, 0);
-+}
-+
-+static int yaffs_unlink(struct inode *dir, struct dentry *dentry)
-+{
-+ int retVal;
-+
-+ yaffs_Device *dev;
-+
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_unlink %d:%s\n", (int)(dir->i_ino),
-+ dentry->d_name.name));
-+
-+ dev = yaffs_InodeToObject(dir)->myDev;
-+
-+ yaffs_GrossLock(dev);
-+
-+ retVal = yaffs_Unlink(yaffs_InodeToObject(dir), dentry->d_name.name);
-+
-+ if (retVal == YAFFS_OK) {
-+ dentry->d_inode->i_nlink--;
-+ dir->i_version++;
-+ yaffs_GrossUnlock(dev);
-+ mark_inode_dirty(dentry->d_inode);
-+ return 0;
-+ }
-+ yaffs_GrossUnlock(dev);
-+ return -ENOTEMPTY;
-+}
-+
-+/*
-+ * Create a link...
-+ */
-+static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
-+ struct dentry *dentry)
-+{
-+ struct inode *inode = old_dentry->d_inode;
-+ yaffs_Object *obj = NULL;
-+ yaffs_Object *link = NULL;
-+ yaffs_Device *dev;
-+
-+ T(YAFFS_TRACE_OS, ("yaffs_link\n"));
-+
-+ obj = yaffs_InodeToObject(inode);
-+ dev = obj->myDev;
-+
-+ yaffs_GrossLock(dev);
-+
-+ if (!S_ISDIR(inode->i_mode)) /* Don't link directories */
-+ link = yaffs_Link(yaffs_InodeToObject(dir), dentry->d_name.name,
-+ obj);
-+
-+ if (link) {
-+ old_dentry->d_inode->i_nlink = yaffs_GetObjectLinkCount(obj);
-+ d_instantiate(dentry, old_dentry->d_inode);
-+ atomic_inc(&old_dentry->d_inode->i_count);
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_link link count %d i_count %d\n",
-+ old_dentry->d_inode->i_nlink,
-+ atomic_read(&old_dentry->d_inode->i_count)));
-+ }
-+
-+ yaffs_GrossUnlock(dev);
-+
-+ if (link)
-+ return 0;
-+
-+ return -EPERM;
-+}
-+
-+static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
-+ const char *symname)
-+{
-+ yaffs_Object *obj;
-+ yaffs_Device *dev;
-+ uid_t uid = YCRED(current)->fsuid;
-+ gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
-+
-+ T(YAFFS_TRACE_OS, ("yaffs_symlink\n"));
-+
-+ dev = yaffs_InodeToObject(dir)->myDev;
-+ yaffs_GrossLock(dev);
-+ obj = yaffs_MknodSymLink(yaffs_InodeToObject(dir), dentry->d_name.name,
-+ S_IFLNK | S_IRWXUGO, uid, gid, symname);
-+ yaffs_GrossUnlock(dev);
-+
-+ if (obj) {
-+ struct inode *inode;
-+
-+ inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
-+ d_instantiate(dentry, inode);
-+ T(YAFFS_TRACE_OS, ("symlink created OK\n"));
-+ return 0;
-+ } else {
-+ T(YAFFS_TRACE_OS, ("symlink not created\n"));
-+ }
-+
-+ return -ENOMEM;
-+}
-+
-+static int yaffs_sync_object(struct file *file, struct dentry *dentry,
-+ int datasync)
-+{
-+
-+ yaffs_Object *obj;
-+ yaffs_Device *dev;
-+
-+ obj = yaffs_DentryToObject(dentry);
-+
-+ dev = obj->myDev;
-+
-+ T(YAFFS_TRACE_OS, ("yaffs_sync_object\n"));
-+ yaffs_GrossLock(dev);
-+ yaffs_FlushFile(obj, 1);
-+ yaffs_GrossUnlock(dev);
-+ return 0;
-+}
-+
-+/*
-+ * The VFS layer already does all the dentry stuff for rename.
-+ *
-+ * NB: POSIX says you can rename an object over an old object of the same name
-+ */
-+static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
-+ struct inode *new_dir, struct dentry *new_dentry)
-+{
-+ yaffs_Device *dev;
-+ int retVal = YAFFS_FAIL;
-+ yaffs_Object *target;
-+
-+ T(YAFFS_TRACE_OS, ("yaffs_rename\n"));
-+ dev = yaffs_InodeToObject(old_dir)->myDev;
-+
-+ yaffs_GrossLock(dev);
-+
-+ /* Check if the target is an existing directory that is not empty. */
-+ target = yaffs_FindObjectByName(yaffs_InodeToObject(new_dir),
-+ new_dentry->d_name.name);
-+
-+
-+
-+ if (target && target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
-+ !ylist_empty(&target->variant.directoryVariant.children)) {
-+
-+ T(YAFFS_TRACE_OS, ("target is non-empty dir\n"));
-+
-+ retVal = YAFFS_FAIL;
-+ } else {
-+ /* Now does unlinking internally using shadowing mechanism */
-+ T(YAFFS_TRACE_OS, ("calling yaffs_RenameObject\n"));
-+
-+ retVal = yaffs_RenameObject(yaffs_InodeToObject(old_dir),
-+ old_dentry->d_name.name,
-+ yaffs_InodeToObject(new_dir),
-+ new_dentry->d_name.name);
-+ }
-+ yaffs_GrossUnlock(dev);
-+
-+ if (retVal == YAFFS_OK) {
-+ if (target) {
-+ new_dentry->d_inode->i_nlink--;
-+ mark_inode_dirty(new_dentry->d_inode);
-+ }
-+
-+ return 0;
-+ } else {
-+ return -ENOTEMPTY;
-+ }
-+}
-+
-+static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
-+{
-+ struct inode *inode = dentry->d_inode;
-+ int error;
-+ yaffs_Device *dev;
-+
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_setattr of object %d\n",
-+ yaffs_InodeToObject(inode)->objectId));
-+
-+ error = inode_change_ok(inode, attr);
-+ if (error == 0) {
-+ dev = yaffs_InodeToObject(inode)->myDev;
-+ yaffs_GrossLock(dev);
-+ if (yaffs_SetAttributes(yaffs_InodeToObject(inode), attr) ==
-+ YAFFS_OK) {
-+ error = 0;
-+ } else {
-+ error = -EPERM;
-+ }
-+ yaffs_GrossUnlock(dev);
-+ if (!error)
-+ error = inode_setattr(inode, attr);
-+ }
-+ return error;
-+}
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf)
-+{
-+ yaffs_Device *dev = yaffs_DentryToObject(dentry)->myDev;
-+ struct super_block *sb = dentry->d_sb;
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf)
-+{
-+ yaffs_Device *dev = yaffs_SuperToDevice(sb);
-+#else
-+static int yaffs_statfs(struct super_block *sb, struct statfs *buf)
-+{
-+ yaffs_Device *dev = yaffs_SuperToDevice(sb);
-+#endif
-+
-+ T(YAFFS_TRACE_OS, ("yaffs_statfs\n"));
-+
-+ yaffs_GrossLock(dev);
-+
-+ buf->f_type = YAFFS_MAGIC;
-+ buf->f_bsize = sb->s_blocksize;
-+ buf->f_namelen = 255;
-+
-+ if (dev->nDataBytesPerChunk & (dev->nDataBytesPerChunk - 1)) {
-+ /* Do this if chunk size is not a power of 2 */
-+
-+ uint64_t bytesInDev;
-+ uint64_t bytesFree;
-+
-+ bytesInDev = ((uint64_t)((dev->endBlock - dev->startBlock + 1))) *
-+ ((uint64_t)(dev->nChunksPerBlock * dev->nDataBytesPerChunk));
-+
-+ do_div(bytesInDev, sb->s_blocksize); /* bytesInDev becomes the number of blocks */
-+ buf->f_blocks = bytesInDev;
-+
-+ bytesFree = ((uint64_t)(yaffs_GetNumberOfFreeChunks(dev))) *
-+ ((uint64_t)(dev->nDataBytesPerChunk));
-+
-+ do_div(bytesFree, sb->s_blocksize);
-+
-+ buf->f_bfree = bytesFree;
-+
-+ } else if (sb->s_blocksize > dev->nDataBytesPerChunk) {
-+
-+ buf->f_blocks =
-+ (dev->endBlock - dev->startBlock + 1) *
-+ dev->nChunksPerBlock /
-+ (sb->s_blocksize / dev->nDataBytesPerChunk);
-+ buf->f_bfree =
-+ yaffs_GetNumberOfFreeChunks(dev) /
-+ (sb->s_blocksize / dev->nDataBytesPerChunk);
-+ } else {
-+ buf->f_blocks =
-+ (dev->endBlock - dev->startBlock + 1) *
-+ dev->nChunksPerBlock *
-+ (dev->nDataBytesPerChunk / sb->s_blocksize);
-+
-+ buf->f_bfree =
-+ yaffs_GetNumberOfFreeChunks(dev) *
-+ (dev->nDataBytesPerChunk / sb->s_blocksize);
-+ }
-+
-+ buf->f_files = 0;
-+ buf->f_ffree = 0;
-+ buf->f_bavail = buf->f_bfree;
-+
-+ yaffs_GrossUnlock(dev);
-+ return 0;
-+}
-+
-+
-+static int yaffs_do_sync_fs(struct super_block *sb)
-+{
-+
-+ yaffs_Device *dev = yaffs_SuperToDevice(sb);
-+ T(YAFFS_TRACE_OS, ("yaffs_do_sync_fs\n"));
-+
-+ if (sb->s_dirt) {
-+ yaffs_GrossLock(dev);
-+
-+ if (dev) {
-+ yaffs_FlushEntireDeviceCache(dev);
-+ yaffs_CheckpointSave(dev);
-+ }
-+
-+ yaffs_GrossUnlock(dev);
-+
-+ sb->s_dirt = 0;
-+ }
-+ return 0;
-+}
-+
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+static void yaffs_write_super(struct super_block *sb)
-+#else
-+static int yaffs_write_super(struct super_block *sb)
-+#endif
-+{
-+
-+ T(YAFFS_TRACE_OS, ("yaffs_write_super\n"));
-+ if (yaffs_auto_checkpoint >= 2)
-+ yaffs_do_sync_fs(sb);
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
-+ return 0;
-+#endif
-+}
-+
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+static int yaffs_sync_fs(struct super_block *sb, int wait)
-+#else
-+static int yaffs_sync_fs(struct super_block *sb)
-+#endif
-+{
-+ T(YAFFS_TRACE_OS, ("yaffs_sync_fs\n"));
-+
-+ if (yaffs_auto_checkpoint >= 1)
-+ yaffs_do_sync_fs(sb);
-+
-+ return 0;
-+}
-+
-+#ifdef YAFFS_USE_OWN_IGET
-+
-+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino)
-+{
-+ struct inode *inode;
-+ yaffs_Object *obj;
-+ yaffs_Device *dev = yaffs_SuperToDevice(sb);
-+
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_iget for %lu\n", ino));
-+
-+ inode = iget_locked(sb, ino);
-+ if (!inode)
-+ return ERR_PTR(-ENOMEM);
-+ if (!(inode->i_state & I_NEW))
-+ return inode;
-+
-+ /* NB This is called as a side effect of other functions, but
-+ * we had to release the lock to prevent deadlocks, so
-+ * need to lock again.
-+ */
-+
-+ yaffs_GrossLock(dev);
-+
-+ obj = yaffs_FindObjectByNumber(dev, inode->i_ino);
-+
-+ yaffs_FillInodeFromObject(inode, obj);
-+
-+ yaffs_GrossUnlock(dev);
-+
-+ unlock_new_inode(inode);
-+ return inode;
-+}
-+
-+#else
-+
-+static void yaffs_read_inode(struct inode *inode)
-+{
-+ /* NB This is called as a side effect of other functions, but
-+ * we had to release the lock to prevent deadlocks, so
-+ * need to lock again.
-+ */
-+
-+ yaffs_Object *obj;
-+ yaffs_Device *dev = yaffs_SuperToDevice(inode->i_sb);
-+
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_read_inode for %d\n", (int)inode->i_ino));
-+
-+ yaffs_GrossLock(dev);
-+
-+ obj = yaffs_FindObjectByNumber(dev, inode->i_ino);
-+
-+ yaffs_FillInodeFromObject(inode, obj);
-+
-+ yaffs_GrossUnlock(dev);
-+}
-+
-+#endif
-+
-+static YLIST_HEAD(yaffs_dev_list);
-+
-+#if 0 /* not used */
-+static int yaffs_remount_fs(struct super_block *sb, int *flags, char *data)
-+{
-+ yaffs_Device *dev = yaffs_SuperToDevice(sb);
-+
-+ if (*flags & MS_RDONLY) {
-+ struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
-+
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_remount_fs: %s: RO\n", dev->name));
-+
-+ yaffs_GrossLock(dev);
-+
-+ yaffs_FlushEntireDeviceCache(dev);
-+
-+ yaffs_CheckpointSave(dev);
-+
-+ if (mtd->sync)
-+ mtd->sync(mtd);
-+
-+ yaffs_GrossUnlock(dev);
-+ } else {
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_remount_fs: %s: RW\n", dev->name));
-+ }
-+
-+ return 0;
-+}
-+#endif
-+
-+static void yaffs_put_super(struct super_block *sb)
-+{
-+ yaffs_Device *dev = yaffs_SuperToDevice(sb);
-+
-+ T(YAFFS_TRACE_OS, ("yaffs_put_super\n"));
-+
-+ yaffs_GrossLock(dev);
-+
-+ yaffs_FlushEntireDeviceCache(dev);
-+
-+ yaffs_CheckpointSave(dev);
-+
-+ if (dev->putSuperFunc)
-+ dev->putSuperFunc(sb);
-+
-+ yaffs_Deinitialise(dev);
-+
-+ yaffs_GrossUnlock(dev);
-+
-+ /* we assume this is protected by lock_kernel() in mount/umount */
-+ ylist_del(&dev->devList);
-+
-+ if (dev->spareBuffer) {
-+ YFREE(dev->spareBuffer);
-+ dev->spareBuffer = NULL;
-+ }
-+
-+ kfree(dev);
-+}
-+
-+
-+static void yaffs_MTDPutSuper(struct super_block *sb)
-+{
-+ struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
-+
-+ if (mtd->sync)
-+ mtd->sync(mtd);
-+
-+ put_mtd_device(mtd);
-+}
-+
-+
-+static void yaffs_MarkSuperBlockDirty(void *vsb)
-+{
-+ struct super_block *sb = (struct super_block *)vsb;
-+
-+ T(YAFFS_TRACE_OS, ("yaffs_MarkSuperBlockDirty() sb = %p\n", sb));
-+ if (sb)
-+ sb->s_dirt = 1;
-+}
-+
-+typedef struct {
-+ int inband_tags;
-+ int skip_checkpoint_read;
-+ int skip_checkpoint_write;
-+ int no_cache;
-+} yaffs_options;
-+
-+#define MAX_OPT_LEN 20
-+static int yaffs_parse_options(yaffs_options *options, const char *options_str)
-+{
-+ char cur_opt[MAX_OPT_LEN + 1];
-+ int p;
-+ int error = 0;
-+
-+ /* Parse through the options which is a comma seperated list */
-+
-+ while (options_str && *options_str && !error) {
-+ memset(cur_opt, 0, MAX_OPT_LEN + 1);
-+ p = 0;
-+
-+ while (*options_str && *options_str != ',') {
-+ if (p < MAX_OPT_LEN) {
-+ cur_opt[p] = *options_str;
-+ p++;
-+ }
-+ options_str++;
-+ }
-+
-+ if (!strcmp(cur_opt, "inband-tags"))
-+ options->inband_tags = 1;
-+ else if (!strcmp(cur_opt, "no-cache"))
-+ options->no_cache = 1;
-+ else if (!strcmp(cur_opt, "no-checkpoint-read"))
-+ options->skip_checkpoint_read = 1;
-+ else if (!strcmp(cur_opt, "no-checkpoint-write"))
-+ options->skip_checkpoint_write = 1;
-+ else if (!strcmp(cur_opt, "no-checkpoint")) {
-+ options->skip_checkpoint_read = 1;
-+ options->skip_checkpoint_write = 1;
-+ } else {
-+ printk(KERN_INFO "yaffs: Bad mount option \"%s\"\n",
-+ cur_opt);
-+ error = 1;
-+ }
-+ }
-+
-+ return error;
-+}
-+
-+static struct super_block *yaffs_internal_read_super(int yaffsVersion,
-+ struct super_block *sb,
-+ void *data, int silent)
-+{
-+ int nBlocks;
-+ struct inode *inode = NULL;
-+ struct dentry *root;
-+ yaffs_Device *dev = 0;
-+ char devname_buf[BDEVNAME_SIZE + 1];
-+ struct mtd_info *mtd;
-+ int err;
-+ char *data_str = (char *)data;
-+
-+ yaffs_options options;
-+
-+ sb->s_magic = YAFFS_MAGIC;
-+ sb->s_op = &yaffs_super_ops;
-+ sb->s_flags |= MS_NOATIME;
-+
-+ if (!sb)
-+ printk(KERN_INFO "yaffs: sb is NULL\n");
-+ else if (!sb->s_dev)
-+ printk(KERN_INFO "yaffs: sb->s_dev is NULL\n");
-+ else if (!yaffs_devname(sb, devname_buf))
-+ printk(KERN_INFO "yaffs: devname is NULL\n");
-+ else
-+ printk(KERN_INFO "yaffs: dev is %d name is \"%s\"\n",
-+ sb->s_dev,
-+ yaffs_devname(sb, devname_buf));
-+
-+ if (!data_str)
-+ data_str = "";
-+
-+ printk(KERN_INFO "yaffs: passed flags \"%s\"\n", data_str);
-+
-+ memset(&options, 0, sizeof(options));
-+
-+ if (yaffs_parse_options(&options, data_str)) {
-+ /* Option parsing failed */
-+ return NULL;
-+ }
-+
-+
-+ sb->s_blocksize = PAGE_CACHE_SIZE;
-+ sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
-+ T(YAFFS_TRACE_OS, ("yaffs_read_super: Using yaffs%d\n", yaffsVersion));
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_read_super: block size %d\n", (int)(sb->s_blocksize)));
-+
-+#ifdef CONFIG_YAFFS_DISABLE_WRITE_VERIFY
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs: Write verification disabled. All guarantees "
-+ "null and void\n"));
-+#endif
-+
-+ T(YAFFS_TRACE_ALWAYS, ("yaffs: Attempting MTD mount on %u.%u, "
-+ "\"%s\"\n",
-+ MAJOR(sb->s_dev), MINOR(sb->s_dev),
-+ yaffs_devname(sb, devname_buf)));
-+
-+ /* Check it's an mtd device..... */
-+ if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR)
-+ return NULL; /* This isn't an mtd device */
-+
-+ /* Get the device */
-+ mtd = get_mtd_device(NULL, MINOR(sb->s_dev));
-+ if (!mtd) {
-+ T(YAFFS_TRACE_ALWAYS,
-+ ("yaffs: MTD device #%u doesn't appear to exist\n",
-+ MINOR(sb->s_dev)));
-+ return NULL;
-+ }
-+ /* Check it's NAND */
-+ if (mtd->type != MTD_NANDFLASH) {
-+ T(YAFFS_TRACE_ALWAYS,
-+ ("yaffs: MTD device is not NAND it's type %d\n", mtd->type));
-+ return NULL;
-+ }
-+
-+ T(YAFFS_TRACE_OS, (" erase %p\n", mtd->erase));
-+ T(YAFFS_TRACE_OS, (" read %p\n", mtd->read));
-+ T(YAFFS_TRACE_OS, (" write %p\n", mtd->write));
-+ T(YAFFS_TRACE_OS, (" readoob %p\n", mtd->read_oob));
-+ T(YAFFS_TRACE_OS, (" writeoob %p\n", mtd->write_oob));
-+ T(YAFFS_TRACE_OS, (" block_isbad %p\n", mtd->block_isbad));
-+ T(YAFFS_TRACE_OS, (" block_markbad %p\n", mtd->block_markbad));
-+ T(YAFFS_TRACE_OS, (" %s %d\n", WRITE_SIZE_STR, WRITE_SIZE(mtd)));
-+ T(YAFFS_TRACE_OS, (" oobsize %d\n", mtd->oobsize));
-+ T(YAFFS_TRACE_OS, (" erasesize %d\n", mtd->erasesize));
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-+ T(YAFFS_TRACE_OS, (" size %u\n", mtd->size));
-+#else
-+ T(YAFFS_TRACE_OS, (" size %lld\n", mtd->size));
-+#endif
-+
-+#ifdef CONFIG_YAFFS_AUTO_YAFFS2
-+
-+ if (yaffsVersion == 1 && WRITE_SIZE(mtd) >= 2048) {
-+ T(YAFFS_TRACE_ALWAYS, ("yaffs: auto selecting yaffs2\n"));
-+ yaffsVersion = 2;
-+ }
-+
-+ /* Added NCB 26/5/2006 for completeness */
-+ if (yaffsVersion == 2 && !options.inband_tags && WRITE_SIZE(mtd) == 512) {
-+ T(YAFFS_TRACE_ALWAYS, ("yaffs: auto selecting yaffs1\n"));
-+ yaffsVersion = 1;
-+ }
-+
-+#endif
-+
-+ if (yaffsVersion == 2) {
-+ /* Check for version 2 style functions */
-+ if (!mtd->erase ||
-+ !mtd->block_isbad ||
-+ !mtd->block_markbad ||
-+ !mtd->read ||
-+ !mtd->write ||
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+ !mtd->read_oob || !mtd->write_oob) {
-+#else
-+ !mtd->write_ecc ||
-+ !mtd->read_ecc || !mtd->read_oob || !mtd->write_oob) {
-+#endif
-+ T(YAFFS_TRACE_ALWAYS,
-+ ("yaffs: MTD device does not support required "
-+ "functions\n"));;
-+ return NULL;
-+ }
-+
-+ if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
-+ mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) &&
-+ !options.inband_tags) {
-+ T(YAFFS_TRACE_ALWAYS,
-+ ("yaffs: MTD device does not have the "
-+ "right page sizes\n"));
-+ return NULL;
-+ }
-+ } else {
-+ /* Check for V1 style functions */
-+ if (!mtd->erase ||
-+ !mtd->read ||
-+ !mtd->write ||
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+ !mtd->read_oob || !mtd->write_oob) {
-+#else
-+ !mtd->write_ecc ||
-+ !mtd->read_ecc || !mtd->read_oob || !mtd->write_oob) {
-+#endif
-+ T(YAFFS_TRACE_ALWAYS,
-+ ("yaffs: MTD device does not support required "
-+ "functions\n"));;
-+ return NULL;
-+ }
-+
-+ if (WRITE_SIZE(mtd) < YAFFS_BYTES_PER_CHUNK ||
-+ mtd->oobsize != YAFFS_BYTES_PER_SPARE) {
-+ T(YAFFS_TRACE_ALWAYS,
-+ ("yaffs: MTD device does not support have the "
-+ "right page sizes\n"));
-+ return NULL;
-+ }
-+ }
-+
-+ /* OK, so if we got here, we have an MTD that's NAND and looks
-+ * like it has the right capabilities
-+ * Set the yaffs_Device up for mtd
-+ */
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+ sb->s_fs_info = dev = kmalloc(sizeof(yaffs_Device), GFP_KERNEL);
-+#else
-+ sb->u.generic_sbp = dev = kmalloc(sizeof(yaffs_Device), GFP_KERNEL);
-+#endif
-+ if (!dev) {
-+ /* Deep shit could not allocate device structure */
-+ T(YAFFS_TRACE_ALWAYS,
-+ ("yaffs_read_super: Failed trying to allocate "
-+ "yaffs_Device. \n"));
-+ return NULL;
-+ }
-+
-+ memset(dev, 0, sizeof(yaffs_Device));
-+ dev->genericDevice = mtd;
-+ dev->name = mtd->name;
-+
-+ /* Set up the memory size parameters.... */
-+
-+ nBlocks = YCALCBLOCKS(mtd->size, (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK));
-+
-+ dev->startBlock = 0;
-+ dev->endBlock = nBlocks - 1;
-+ dev->nChunksPerBlock = YAFFS_CHUNKS_PER_BLOCK;
-+ dev->totalBytesPerChunk = YAFFS_BYTES_PER_CHUNK;
-+ dev->nReservedBlocks = 5;
-+ dev->nShortOpCaches = (options.no_cache) ? 0 : 10;
-+ dev->inbandTags = options.inband_tags;
-+
-+ /* ... and the functions. */
-+ if (yaffsVersion == 2) {
-+ dev->writeChunkWithTagsToNAND =
-+ nandmtd2_WriteChunkWithTagsToNAND;
-+ dev->readChunkWithTagsFromNAND =
-+ nandmtd2_ReadChunkWithTagsFromNAND;
-+ dev->markNANDBlockBad = nandmtd2_MarkNANDBlockBad;
-+ dev->queryNANDBlock = nandmtd2_QueryNANDBlock;
-+ dev->spareBuffer = YMALLOC(mtd->oobsize);
-+ dev->isYaffs2 = 1;
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+ dev->totalBytesPerChunk = mtd->writesize;
-+ dev->nChunksPerBlock = mtd->erasesize / mtd->writesize;
-+#else
-+ dev->totalBytesPerChunk = mtd->oobblock;
-+ dev->nChunksPerBlock = mtd->erasesize / mtd->oobblock;
-+#endif
-+ nBlocks = YCALCBLOCKS(mtd->size, mtd->erasesize);
-+
-+ dev->startBlock = 0;
-+ dev->endBlock = nBlocks - 1;
-+ } else {
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+ /* use the MTD interface in yaffs_mtdif1.c */
-+ dev->writeChunkWithTagsToNAND =
-+ nandmtd1_WriteChunkWithTagsToNAND;
-+ dev->readChunkWithTagsFromNAND =
-+ nandmtd1_ReadChunkWithTagsFromNAND;
-+ dev->markNANDBlockBad = nandmtd1_MarkNANDBlockBad;
-+ dev->queryNANDBlock = nandmtd1_QueryNANDBlock;
-+#else
-+ dev->writeChunkToNAND = nandmtd_WriteChunkToNAND;
-+ dev->readChunkFromNAND = nandmtd_ReadChunkFromNAND;
-+#endif
-+ dev->isYaffs2 = 0;
-+ }
-+ /* ... and common functions */
-+ dev->eraseBlockInNAND = nandmtd_EraseBlockInNAND;
-+ dev->initialiseNAND = nandmtd_InitialiseNAND;
-+
-+ dev->putSuperFunc = yaffs_MTDPutSuper;
-+
-+ dev->superBlock = (void *)sb;
-+ dev->markSuperBlockDirty = yaffs_MarkSuperBlockDirty;
-+
-+
-+#ifndef CONFIG_YAFFS_DOES_ECC
-+ dev->useNANDECC = 1;
-+#endif
-+
-+#ifdef CONFIG_YAFFS_DISABLE_WIDE_TNODES
-+ dev->wideTnodesDisabled = 1;
-+#endif
-+
-+ dev->skipCheckpointRead = options.skip_checkpoint_read;
-+ dev->skipCheckpointWrite = options.skip_checkpoint_write;
-+
-+ /* we assume this is protected by lock_kernel() in mount/umount */
-+ ylist_add_tail(&dev->devList, &yaffs_dev_list);
-+
-+ init_MUTEX(&dev->grossLock);
-+
-+ yaffs_GrossLock(dev);
-+
-+ err = yaffs_GutsInitialise(dev);
-+
-+ T(YAFFS_TRACE_OS,
-+ ("yaffs_read_super: guts initialised %s\n",
-+ (err == YAFFS_OK) ? "OK" : "FAILED"));
-+
-+ /* Release lock before yaffs_get_inode() */
-+ yaffs_GrossUnlock(dev);
-+
-+ /* Create root inode */
-+ if (err == YAFFS_OK)
-+ inode = yaffs_get_inode(sb, S_IFDIR | 0755, 0,
-+ yaffs_Root(dev));
-+
-+ if (!inode)
-+ return NULL;
-+
-+ inode->i_op = &yaffs_dir_inode_operations;
-+ inode->i_fop = &yaffs_dir_operations;
-+
-+ T(YAFFS_TRACE_OS, ("yaffs_read_super: got root inode\n"));
-+
-+ root = d_alloc_root(inode);
-+
-+ T(YAFFS_TRACE_OS, ("yaffs_read_super: d_alloc_root done\n"));
-+
-+ if (!root) {
-+ iput(inode);
-+ return NULL;
-+ }
-+ sb->s_root = root;
-+ sb->s_dirt = !dev->isCheckpointed;
-+ T(YAFFS_TRACE_ALWAYS,
-+ ("yaffs_read_super: isCheckpointed %d\n", dev->isCheckpointed));
-+
-+ T(YAFFS_TRACE_OS, ("yaffs_read_super: done\n"));
-+ return sb;
-+}
-+
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+static int yaffs_internal_read_super_mtd(struct super_block *sb, void *data,
-+ int silent)
-+{
-+ return yaffs_internal_read_super(1, sb, data, silent) ? 0 : -EINVAL;
-+}
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+static int yaffs_read_super(struct file_system_type *fs,
-+ int flags, const char *dev_name,
-+ void *data, struct vfsmount *mnt)
-+{
-+
-+ return get_sb_bdev(fs, flags, dev_name, data,
-+ yaffs_internal_read_super_mtd, mnt);
-+}
-+#else
-+static struct super_block *yaffs_read_super(struct file_system_type *fs,
-+ int flags, const char *dev_name,
-+ void *data)
-+{
-+
-+ return get_sb_bdev(fs, flags, dev_name, data,
-+ yaffs_internal_read_super_mtd);
-+}
-+#endif
-+
-+static struct file_system_type yaffs_fs_type = {
-+ .owner = THIS_MODULE,
-+ .name = "yaffs",
-+ .get_sb = yaffs_read_super,
-+ .kill_sb = kill_block_super,
-+ .fs_flags = FS_REQUIRES_DEV,
++struct yaffs_ecc_other {
++ unsigned char col_parity;
++ unsigned line_parity;
++ unsigned line_parity_prime;
+};
-+#else
-+static struct super_block *yaffs_read_super(struct super_block *sb, void *data,
-+ int silent)
-+{
-+ return yaffs_internal_read_super(1, sb, data, silent);
-+}
-+
-+static DECLARE_FSTYPE(yaffs_fs_type, "yaffs", yaffs_read_super,
-+ FS_REQUIRES_DEV);
-+#endif
-+
-+
-+#ifdef CONFIG_YAFFS_YAFFS2
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+static int yaffs2_internal_read_super_mtd(struct super_block *sb, void *data,
-+ int silent)
-+{
-+ return yaffs_internal_read_super(2, sb, data, silent) ? 0 : -EINVAL;
-+}
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+static int yaffs2_read_super(struct file_system_type *fs,
-+ int flags, const char *dev_name, void *data,
-+ struct vfsmount *mnt)
-+{
-+ return get_sb_bdev(fs, flags, dev_name, data,
-+ yaffs2_internal_read_super_mtd, mnt);
-+}
-+#else
-+static struct super_block *yaffs2_read_super(struct file_system_type *fs,
-+ int flags, const char *dev_name,
-+ void *data)
-+{
+
-+ return get_sb_bdev(fs, flags, dev_name, data,
-+ yaffs2_internal_read_super_mtd);
-+}
-+#endif
-+
-+static struct file_system_type yaffs2_fs_type = {
-+ .owner = THIS_MODULE,
-+ .name = "yaffs2",
-+ .get_sb = yaffs2_read_super,
-+ .kill_sb = kill_block_super,
-+ .fs_flags = FS_REQUIRES_DEV,
-+};
-+#else
-+static struct super_block *yaffs2_read_super(struct super_block *sb,
-+ void *data, int silent)
-+{
-+ return yaffs_internal_read_super(2, sb, data, silent);
-+}
++void yaffs_ecc_cacl(const unsigned char *data, unsigned char *ecc);
++int yaffs_ecc_correct(unsigned char *data, unsigned char *read_ecc,
++ const unsigned char *test_ecc);
+
-+static DECLARE_FSTYPE(yaffs2_fs_type, "yaffs2", yaffs2_read_super,
-+ FS_REQUIRES_DEV);
++void yaffs_ecc_calc_other(const unsigned char *data, unsigned n_bytes,
++ struct yaffs_ecc_other *ecc);
++int yaffs_ecc_correct_other(unsigned char *data, unsigned n_bytes,
++ struct yaffs_ecc_other *read_ecc,
++ const struct yaffs_ecc_other *test_ecc);
+#endif
-+
-+#endif /* CONFIG_YAFFS_YAFFS2 */
-+
-+static struct proc_dir_entry *my_proc_entry;
-+
-+static char *yaffs_dump_dev(char *buf, yaffs_Device * dev)
-+{
-+ buf += sprintf(buf, "startBlock......... %d\n", dev->startBlock);
-+ buf += sprintf(buf, "endBlock........... %d\n", dev->endBlock);
-+ buf += sprintf(buf, "totalBytesPerChunk. %d\n", dev->totalBytesPerChunk);
-+ buf += sprintf(buf, "nDataBytesPerChunk. %d\n", dev->nDataBytesPerChunk);
-+ buf += sprintf(buf, "chunkGroupBits..... %d\n", dev->chunkGroupBits);
-+ buf += sprintf(buf, "chunkGroupSize..... %d\n", dev->chunkGroupSize);
-+ buf += sprintf(buf, "nErasedBlocks...... %d\n", dev->nErasedBlocks);
-+ buf += sprintf(buf, "nReservedBlocks.... %d\n", dev->nReservedBlocks);
-+ buf += sprintf(buf, "blocksInCheckpoint. %d\n", dev->blocksInCheckpoint);
-+ buf += sprintf(buf, "nTnodesCreated..... %d\n", dev->nTnodesCreated);
-+ buf += sprintf(buf, "nFreeTnodes........ %d\n", dev->nFreeTnodes);
-+ buf += sprintf(buf, "nObjectsCreated.... %d\n", dev->nObjectsCreated);
-+ buf += sprintf(buf, "nFreeObjects....... %d\n", dev->nFreeObjects);
-+ buf += sprintf(buf, "nFreeChunks........ %d\n", dev->nFreeChunks);
-+ buf += sprintf(buf, "nPageWrites........ %d\n", dev->nPageWrites);
-+ buf += sprintf(buf, "nPageReads......... %d\n", dev->nPageReads);
-+ buf += sprintf(buf, "nBlockErasures..... %d\n", dev->nBlockErasures);
-+ buf += sprintf(buf, "nGCCopies.......... %d\n", dev->nGCCopies);
-+ buf += sprintf(buf, "garbageCollections. %d\n", dev->garbageCollections);
-+ buf += sprintf(buf, "passiveGCs......... %d\n",
-+ dev->passiveGarbageCollections);
-+ buf += sprintf(buf, "nRetriedWrites..... %d\n", dev->nRetriedWrites);
-+ buf += sprintf(buf, "nShortOpCaches..... %d\n", dev->nShortOpCaches);
-+ buf += sprintf(buf, "nRetireBlocks...... %d\n", dev->nRetiredBlocks);
-+ buf += sprintf(buf, "eccFixed........... %d\n", dev->eccFixed);
-+ buf += sprintf(buf, "eccUnfixed......... %d\n", dev->eccUnfixed);
-+ buf += sprintf(buf, "tagsEccFixed....... %d\n", dev->tagsEccFixed);
-+ buf += sprintf(buf, "tagsEccUnfixed..... %d\n", dev->tagsEccUnfixed);
-+ buf += sprintf(buf, "cacheHits.......... %d\n", dev->cacheHits);
-+ buf += sprintf(buf, "nDeletedFiles...... %d\n", dev->nDeletedFiles);
-+ buf += sprintf(buf, "nUnlinkedFiles..... %d\n", dev->nUnlinkedFiles);
-+ buf +=
-+ sprintf(buf, "nBackgroudDeletions %d\n", dev->nBackgroundDeletions);
-+ buf += sprintf(buf, "useNANDECC......... %d\n", dev->useNANDECC);
-+ buf += sprintf(buf, "isYaffs2........... %d\n", dev->isYaffs2);
-+ buf += sprintf(buf, "inbandTags......... %d\n", dev->inbandTags);
-+
-+ return buf;
-+}
-+
-+static int yaffs_proc_read(char *page,
-+ char **start,
-+ off_t offset, int count, int *eof, void *data)
-+{
-+ struct ylist_head *item;
-+ char *buf = page;
-+ int step = offset;
-+ int n = 0;
-+
-+ /* Get proc_file_read() to step 'offset' by one on each sucessive call.
-+ * We use 'offset' (*ppos) to indicate where we are in devList.
-+ * This also assumes the user has posted a read buffer large
-+ * enough to hold the complete output; but that's life in /proc.
-+ */
-+
-+ *(int *)start = 1;
-+
-+ /* Print header first */
-+ if (step == 0) {
-+ buf += sprintf(buf, "YAFFS built:" __DATE__ " " __TIME__
-+ "\n%s\n%s\n", yaffs_fs_c_version,
-+ yaffs_guts_c_version);
-+ }
-+
-+ /* hold lock_kernel while traversing yaffs_dev_list */
-+ lock_kernel();
-+
-+ /* Locate and print the Nth entry. Order N-squared but N is small. */
-+ ylist_for_each(item, &yaffs_dev_list) {
-+ yaffs_Device *dev = ylist_entry(item, yaffs_Device, devList);
-+ if (n < step) {
-+ n++;
-+ continue;
-+ }
-+ buf += sprintf(buf, "\nDevice %d \"%s\"\n", n, dev->name);
-+ buf = yaffs_dump_dev(buf, dev);
-+ break;
-+ }
-+ unlock_kernel();
-+
-+ return buf - page < count ? buf - page : count;
-+}
-+
-+/**
-+ * Set the verbosity of the warnings and error messages.
-+ *
-+ * Note that the names can only be a..z or _ with the current code.
-+ */
-+
-+static struct {
-+ char *mask_name;
-+ unsigned mask_bitfield;
-+} mask_flags[] = {
-+ {"allocate", YAFFS_TRACE_ALLOCATE},
-+ {"always", YAFFS_TRACE_ALWAYS},
-+ {"bad_blocks", YAFFS_TRACE_BAD_BLOCKS},
-+ {"buffers", YAFFS_TRACE_BUFFERS},
-+ {"bug", YAFFS_TRACE_BUG},
-+ {"checkpt", YAFFS_TRACE_CHECKPOINT},
-+ {"deletion", YAFFS_TRACE_DELETION},
-+ {"erase", YAFFS_TRACE_ERASE},
-+ {"error", YAFFS_TRACE_ERROR},
-+ {"gc_detail", YAFFS_TRACE_GC_DETAIL},
-+ {"gc", YAFFS_TRACE_GC},
-+ {"mtd", YAFFS_TRACE_MTD},
-+ {"nandaccess", YAFFS_TRACE_NANDACCESS},
-+ {"os", YAFFS_TRACE_OS},
-+ {"scan_debug", YAFFS_TRACE_SCAN_DEBUG},
-+ {"scan", YAFFS_TRACE_SCAN},
-+ {"tracing", YAFFS_TRACE_TRACING},
-+
-+ {"verify", YAFFS_TRACE_VERIFY},
-+ {"verify_nand", YAFFS_TRACE_VERIFY_NAND},
-+ {"verify_full", YAFFS_TRACE_VERIFY_FULL},
-+ {"verify_all", YAFFS_TRACE_VERIFY_ALL},
-+
-+ {"write", YAFFS_TRACE_WRITE},
-+ {"all", 0xffffffff},
-+ {"none", 0},
-+ {NULL, 0},
-+};
-+
-+#define MAX_MASK_NAME_LENGTH 40
-+static int yaffs_proc_write(struct file *file, const char *buf,
-+ unsigned long count, void *data)
-+{
-+ unsigned rg = 0, mask_bitfield;
-+ char *end;
-+ char *mask_name;
-+ const char *x;
-+ char substring[MAX_MASK_NAME_LENGTH + 1];
-+ int i;
-+ int done = 0;
-+ int add, len = 0;
-+ int pos = 0;
-+
-+ rg = yaffs_traceMask;
-+
-+ while (!done && (pos < count)) {
-+ done = 1;
-+ while ((pos < count) && isspace(buf[pos]))
-+ pos++;
-+
-+ switch (buf[pos]) {
-+ case '+':
-+ case '-':
-+ case '=':
-+ add = buf[pos];
-+ pos++;
-+ break;
-+
-+ default:
-+ add = ' ';
-+ break;
-+ }
-+ mask_name = NULL;
-+
-+ mask_bitfield = simple_strtoul(buf + pos, &end, 0);
-+
-+ if (end > buf + pos) {
-+ mask_name = "numeral";
-+ len = end - (buf + pos);
-+ pos += len;
-+ done = 0;
-+ } else {
-+ for (x = buf + pos, i = 0;
-+ (*x == '_' || (*x >= 'a' && *x <= 'z')) &&
-+ i < MAX_MASK_NAME_LENGTH; x++, i++, pos++)
-+ substring[i] = *x;
-+ substring[i] = '\0';
-+
-+ for (i = 0; mask_flags[i].mask_name != NULL; i++) {
-+ if (strcmp(substring, mask_flags[i].mask_name) == 0) {
-+ mask_name = mask_flags[i].mask_name;
-+ mask_bitfield = mask_flags[i].mask_bitfield;
-+ done = 0;
-+ break;
-+ }
-+ }
-+ }
-+
-+ if (mask_name != NULL) {
-+ done = 0;
-+ switch (add) {
-+ case '-':
-+ rg &= ~mask_bitfield;
-+ break;
-+ case '+':
-+ rg |= mask_bitfield;
-+ break;
-+ case '=':
-+ rg = mask_bitfield;
-+ break;
-+ default:
-+ rg |= mask_bitfield;
-+ break;
-+ }
-+ }
-+ }
-+
-+ yaffs_traceMask = rg | YAFFS_TRACE_ALWAYS;
-+
-+ printk(KERN_DEBUG "new trace = 0x%08X\n", yaffs_traceMask);
-+
-+ if (rg & YAFFS_TRACE_ALWAYS) {
-+ for (i = 0; mask_flags[i].mask_name != NULL; i++) {
-+ char flag;
-+ flag = ((rg & mask_flags[i].mask_bitfield) == mask_flags[i].mask_bitfield) ? '+' : '-';
-+ printk(KERN_DEBUG "%c%s\n", flag, mask_flags[i].mask_name);
-+ }
-+ }
-+
-+ return count;
-+}
-+
-+/* Stuff to handle installation of file systems */
-+struct file_system_to_install {
-+ struct file_system_type *fst;
-+ int installed;
-+};
-+
-+static struct file_system_to_install fs_to_install[] = {
-+ {&yaffs_fs_type, 0},
-+ {&yaffs2_fs_type, 0},
-+ {NULL, 0}
-+};
-+
-+static int __init init_yaffs_fs(void)
-+{
-+ int error = 0;
-+ struct file_system_to_install *fsinst;
-+
-+ T(YAFFS_TRACE_ALWAYS,
-+ ("yaffs " __DATE__ " " __TIME__ " Installing. \n"));
-+
-+ /* Install the proc_fs entry */
-+ my_proc_entry = create_proc_entry("yaffs",
-+ S_IRUGO | S_IFREG,
-+ YPROC_ROOT);
-+
-+ if (my_proc_entry) {
-+ my_proc_entry->write_proc = yaffs_proc_write;
-+ my_proc_entry->read_proc = yaffs_proc_read;
-+ my_proc_entry->data = NULL;
-+ } else
-+ return -ENOMEM;
-+
-+ /* Now add the file system entries */
-+
-+ fsinst = fs_to_install;
-+
-+ while (fsinst->fst && !error) {
-+ error = register_filesystem(fsinst->fst);
-+ if (!error)
-+ fsinst->installed = 1;
-+ fsinst++;
-+ }
-+
-+ /* Any errors? uninstall */
-+ if (error) {
-+ fsinst = fs_to_install;
-+
-+ while (fsinst->fst) {
-+ if (fsinst->installed) {
-+ unregister_filesystem(fsinst->fst);
-+ fsinst->installed = 0;
-+ }
-+ fsinst++;
-+ }
-+ }
-+
-+ return error;
-+}
-+
-+static void __exit exit_yaffs_fs(void)
-+{
-+
-+ struct file_system_to_install *fsinst;
-+
-+ T(YAFFS_TRACE_ALWAYS, ("yaffs " __DATE__ " " __TIME__
-+ " removing. \n"));
-+
-+ remove_proc_entry("yaffs", YPROC_ROOT);
-+
-+ fsinst = fs_to_install;
-+
-+ while (fsinst->fst) {
-+ if (fsinst->installed) {
-+ unregister_filesystem(fsinst->fst);
-+ fsinst->installed = 0;
-+ }
-+ fsinst++;
-+ }
-+}
-+
-+module_init(init_yaffs_fs)
-+module_exit(exit_yaffs_fs)
-+
-+MODULE_DESCRIPTION("YAFFS2 - a NAND specific flash file system");
-+MODULE_AUTHOR("Charles Manning, Aleph One Ltd., 2002-2006");
-+MODULE_LICENSE("GPL");
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_getblockinfo.h linux-2.6.34/fs/yaffs2/yaffs_getblockinfo.h
---- linux-2.6.34.orig/fs/yaffs2/yaffs_getblockinfo.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffs_getblockinfo.h 2010-05-20 20:16:22.281614392 +0200
-@@ -0,0 +1,34 @@
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_getblockinfo.h linux-2.6.36/fs/yaffs2/yaffs_getblockinfo.h
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_getblockinfo.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_getblockinfo.h 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,36 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
++ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
@@ -3966,29 +1886,31 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_getblockinfo.h linux-2.6.34/fs/yaffs
+#define __YAFFS_GETBLOCKINFO_H__
+
+#include "yaffs_guts.h"
++#include "yaffs_trace.h"
+
+/* Function to manipulate block info */
-+static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk)
++static Y_INLINE struct yaffs_block_info *yaffs_get_block_info(struct yaffs_dev
++ *dev, int blk)
+{
-+ if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
++ if (blk < dev->internal_start_block || blk > dev->internal_end_block) {
+ T(YAFFS_TRACE_ERROR,
+ (TSTR
-+ ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),
++ ("**>> yaffs: get_block_info block %d is not valid" TENDSTR),
+ blk));
+ YBUG();
+ }
-+ return &dev->blockInfo[blk - dev->internalStartBlock];
++ return &dev->block_info[blk - dev->internal_start_block];
+}
+
+#endif
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_guts.c
---- linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffs_guts.c 2010-05-20 20:16:22.301615823 +0200
-@@ -0,0 +1,7552 @@
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_guts.c linux-2.6.36/fs/yaffs2/yaffs_guts.c
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_guts.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_guts.c 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,5227 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
++ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
@@ -3998,134 +1920,119 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ * published by the Free Software Foundation.
+ */
+
-+const char *yaffs_guts_c_version =
-+ "$Id: yaffs_guts.c,v 1.82 2009-03-09 04:24:17 charles Exp $";
-+
+#include "yportenv.h"
++#include "yaffs_trace.h"
+
-+#include "yaffsinterface.h"
+#include "yaffs_guts.h"
+#include "yaffs_tagsvalidity.h"
+#include "yaffs_getblockinfo.h"
+
+#include "yaffs_tagscompat.h"
-+#ifndef CONFIG_YAFFS_USE_OWN_SORT
-+#include "yaffs_qsort.h"
-+#endif
++
+#include "yaffs_nand.h"
+
-+#include "yaffs_checkptrw.h"
++#include "yaffs_yaffs1.h"
++#include "yaffs_yaffs2.h"
++#include "yaffs_bitmap.h"
++#include "yaffs_verify.h"
+
+#include "yaffs_nand.h"
+#include "yaffs_packedtags2.h"
+
++#include "yaffs_nameval.h"
++#include "yaffs_allocator.h"
+
-+#define YAFFS_PASSIVE_GC_CHUNKS 2
++#include "yaffs_attribs.h"
+
-+#include "yaffs_ecc.h"
++/* Note YAFFS_GC_GOOD_ENOUGH must be <= YAFFS_GC_PASSIVE_THRESHOLD */
++#define YAFFS_GC_GOOD_ENOUGH 2
++#define YAFFS_GC_PASSIVE_THRESHOLD 4
+
++#include "yaffs_ecc.h"
+
+/* Robustification (if it ever comes about...) */
-+static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND);
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND,
-+ int erasedOk);
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+ const __u8 *data,
-+ const yaffs_ExtendedTags *tags);
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+ const yaffs_ExtendedTags *tags);
++static void yaffs_retire_block(struct yaffs_dev *dev, int flash_block);
++static void yaffs_handle_chunk_wr_error(struct yaffs_dev *dev, int nand_chunk,
++ int erased_ok);
++static void yaffs_handle_chunk_wr_ok(struct yaffs_dev *dev, int nand_chunk,
++ const u8 * data,
++ const struct yaffs_ext_tags *tags);
++static void yaffs_handle_chunk_update(struct yaffs_dev *dev, int nand_chunk,
++ const struct yaffs_ext_tags *tags);
+
+/* Other local prototypes */
-+static int yaffs_UnlinkObject(yaffs_Object *obj);
-+static int yaffs_ObjectHasCachedWriteData(yaffs_Object *obj);
-+
-+static void yaffs_HardlinkFixup(yaffs_Device *dev, yaffs_Object *hardList);
++static void yaffs_update_parent(struct yaffs_obj *obj);
++static int yaffs_unlink_obj(struct yaffs_obj *obj);
++static int yaffs_obj_cache_dirty(struct yaffs_obj *obj);
+
-+static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device *dev,
-+ const __u8 *buffer,
-+ yaffs_ExtendedTags *tags,
-+ int useReserve);
-+static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
-+ int chunkInNAND, int inScan);
++static int yaffs_write_new_chunk(struct yaffs_dev *dev,
++ const u8 * buffer,
++ struct yaffs_ext_tags *tags, int use_reserver);
+
-+static yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number,
-+ yaffs_ObjectType type);
-+static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
-+ yaffs_Object *obj);
-+static int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name,
-+ int force, int isShrink, int shadows);
-+static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj);
-+static int yaffs_CheckStructures(void);
-+static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level,
-+ int chunkOffset, int *limit);
-+static int yaffs_DoGenericObjectDeletion(yaffs_Object *in);
++static struct yaffs_obj *yaffs_new_obj(struct yaffs_dev *dev, int number,
++ enum yaffs_obj_type type);
+
-+static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device *dev, int blockNo);
++static int yaffs_apply_xattrib_mod(struct yaffs_obj *obj, char *buffer,
++ struct yaffs_xattr_mod *xmod);
+
++static void yaffs_remove_obj_from_dir(struct yaffs_obj *obj);
++static int yaffs_generic_obj_del(struct yaffs_obj *in);
+
-+static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
-+ int chunkInNAND);
++static int yaffs_check_chunk_erased(struct yaffs_dev *dev, int nand_chunk);
+
-+static int yaffs_UnlinkWorker(yaffs_Object *obj);
++static int yaffs_unlink_worker(struct yaffs_obj *obj);
+
-+static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId,
-+ int chunkInObject);
++static int yaffs_tags_match(const struct yaffs_ext_tags *tags, int obj_id,
++ int chunk_obj);
+
-+static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
-+ yaffs_BlockInfo **blockUsedPtr);
++static int yaffs_alloc_chunk(struct yaffs_dev *dev, int use_reserver,
++ struct yaffs_block_info **block_ptr);
+
-+static void yaffs_VerifyFreeChunks(yaffs_Device *dev);
++static void yaffs_check_obj_details_loaded(struct yaffs_obj *in);
+
-+static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in);
++static void yaffs_invalidate_whole_cache(struct yaffs_obj *in);
++static void yaffs_invalidate_chunk_cache(struct yaffs_obj *object,
++ int chunk_id);
+
-+static void yaffs_VerifyDirectory(yaffs_Object *directory);
-+#ifdef YAFFS_PARANOID
-+static int yaffs_CheckFileSanity(yaffs_Object *in);
-+#else
-+#define yaffs_CheckFileSanity(in)
-+#endif
++static int yaffs_find_chunk_in_file(struct yaffs_obj *in, int inode_chunk,
++ struct yaffs_ext_tags *tags);
+
-+static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in);
-+static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId);
-+
-+static void yaffs_InvalidateCheckpoint(yaffs_Device *dev);
-+
-+static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
-+ yaffs_ExtendedTags *tags);
-+
-+static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
-+ unsigned pos);
-+static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
-+ yaffs_FileStructure *fStruct,
-+ __u32 chunkId);
++static int yaffs_verify_chunk_written(struct yaffs_dev *dev,
++ int nand_chunk,
++ const u8 * data,
++ struct yaffs_ext_tags *tags);
+
++static void yaffs_load_name_from_oh(struct yaffs_dev *dev, YCHAR * name,
++ const YCHAR * oh_name, int buff_size);
++static void yaffs_load_oh_from_name(struct yaffs_dev *dev, YCHAR * oh_name,
++ const YCHAR * name);
+
+/* Function to calculate chunk and offset */
+
-+static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, int *chunkOut,
-+ __u32 *offsetOut)
++static void yaffs_addr_to_chunk(struct yaffs_dev *dev, loff_t addr,
++ int *chunk_out, u32 * offset_out)
+{
+ int chunk;
-+ __u32 offset;
++ u32 offset;
+
-+ chunk = (__u32)(addr >> dev->chunkShift);
++ chunk = (u32) (addr >> dev->chunk_shift);
+
-+ if (dev->chunkDiv == 1) {
++ if (dev->chunk_div == 1) {
+ /* easy power of 2 case */
-+ offset = (__u32)(addr & dev->chunkMask);
++ offset = (u32) (addr & dev->chunk_mask);
+ } else {
+ /* Non power-of-2 case */
+
-+ loff_t chunkBase;
++ loff_t chunk_base;
+
-+ chunk /= dev->chunkDiv;
++ chunk /= dev->chunk_div;
+
-+ chunkBase = ((loff_t)chunk) * dev->nDataBytesPerChunk;
-+ offset = (__u32)(addr - chunkBase);
++ chunk_base = ((loff_t) chunk) * dev->data_bytes_per_chunk;
++ offset = (u32) (addr - chunk_base);
+ }
+
-+ *chunkOut = chunk;
-+ *offsetOut = offset;
++ *chunk_out = chunk;
++ *offset_out = offset;
+}
+
+/* Function to return the number of shifts for a power of 2 greater than or
@@ -4134,95 +2041,94 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ * be hellishly efficient.
+ */
+
-+static __u32 ShiftsGE(__u32 x)
++static u32 calc_shifts_ceiling(u32 x)
+{
-+ int extraBits;
-+ int nShifts;
++ int extra_bits;
++ int shifts;
+
-+ nShifts = extraBits = 0;
++ shifts = extra_bits = 0;
+
+ while (x > 1) {
+ if (x & 1)
-+ extraBits++;
++ extra_bits++;
+ x >>= 1;
-+ nShifts++;
++ shifts++;
+ }
+
-+ if (extraBits)
-+ nShifts++;
++ if (extra_bits)
++ shifts++;
+
-+ return nShifts;
++ return shifts;
+}
+
+/* Function to return the number of shifts to get a 1 in bit 0
+ */
+
-+static __u32 Shifts(__u32 x)
++static u32 calc_shifts(u32 x)
+{
-+ int nShifts;
++ u32 shifts;
+
-+ nShifts = 0;
++ shifts = 0;
+
+ if (!x)
+ return 0;
+
-+ while (!(x&1)) {
++ while (!(x & 1)) {
+ x >>= 1;
-+ nShifts++;
++ shifts++;
+ }
+
-+ return nShifts;
++ return shifts;
+}
+
-+
-+
+/*
+ * Temporary buffer manipulations.
+ */
+
-+static int yaffs_InitialiseTempBuffers(yaffs_Device *dev)
++static int yaffs_init_tmp_buffers(struct yaffs_dev *dev)
+{
+ int i;
-+ __u8 *buf = (__u8 *)1;
++ u8 *buf = (u8 *) 1;
+
-+ memset(dev->tempBuffer, 0, sizeof(dev->tempBuffer));
++ memset(dev->temp_buffer, 0, sizeof(dev->temp_buffer));
+
+ for (i = 0; buf && i < YAFFS_N_TEMP_BUFFERS; i++) {
-+ dev->tempBuffer[i].line = 0; /* not in use */
-+ dev->tempBuffer[i].buffer = buf =
-+ YMALLOC_DMA(dev->totalBytesPerChunk);
++ dev->temp_buffer[i].line = 0; /* not in use */
++ dev->temp_buffer[i].buffer = buf =
++ YMALLOC_DMA(dev->param.total_bytes_per_chunk);
+ }
+
+ return buf ? YAFFS_OK : YAFFS_FAIL;
+}
+
-+__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo)
++u8 *yaffs_get_temp_buffer(struct yaffs_dev * dev, int line_no)
+{
+ int i, j;
+
-+ dev->tempInUse++;
-+ if (dev->tempInUse > dev->maxTemp)
-+ dev->maxTemp = dev->tempInUse;
++ dev->temp_in_use++;
++ if (dev->temp_in_use > dev->max_temp)
++ dev->max_temp = dev->temp_in_use;
+
+ for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-+ if (dev->tempBuffer[i].line == 0) {
-+ dev->tempBuffer[i].line = lineNo;
-+ if ((i + 1) > dev->maxTemp) {
-+ dev->maxTemp = i + 1;
++ if (dev->temp_buffer[i].line == 0) {
++ dev->temp_buffer[i].line = line_no;
++ if ((i + 1) > dev->max_temp) {
++ dev->max_temp = i + 1;
+ for (j = 0; j <= i; j++)
-+ dev->tempBuffer[j].maxLine =
-+ dev->tempBuffer[j].line;
++ dev->temp_buffer[j].max_line =
++ dev->temp_buffer[j].line;
+ }
+
-+ return dev->tempBuffer[i].buffer;
++ return dev->temp_buffer[i].buffer;
+ }
+ }
+
+ T(YAFFS_TRACE_BUFFERS,
+ (TSTR("Out of temp buffers at line %d, other held by lines:"),
-+ lineNo));
++ line_no));
+ for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
-+ T(YAFFS_TRACE_BUFFERS, (TSTR(" %d "), dev->tempBuffer[i].line));
++ T(YAFFS_TRACE_BUFFERS,
++ (TSTR(" %d "), dev->temp_buffer[i].line));
+
+ T(YAFFS_TRACE_BUFFERS, (TSTR(" " TENDSTR)));
+
@@ -4231,21 +2137,20 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ * This is not good.
+ */
+
-+ dev->unmanagedTempAllocations++;
-+ return YMALLOC(dev->nDataBytesPerChunk);
++ dev->unmanaged_buffer_allocs++;
++ return YMALLOC(dev->data_bytes_per_chunk);
+
+}
+
-+void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer,
-+ int lineNo)
++void yaffs_release_temp_buffer(struct yaffs_dev *dev, u8 * buffer, int line_no)
+{
+ int i;
+
-+ dev->tempInUse--;
++ dev->temp_in_use--;
+
+ for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-+ if (dev->tempBuffer[i].buffer == buffer) {
-+ dev->tempBuffer[i].line = 0;
++ if (dev->temp_buffer[i].buffer == buffer) {
++ dev->temp_buffer[i].line = 0;
+ return;
+ }
+ }
@@ -4254,9 +2159,9 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ /* assume it is an unmanaged one. */
+ T(YAFFS_TRACE_BUFFERS,
+ (TSTR("Releasing unmanaged temp buffer in line %d" TENDSTR),
-+ lineNo));
++ line_no));
+ YFREE(buffer);
-+ dev->unmanagedTempDeallocations++;
++ dev->unmanaged_buffer_deallocs++;
+ }
+
+}
@@ -4264,586 +2169,37 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+/*
+ * Determine if we have a managed buffer.
+ */
-+int yaffs_IsManagedTempBuffer(yaffs_Device *dev, const __u8 *buffer)
++int yaffs_is_managed_tmp_buffer(struct yaffs_dev *dev, const u8 * buffer)
+{
+ int i;
+
+ for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-+ if (dev->tempBuffer[i].buffer == buffer)
++ if (dev->temp_buffer[i].buffer == buffer)
+ return 1;
+ }
+
-+ for (i = 0; i < dev->nShortOpCaches; i++) {
-+ if (dev->srCache[i].data == buffer)
++ for (i = 0; i < dev->param.n_caches; i++) {
++ if (dev->cache[i].data == buffer)
+ return 1;
+ }
+
-+ if (buffer == dev->checkpointBuffer)
++ if (buffer == dev->checkpt_buffer)
+ return 1;
+
+ T(YAFFS_TRACE_ALWAYS,
-+ (TSTR("yaffs: unmaged buffer detected.\n" TENDSTR)));
++ (TSTR("yaffs: unmaged buffer detected.\n" TENDSTR)));
+ return 0;
+}
+
-+
-+
-+/*
-+ * Chunk bitmap manipulations
-+ */
-+
-+static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device *dev, int blk)
-+{
-+ if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
-+ T(YAFFS_TRACE_ERROR,
-+ (TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
-+ blk));
-+ YBUG();
-+ }
-+ return dev->chunkBits +
-+ (dev->chunkBitmapStride * (blk - dev->internalStartBlock));
-+}
-+
-+static Y_INLINE void yaffs_VerifyChunkBitId(yaffs_Device *dev, int blk, int chunk)
-+{
-+ if (blk < dev->internalStartBlock || blk > dev->internalEndBlock ||
-+ chunk < 0 || chunk >= dev->nChunksPerBlock) {
-+ T(YAFFS_TRACE_ERROR,
-+ (TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),
-+ blk, chunk));
-+ YBUG();
-+ }
-+}
-+
-+static Y_INLINE void yaffs_ClearChunkBits(yaffs_Device *dev, int blk)
-+{
-+ __u8 *blkBits = yaffs_BlockBits(dev, blk);
-+
-+ memset(blkBits, 0, dev->chunkBitmapStride);
-+}
-+
-+static Y_INLINE void yaffs_ClearChunkBit(yaffs_Device *dev, int blk, int chunk)
-+{
-+ __u8 *blkBits = yaffs_BlockBits(dev, blk);
-+
-+ yaffs_VerifyChunkBitId(dev, blk, chunk);
-+
-+ blkBits[chunk / 8] &= ~(1 << (chunk & 7));
-+}
-+
-+static Y_INLINE void yaffs_SetChunkBit(yaffs_Device *dev, int blk, int chunk)
-+{
-+ __u8 *blkBits = yaffs_BlockBits(dev, blk);
-+
-+ yaffs_VerifyChunkBitId(dev, blk, chunk);
-+
-+ blkBits[chunk / 8] |= (1 << (chunk & 7));
-+}
-+
-+static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device *dev, int blk, int chunk)
-+{
-+ __u8 *blkBits = yaffs_BlockBits(dev, blk);
-+ yaffs_VerifyChunkBitId(dev, blk, chunk);
-+
-+ return (blkBits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
-+}
-+
-+static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device *dev, int blk)
-+{
-+ __u8 *blkBits = yaffs_BlockBits(dev, blk);
-+ int i;
-+ for (i = 0; i < dev->chunkBitmapStride; i++) {
-+ if (*blkBits)
-+ return 1;
-+ blkBits++;
-+ }
-+ return 0;
-+}
-+
-+static int yaffs_CountChunkBits(yaffs_Device *dev, int blk)
-+{
-+ __u8 *blkBits = yaffs_BlockBits(dev, blk);
-+ int i;
-+ int n = 0;
-+ for (i = 0; i < dev->chunkBitmapStride; i++) {
-+ __u8 x = *blkBits;
-+ while (x) {
-+ if (x & 1)
-+ n++;
-+ x >>= 1;
-+ }
-+
-+ blkBits++;
-+ }
-+ return n;
-+}
-+
+/*
+ * Verification code
+ */
+
-+static int yaffs_SkipVerification(yaffs_Device *dev)
-+{
-+ return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY | YAFFS_TRACE_VERIFY_FULL));
-+}
-+
-+static int yaffs_SkipFullVerification(yaffs_Device *dev)
-+{
-+ return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY_FULL));
-+}
-+
-+static int yaffs_SkipNANDVerification(yaffs_Device *dev)
-+{
-+ return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY_NAND));
-+}
-+
-+static const char *blockStateName[] = {
-+"Unknown",
-+"Needs scanning",
-+"Scanning",
-+"Empty",
-+"Allocating",
-+"Full",
-+"Dirty",
-+"Checkpoint",
-+"Collecting",
-+"Dead"
-+};
-+
-+static void yaffs_VerifyBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n)
-+{
-+ int actuallyUsed;
-+ int inUse;
-+
-+ if (yaffs_SkipVerification(dev))
-+ return;
-+
-+ /* Report illegal runtime states */
-+ if (bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
-+ T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has undefined state %d"TENDSTR), n, bi->blockState));
-+
-+ switch (bi->blockState) {
-+ case YAFFS_BLOCK_STATE_UNKNOWN:
-+ case YAFFS_BLOCK_STATE_SCANNING:
-+ case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
-+ T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has bad run-state %s"TENDSTR),
-+ n, blockStateName[bi->blockState]));
-+ }
-+
-+ /* Check pages in use and soft deletions are legal */
-+
-+ actuallyUsed = bi->pagesInUse - bi->softDeletions;
-+
-+ if (bi->pagesInUse < 0 || bi->pagesInUse > dev->nChunksPerBlock ||
-+ bi->softDeletions < 0 || bi->softDeletions > dev->nChunksPerBlock ||
-+ actuallyUsed < 0 || actuallyUsed > dev->nChunksPerBlock)
-+ T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
-+ n, bi->pagesInUse, bi->softDeletions));
-+
-+
-+ /* Check chunk bitmap legal */
-+ inUse = yaffs_CountChunkBits(dev, n);
-+ if (inUse != bi->pagesInUse)
-+ T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
-+ n, bi->pagesInUse, inUse));
-+
-+ /* Check that the sequence number is valid.
-+ * Ten million is legal, but is very unlikely
-+ */
-+ if (dev->isYaffs2 &&
-+ (bi->blockState == YAFFS_BLOCK_STATE_ALLOCATING || bi->blockState == YAFFS_BLOCK_STATE_FULL) &&
-+ (bi->sequenceNumber < YAFFS_LOWEST_SEQUENCE_NUMBER || bi->sequenceNumber > 10000000))
-+ T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has suspect sequence number of %d"TENDSTR),
-+ n, bi->sequenceNumber));
-+}
-+
-+static void yaffs_VerifyCollectedBlock(yaffs_Device *dev, yaffs_BlockInfo *bi,
-+ int n)
-+{
-+ yaffs_VerifyBlock(dev, bi, n);
-+
-+ /* After collection the block should be in the erased state */
-+ /* This will need to change if we do partial gc */
-+
-+ if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING &&
-+ bi->blockState != YAFFS_BLOCK_STATE_EMPTY) {
-+ T(YAFFS_TRACE_ERROR, (TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
-+ n, bi->blockState));
-+ }
-+}
-+
-+static void yaffs_VerifyBlocks(yaffs_Device *dev)
-+{
-+ int i;
-+ int nBlocksPerState[YAFFS_NUMBER_OF_BLOCK_STATES];
-+ int nIllegalBlockStates = 0;
-+
-+ if (yaffs_SkipVerification(dev))
-+ return;
-+
-+ memset(nBlocksPerState, 0, sizeof(nBlocksPerState));
-+
-+ for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-+ yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+ yaffs_VerifyBlock(dev, bi, i);
-+
-+ if (bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
-+ nBlocksPerState[bi->blockState]++;
-+ else
-+ nIllegalBlockStates++;
-+ }
-+
-+ T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
-+ T(YAFFS_TRACE_VERIFY, (TSTR("Block summary"TENDSTR)));
-+
-+ T(YAFFS_TRACE_VERIFY, (TSTR("%d blocks have illegal states"TENDSTR), nIllegalBlockStates));
-+ if (nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
-+ T(YAFFS_TRACE_VERIFY, (TSTR("Too many allocating blocks"TENDSTR)));
-+
-+ for (i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
-+ T(YAFFS_TRACE_VERIFY,
-+ (TSTR("%s %d blocks"TENDSTR),
-+ blockStateName[i], nBlocksPerState[i]));
-+
-+ if (dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
-+ T(YAFFS_TRACE_VERIFY,
-+ (TSTR("Checkpoint block count wrong dev %d count %d"TENDSTR),
-+ dev->blocksInCheckpoint, nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT]));
-+
-+ if (dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
-+ T(YAFFS_TRACE_VERIFY,
-+ (TSTR("Erased block count wrong dev %d count %d"TENDSTR),
-+ dev->nErasedBlocks, nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY]));
-+
-+ if (nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
-+ T(YAFFS_TRACE_VERIFY,
-+ (TSTR("Too many collecting blocks %d (max is 1)"TENDSTR),
-+ nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING]));
-+
-+ T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
-+
-+}
-+
-+/*
-+ * Verify the object header. oh must be valid, but obj and tags may be NULL in which
-+ * case those tests will not be performed.
-+ */
-+static void yaffs_VerifyObjectHeader(yaffs_Object *obj, yaffs_ObjectHeader *oh, yaffs_ExtendedTags *tags, int parentCheck)
-+{
-+ if (obj && yaffs_SkipVerification(obj->myDev))
-+ return;
-+
-+ if (!(tags && obj && oh)) {
-+ T(YAFFS_TRACE_VERIFY,
-+ (TSTR("Verifying object header tags %x obj %x oh %x"TENDSTR),
-+ (__u32)tags, (__u32)obj, (__u32)oh));
-+ return;
-+ }
-+
-+ if (oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
-+ oh->type > YAFFS_OBJECT_TYPE_MAX)
-+ T(YAFFS_TRACE_VERIFY,
-+ (TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
-+ tags->objectId, oh->type));
-+
-+ if (tags->objectId != obj->objectId)
-+ T(YAFFS_TRACE_VERIFY,
-+ (TSTR("Obj %d header mismatch objectId %d"TENDSTR),
-+ tags->objectId, obj->objectId));
-+
-+
-+ /*
-+ * Check that the object's parent ids match if parentCheck requested.
-+ *
-+ * Tests do not apply to the root object.
-+ */
-+
-+ if (parentCheck && tags->objectId > 1 && !obj->parent)
-+ T(YAFFS_TRACE_VERIFY,
-+ (TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
-+ tags->objectId, oh->parentObjectId));
-+
-+ if (parentCheck && obj->parent &&
-+ oh->parentObjectId != obj->parent->objectId &&
-+ (oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
-+ obj->parent->objectId != YAFFS_OBJECTID_DELETED))
-+ T(YAFFS_TRACE_VERIFY,
-+ (TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
-+ tags->objectId, oh->parentObjectId, obj->parent->objectId));
-+
-+ if (tags->objectId > 1 && oh->name[0] == 0) /* Null name */
-+ T(YAFFS_TRACE_VERIFY,
-+ (TSTR("Obj %d header name is NULL"TENDSTR),
-+ obj->objectId));
-+
-+ if (tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
-+ T(YAFFS_TRACE_VERIFY,
-+ (TSTR("Obj %d header name is 0xFF"TENDSTR),
-+ obj->objectId));
-+}
-+
-+
-+
-+static int yaffs_VerifyTnodeWorker(yaffs_Object *obj, yaffs_Tnode *tn,
-+ __u32 level, int chunkOffset)
-+{
-+ int i;
-+ yaffs_Device *dev = obj->myDev;
-+ int ok = 1;
-+
-+ if (tn) {
-+ if (level > 0) {
-+
-+ for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
-+ if (tn->internal[i]) {
-+ ok = yaffs_VerifyTnodeWorker(obj,
-+ tn->internal[i],
-+ level - 1,
-+ (chunkOffset<<YAFFS_TNODES_INTERNAL_BITS) + i);
-+ }
-+ }
-+ } else if (level == 0) {
-+ yaffs_ExtendedTags tags;
-+ __u32 objectId = obj->objectId;
-+
-+ chunkOffset <<= YAFFS_TNODES_LEVEL0_BITS;
-+
-+ for (i = 0; i < YAFFS_NTNODES_LEVEL0; i++) {
-+ __u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
-+
-+ if (theChunk > 0) {
-+ /* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),tags.objectId,tags.chunkId,theChunk)); */
-+ yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
-+ if (tags.objectId != objectId || tags.chunkId != chunkOffset) {
-+ T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-+ objectId, chunkOffset, theChunk,
-+ tags.objectId, tags.chunkId));
-+ }
-+ }
-+ chunkOffset++;
-+ }
-+ }
-+ }
-+
-+ return ok;
-+
-+}
-+
-+
-+static void yaffs_VerifyFile(yaffs_Object *obj)
-+{
-+ int requiredTallness;
-+ int actualTallness;
-+ __u32 lastChunk;
-+ __u32 x;
-+ __u32 i;
-+ yaffs_Device *dev;
-+ yaffs_ExtendedTags tags;
-+ yaffs_Tnode *tn;
-+ __u32 objectId;
-+
-+ if (!obj)
-+ return;
-+
-+ if (yaffs_SkipVerification(obj->myDev))
-+ return;
-+
-+ dev = obj->myDev;
-+ objectId = obj->objectId;
-+
-+ /* Check file size is consistent with tnode depth */
-+ lastChunk = obj->variant.fileVariant.fileSize / dev->nDataBytesPerChunk + 1;
-+ x = lastChunk >> YAFFS_TNODES_LEVEL0_BITS;
-+ requiredTallness = 0;
-+ while (x > 0) {
-+ x >>= YAFFS_TNODES_INTERNAL_BITS;
-+ requiredTallness++;
-+ }
-+
-+ actualTallness = obj->variant.fileVariant.topLevel;
-+
-+ if (requiredTallness > actualTallness)
-+ T(YAFFS_TRACE_VERIFY,
-+ (TSTR("Obj %d had tnode tallness %d, needs to be %d"TENDSTR),
-+ obj->objectId, actualTallness, requiredTallness));
-+
-+
-+ /* Check that the chunks in the tnode tree are all correct.
-+ * We do this by scanning through the tnode tree and
-+ * checking the tags for every chunk match.
-+ */
-+
-+ if (yaffs_SkipNANDVerification(dev))
-+ return;
-+
-+ for (i = 1; i <= lastChunk; i++) {
-+ tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant, i);
-+
-+ if (tn) {
-+ __u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
-+ if (theChunk > 0) {
-+ /* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),objectId,i,theChunk)); */
-+ yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
-+ if (tags.objectId != objectId || tags.chunkId != i) {
-+ T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-+ objectId, i, theChunk,
-+ tags.objectId, tags.chunkId));
-+ }
-+ }
-+ }
-+ }
-+}
-+
-+
-+static void yaffs_VerifyHardLink(yaffs_Object *obj)
-+{
-+ if (obj && yaffs_SkipVerification(obj->myDev))
-+ return;
-+
-+ /* Verify sane equivalent object */
-+}
-+
-+static void yaffs_VerifySymlink(yaffs_Object *obj)
-+{
-+ if (obj && yaffs_SkipVerification(obj->myDev))
-+ return;
-+
-+ /* Verify symlink string */
-+}
-+
-+static void yaffs_VerifySpecial(yaffs_Object *obj)
-+{
-+ if (obj && yaffs_SkipVerification(obj->myDev))
-+ return;
-+}
-+
-+static void yaffs_VerifyObject(yaffs_Object *obj)
-+{
-+ yaffs_Device *dev;
-+
-+ __u32 chunkMin;
-+ __u32 chunkMax;
-+
-+ __u32 chunkIdOk;
-+ __u32 chunkInRange;
-+ __u32 chunkShouldNotBeDeleted;
-+ __u32 chunkValid;
-+
-+ if (!obj)
-+ return;
-+
-+ if (obj->beingCreated)
-+ return;
-+
-+ dev = obj->myDev;
-+
-+ if (yaffs_SkipVerification(dev))
-+ return;
-+
-+ /* Check sane object header chunk */
-+
-+ chunkMin = dev->internalStartBlock * dev->nChunksPerBlock;
-+ chunkMax = (dev->internalEndBlock+1) * dev->nChunksPerBlock - 1;
-+
-+ chunkInRange = (((unsigned)(obj->hdrChunk)) >= chunkMin && ((unsigned)(obj->hdrChunk)) <= chunkMax);
-+ chunkIdOk = chunkInRange || obj->hdrChunk == 0;
-+ chunkValid = chunkInRange &&
-+ yaffs_CheckChunkBit(dev,
-+ obj->hdrChunk / dev->nChunksPerBlock,
-+ obj->hdrChunk % dev->nChunksPerBlock);
-+ chunkShouldNotBeDeleted = chunkInRange && !chunkValid;
-+
-+ if (!obj->fake &&
-+ (!chunkIdOk || chunkShouldNotBeDeleted)) {
-+ T(YAFFS_TRACE_VERIFY,
-+ (TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
-+ obj->objectId, obj->hdrChunk,
-+ chunkIdOk ? "" : ",out of range",
-+ chunkShouldNotBeDeleted ? ",marked as deleted" : ""));
-+ }
-+
-+ if (chunkValid && !yaffs_SkipNANDVerification(dev)) {
-+ yaffs_ExtendedTags tags;
-+ yaffs_ObjectHeader *oh;
-+ __u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
-+
-+ oh = (yaffs_ObjectHeader *)buffer;
-+
-+ yaffs_ReadChunkWithTagsFromNAND(dev, obj->hdrChunk, buffer,
-+ &tags);
-+
-+ yaffs_VerifyObjectHeader(obj, oh, &tags, 1);
-+
-+ yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
-+ }
-+
-+ /* Verify it has a parent */
-+ if (obj && !obj->fake &&
-+ (!obj->parent || obj->parent->myDev != dev)) {
-+ T(YAFFS_TRACE_VERIFY,
-+ (TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
-+ obj->objectId, obj->parent));
-+ }
-+
-+ /* Verify parent is a directory */
-+ if (obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+ T(YAFFS_TRACE_VERIFY,
-+ (TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
-+ obj->objectId, obj->parent->variantType));
-+ }
-+
-+ switch (obj->variantType) {
-+ case YAFFS_OBJECT_TYPE_FILE:
-+ yaffs_VerifyFile(obj);
-+ break;
-+ case YAFFS_OBJECT_TYPE_SYMLINK:
-+ yaffs_VerifySymlink(obj);
-+ break;
-+ case YAFFS_OBJECT_TYPE_DIRECTORY:
-+ yaffs_VerifyDirectory(obj);
-+ break;
-+ case YAFFS_OBJECT_TYPE_HARDLINK:
-+ yaffs_VerifyHardLink(obj);
-+ break;
-+ case YAFFS_OBJECT_TYPE_SPECIAL:
-+ yaffs_VerifySpecial(obj);
-+ break;
-+ case YAFFS_OBJECT_TYPE_UNKNOWN:
-+ default:
-+ T(YAFFS_TRACE_VERIFY,
-+ (TSTR("Obj %d has illegaltype %d"TENDSTR),
-+ obj->objectId, obj->variantType));
-+ break;
-+ }
-+}
-+
-+static void yaffs_VerifyObjects(yaffs_Device *dev)
-+{
-+ yaffs_Object *obj;
-+ int i;
-+ struct ylist_head *lh;
-+
-+ if (yaffs_SkipVerification(dev))
-+ return;
-+
-+ /* Iterate through the objects in each hash entry */
-+
-+ for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
-+ ylist_for_each(lh, &dev->objectBucket[i].list) {
-+ if (lh) {
-+ obj = ylist_entry(lh, yaffs_Object, hashLink);
-+ yaffs_VerifyObject(obj);
-+ }
-+ }
-+ }
-+}
-+
-+
+/*
+ * Simple hash function. Needs to have a reasonable spread
+ */
+
-+static Y_INLINE int yaffs_HashFunction(int n)
++static Y_INLINE int yaffs_hash_fn(int n)
+{
+ n = abs(n);
+ return n % YAFFS_NOBJECT_BUCKETS;
@@ -4854,25 +2210,24 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ * Note that root might have a presence in NAND if permissions are set.
+ */
+
-+yaffs_Object *yaffs_Root(yaffs_Device *dev)
++struct yaffs_obj *yaffs_root(struct yaffs_dev *dev)
+{
-+ return dev->rootDir;
++ return dev->root_dir;
+}
+
-+yaffs_Object *yaffs_LostNFound(yaffs_Device *dev)
++struct yaffs_obj *yaffs_lost_n_found(struct yaffs_dev *dev)
+{
-+ return dev->lostNFoundDir;
++ return dev->lost_n_found;
+}
+
-+
+/*
+ * Erased NAND checking functions
+ */
+
-+int yaffs_CheckFF(__u8 *buffer, int nBytes)
++int yaffs_check_ff(u8 * buffer, int n_bytes)
+{
+ /* Horrible, slow implementation */
-+ while (nBytes--) {
++ while (n_bytes--) {
+ if (*buffer != 0xFF)
+ return 0;
+ buffer++;
@@ -4880,47 +2235,67 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ return 1;
+}
+
-+static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
-+ int chunkInNAND)
++static int yaffs_check_chunk_erased(struct yaffs_dev *dev, int nand_chunk)
+{
+ int retval = YAFFS_OK;
-+ __u8 *data = yaffs_GetTempBuffer(dev, __LINE__);
-+ yaffs_ExtendedTags tags;
++ u8 *data = yaffs_get_temp_buffer(dev, __LINE__);
++ struct yaffs_ext_tags tags;
+ int result;
+
-+ result = yaffs_ReadChunkWithTagsFromNAND(dev, chunkInNAND, data, &tags);
++ result = yaffs_rd_chunk_tags_nand(dev, nand_chunk, data, &tags);
+
-+ if (tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR)
++ if (tags.ecc_result > YAFFS_ECC_RESULT_NO_ERROR)
+ retval = YAFFS_FAIL;
+
-+ if (!yaffs_CheckFF(data, dev->nDataBytesPerChunk) || tags.chunkUsed) {
++ if (!yaffs_check_ff(data, dev->data_bytes_per_chunk) || tags.chunk_used) {
+ T(YAFFS_TRACE_NANDACCESS,
-+ (TSTR("Chunk %d not erased" TENDSTR), chunkInNAND));
++ (TSTR("Chunk %d not erased" TENDSTR), nand_chunk));
+ retval = YAFFS_FAIL;
+ }
+
-+ yaffs_ReleaseTempBuffer(dev, data, __LINE__);
++ yaffs_release_temp_buffer(dev, data, __LINE__);
+
+ return retval;
+
+}
+
-+static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
-+ const __u8 *data,
-+ yaffs_ExtendedTags *tags,
-+ int useReserve)
++static int yaffs_verify_chunk_written(struct yaffs_dev *dev,
++ int nand_chunk,
++ const u8 * data,
++ struct yaffs_ext_tags *tags)
++{
++ int retval = YAFFS_OK;
++ struct yaffs_ext_tags temp_tags;
++ u8 *buffer = yaffs_get_temp_buffer(dev, __LINE__);
++ int result;
++
++ result = yaffs_rd_chunk_tags_nand(dev, nand_chunk, buffer, &temp_tags);
++ if (memcmp(buffer, data, dev->data_bytes_per_chunk) ||
++ temp_tags.obj_id != tags->obj_id ||
++ temp_tags.chunk_id != tags->chunk_id ||
++ temp_tags.n_bytes != tags->n_bytes)
++ retval = YAFFS_FAIL;
++
++ yaffs_release_temp_buffer(dev, buffer, __LINE__);
++
++ return retval;
++}
++
++static int yaffs_write_new_chunk(struct yaffs_dev *dev,
++ const u8 * data,
++ struct yaffs_ext_tags *tags, int use_reserver)
+{
+ int attempts = 0;
-+ int writeOk = 0;
++ int write_ok = 0;
+ int chunk;
+
-+ yaffs_InvalidateCheckpoint(dev);
++ yaffs2_checkpt_invalidate(dev);
+
+ do {
-+ yaffs_BlockInfo *bi = 0;
-+ int erasedOk = 0;
++ struct yaffs_block_info *bi = 0;
++ int erased_ok = 0;
+
-+ chunk = yaffs_AllocateChunk(dev, useReserve, &bi);
++ chunk = yaffs_alloc_chunk(dev, use_reserver, &bi);
+ if (chunk < 0) {
+ /* no space */
+ break;
@@ -4932,7 +2307,7 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ *
+ * Check the first page we try to write in a block.
+ * If the check passes then we don't need to check any
-+ * more. If the check fails, we check again...
++ * more. If the check fails, we check again...
+ * If the block has been erased, we don't need to check.
+ *
+ * However, if the block has been prioritised for gc,
@@ -4944,55 +2319,64 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ * chunk due to power loss. This checking policy should
+ * catch that case with very few checks and thus save a
+ * lot of checks that are most likely not needed.
++ *
++ * Mods to the above
++ * If an erase check fails or the write fails we skip the
++ * rest of the block.
+ */
-+ if (bi->gcPrioritise) {
-+ yaffs_DeleteChunk(dev, chunk, 1, __LINE__);
-+ /* try another chunk */
-+ continue;
-+ }
+
+ /* let's give it a try */
+ attempts++;
+
-+#ifdef CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED
-+ bi->skipErasedCheck = 0;
-+#endif
-+ if (!bi->skipErasedCheck) {
-+ erasedOk = yaffs_CheckChunkErased(dev, chunk);
-+ if (erasedOk != YAFFS_OK) {
-+ T(YAFFS_TRACE_ERROR,
-+ (TSTR("**>> yaffs chunk %d was not erased"
-+ TENDSTR), chunk));
++ if (dev->param.always_check_erased)
++ bi->skip_erased_check = 0;
+
-+ /* try another chunk */
++ if (!bi->skip_erased_check) {
++ erased_ok = yaffs_check_chunk_erased(dev, chunk);
++ if (erased_ok != YAFFS_OK) {
++ T(YAFFS_TRACE_ERROR,
++ (TSTR("**>> yaffs chunk %d was not erased"
++ TENDSTR), chunk));
++
++ /* If not erased, delete this one,
++ * skip rest of block and
++ * try another chunk */
++ yaffs_chunk_del(dev, chunk, 1, __LINE__);
++ yaffs_skip_rest_of_block(dev);
+ continue;
+ }
-+ bi->skipErasedCheck = 1;
+ }
+
-+ writeOk = yaffs_WriteChunkWithTagsToNAND(dev, chunk,
-+ data, tags);
-+ if (writeOk != YAFFS_OK) {
-+ yaffs_HandleWriteChunkError(dev, chunk, erasedOk);
-+ /* try another chunk */
++ write_ok = yaffs_wr_chunk_tags_nand(dev, chunk, data, tags);
++
++ if (!bi->skip_erased_check)
++ write_ok =
++ yaffs_verify_chunk_written(dev, chunk, data, tags);
++
++ if (write_ok != YAFFS_OK) {
++ /* Clean up aborted write, skip to next block and
++ * try another chunk */
++ yaffs_handle_chunk_wr_error(dev, chunk, erased_ok);
+ continue;
+ }
+
++ bi->skip_erased_check = 1;
++
+ /* Copy the data into the robustification buffer */
-+ yaffs_HandleWriteChunkOk(dev, chunk, data, tags);
++ yaffs_handle_chunk_wr_ok(dev, chunk, data, tags);
+
-+ } while (writeOk != YAFFS_OK &&
-+ (yaffs_wr_attempts <= 0 || attempts <= yaffs_wr_attempts));
++ } while (write_ok != YAFFS_OK &&
++ (yaffs_wr_attempts <= 0 || attempts <= yaffs_wr_attempts));
+
-+ if (!writeOk)
++ if (!write_ok)
+ chunk = -1;
+
+ if (attempts > 1) {
+ T(YAFFS_TRACE_ERROR,
-+ (TSTR("**>> yaffs write required %d attempts" TENDSTR),
-+ attempts));
++ (TSTR("**>> yaffs write required %d attempts" TENDSTR),
++ attempts));
+
-+ dev->nRetriedWrites += (attempts - 1);
++ dev->n_retired_writes += (attempts - 1);
+ }
+
+ return chunk;
@@ -5002,41 +2386,49 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ * Block retiring for handling a broken block.
+ */
+
-+static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND)
++static void yaffs_retire_block(struct yaffs_dev *dev, int flash_block)
+{
-+ yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
-+
-+ yaffs_InvalidateCheckpoint(dev);
++ struct yaffs_block_info *bi = yaffs_get_block_info(dev, flash_block);
+
-+ if (yaffs_MarkBlockBad(dev, blockInNAND) != YAFFS_OK) {
-+ if (yaffs_EraseBlockInNAND(dev, blockInNAND) != YAFFS_OK) {
-+ T(YAFFS_TRACE_ALWAYS, (TSTR(
-+ "yaffs: Failed to mark bad and erase block %d"
-+ TENDSTR), blockInNAND));
-+ } else {
-+ yaffs_ExtendedTags tags;
-+ int chunkId = blockInNAND * dev->nChunksPerBlock;
++ yaffs2_checkpt_invalidate(dev);
+
-+ __u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
++ yaffs2_clear_oldest_dirty_seq(dev, bi);
+
-+ memset(buffer, 0xff, dev->nDataBytesPerChunk);
-+ yaffs_InitialiseTags(&tags);
-+ tags.sequenceNumber = YAFFS_SEQUENCE_BAD_BLOCK;
-+ if (dev->writeChunkWithTagsToNAND(dev, chunkId -
-+ dev->chunkOffset, buffer, &tags) != YAFFS_OK)
-+ T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Failed to "
-+ TCONT("write bad block marker to block %d")
-+ TENDSTR), blockInNAND));
++ if (yaffs_mark_bad(dev, flash_block) != YAFFS_OK) {
++ if (yaffs_erase_block(dev, flash_block) != YAFFS_OK) {
++ T(YAFFS_TRACE_ALWAYS,
++ (TSTR
++ ("yaffs: Failed to mark bad and erase block %d"
++ TENDSTR), flash_block));
++ } else {
++ struct yaffs_ext_tags tags;
++ int chunk_id =
++ flash_block * dev->param.chunks_per_block;
++
++ u8 *buffer = yaffs_get_temp_buffer(dev, __LINE__);
++
++ memset(buffer, 0xff, dev->data_bytes_per_chunk);
++ yaffs_init_tags(&tags);
++ tags.seq_number = YAFFS_SEQUENCE_BAD_BLOCK;
++ if (dev->param.write_chunk_tags_fn(dev, chunk_id -
++ dev->chunk_offset,
++ buffer,
++ &tags) != YAFFS_OK)
++ T(YAFFS_TRACE_ALWAYS,
++ (TSTR
++ ("yaffs: Failed to "
++ TCONT("write bad block marker to block %d")
++ TENDSTR), flash_block));
+
-+ yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
++ yaffs_release_temp_buffer(dev, buffer, __LINE__);
+ }
+ }
+
-+ bi->blockState = YAFFS_BLOCK_STATE_DEAD;
-+ bi->gcPrioritise = 0;
-+ bi->needsRetiring = 0;
++ bi->block_state = YAFFS_BLOCK_STATE_DEAD;
++ bi->gc_prioritise = 0;
++ bi->needs_retiring = 0;
+
-+ dev->nRetiredBlocks++;
++ dev->n_retired_blocks++;
+}
+
+/*
@@ -5044,68 +2436,74 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ *
+ */
+
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+ const __u8 *data,
-+ const yaffs_ExtendedTags *tags)
++static void yaffs_handle_chunk_wr_ok(struct yaffs_dev *dev, int nand_chunk,
++ const u8 * data,
++ const struct yaffs_ext_tags *tags)
+{
++ dev = dev;
++ nand_chunk = nand_chunk;
++ data = data;
++ tags = tags;
+}
+
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+ const yaffs_ExtendedTags *tags)
++static void yaffs_handle_chunk_update(struct yaffs_dev *dev, int nand_chunk,
++ const struct yaffs_ext_tags *tags)
+{
++ dev = dev;
++ nand_chunk = nand_chunk;
++ tags = tags;
+}
+
-+void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi)
++void yaffs_handle_chunk_error(struct yaffs_dev *dev,
++ struct yaffs_block_info *bi)
+{
-+ if (!bi->gcPrioritise) {
-+ bi->gcPrioritise = 1;
-+ dev->hasPendingPrioritisedGCs = 1;
-+ bi->chunkErrorStrikes++;
++ if (!bi->gc_prioritise) {
++ bi->gc_prioritise = 1;
++ dev->has_pending_prioritised_gc = 1;
++ bi->chunk_error_strikes++;
+
-+ if (bi->chunkErrorStrikes > 3) {
-+ bi->needsRetiring = 1; /* Too many stikes, so retire this */
-+ T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Block struck out" TENDSTR)));
++ if (bi->chunk_error_strikes > 3) {
++ bi->needs_retiring = 1; /* Too many stikes, so retire this */
++ T(YAFFS_TRACE_ALWAYS,
++ (TSTR("yaffs: Block struck out" TENDSTR)));
+
+ }
+ }
+}
+
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND,
-+ int erasedOk)
++static void yaffs_handle_chunk_wr_error(struct yaffs_dev *dev, int nand_chunk,
++ int erased_ok)
+{
-+ int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
-+ yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
++ int flash_block = nand_chunk / dev->param.chunks_per_block;
++ struct yaffs_block_info *bi = yaffs_get_block_info(dev, flash_block);
+
-+ yaffs_HandleChunkError(dev, bi);
++ yaffs_handle_chunk_error(dev, bi);
+
-+ if (erasedOk) {
++ if (erased_ok) {
+ /* Was an actual write failure, so mark the block for retirement */
-+ bi->needsRetiring = 1;
++ bi->needs_retiring = 1;
+ T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
-+ (TSTR("**>> Block %d needs retiring" TENDSTR), blockInNAND));
++ (TSTR("**>> Block %d needs retiring" TENDSTR), flash_block));
+ }
+
+ /* Delete the chunk */
-+ yaffs_DeleteChunk(dev, chunkInNAND, 1, __LINE__);
++ yaffs_chunk_del(dev, nand_chunk, 1, __LINE__);
++ yaffs_skip_rest_of_block(dev);
+}
+
-+
+/*---------------- Name handling functions ------------*/
+
-+static __u16 yaffs_CalcNameSum(const YCHAR *name)
++static u16 yaffs_calc_name_sum(const YCHAR * name)
+{
-+ __u16 sum = 0;
-+ __u16 i = 1;
++ u16 sum = 0;
++ u16 i = 1;
+
-+ const YUCHAR *bname = (const YUCHAR *) name;
++ const YUCHAR *bname = (const YUCHAR *)name;
+ if (bname) {
-+ while ((*bname) && (i < (YAFFS_MAX_NAME_LENGTH/2))) {
++ while ((*bname) && (i < (YAFFS_MAX_NAME_LENGTH / 2))) {
+
-+#ifdef CONFIG_YAFFS_CASE_INSENSITIVE
-+ sum += yaffs_toupper(*bname) * i;
-+#else
-+ sum += (*bname) * i;
-+#endif
++ /* 0x1f mask is case insensitive */
++ sum += ((*bname) & 0x1f) * i;
+ i++;
+ bname++;
+ }
@@ -5113,16 +2511,32 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ return sum;
+}
+
-+static void yaffs_SetObjectName(yaffs_Object *obj, const YCHAR *name)
++void yaffs_set_obj_name(struct yaffs_obj *obj, const YCHAR * name)
+{
-+#ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
-+ memset(obj->shortName, 0, sizeof(YCHAR) * (YAFFS_SHORT_NAME_LENGTH+1));
-+ if (name && yaffs_strlen(name) <= YAFFS_SHORT_NAME_LENGTH)
-+ yaffs_strcpy(obj->shortName, name);
++#ifndef CONFIG_YAFFS_NO_SHORT_NAMES
++ memset(obj->short_name, 0, sizeof(obj->short_name));
++ if (name &&
++ yaffs_strnlen(name, YAFFS_SHORT_NAME_LENGTH + 1) <=
++ YAFFS_SHORT_NAME_LENGTH)
++ yaffs_strcpy(obj->short_name, name);
+ else
-+ obj->shortName[0] = _Y('\0');
++ obj->short_name[0] = _Y('\0');
++#endif
++ obj->sum = yaffs_calc_name_sum(name);
++}
++
++void yaffs_set_obj_name_from_oh(struct yaffs_obj *obj,
++ const struct yaffs_obj_hdr *oh)
++{
++#ifdef CONFIG_YAFFS_AUTO_UNICODE
++ YCHAR tmp_name[YAFFS_MAX_NAME_LENGTH + 1];
++ memset(tmp_name, 0, sizeof(tmp_name));
++ yaffs_load_name_from_oh(obj->my_dev, tmp_name, oh->name,
++ YAFFS_MAX_NAME_LENGTH + 1);
++ yaffs_set_obj_name(obj, tmp_name);
++#else
++ yaffs_set_obj_name(obj, oh->name);
+#endif
-+ obj->sum = yaffs_CalcNameSum(name);
+}
+
+/*-------------------- TNODES -------------------
@@ -5132,239 +2546,90 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ * in the tnode.
+ */
+
-+/* yaffs_CreateTnodes creates a bunch more tnodes and
-+ * adds them to the tnode free list.
-+ * Don't use this function directly
-+ */
-+
-+static int yaffs_CreateTnodes(yaffs_Device *dev, int nTnodes)
++struct yaffs_tnode *yaffs_get_tnode(struct yaffs_dev *dev)
+{
-+ int i;
-+ int tnodeSize;
-+ yaffs_Tnode *newTnodes;
-+ __u8 *mem;
-+ yaffs_Tnode *curr;
-+ yaffs_Tnode *next;
-+ yaffs_TnodeList *tnl;
-+
-+ if (nTnodes < 1)
-+ return YAFFS_OK;
-+
-+ /* Calculate the tnode size in bytes for variable width tnode support.
-+ * Must be a multiple of 32-bits */
-+ tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+
-+ if (tnodeSize < sizeof(yaffs_Tnode))
-+ tnodeSize = sizeof(yaffs_Tnode);
-+
-+ /* make these things */
-+
-+ newTnodes = YMALLOC(nTnodes * tnodeSize);
-+ mem = (__u8 *)newTnodes;
-+
-+ if (!newTnodes) {
-+ T(YAFFS_TRACE_ERROR,
-+ (TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
-+ return YAFFS_FAIL;
-+ }
-+
-+ /* Hook them into the free list */
-+#if 0
-+ for (i = 0; i < nTnodes - 1; i++) {
-+ newTnodes[i].internal[0] = &newTnodes[i + 1];
-+#ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-+ newTnodes[i].internal[YAFFS_NTNODES_INTERNAL] = (void *)1;
-+#endif
-+ }
-+
-+ newTnodes[nTnodes - 1].internal[0] = dev->freeTnodes;
-+#ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-+ newTnodes[nTnodes - 1].internal[YAFFS_NTNODES_INTERNAL] = (void *)1;
-+#endif
-+ dev->freeTnodes = newTnodes;
-+#else
-+ /* New hookup for wide tnodes */
-+ for (i = 0; i < nTnodes - 1; i++) {
-+ curr = (yaffs_Tnode *) &mem[i * tnodeSize];
-+ next = (yaffs_Tnode *) &mem[(i+1) * tnodeSize];
-+ curr->internal[0] = next;
-+ }
-+
-+ curr = (yaffs_Tnode *) &mem[(nTnodes - 1) * tnodeSize];
-+ curr->internal[0] = dev->freeTnodes;
-+ dev->freeTnodes = (yaffs_Tnode *)mem;
-+
-+#endif
-+
-+
-+ dev->nFreeTnodes += nTnodes;
-+ dev->nTnodesCreated += nTnodes;
-+
-+ /* Now add this bunch of tnodes to a list for freeing up.
-+ * NB If we can't add this to the management list it isn't fatal
-+ * but it just means we can't free this bunch of tnodes later.
-+ */
-+
-+ tnl = YMALLOC(sizeof(yaffs_TnodeList));
-+ if (!tnl) {
-+ T(YAFFS_TRACE_ERROR,
-+ (TSTR
-+ ("yaffs: Could not add tnodes to management list" TENDSTR)));
-+ return YAFFS_FAIL;
-+ } else {
-+ tnl->tnodes = newTnodes;
-+ tnl->next = dev->allocatedTnodeList;
-+ dev->allocatedTnodeList = tnl;
-+ }
-+
-+ T(YAFFS_TRACE_ALLOCATE, (TSTR("yaffs: Tnodes added" TENDSTR)));
-+
-+ return YAFFS_OK;
-+}
-+
-+/* GetTnode gets us a clean tnode. Tries to make allocate more if we run out */
-+
-+static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device *dev)
-+{
-+ yaffs_Tnode *tn = NULL;
-+
-+ /* If there are none left make more */
-+ if (!dev->freeTnodes)
-+ yaffs_CreateTnodes(dev, YAFFS_ALLOCATION_NTNODES);
-+
-+ if (dev->freeTnodes) {
-+ tn = dev->freeTnodes;
-+#ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-+ if (tn->internal[YAFFS_NTNODES_INTERNAL] != (void *)1) {
-+ /* Hoosterman, this thing looks like it isn't in the list */
-+ T(YAFFS_TRACE_ALWAYS,
-+ (TSTR("yaffs: Tnode list bug 1" TENDSTR)));
-+ }
-+#endif
-+ dev->freeTnodes = dev->freeTnodes->internal[0];
-+ dev->nFreeTnodes--;
++ struct yaffs_tnode *tn = yaffs_alloc_raw_tnode(dev);
++ if (tn) {
++ memset(tn, 0, dev->tnode_size);
++ dev->n_tnodes++;
+ }
+
-+ dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
-+
-+ return tn;
-+}
-+
-+static yaffs_Tnode *yaffs_GetTnode(yaffs_Device *dev)
-+{
-+ yaffs_Tnode *tn = yaffs_GetTnodeRaw(dev);
-+ int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+
-+ if (tnodeSize < sizeof(yaffs_Tnode))
-+ tnodeSize = sizeof(yaffs_Tnode);
-+
-+ if (tn)
-+ memset(tn, 0, tnodeSize);
++ dev->checkpoint_blocks_required = 0; /* force recalculation */
+
+ return tn;
+}
+
+/* FreeTnode frees up a tnode and puts it back on the free list */
-+static void yaffs_FreeTnode(yaffs_Device *dev, yaffs_Tnode *tn)
++static void yaffs_free_tnode(struct yaffs_dev *dev, struct yaffs_tnode *tn)
+{
-+ if (tn) {
-+#ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-+ if (tn->internal[YAFFS_NTNODES_INTERNAL] != 0) {
-+ /* Hoosterman, this thing looks like it is already in the list */
-+ T(YAFFS_TRACE_ALWAYS,
-+ (TSTR("yaffs: Tnode list bug 2" TENDSTR)));
-+ }
-+ tn->internal[YAFFS_NTNODES_INTERNAL] = (void *)1;
-+#endif
-+ tn->internal[0] = dev->freeTnodes;
-+ dev->freeTnodes = tn;
-+ dev->nFreeTnodes++;
-+ }
-+ dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
-+}
-+
-+static void yaffs_DeinitialiseTnodes(yaffs_Device *dev)
-+{
-+ /* Free the list of allocated tnodes */
-+ yaffs_TnodeList *tmp;
-+
-+ while (dev->allocatedTnodeList) {
-+ tmp = dev->allocatedTnodeList->next;
-+
-+ YFREE(dev->allocatedTnodeList->tnodes);
-+ YFREE(dev->allocatedTnodeList);
-+ dev->allocatedTnodeList = tmp;
-+
-+ }
-+
-+ dev->freeTnodes = NULL;
-+ dev->nFreeTnodes = 0;
++ yaffs_free_raw_tnode(dev, tn);
++ dev->n_tnodes--;
++ dev->checkpoint_blocks_required = 0; /* force recalculation */
+}
+
-+static void yaffs_InitialiseTnodes(yaffs_Device *dev)
++static void yaffs_deinit_tnodes_and_objs(struct yaffs_dev *dev)
+{
-+ dev->allocatedTnodeList = NULL;
-+ dev->freeTnodes = NULL;
-+ dev->nFreeTnodes = 0;
-+ dev->nTnodesCreated = 0;
++ yaffs_deinit_raw_tnodes_and_objs(dev);
++ dev->n_obj = 0;
++ dev->n_tnodes = 0;
+}
+
-+
-+void yaffs_PutLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos,
-+ unsigned val)
++void yaffs_load_tnode_0(struct yaffs_dev *dev, struct yaffs_tnode *tn,
++ unsigned pos, unsigned val)
+{
-+ __u32 *map = (__u32 *)tn;
-+ __u32 bitInMap;
-+ __u32 bitInWord;
-+ __u32 wordInMap;
-+ __u32 mask;
++ u32 *map = (u32 *) tn;
++ u32 bit_in_map;
++ u32 bit_in_word;
++ u32 word_in_map;
++ u32 mask;
+
+ pos &= YAFFS_TNODES_LEVEL0_MASK;
-+ val >>= dev->chunkGroupBits;
++ val >>= dev->chunk_grp_bits;
+
-+ bitInMap = pos * dev->tnodeWidth;
-+ wordInMap = bitInMap / 32;
-+ bitInWord = bitInMap & (32 - 1);
++ bit_in_map = pos * dev->tnode_width;
++ word_in_map = bit_in_map / 32;
++ bit_in_word = bit_in_map & (32 - 1);
+
-+ mask = dev->tnodeMask << bitInWord;
++ mask = dev->tnode_mask << bit_in_word;
+
-+ map[wordInMap] &= ~mask;
-+ map[wordInMap] |= (mask & (val << bitInWord));
++ map[word_in_map] &= ~mask;
++ map[word_in_map] |= (mask & (val << bit_in_word));
+
-+ if (dev->tnodeWidth > (32 - bitInWord)) {
-+ bitInWord = (32 - bitInWord);
-+ wordInMap++;;
-+ mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord);
-+ map[wordInMap] &= ~mask;
-+ map[wordInMap] |= (mask & (val >> bitInWord));
++ if (dev->tnode_width > (32 - bit_in_word)) {
++ bit_in_word = (32 - bit_in_word);
++ word_in_map++;;
++ mask =
++ dev->tnode_mask >> ( /*dev->tnode_width - */ bit_in_word);
++ map[word_in_map] &= ~mask;
++ map[word_in_map] |= (mask & (val >> bit_in_word));
+ }
+}
+
-+static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
-+ unsigned pos)
++u32 yaffs_get_group_base(struct yaffs_dev *dev, struct yaffs_tnode *tn,
++ unsigned pos)
+{
-+ __u32 *map = (__u32 *)tn;
-+ __u32 bitInMap;
-+ __u32 bitInWord;
-+ __u32 wordInMap;
-+ __u32 val;
++ u32 *map = (u32 *) tn;
++ u32 bit_in_map;
++ u32 bit_in_word;
++ u32 word_in_map;
++ u32 val;
+
+ pos &= YAFFS_TNODES_LEVEL0_MASK;
+
-+ bitInMap = pos * dev->tnodeWidth;
-+ wordInMap = bitInMap / 32;
-+ bitInWord = bitInMap & (32 - 1);
++ bit_in_map = pos * dev->tnode_width;
++ word_in_map = bit_in_map / 32;
++ bit_in_word = bit_in_map & (32 - 1);
+
-+ val = map[wordInMap] >> bitInWord;
++ val = map[word_in_map] >> bit_in_word;
+
-+ if (dev->tnodeWidth > (32 - bitInWord)) {
-+ bitInWord = (32 - bitInWord);
-+ wordInMap++;;
-+ val |= (map[wordInMap] << bitInWord);
++ if (dev->tnode_width > (32 - bit_in_word)) {
++ bit_in_word = (32 - bit_in_word);
++ word_in_map++;;
++ val |= (map[word_in_map] << bit_in_word);
+ }
+
-+ val &= dev->tnodeMask;
-+ val <<= dev->chunkGroupBits;
++ val &= dev->tnode_mask;
++ val <<= dev->chunk_grp_bits;
+
+ return val;
+}
@@ -5372,46 +2637,48 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+/* ------------------- End of individual tnode manipulation -----------------*/
+
+/* ---------Functions to manipulate the look-up tree (made up of tnodes) ------
-+ * The look up tree is represented by the top tnode and the number of topLevel
++ * The look up tree is represented by the top tnode and the number of top_level
+ * in the tree. 0 means only the level 0 tnode is in the tree.
+ */
+
+/* FindLevel0Tnode finds the level 0 tnode, if one exists. */
-+static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
-+ yaffs_FileStructure *fStruct,
-+ __u32 chunkId)
++struct yaffs_tnode *yaffs_find_tnode_0(struct yaffs_dev *dev,
++ struct yaffs_file_var *file_struct,
++ u32 chunk_id)
+{
-+ yaffs_Tnode *tn = fStruct->top;
-+ __u32 i;
-+ int requiredTallness;
-+ int level = fStruct->topLevel;
++ struct yaffs_tnode *tn = file_struct->top;
++ u32 i;
++ int required_depth;
++ int level = file_struct->top_level;
++
++ dev = dev;
+
+ /* Check sane level and chunk Id */
+ if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL)
+ return NULL;
+
-+ if (chunkId > YAFFS_MAX_CHUNK_ID)
++ if (chunk_id > YAFFS_MAX_CHUNK_ID)
+ return NULL;
+
-+ /* First check we're tall enough (ie enough topLevel) */
++ /* First check we're tall enough (ie enough top_level) */
+
-+ i = chunkId >> YAFFS_TNODES_LEVEL0_BITS;
-+ requiredTallness = 0;
++ i = chunk_id >> YAFFS_TNODES_LEVEL0_BITS;
++ required_depth = 0;
+ while (i) {
+ i >>= YAFFS_TNODES_INTERNAL_BITS;
-+ requiredTallness++;
++ required_depth++;
+ }
+
-+ if (requiredTallness > fStruct->topLevel)
-+ return NULL; /* Not tall enough, so we can't find it */
++ if (required_depth > file_struct->top_level)
++ return NULL; /* Not tall enough, so we can't find it */
+
+ /* Traverse down to level 0 */
+ while (level > 0 && tn) {
-+ tn = tn->internal[(chunkId >>
-+ (YAFFS_TNODES_LEVEL0_BITS +
-+ (level - 1) *
-+ YAFFS_TNODES_INTERNAL_BITS)) &
-+ YAFFS_TNODES_INTERNAL_MASK];
++ tn = tn->internal[(chunk_id >>
++ (YAFFS_TNODES_LEVEL0_BITS +
++ (level - 1) *
++ YAFFS_TNODES_INTERNAL_BITS)) &
++ YAFFS_TNODES_INTERNAL_MASK];
+ level--;
+ }
+
@@ -5429,82 +2696,85 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ * be plugged into the ttree.
+ */
+
-+static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev,
-+ yaffs_FileStructure *fStruct,
-+ __u32 chunkId,
-+ yaffs_Tnode *passedTn)
++struct yaffs_tnode *yaffs_add_find_tnode_0(struct yaffs_dev *dev,
++ struct yaffs_file_var *file_struct,
++ u32 chunk_id,
++ struct yaffs_tnode *passed_tn)
+{
-+ int requiredTallness;
++ int required_depth;
+ int i;
+ int l;
-+ yaffs_Tnode *tn;
-+
-+ __u32 x;
++ struct yaffs_tnode *tn;
+
++ u32 x;
+
+ /* Check sane level and page Id */
-+ if (fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL)
++ if (file_struct->top_level < 0
++ || file_struct->top_level > YAFFS_TNODES_MAX_LEVEL)
+ return NULL;
+
-+ if (chunkId > YAFFS_MAX_CHUNK_ID)
++ if (chunk_id > YAFFS_MAX_CHUNK_ID)
+ return NULL;
+
-+ /* First check we're tall enough (ie enough topLevel) */
++ /* First check we're tall enough (ie enough top_level) */
+
-+ x = chunkId >> YAFFS_TNODES_LEVEL0_BITS;
-+ requiredTallness = 0;
++ x = chunk_id >> YAFFS_TNODES_LEVEL0_BITS;
++ required_depth = 0;
+ while (x) {
+ x >>= YAFFS_TNODES_INTERNAL_BITS;
-+ requiredTallness++;
++ required_depth++;
+ }
+
-+
-+ if (requiredTallness > fStruct->topLevel) {
++ if (required_depth > file_struct->top_level) {
+ /* Not tall enough, gotta make the tree taller */
-+ for (i = fStruct->topLevel; i < requiredTallness; i++) {
++ for (i = file_struct->top_level; i < required_depth; i++) {
+
-+ tn = yaffs_GetTnode(dev);
++ tn = yaffs_get_tnode(dev);
+
+ if (tn) {
-+ tn->internal[0] = fStruct->top;
-+ fStruct->top = tn;
++ tn->internal[0] = file_struct->top;
++ file_struct->top = tn;
++ file_struct->top_level++;
+ } else {
+ T(YAFFS_TRACE_ERROR,
+ (TSTR("yaffs: no more tnodes" TENDSTR)));
++ return NULL;
+ }
+ }
-+
-+ fStruct->topLevel = requiredTallness;
+ }
+
+ /* Traverse down to level 0, adding anything we need */
+
-+ l = fStruct->topLevel;
-+ tn = fStruct->top;
++ l = file_struct->top_level;
++ tn = file_struct->top;
+
+ if (l > 0) {
+ while (l > 0 && tn) {
-+ x = (chunkId >>
++ x = (chunk_id >>
+ (YAFFS_TNODES_LEVEL0_BITS +
+ (l - 1) * YAFFS_TNODES_INTERNAL_BITS)) &
+ YAFFS_TNODES_INTERNAL_MASK;
+
-+
+ if ((l > 1) && !tn->internal[x]) {
+ /* Add missing non-level-zero tnode */
-+ tn->internal[x] = yaffs_GetTnode(dev);
-+
++ tn->internal[x] = yaffs_get_tnode(dev);
++ if (!tn->internal[x])
++ return NULL;
+ } else if (l == 1) {
+ /* Looking from level 1 at level 0 */
-+ if (passedTn) {
-+ /* If we already have one, then release it.*/
++ if (passed_tn) {
++ /* If we already have one, then release it. */
+ if (tn->internal[x])
-+ yaffs_FreeTnode(dev, tn->internal[x]);
-+ tn->internal[x] = passedTn;
++ yaffs_free_tnode(dev,
++ tn->
++ internal[x]);
++ tn->internal[x] = passed_tn;
+
+ } else if (!tn->internal[x]) {
+ /* Don't have one, none passed in */
-+ tn->internal[x] = yaffs_GetTnode(dev);
++ tn->internal[x] = yaffs_get_tnode(dev);
++ if (!tn->internal[x])
++ return NULL;
+ }
+ }
+
@@ -5513,140 +2783,56 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ }
+ } else {
+ /* top is level 0 */
-+ if (passedTn) {
-+ memcpy(tn, passedTn, (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+ yaffs_FreeTnode(dev, passedTn);
++ if (passed_tn) {
++ memcpy(tn, passed_tn,
++ (dev->tnode_width * YAFFS_NTNODES_LEVEL0) / 8);
++ yaffs_free_tnode(dev, passed_tn);
+ }
+ }
+
+ return tn;
+}
+
-+static int yaffs_FindChunkInGroup(yaffs_Device *dev, int theChunk,
-+ yaffs_ExtendedTags *tags, int objectId,
-+ int chunkInInode)
++static int yaffs_find_chunk_in_group(struct yaffs_dev *dev, int the_chunk,
++ struct yaffs_ext_tags *tags, int obj_id,
++ int inode_chunk)
+{
+ int j;
+
-+ for (j = 0; theChunk && j < dev->chunkGroupSize; j++) {
-+ if (yaffs_CheckChunkBit(dev, theChunk / dev->nChunksPerBlock,
-+ theChunk % dev->nChunksPerBlock)) {
-+ yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL,
-+ tags);
-+ if (yaffs_TagsMatch(tags, objectId, chunkInInode)) {
-+ /* found it; */
-+ return theChunk;
-+ }
-+ }
-+ theChunk++;
-+ }
-+ return -1;
-+}
-+
-+
-+/* DeleteWorker scans backwards through the tnode tree and deletes all the
-+ * chunks and tnodes in the file
-+ * Returns 1 if the tree was deleted.
-+ * Returns 0 if it stopped early due to hitting the limit and the delete is incomplete.
-+ */
-+
-+static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level,
-+ int chunkOffset, int *limit)
-+{
-+ int i;
-+ int chunkInInode;
-+ int theChunk;
-+ yaffs_ExtendedTags tags;
-+ int foundChunk;
-+ yaffs_Device *dev = in->myDev;
-+
-+ int allDone = 1;
-+
-+ if (tn) {
-+ if (level > 0) {
-+ for (i = YAFFS_NTNODES_INTERNAL - 1; allDone && i >= 0;
-+ i--) {
-+ if (tn->internal[i]) {
-+ if (limit && (*limit) < 0) {
-+ allDone = 0;
-+ } else {
-+ allDone =
-+ yaffs_DeleteWorker(in,
-+ tn->
-+ internal
-+ [i],
-+ level -
-+ 1,
-+ (chunkOffset
-+ <<
-+ YAFFS_TNODES_INTERNAL_BITS)
-+ + i,
-+ limit);
-+ }
-+ if (allDone) {
-+ yaffs_FreeTnode(dev,
-+ tn->
-+ internal[i]);
-+ tn->internal[i] = NULL;
-+ }
-+ }
-+ }
-+ return (allDone) ? 1 : 0;
-+ } else if (level == 0) {
-+ int hitLimit = 0;
-+
-+ for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0 && !hitLimit;
-+ i--) {
-+ theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
-+ if (theChunk) {
-+
-+ chunkInInode = (chunkOffset <<
-+ YAFFS_TNODES_LEVEL0_BITS) + i;
-+
-+ foundChunk =
-+ yaffs_FindChunkInGroup(dev,
-+ theChunk,
-+ &tags,
-+ in->objectId,
-+ chunkInInode);
-+
-+ if (foundChunk > 0) {
-+ yaffs_DeleteChunk(dev,
-+ foundChunk, 1,
-+ __LINE__);
-+ in->nDataChunks--;
-+ if (limit) {
-+ *limit = *limit - 1;
-+ if (*limit <= 0)
-+ hitLimit = 1;
-+ }
-+
-+ }
++ for (j = 0; the_chunk && j < dev->chunk_grp_size; j++) {
++ if (yaffs_check_chunk_bit
++ (dev, the_chunk / dev->param.chunks_per_block,
++ the_chunk % dev->param.chunks_per_block)) {
+
-+ yaffs_PutLevel0Tnode(dev, tn, i, 0);
++ if (dev->chunk_grp_size == 1)
++ return the_chunk;
++ else {
++ yaffs_rd_chunk_tags_nand(dev, the_chunk, NULL,
++ tags);
++ if (yaffs_tags_match(tags, obj_id, inode_chunk)) {
++ /* found it; */
++ return the_chunk;
+ }
-+
+ }
-+ return (i < 0) ? 1 : 0;
-+
+ }
-+
++ the_chunk++;
+ }
-+
-+ return 1;
-+
++ return -1;
+}
+
-+static void yaffs_SoftDeleteChunk(yaffs_Device *dev, int chunk)
++static void yaffs_soft_del_chunk(struct yaffs_dev *dev, int chunk)
+{
-+ yaffs_BlockInfo *theBlock;
++ struct yaffs_block_info *the_block;
++ unsigned block_no;
+
+ T(YAFFS_TRACE_DELETION, (TSTR("soft delete chunk %d" TENDSTR), chunk));
+
-+ theBlock = yaffs_GetBlockInfo(dev, chunk / dev->nChunksPerBlock);
-+ if (theBlock) {
-+ theBlock->softDeletions++;
-+ dev->nFreeChunks++;
++ block_no = chunk / dev->param.chunks_per_block;
++ the_block = yaffs_get_block_info(dev, block_no);
++ if (the_block) {
++ the_block->soft_del_pages++;
++ dev->n_free_chunks++;
++ yaffs2_update_oldest_dirty_seq(dev, block_no, the_block);
+ }
+}
+
@@ -5656,51 +2842,51 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ * Thus, essentially this is the same as DeleteWorker except that the chunks are soft deleted.
+ */
+
-+static int yaffs_SoftDeleteWorker(yaffs_Object *in, yaffs_Tnode *tn,
-+ __u32 level, int chunkOffset)
++static int yaffs_soft_del_worker(struct yaffs_obj *in, struct yaffs_tnode *tn,
++ u32 level, int chunk_offset)
+{
+ int i;
-+ int theChunk;
-+ int allDone = 1;
-+ yaffs_Device *dev = in->myDev;
++ int the_chunk;
++ int all_done = 1;
++ struct yaffs_dev *dev = in->my_dev;
+
+ if (tn) {
+ if (level > 0) {
+
-+ for (i = YAFFS_NTNODES_INTERNAL - 1; allDone && i >= 0;
++ for (i = YAFFS_NTNODES_INTERNAL - 1; all_done && i >= 0;
+ i--) {
+ if (tn->internal[i]) {
-+ allDone =
-+ yaffs_SoftDeleteWorker(in,
-+ tn->
-+ internal[i],
-+ level - 1,
-+ (chunkOffset
-+ <<
-+ YAFFS_TNODES_INTERNAL_BITS)
-+ + i);
-+ if (allDone) {
-+ yaffs_FreeTnode(dev,
-+ tn->
-+ internal[i]);
++ all_done =
++ yaffs_soft_del_worker(in,
++ tn->internal
++ [i],
++ level - 1,
++ (chunk_offset
++ <<
++ YAFFS_TNODES_INTERNAL_BITS)
++ + i);
++ if (all_done) {
++ yaffs_free_tnode(dev,
++ tn->internal
++ [i]);
+ tn->internal[i] = NULL;
+ } else {
+ /* Hoosterman... how could this happen? */
+ }
+ }
+ }
-+ return (allDone) ? 1 : 0;
++ return (all_done) ? 1 : 0;
+ } else if (level == 0) {
+
+ for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0; i--) {
-+ theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
-+ if (theChunk) {
++ the_chunk = yaffs_get_group_base(dev, tn, i);
++ if (the_chunk) {
+ /* Note this does not find the real chunk, only the chunk group.
+ * We make an assumption that a chunk group is not larger than
+ * a block.
+ */
-+ yaffs_SoftDeleteChunk(dev, theChunk);
-+ yaffs_PutLevel0Tnode(dev, tn, i, 0);
++ yaffs_soft_del_chunk(dev, the_chunk);
++ yaffs_load_tnode_0(dev, tn, i, 0);
+ }
+
+ }
@@ -5714,25 +2900,25 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+
+}
+
-+static void yaffs_SoftDeleteFile(yaffs_Object *obj)
++static void yaffs_soft_del_file(struct yaffs_obj *obj)
+{
+ if (obj->deleted &&
-+ obj->variantType == YAFFS_OBJECT_TYPE_FILE && !obj->softDeleted) {
-+ if (obj->nDataChunks <= 0) {
++ obj->variant_type == YAFFS_OBJECT_TYPE_FILE && !obj->soft_del) {
++ if (obj->n_data_chunks <= 0) {
+ /* Empty file with no duplicate object headers, just delete it immediately */
-+ yaffs_FreeTnode(obj->myDev,
-+ obj->variant.fileVariant.top);
-+ obj->variant.fileVariant.top = NULL;
++ yaffs_free_tnode(obj->my_dev,
++ obj->variant.file_variant.top);
++ obj->variant.file_variant.top = NULL;
+ T(YAFFS_TRACE_TRACING,
+ (TSTR("yaffs: Deleting empty file %d" TENDSTR),
-+ obj->objectId));
-+ yaffs_DoGenericObjectDeletion(obj);
++ obj->obj_id));
++ yaffs_generic_obj_del(obj);
+ } else {
-+ yaffs_SoftDeleteWorker(obj,
-+ obj->variant.fileVariant.top,
-+ obj->variant.fileVariant.
-+ topLevel, 0);
-+ obj->softDeleted = 1;
++ yaffs_soft_del_worker(obj,
++ obj->variant.file_variant.top,
++ obj->variant.
++ file_variant.top_level, 0);
++ obj->soft_del = 1;
+ }
+ }
+}
@@ -5746,33 +2932,50 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ * level 0 tnode entries must be zeroed out.
+ * Could also use this for file deletion, but that's probably better handled
+ * by a special case.
++ *
++ * This function is recursive. For levels > 0 the function is called again on
++ * any sub-tree. For level == 0 we just check if the sub-tree has data.
++ * If there is no data in a subtree then it is pruned.
+ */
+
-+static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device *dev, yaffs_Tnode *tn,
-+ __u32 level, int del0)
++static struct yaffs_tnode *yaffs_prune_worker(struct yaffs_dev *dev,
++ struct yaffs_tnode *tn, u32 level,
++ int del0)
+{
+ int i;
-+ int hasData;
++ int has_data;
+
+ if (tn) {
-+ hasData = 0;
-+
-+ for (i = 0; i < YAFFS_NTNODES_INTERNAL; i++) {
-+ if (tn->internal[i] && level > 0) {
-+ tn->internal[i] =
-+ yaffs_PruneWorker(dev, tn->internal[i],
-+ level - 1,
-+ (i == 0) ? del0 : 1);
++ has_data = 0;
++
++ if (level > 0) {
++ for (i = 0; i < YAFFS_NTNODES_INTERNAL; i++) {
++ if (tn->internal[i]) {
++ tn->internal[i] =
++ yaffs_prune_worker(dev,
++ tn->internal[i],
++ level - 1,
++ (i ==
++ 0) ? del0 : 1);
++ }
++
++ if (tn->internal[i])
++ has_data++;
+ }
++ } else {
++ int tnode_size_u32 = dev->tnode_size / sizeof(u32);
++ u32 *map = (u32 *) tn;
+
-+ if (tn->internal[i])
-+ hasData++;
++ for (i = 0; !has_data && i < tnode_size_u32; i++) {
++ if (map[i])
++ has_data++;
++ }
+ }
+
-+ if (hasData == 0 && del0) {
++ if (has_data == 0 && del0) {
+ /* Free and return NULL */
+
-+ yaffs_FreeTnode(dev, tn);
++ yaffs_free_tnode(dev, tn);
+ tn = NULL;
+ }
+
@@ -5782,17 +2985,18 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+
+}
+
-+static int yaffs_PruneFileStructure(yaffs_Device *dev,
-+ yaffs_FileStructure *fStruct)
++static int yaffs_prune_tree(struct yaffs_dev *dev,
++ struct yaffs_file_var *file_struct)
+{
+ int i;
-+ int hasData;
++ int has_data;
+ int done = 0;
-+ yaffs_Tnode *tn;
++ struct yaffs_tnode *tn;
+
-+ if (fStruct->topLevel > 0) {
-+ fStruct->top =
-+ yaffs_PruneWorker(dev, fStruct->top, fStruct->topLevel, 0);
++ if (file_struct->top_level > 0) {
++ file_struct->top =
++ yaffs_prune_worker(dev, file_struct->top,
++ file_struct->top_level, 0);
+
+ /* Now we have a tree with all the non-zero branches NULL but the height
+ * is the same as it was.
@@ -5801,19 +3005,19 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ * (ie all the non-zero are NULL)
+ */
+
-+ while (fStruct->topLevel && !done) {
-+ tn = fStruct->top;
++ while (file_struct->top_level && !done) {
++ tn = file_struct->top;
+
-+ hasData = 0;
++ has_data = 0;
+ for (i = 1; i < YAFFS_NTNODES_INTERNAL; i++) {
+ if (tn->internal[i])
-+ hasData++;
++ has_data++;
+ }
+
-+ if (!hasData) {
-+ fStruct->top = tn->internal[0];
-+ fStruct->topLevel--;
-+ yaffs_FreeTnode(dev, tn);
++ if (!has_data) {
++ file_struct->top = tn->internal[0];
++ file_struct->top_level--;
++ yaffs_free_tnode(dev, tn);
+ } else {
+ done = 1;
+ }
@@ -5825,250 +3029,149 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+
+/*-------------------- End of File Structure functions.-------------------*/
+
-+/* yaffs_CreateFreeObjects creates a bunch more objects and
-+ * adds them to the object free list.
-+ */
-+static int yaffs_CreateFreeObjects(yaffs_Device *dev, int nObjects)
-+{
-+ int i;
-+ yaffs_Object *newObjects;
-+ yaffs_ObjectList *list;
-+
-+ if (nObjects < 1)
-+ return YAFFS_OK;
-+
-+ /* make these things */
-+ newObjects = YMALLOC(nObjects * sizeof(yaffs_Object));
-+ list = YMALLOC(sizeof(yaffs_ObjectList));
-+
-+ if (!newObjects || !list) {
-+ if (newObjects)
-+ YFREE(newObjects);
-+ if (list)
-+ YFREE(list);
-+ T(YAFFS_TRACE_ALLOCATE,
-+ (TSTR("yaffs: Could not allocate more objects" TENDSTR)));
-+ return YAFFS_FAIL;
-+ }
-+
-+ /* Hook them into the free list */
-+ for (i = 0; i < nObjects - 1; i++) {
-+ newObjects[i].siblings.next =
-+ (struct ylist_head *)(&newObjects[i + 1]);
-+ }
-+
-+ newObjects[nObjects - 1].siblings.next = (void *)dev->freeObjects;
-+ dev->freeObjects = newObjects;
-+ dev->nFreeObjects += nObjects;
-+ dev->nObjectsCreated += nObjects;
-+
-+ /* Now add this bunch of Objects to a list for freeing up. */
-+
-+ list->objects = newObjects;
-+ list->next = dev->allocatedObjectList;
-+ dev->allocatedObjectList = list;
-+
-+ return YAFFS_OK;
-+}
-+
-+
+/* AllocateEmptyObject gets us a clean Object. Tries to make allocate more if we run out */
-+static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device *dev)
++static struct yaffs_obj *yaffs_alloc_empty_obj(struct yaffs_dev *dev)
+{
-+ yaffs_Object *tn = NULL;
++ struct yaffs_obj *obj = yaffs_alloc_raw_obj(dev);
+
-+#ifdef VALGRIND_TEST
-+ tn = YMALLOC(sizeof(yaffs_Object));
-+#else
-+ /* If there are none left make more */
-+ if (!dev->freeObjects)
-+ yaffs_CreateFreeObjects(dev, YAFFS_ALLOCATION_NOBJECTS);
++ if (obj) {
++ dev->n_obj++;
+
-+ if (dev->freeObjects) {
-+ tn = dev->freeObjects;
-+ dev->freeObjects =
-+ (yaffs_Object *) (dev->freeObjects->siblings.next);
-+ dev->nFreeObjects--;
-+ }
-+#endif
-+ if (tn) {
+ /* Now sweeten it up... */
+
-+ memset(tn, 0, sizeof(yaffs_Object));
-+ tn->beingCreated = 1;
-+
-+ tn->myDev = dev;
-+ tn->hdrChunk = 0;
-+ tn->variantType = YAFFS_OBJECT_TYPE_UNKNOWN;
-+ YINIT_LIST_HEAD(&(tn->hardLinks));
-+ YINIT_LIST_HEAD(&(tn->hashLink));
-+ YINIT_LIST_HEAD(&tn->siblings);
++ memset(obj, 0, sizeof(struct yaffs_obj));
++ obj->being_created = 1;
+
++ obj->my_dev = dev;
++ obj->hdr_chunk = 0;
++ obj->variant_type = YAFFS_OBJECT_TYPE_UNKNOWN;
++ INIT_LIST_HEAD(&(obj->hard_links));
++ INIT_LIST_HEAD(&(obj->hash_link));
++ INIT_LIST_HEAD(&obj->siblings);
+
+ /* Now make the directory sane */
-+ if (dev->rootDir) {
-+ tn->parent = dev->rootDir;
-+ ylist_add(&(tn->siblings), &dev->rootDir->variant.directoryVariant.children);
++ if (dev->root_dir) {
++ obj->parent = dev->root_dir;
++ list_add(&(obj->siblings),
++ &dev->root_dir->variant.dir_variant.children);
+ }
+
+ /* Add it to the lost and found directory.
-+ * NB Can't put root or lostNFound in lostNFound so
-+ * check if lostNFound exists first
++ * NB Can't put root or lost-n-found in lost-n-found so
++ * check if lost-n-found exists first
+ */
-+ if (dev->lostNFoundDir)
-+ yaffs_AddObjectToDirectory(dev->lostNFoundDir, tn);
++ if (dev->lost_n_found)
++ yaffs_add_obj_to_dir(dev->lost_n_found, obj);
+
-+ tn->beingCreated = 0;
++ obj->being_created = 0;
+ }
+
-+ dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
++ dev->checkpoint_blocks_required = 0; /* force recalculation */
+
-+ return tn;
++ return obj;
+}
+
-+static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device *dev, int number,
-+ __u32 mode)
++static struct yaffs_obj *yaffs_create_fake_dir(struct yaffs_dev *dev,
++ int number, u32 mode)
+{
+
-+ yaffs_Object *obj =
-+ yaffs_CreateNewObject(dev, number, YAFFS_OBJECT_TYPE_DIRECTORY);
++ struct yaffs_obj *obj =
++ yaffs_new_obj(dev, number, YAFFS_OBJECT_TYPE_DIRECTORY);
+ if (obj) {
-+ obj->fake = 1; /* it is fake so it might have no NAND presence... */
-+ obj->renameAllowed = 0; /* ... and we're not allowed to rename it... */
-+ obj->unlinkAllowed = 0; /* ... or unlink it */
++ obj->fake = 1; /* it is fake so it might have no NAND presence... */
++ obj->rename_allowed = 0; /* ... and we're not allowed to rename it... */
++ obj->unlink_allowed = 0; /* ... or unlink it */
+ obj->deleted = 0;
+ obj->unlinked = 0;
+ obj->yst_mode = mode;
-+ obj->myDev = dev;
-+ obj->hdrChunk = 0; /* Not a valid chunk. */
++ obj->my_dev = dev;
++ obj->hdr_chunk = 0; /* Not a valid chunk. */
+ }
+
+ return obj;
+
+}
+
-+static void yaffs_UnhashObject(yaffs_Object *tn)
++static void yaffs_unhash_obj(struct yaffs_obj *obj)
+{
+ int bucket;
-+ yaffs_Device *dev = tn->myDev;
++ struct yaffs_dev *dev = obj->my_dev;
+
+ /* If it is still linked into the bucket list, free from the list */
-+ if (!ylist_empty(&tn->hashLink)) {
-+ ylist_del_init(&tn->hashLink);
-+ bucket = yaffs_HashFunction(tn->objectId);
-+ dev->objectBucket[bucket].count--;
++ if (!list_empty(&obj->hash_link)) {
++ list_del_init(&obj->hash_link);
++ bucket = yaffs_hash_fn(obj->obj_id);
++ dev->obj_bucket[bucket].count--;
+ }
+}
+
+/* FreeObject frees up a Object and puts it back on the free list */
-+static void yaffs_FreeObject(yaffs_Object *tn)
++static void yaffs_free_obj(struct yaffs_obj *obj)
+{
-+ yaffs_Device *dev = tn->myDev;
++ struct yaffs_dev *dev = obj->my_dev;
+
-+#ifdef __KERNEL__
-+ T(YAFFS_TRACE_OS, (TSTR("FreeObject %p inode %p"TENDSTR), tn, tn->myInode));
-+#endif
++ T(YAFFS_TRACE_OS,
++ (TSTR("FreeObject %p inode %p" TENDSTR), obj, obj->my_inode));
+
-+ if (tn->parent)
++ if (!obj)
+ YBUG();
-+ if (!ylist_empty(&tn->siblings))
++ if (obj->parent)
++ YBUG();
++ if (!list_empty(&obj->siblings))
+ YBUG();
+
-+
-+#ifdef __KERNEL__
-+ if (tn->myInode) {
++ if (obj->my_inode) {
+ /* We're still hooked up to a cached inode.
+ * Don't delete now, but mark for later deletion
+ */
-+ tn->deferedFree = 1;
++ obj->defered_free = 1;
+ return;
+ }
-+#endif
+
-+ yaffs_UnhashObject(tn);
++ yaffs_unhash_obj(obj);
+
-+#ifdef VALGRIND_TEST
-+ YFREE(tn);
-+#else
-+ /* Link into the free list. */
-+ tn->siblings.next = (struct ylist_head *)(dev->freeObjects);
-+ dev->freeObjects = tn;
-+ dev->nFreeObjects++;
-+#endif
-+ dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
++ yaffs_free_raw_obj(dev, obj);
++ dev->n_obj--;
++ dev->checkpoint_blocks_required = 0; /* force recalculation */
+}
+
-+#ifdef __KERNEL__
-+
-+void yaffs_HandleDeferedFree(yaffs_Object *obj)
++void yaffs_handle_defered_free(struct yaffs_obj *obj)
+{
-+ if (obj->deferedFree)
-+ yaffs_FreeObject(obj);
++ if (obj->defered_free)
++ yaffs_free_obj(obj);
+}
+
-+#endif
-+
-+static void yaffs_DeinitialiseObjects(yaffs_Device *dev)
-+{
-+ /* Free the list of allocated Objects */
-+
-+ yaffs_ObjectList *tmp;
-+
-+ while (dev->allocatedObjectList) {
-+ tmp = dev->allocatedObjectList->next;
-+ YFREE(dev->allocatedObjectList->objects);
-+ YFREE(dev->allocatedObjectList);
-+
-+ dev->allocatedObjectList = tmp;
-+ }
-+
-+ dev->freeObjects = NULL;
-+ dev->nFreeObjects = 0;
-+}
-+
-+static void yaffs_InitialiseObjects(yaffs_Device *dev)
++static void yaffs_init_tnodes_and_objs(struct yaffs_dev *dev)
+{
+ int i;
+
-+ dev->allocatedObjectList = NULL;
-+ dev->freeObjects = NULL;
-+ dev->nFreeObjects = 0;
++ dev->n_obj = 0;
++ dev->n_tnodes = 0;
++
++ yaffs_init_raw_tnodes_and_objs(dev);
+
+ for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
-+ YINIT_LIST_HEAD(&dev->objectBucket[i].list);
-+ dev->objectBucket[i].count = 0;
++ INIT_LIST_HEAD(&dev->obj_bucket[i].list);
++ dev->obj_bucket[i].count = 0;
+ }
+}
+
-+static int yaffs_FindNiceObjectBucket(yaffs_Device *dev)
++static int yaffs_find_nice_bucket(struct yaffs_dev *dev)
+{
-+ static int x;
+ int i;
+ int l = 999;
+ int lowest = 999999;
+
-+ /* First let's see if we can find one that's empty. */
-+
-+ for (i = 0; i < 10 && lowest > 0; i++) {
-+ x++;
-+ x %= YAFFS_NOBJECT_BUCKETS;
-+ if (dev->objectBucket[x].count < lowest) {
-+ lowest = dev->objectBucket[x].count;
-+ l = x;
-+ }
-+
-+ }
-+
-+ /* If we didn't find an empty list, then try
-+ * looking a bit further for a short one
++ /* Search for the shortest list or one that
++ * isn't too long.
+ */
+
-+ for (i = 0; i < 10 && lowest > 3; i++) {
-+ x++;
-+ x %= YAFFS_NOBJECT_BUCKETS;
-+ if (dev->objectBucket[x].count < lowest) {
-+ lowest = dev->objectBucket[x].count;
-+ l = x;
++ for (i = 0; i < 10 && lowest > 4; i++) {
++ dev->bucket_finder++;
++ dev->bucket_finder %= YAFFS_NOBJECT_BUCKETS;
++ if (dev->obj_bucket[dev->bucket_finder].count < lowest) {
++ lowest = dev->obj_bucket[dev->bucket_finder].count;
++ l = dev->bucket_finder;
+ }
+
+ }
@@ -6076,29 +3179,29 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ return l;
+}
+
-+static int yaffs_CreateNewObjectNumber(yaffs_Device *dev)
++static int yaffs_new_obj_id(struct yaffs_dev *dev)
+{
-+ int bucket = yaffs_FindNiceObjectBucket(dev);
++ int bucket = yaffs_find_nice_bucket(dev);
+
+ /* Now find an object value that has not already been taken
+ * by scanning the list.
+ */
+
+ int found = 0;
-+ struct ylist_head *i;
++ struct list_head *i;
+
-+ __u32 n = (__u32) bucket;
++ u32 n = (u32) bucket;
+
-+ /* yaffs_CheckObjectHashSanity(); */
++ /* yaffs_check_obj_hash_sane(); */
+
+ while (!found) {
+ found = 1;
+ n += YAFFS_NOBJECT_BUCKETS;
-+ if (1 || dev->objectBucket[bucket].count > 0) {
-+ ylist_for_each(i, &dev->objectBucket[bucket].list) {
++ if (1 || dev->obj_bucket[bucket].count > 0) {
++ list_for_each(i, &dev->obj_bucket[bucket].list) {
+ /* If there is already one in the list */
-+ if (i && ylist_entry(i, yaffs_Object,
-+ hashLink)->objectId == n) {
++ if (i && list_entry(i, struct yaffs_obj,
++ hash_link)->obj_id == n) {
+ found = 0;
+ }
+ }
@@ -6108,31 +3211,30 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ return n;
+}
+
-+static void yaffs_HashObject(yaffs_Object *in)
++static void yaffs_hash_obj(struct yaffs_obj *in)
+{
-+ int bucket = yaffs_HashFunction(in->objectId);
-+ yaffs_Device *dev = in->myDev;
++ int bucket = yaffs_hash_fn(in->obj_id);
++ struct yaffs_dev *dev = in->my_dev;
+
-+ ylist_add(&in->hashLink, &dev->objectBucket[bucket].list);
-+ dev->objectBucket[bucket].count++;
++ list_add(&in->hash_link, &dev->obj_bucket[bucket].list);
++ dev->obj_bucket[bucket].count++;
+}
+
-+yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number)
++struct yaffs_obj *yaffs_find_by_number(struct yaffs_dev *dev, u32 number)
+{
-+ int bucket = yaffs_HashFunction(number);
-+ struct ylist_head *i;
-+ yaffs_Object *in;
++ int bucket = yaffs_hash_fn(number);
++ struct list_head *i;
++ struct yaffs_obj *in;
+
-+ ylist_for_each(i, &dev->objectBucket[bucket].list) {
++ list_for_each(i, &dev->obj_bucket[bucket].list) {
+ /* Look if it is in the list */
+ if (i) {
-+ in = ylist_entry(i, yaffs_Object, hashLink);
-+ if (in->objectId == number) {
-+#ifdef __KERNEL__
++ in = list_entry(i, struct yaffs_obj, hash_link);
++ if (in->obj_id == number) {
++
+ /* Don't tell the VFS about this one if it is defered free */
-+ if (in->deferedFree)
++ if (in->defered_free)
+ return NULL;
-+#endif
+
+ return in;
+ }
@@ -6142,57 +3244,48 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ return NULL;
+}
+
-+yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number,
-+ yaffs_ObjectType type)
++struct yaffs_obj *yaffs_new_obj(struct yaffs_dev *dev, int number,
++ enum yaffs_obj_type type)
+{
-+ yaffs_Object *theObject;
-+ yaffs_Tnode *tn = NULL;
++ struct yaffs_obj *the_obj = NULL;
++ struct yaffs_tnode *tn = NULL;
+
+ if (number < 0)
-+ number = yaffs_CreateNewObjectNumber(dev);
-+
-+ theObject = yaffs_AllocateEmptyObject(dev);
-+ if (!theObject)
-+ return NULL;
++ number = yaffs_new_obj_id(dev);
+
+ if (type == YAFFS_OBJECT_TYPE_FILE) {
-+ tn = yaffs_GetTnode(dev);
-+ if (!tn) {
-+ yaffs_FreeObject(theObject);
++ tn = yaffs_get_tnode(dev);
++ if (!tn)
+ return NULL;
-+ }
+ }
+
-+ if (theObject) {
-+ theObject->fake = 0;
-+ theObject->renameAllowed = 1;
-+ theObject->unlinkAllowed = 1;
-+ theObject->objectId = number;
-+ yaffs_HashObject(theObject);
-+ theObject->variantType = type;
-+#ifdef CONFIG_YAFFS_WINCE
-+ yfsd_WinFileTimeNow(theObject->win_atime);
-+ theObject->win_ctime[0] = theObject->win_mtime[0] =
-+ theObject->win_atime[0];
-+ theObject->win_ctime[1] = theObject->win_mtime[1] =
-+ theObject->win_atime[1];
++ the_obj = yaffs_alloc_empty_obj(dev);
++ if (!the_obj) {
++ if (tn)
++ yaffs_free_tnode(dev, tn);
++ return NULL;
++ }
+
-+#else
++ if (the_obj) {
++ the_obj->fake = 0;
++ the_obj->rename_allowed = 1;
++ the_obj->unlink_allowed = 1;
++ the_obj->obj_id = number;
++ yaffs_hash_obj(the_obj);
++ the_obj->variant_type = type;
++ yaffs_load_current_time(the_obj, 1, 1);
+
-+ theObject->yst_atime = theObject->yst_mtime =
-+ theObject->yst_ctime = Y_CURRENT_TIME;
-+#endif
+ switch (type) {
+ case YAFFS_OBJECT_TYPE_FILE:
-+ theObject->variant.fileVariant.fileSize = 0;
-+ theObject->variant.fileVariant.scannedFileSize = 0;
-+ theObject->variant.fileVariant.shrinkSize = 0xFFFFFFFF; /* max __u32 */
-+ theObject->variant.fileVariant.topLevel = 0;
-+ theObject->variant.fileVariant.top = tn;
++ the_obj->variant.file_variant.file_size = 0;
++ the_obj->variant.file_variant.scanned_size = 0;
++ the_obj->variant.file_variant.shrink_size = ~0; /* max */
++ the_obj->variant.file_variant.top_level = 0;
++ the_obj->variant.file_variant.top = tn;
+ break;
+ case YAFFS_OBJECT_TYPE_DIRECTORY:
-+ YINIT_LIST_HEAD(&theObject->variant.directoryVariant.
-+ children);
++ INIT_LIST_HEAD(&the_obj->variant.dir_variant.children);
++ INIT_LIST_HEAD(&the_obj->variant.dir_variant.dirty);
+ break;
+ case YAFFS_OBJECT_TYPE_SYMLINK:
+ case YAFFS_OBJECT_TYPE_HARDLINK:
@@ -6205,118 +3298,109 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ }
+ }
+
-+ return theObject;
++ return the_obj;
+}
+
-+static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device *dev,
-+ int number,
-+ yaffs_ObjectType type)
++struct yaffs_obj *yaffs_find_or_create_by_number(struct yaffs_dev *dev,
++ int number,
++ enum yaffs_obj_type type)
+{
-+ yaffs_Object *theObject = NULL;
++ struct yaffs_obj *the_obj = NULL;
+
+ if (number > 0)
-+ theObject = yaffs_FindObjectByNumber(dev, number);
++ the_obj = yaffs_find_by_number(dev, number);
+
-+ if (!theObject)
-+ theObject = yaffs_CreateNewObject(dev, number, type);
++ if (!the_obj)
++ the_obj = yaffs_new_obj(dev, number, type);
+
-+ return theObject;
++ return the_obj;
+
+}
+
-+
-+static YCHAR *yaffs_CloneString(const YCHAR *str)
++YCHAR *yaffs_clone_str(const YCHAR * str)
+{
-+ YCHAR *newStr = NULL;
++ YCHAR *new_str = NULL;
++ int len;
+
-+ if (str && *str) {
-+ newStr = YMALLOC((yaffs_strlen(str) + 1) * sizeof(YCHAR));
-+ if (newStr)
-+ yaffs_strcpy(newStr, str);
-+ }
++ if (!str)
++ str = _Y("");
+
-+ return newStr;
++ len = yaffs_strnlen(str, YAFFS_MAX_ALIAS_LENGTH);
++ new_str = YMALLOC((len + 1) * sizeof(YCHAR));
++ if (new_str) {
++ yaffs_strncpy(new_str, str, len);
++ new_str[len] = 0;
++ }
++ return new_str;
+
+}
+
+/*
+ * Mknod (create) a new object.
-+ * equivalentObject only has meaning for a hard link;
-+ * aliasString only has meaning for a sumlink.
++ * equiv_obj only has meaning for a hard link;
++ * alias_str only has meaning for a symlink.
+ * rdev only has meaning for devices (a subset of special objects)
+ */
+
-+static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type,
-+ yaffs_Object *parent,
-+ const YCHAR *name,
-+ __u32 mode,
-+ __u32 uid,
-+ __u32 gid,
-+ yaffs_Object *equivalentObject,
-+ const YCHAR *aliasString, __u32 rdev)
++static struct yaffs_obj *yaffs_create_obj(enum yaffs_obj_type type,
++ struct yaffs_obj *parent,
++ const YCHAR * name,
++ u32 mode,
++ u32 uid,
++ u32 gid,
++ struct yaffs_obj *equiv_obj,
++ const YCHAR * alias_str, u32 rdev)
+{
-+ yaffs_Object *in;
++ struct yaffs_obj *in;
+ YCHAR *str = NULL;
+
-+ yaffs_Device *dev = parent->myDev;
++ struct yaffs_dev *dev = parent->my_dev;
+
-+ /* Check if the entry exists. If it does then fail the call since we don't want a dup.*/
-+ if (yaffs_FindObjectByName(parent, name))
++ /* Check if the entry exists. If it does then fail the call since we don't want a dup. */
++ if (yaffs_find_by_name(parent, name))
+ return NULL;
+
-+ in = yaffs_CreateNewObject(dev, -1, type);
-+
-+ if (!in)
-+ return YAFFS_FAIL;
-+
+ if (type == YAFFS_OBJECT_TYPE_SYMLINK) {
-+ str = yaffs_CloneString(aliasString);
-+ if (!str) {
-+ yaffs_FreeObject(in);
++ str = yaffs_clone_str(alias_str);
++ if (!str)
+ return NULL;
-+ }
+ }
+
++ in = yaffs_new_obj(dev, -1, type);
+
++ if (!in) {
++ if (str)
++ YFREE(str);
++ return NULL;
++ }
+
+ if (in) {
-+ in->hdrChunk = 0;
++ in->hdr_chunk = 0;
+ in->valid = 1;
-+ in->variantType = type;
++ in->variant_type = type;
+
+ in->yst_mode = mode;
+
-+#ifdef CONFIG_YAFFS_WINCE
-+ yfsd_WinFileTimeNow(in->win_atime);
-+ in->win_ctime[0] = in->win_mtime[0] = in->win_atime[0];
-+ in->win_ctime[1] = in->win_mtime[1] = in->win_atime[1];
-+
-+#else
-+ in->yst_atime = in->yst_mtime = in->yst_ctime = Y_CURRENT_TIME;
++ yaffs_attribs_init(in, gid, uid, rdev);
+
-+ in->yst_rdev = rdev;
-+ in->yst_uid = uid;
-+ in->yst_gid = gid;
-+#endif
-+ in->nDataChunks = 0;
++ in->n_data_chunks = 0;
+
-+ yaffs_SetObjectName(in, name);
++ yaffs_set_obj_name(in, name);
+ in->dirty = 1;
+
-+ yaffs_AddObjectToDirectory(parent, in);
++ yaffs_add_obj_to_dir(parent, in);
+
-+ in->myDev = parent->myDev;
++ in->my_dev = parent->my_dev;
+
+ switch (type) {
+ case YAFFS_OBJECT_TYPE_SYMLINK:
-+ in->variant.symLinkVariant.alias = str;
++ in->variant.symlink_variant.alias = str;
+ break;
+ case YAFFS_OBJECT_TYPE_HARDLINK:
-+ in->variant.hardLinkVariant.equivalentObject =
-+ equivalentObject;
-+ in->variant.hardLinkVariant.equivalentObjectId =
-+ equivalentObject->objectId;
-+ ylist_add(&in->hardLinks, &equivalentObject->hardLinks);
++ in->variant.hardlink_variant.equiv_obj = equiv_obj;
++ in->variant.hardlink_variant.equiv_id =
++ equiv_obj->obj_id;
++ list_add(&in->hard_links, &equiv_obj->hard_links);
+ break;
+ case YAFFS_OBJECT_TYPE_FILE:
+ case YAFFS_OBJECT_TYPE_DIRECTORY:
@@ -6326,439 +3410,341 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ break;
+ }
+
-+ if (yaffs_UpdateObjectHeader(in, name, 0, 0, 0) < 0) {
++ if (yaffs_update_oh(in, name, 0, 0, 0, NULL) < 0) {
+ /* Could not create the object header, fail the creation */
-+ yaffs_DeleteObject(in);
++ yaffs_del_obj(in);
+ in = NULL;
+ }
+
++ yaffs_update_parent(parent);
+ }
+
+ return in;
+}
+
-+yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name,
-+ __u32 mode, __u32 uid, __u32 gid)
++struct yaffs_obj *yaffs_create_file(struct yaffs_obj *parent,
++ const YCHAR * name, u32 mode, u32 uid,
++ u32 gid)
+{
-+ return yaffs_MknodObject(YAFFS_OBJECT_TYPE_FILE, parent, name, mode,
++ return yaffs_create_obj(YAFFS_OBJECT_TYPE_FILE, parent, name, mode,
+ uid, gid, NULL, NULL, 0);
+}
+
-+yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name,
-+ __u32 mode, __u32 uid, __u32 gid)
++struct yaffs_obj *yaffs_create_dir(struct yaffs_obj *parent, const YCHAR * name,
++ u32 mode, u32 uid, u32 gid)
+{
-+ return yaffs_MknodObject(YAFFS_OBJECT_TYPE_DIRECTORY, parent, name,
-+ mode, uid, gid, NULL, NULL, 0);
++ return yaffs_create_obj(YAFFS_OBJECT_TYPE_DIRECTORY, parent, name,
++ mode, uid, gid, NULL, NULL, 0);
+}
+
-+yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name,
-+ __u32 mode, __u32 uid, __u32 gid, __u32 rdev)
++struct yaffs_obj *yaffs_create_special(struct yaffs_obj *parent,
++ const YCHAR * name, u32 mode, u32 uid,
++ u32 gid, u32 rdev)
+{
-+ return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SPECIAL, parent, name, mode,
-+ uid, gid, NULL, NULL, rdev);
++ return yaffs_create_obj(YAFFS_OBJECT_TYPE_SPECIAL, parent, name, mode,
++ uid, gid, NULL, NULL, rdev);
+}
+
-+yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name,
-+ __u32 mode, __u32 uid, __u32 gid,
-+ const YCHAR *alias)
++struct yaffs_obj *yaffs_create_symlink(struct yaffs_obj *parent,
++ const YCHAR * name, u32 mode, u32 uid,
++ u32 gid, const YCHAR * alias)
+{
-+ return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SYMLINK, parent, name, mode,
++ return yaffs_create_obj(YAFFS_OBJECT_TYPE_SYMLINK, parent, name, mode,
+ uid, gid, NULL, alias, 0);
+}
+
-+/* yaffs_Link returns the object id of the equivalent object.*/
-+yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name,
-+ yaffs_Object *equivalentObject)
++/* yaffs_link_obj returns the object id of the equivalent object.*/
++struct yaffs_obj *yaffs_link_obj(struct yaffs_obj *parent, const YCHAR * name,
++ struct yaffs_obj *equiv_obj)
+{
+ /* Get the real object in case we were fed a hard link as an equivalent object */
-+ equivalentObject = yaffs_GetEquivalentObject(equivalentObject);
++ equiv_obj = yaffs_get_equivalent_obj(equiv_obj);
+
-+ if (yaffs_MknodObject
++ if (yaffs_create_obj
+ (YAFFS_OBJECT_TYPE_HARDLINK, parent, name, 0, 0, 0,
-+ equivalentObject, NULL, 0)) {
-+ return equivalentObject;
++ equiv_obj, NULL, 0)) {
++ return equiv_obj;
+ } else {
+ return NULL;
+ }
+
+}
+
-+static int yaffs_ChangeObjectName(yaffs_Object *obj, yaffs_Object *newDir,
-+ const YCHAR *newName, int force, int shadows)
++static int yaffs_change_obj_name(struct yaffs_obj *obj,
++ struct yaffs_obj *new_dir,
++ const YCHAR * new_name, int force, int shadows)
+{
-+ int unlinkOp;
-+ int deleteOp;
++ int unlink_op;
++ int del_op;
+
-+ yaffs_Object *existingTarget;
++ struct yaffs_obj *existing_target;
+
-+ if (newDir == NULL)
-+ newDir = obj->parent; /* use the old directory */
++ if (new_dir == NULL)
++ new_dir = obj->parent; /* use the old directory */
+
-+ if (newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
++ if (new_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
+ T(YAFFS_TRACE_ALWAYS,
+ (TSTR
-+ ("tragedy: yaffs_ChangeObjectName: newDir is not a directory"
++ ("tragedy: yaffs_change_obj_name: new_dir is not a directory"
+ TENDSTR)));
+ YBUG();
+ }
+
+ /* TODO: Do we need this different handling for YAFFS2 and YAFFS1?? */
-+ if (obj->myDev->isYaffs2)
-+ unlinkOp = (newDir == obj->myDev->unlinkedDir);
++ if (obj->my_dev->param.is_yaffs2)
++ unlink_op = (new_dir == obj->my_dev->unlinked_dir);
+ else
-+ unlinkOp = (newDir == obj->myDev->unlinkedDir
-+ && obj->variantType == YAFFS_OBJECT_TYPE_FILE);
++ unlink_op = (new_dir == obj->my_dev->unlinked_dir
++ && obj->variant_type == YAFFS_OBJECT_TYPE_FILE);
+
-+ deleteOp = (newDir == obj->myDev->deletedDir);
++ del_op = (new_dir == obj->my_dev->del_dir);
+
-+ existingTarget = yaffs_FindObjectByName(newDir, newName);
++ existing_target = yaffs_find_by_name(new_dir, new_name);
+
+ /* If the object is a file going into the unlinked directory,
+ * then it is OK to just stuff it in since duplicate names are allowed.
+ * else only proceed if the new name does not exist and if we're putting
+ * it into a directory.
+ */
-+ if ((unlinkOp ||
-+ deleteOp ||
++ if ((unlink_op ||
++ del_op ||
+ force ||
+ (shadows > 0) ||
-+ !existingTarget) &&
-+ newDir->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) {
-+ yaffs_SetObjectName(obj, newName);
++ !existing_target) &&
++ new_dir->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY) {
++ yaffs_set_obj_name(obj, new_name);
+ obj->dirty = 1;
+
-+ yaffs_AddObjectToDirectory(newDir, obj);
++ yaffs_add_obj_to_dir(new_dir, obj);
+
-+ if (unlinkOp)
++ if (unlink_op)
+ obj->unlinked = 1;
+
+ /* If it is a deletion then we mark it as a shrink for gc purposes. */
-+ if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows) >= 0)
++ if (yaffs_update_oh(obj, new_name, 0, del_op, shadows, NULL) >=
++ 0)
+ return YAFFS_OK;
+ }
+
+ return YAFFS_FAIL;
+}
+
-+int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName,
-+ yaffs_Object *newDir, const YCHAR *newName)
++int yaffs_rename_obj(struct yaffs_obj *old_dir, const YCHAR * old_name,
++ struct yaffs_obj *new_dir, const YCHAR * new_name)
+{
-+ yaffs_Object *obj = NULL;
-+ yaffs_Object *existingTarget = NULL;
++ struct yaffs_obj *obj = NULL;
++ struct yaffs_obj *existing_target = NULL;
+ int force = 0;
++ int result;
++ struct yaffs_dev *dev;
+
-+
-+ if (!oldDir || oldDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
++ if (!old_dir || old_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
+ YBUG();
-+ if (!newDir || newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
++ if (!new_dir || new_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
+ YBUG();
+
++ dev = old_dir->my_dev;
++
+#ifdef CONFIG_YAFFS_CASE_INSENSITIVE
-+ /* Special case for case insemsitive systems (eg. WinCE).
++ /* Special case for case insemsitive systems.
+ * While look-up is case insensitive, the name isn't.
+ * Therefore we might want to change x.txt to X.txt
-+ */
-+ if (oldDir == newDir && yaffs_strcmp(oldName, newName) == 0)
++ */
++ if (old_dir == new_dir && yaffs_strcmp(old_name, new_name) == 0)
+ force = 1;
+#endif
+
-+ else if (yaffs_strlen(newName) > YAFFS_MAX_NAME_LENGTH)
++ if (yaffs_strnlen(new_name, YAFFS_MAX_NAME_LENGTH + 1) >
++ YAFFS_MAX_NAME_LENGTH)
+ /* ENAMETOOLONG */
+ return YAFFS_FAIL;
+
-+ obj = yaffs_FindObjectByName(oldDir, oldName);
++ obj = yaffs_find_by_name(old_dir, old_name);
+
-+ if (obj && obj->renameAllowed) {
++ if (obj && obj->rename_allowed) {
+
+ /* Now do the handling for an existing target, if there is one */
+
-+ existingTarget = yaffs_FindObjectByName(newDir, newName);
-+ if (existingTarget &&
-+ existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
-+ !ylist_empty(&existingTarget->variant.directoryVariant.children)) {
++ existing_target = yaffs_find_by_name(new_dir, new_name);
++ if (existing_target &&
++ existing_target->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY
++ && !list_empty(&existing_target->variant.dir_variant.
++ children)) {
+ /* There is a target that is a non-empty directory, so we fail */
+ return YAFFS_FAIL; /* EEXIST or ENOTEMPTY */
-+ } else if (existingTarget && existingTarget != obj) {
++ } else if (existing_target && existing_target != obj) {
+ /* Nuke the target first, using shadowing,
-+ * but only if it isn't the same object
++ * but only if it isn't the same object.
++ *
++ * Note we must disable gc otherwise it can mess up the shadowing.
++ *
+ */
-+ yaffs_ChangeObjectName(obj, newDir, newName, force,
-+ existingTarget->objectId);
-+ yaffs_UnlinkObject(existingTarget);
++ dev->gc_disable = 1;
++ yaffs_change_obj_name(obj, new_dir, new_name, force,
++ existing_target->obj_id);
++ existing_target->is_shadowed = 1;
++ yaffs_unlink_obj(existing_target);
++ dev->gc_disable = 0;
+ }
+
-+ return yaffs_ChangeObjectName(obj, newDir, newName, 1, 0);
++ result = yaffs_change_obj_name(obj, new_dir, new_name, 1, 0);
++
++ yaffs_update_parent(old_dir);
++ if (new_dir != old_dir)
++ yaffs_update_parent(new_dir);
++
++ return result;
+ }
+ return YAFFS_FAIL;
+}
+
+/*------------------------- Block Management and Page Allocation ----------------*/
+
-+static int yaffs_InitialiseBlocks(yaffs_Device *dev)
++static int yaffs_init_blocks(struct yaffs_dev *dev)
+{
-+ int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
++ int n_blocks = dev->internal_end_block - dev->internal_start_block + 1;
+
-+ dev->blockInfo = NULL;
-+ dev->chunkBits = NULL;
++ dev->block_info = NULL;
++ dev->chunk_bits = NULL;
+
-+ dev->allocationBlock = -1; /* force it to get a new one */
++ dev->alloc_block = -1; /* force it to get a new one */
+
+ /* If the first allocation strategy fails, thry the alternate one */
-+ dev->blockInfo = YMALLOC(nBlocks * sizeof(yaffs_BlockInfo));
-+ if (!dev->blockInfo) {
-+ dev->blockInfo = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockInfo));
-+ dev->blockInfoAlt = 1;
-+ } else
-+ dev->blockInfoAlt = 0;
-+
-+ if (dev->blockInfo) {
++ dev->block_info = YMALLOC(n_blocks * sizeof(struct yaffs_block_info));
++ if (!dev->block_info) {
++ dev->block_info =
++ YMALLOC_ALT(n_blocks * sizeof(struct yaffs_block_info));
++ dev->block_info_alt = 1;
++ } else {
++ dev->block_info_alt = 0;
++ }
++
++ if (dev->block_info) {
+ /* Set up dynamic blockinfo stuff. */
-+ dev->chunkBitmapStride = (dev->nChunksPerBlock + 7) / 8; /* round up bytes */
-+ dev->chunkBits = YMALLOC(dev->chunkBitmapStride * nBlocks);
-+ if (!dev->chunkBits) {
-+ dev->chunkBits = YMALLOC_ALT(dev->chunkBitmapStride * nBlocks);
-+ dev->chunkBitsAlt = 1;
-+ } else
-+ dev->chunkBitsAlt = 0;
-+ }
-+
-+ if (dev->blockInfo && dev->chunkBits) {
-+ memset(dev->blockInfo, 0, nBlocks * sizeof(yaffs_BlockInfo));
-+ memset(dev->chunkBits, 0, dev->chunkBitmapStride * nBlocks);
++ dev->chunk_bit_stride = (dev->param.chunks_per_block + 7) / 8; /* round up bytes */
++ dev->chunk_bits = YMALLOC(dev->chunk_bit_stride * n_blocks);
++ if (!dev->chunk_bits) {
++ dev->chunk_bits =
++ YMALLOC_ALT(dev->chunk_bit_stride * n_blocks);
++ dev->chunk_bits_alt = 1;
++ } else {
++ dev->chunk_bits_alt = 0;
++ }
++ }
++
++ if (dev->block_info && dev->chunk_bits) {
++ memset(dev->block_info, 0,
++ n_blocks * sizeof(struct yaffs_block_info));
++ memset(dev->chunk_bits, 0, dev->chunk_bit_stride * n_blocks);
+ return YAFFS_OK;
+ }
+
+ return YAFFS_FAIL;
+}
+
-+static void yaffs_DeinitialiseBlocks(yaffs_Device *dev)
++static void yaffs_deinit_blocks(struct yaffs_dev *dev)
+{
-+ if (dev->blockInfoAlt && dev->blockInfo)
-+ YFREE_ALT(dev->blockInfo);
-+ else if (dev->blockInfo)
-+ YFREE(dev->blockInfo);
++ if (dev->block_info_alt && dev->block_info)
++ YFREE_ALT(dev->block_info);
++ else if (dev->block_info)
++ YFREE(dev->block_info);
+
-+ dev->blockInfoAlt = 0;
++ dev->block_info_alt = 0;
+
-+ dev->blockInfo = NULL;
++ dev->block_info = NULL;
+
-+ if (dev->chunkBitsAlt && dev->chunkBits)
-+ YFREE_ALT(dev->chunkBits);
-+ else if (dev->chunkBits)
-+ YFREE(dev->chunkBits);
-+ dev->chunkBitsAlt = 0;
-+ dev->chunkBits = NULL;
++ if (dev->chunk_bits_alt && dev->chunk_bits)
++ YFREE_ALT(dev->chunk_bits);
++ else if (dev->chunk_bits)
++ YFREE(dev->chunk_bits);
++ dev->chunk_bits_alt = 0;
++ dev->chunk_bits = NULL;
+}
+
-+static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device *dev,
-+ yaffs_BlockInfo *bi)
++void yaffs_block_became_dirty(struct yaffs_dev *dev, int block_no)
+{
-+ int i;
-+ __u32 seq;
-+ yaffs_BlockInfo *b;
++ struct yaffs_block_info *bi = yaffs_get_block_info(dev, block_no);
+
-+ if (!dev->isYaffs2)
-+ return 1; /* disqualification only applies to yaffs2. */
-+
-+ if (!bi->hasShrinkHeader)
-+ return 1; /* can gc */
++ int erased_ok = 0;
+
-+ /* Find the oldest dirty sequence number if we don't know it and save it
-+ * so we don't have to keep recomputing it.
-+ */
-+ if (!dev->oldestDirtySequence) {
-+ seq = dev->sequenceNumber;
-+
-+ for (i = dev->internalStartBlock; i <= dev->internalEndBlock;
-+ i++) {
-+ b = yaffs_GetBlockInfo(dev, i);
-+ if (b->blockState == YAFFS_BLOCK_STATE_FULL &&
-+ (b->pagesInUse - b->softDeletions) <
-+ dev->nChunksPerBlock && b->sequenceNumber < seq) {
-+ seq = b->sequenceNumber;
-+ }
-+ }
-+ dev->oldestDirtySequence = seq;
-+ }
-+
-+ /* Can't do gc of this block if there are any blocks older than this one that have
-+ * discarded pages.
-+ */
-+ return (bi->sequenceNumber <= dev->oldestDirtySequence);
-+}
-+
-+/* FindDiretiestBlock is used to select the dirtiest block (or close enough)
-+ * for garbage collection.
-+ */
-+
-+static int yaffs_FindBlockForGarbageCollection(yaffs_Device *dev,
-+ int aggressive)
-+{
-+ int b = dev->currentDirtyChecker;
-+
-+ int i;
-+ int iterations;
-+ int dirtiest = -1;
-+ int pagesInUse = 0;
-+ int prioritised = 0;
-+ yaffs_BlockInfo *bi;
-+ int pendingPrioritisedExist = 0;
-+
-+ /* First let's see if we need to grab a prioritised block */
-+ if (dev->hasPendingPrioritisedGCs) {
-+ for (i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++) {
-+
-+ bi = yaffs_GetBlockInfo(dev, i);
-+ /* yaffs_VerifyBlock(dev,bi,i); */
-+
-+ if (bi->gcPrioritise) {
-+ pendingPrioritisedExist = 1;
-+ if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
-+ yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
-+ pagesInUse = (bi->pagesInUse - bi->softDeletions);
-+ dirtiest = i;
-+ prioritised = 1;
-+ aggressive = 1; /* Fool the non-aggressive skip logiv below */
-+ }
-+ }
-+ }
-+
-+ if (!pendingPrioritisedExist) /* None found, so we can clear this */
-+ dev->hasPendingPrioritisedGCs = 0;
-+ }
-+
-+ /* If we're doing aggressive GC then we are happy to take a less-dirty block, and
-+ * search harder.
-+ * else (we're doing a leasurely gc), then we only bother to do this if the
-+ * block has only a few pages in use.
++ /* If the block is still healthy erase it and mark as clean.
++ * If the block has had a data failure, then retire it.
+ */
+
-+ dev->nonAggressiveSkip--;
-+
-+ if (!aggressive && (dev->nonAggressiveSkip > 0))
-+ return -1;
-+
-+ if (!prioritised)
-+ pagesInUse =
-+ (aggressive) ? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1;
-+
-+ if (aggressive)
-+ iterations =
-+ dev->internalEndBlock - dev->internalStartBlock + 1;
-+ else {
-+ iterations =
-+ dev->internalEndBlock - dev->internalStartBlock + 1;
-+ iterations = iterations / 16;
-+ if (iterations > 200)
-+ iterations = 200;
-+ }
-+
-+ for (i = 0; i <= iterations && pagesInUse > 0 && !prioritised; i++) {
-+ b++;
-+ if (b < dev->internalStartBlock || b > dev->internalEndBlock)
-+ b = dev->internalStartBlock;
-+
-+ if (b < dev->internalStartBlock || b > dev->internalEndBlock) {
-+ T(YAFFS_TRACE_ERROR,
-+ (TSTR("**>> Block %d is not valid" TENDSTR), b));
-+ YBUG();
-+ }
++ T(YAFFS_TRACE_GC | YAFFS_TRACE_ERASE,
++ (TSTR("yaffs_block_became_dirty block %d state %d %s" TENDSTR),
++ block_no, bi->block_state,
++ (bi->needs_retiring) ? "needs retiring" : ""));
+
-+ bi = yaffs_GetBlockInfo(dev, b);
++ yaffs2_clear_oldest_dirty_seq(dev, bi);
+
-+ if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
-+ (bi->pagesInUse - bi->softDeletions) < pagesInUse &&
-+ yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
-+ dirtiest = b;
-+ pagesInUse = (bi->pagesInUse - bi->softDeletions);
-+ }
-+ }
++ bi->block_state = YAFFS_BLOCK_STATE_DIRTY;
+
-+ dev->currentDirtyChecker = b;
++ /* If this is the block being garbage collected then stop gc'ing this block */
++ if (block_no == dev->gc_block)
++ dev->gc_block = 0;
+
-+ if (dirtiest > 0) {
-+ T(YAFFS_TRACE_GC,
-+ (TSTR("GC Selected block %d with %d free, prioritised:%d" TENDSTR), dirtiest,
-+ dev->nChunksPerBlock - pagesInUse, prioritised));
++ /* If this block is currently the best candidate for gc then drop as a candidate */
++ if (block_no == dev->gc_dirtiest) {
++ dev->gc_dirtiest = 0;
++ dev->gc_pages_in_use = 0;
+ }
+
-+ dev->oldestDirtySequence = 0;
-+
-+ if (dirtiest > 0)
-+ dev->nonAggressiveSkip = 4;
-+
-+ return dirtiest;
-+}
-+
-+static void yaffs_BlockBecameDirty(yaffs_Device *dev, int blockNo)
-+{
-+ yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockNo);
-+
-+ int erasedOk = 0;
-+
-+ /* If the block is still healthy erase it and mark as clean.
-+ * If the block has had a data failure, then retire it.
-+ */
-+
-+ T(YAFFS_TRACE_GC | YAFFS_TRACE_ERASE,
-+ (TSTR("yaffs_BlockBecameDirty block %d state %d %s"TENDSTR),
-+ blockNo, bi->blockState, (bi->needsRetiring) ? "needs retiring" : ""));
-+
-+ bi->blockState = YAFFS_BLOCK_STATE_DIRTY;
-+
-+ if (!bi->needsRetiring) {
-+ yaffs_InvalidateCheckpoint(dev);
-+ erasedOk = yaffs_EraseBlockInNAND(dev, blockNo);
-+ if (!erasedOk) {
-+ dev->nErasureFailures++;
++ if (!bi->needs_retiring) {
++ yaffs2_checkpt_invalidate(dev);
++ erased_ok = yaffs_erase_block(dev, block_no);
++ if (!erased_ok) {
++ dev->n_erase_failures++;
+ T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
-+ (TSTR("**>> Erasure failed %d" TENDSTR), blockNo));
++ (TSTR("**>> Erasure failed %d" TENDSTR), block_no));
+ }
+ }
+
-+ if (erasedOk &&
-+ ((yaffs_traceMask & YAFFS_TRACE_ERASE) || !yaffs_SkipVerification(dev))) {
++ if (erased_ok &&
++ ((yaffs_trace_mask & YAFFS_TRACE_ERASE)
++ || !yaffs_skip_verification(dev))) {
+ int i;
-+ for (i = 0; i < dev->nChunksPerBlock; i++) {
-+ if (!yaffs_CheckChunkErased
-+ (dev, blockNo * dev->nChunksPerBlock + i)) {
++ for (i = 0; i < dev->param.chunks_per_block; i++) {
++ if (!yaffs_check_chunk_erased
++ (dev, block_no * dev->param.chunks_per_block + i)) {
+ T(YAFFS_TRACE_ERROR,
+ (TSTR
+ (">>Block %d erasure supposedly OK, but chunk %d not erased"
-+ TENDSTR), blockNo, i));
++ TENDSTR), block_no, i));
+ }
+ }
+ }
+
-+ if (erasedOk) {
++ if (erased_ok) {
+ /* Clean it up... */
-+ bi->blockState = YAFFS_BLOCK_STATE_EMPTY;
-+ dev->nErasedBlocks++;
-+ bi->pagesInUse = 0;
-+ bi->softDeletions = 0;
-+ bi->hasShrinkHeader = 0;
-+ bi->skipErasedCheck = 1; /* This is clean, so no need to check */
-+ bi->gcPrioritise = 0;
-+ yaffs_ClearChunkBits(dev, blockNo);
++ bi->block_state = YAFFS_BLOCK_STATE_EMPTY;
++ bi->seq_number = 0;
++ dev->n_erased_blocks++;
++ bi->pages_in_use = 0;
++ bi->soft_del_pages = 0;
++ bi->has_shrink_hdr = 0;
++ bi->skip_erased_check = 1; /* This is clean, so no need to check */
++ bi->gc_prioritise = 0;
++ yaffs_clear_chunk_bits(dev, block_no);
+
+ T(YAFFS_TRACE_ERASE,
-+ (TSTR("Erased block %d" TENDSTR), blockNo));
++ (TSTR("Erased block %d" TENDSTR), block_no));
+ } else {
-+ dev->nFreeChunks -= dev->nChunksPerBlock; /* We lost a block of free space */
++ dev->n_free_chunks -= dev->param.chunks_per_block; /* We lost a block of free space */
+
-+ yaffs_RetireBlock(dev, blockNo);
++ yaffs_retire_block(dev, block_no);
+ T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
-+ (TSTR("**>> Block %d retired" TENDSTR), blockNo));
++ (TSTR("**>> Block %d retired" TENDSTR), block_no));
+ }
+}
+
-+static int yaffs_FindBlockForAllocation(yaffs_Device *dev)
++static int yaffs_find_alloc_block(struct yaffs_dev *dev)
+{
+ int i;
+
-+ yaffs_BlockInfo *bi;
++ struct yaffs_block_info *bi;
+
-+ if (dev->nErasedBlocks < 1) {
++ if (dev->n_erased_blocks < 1) {
+ /* Hoosterman we've got a problem.
+ * Can't get space to gc
+ */
@@ -6770,264 +3756,233 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+
+ /* Find an empty block. */
+
-+ for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-+ dev->allocationBlockFinder++;
-+ if (dev->allocationBlockFinder < dev->internalStartBlock
-+ || dev->allocationBlockFinder > dev->internalEndBlock) {
-+ dev->allocationBlockFinder = dev->internalStartBlock;
++ for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
++ dev->alloc_block_finder++;
++ if (dev->alloc_block_finder < dev->internal_start_block
++ || dev->alloc_block_finder > dev->internal_end_block) {
++ dev->alloc_block_finder = dev->internal_start_block;
+ }
+
-+ bi = yaffs_GetBlockInfo(dev, dev->allocationBlockFinder);
++ bi = yaffs_get_block_info(dev, dev->alloc_block_finder);
+
-+ if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY) {
-+ bi->blockState = YAFFS_BLOCK_STATE_ALLOCATING;
-+ dev->sequenceNumber++;
-+ bi->sequenceNumber = dev->sequenceNumber;
-+ dev->nErasedBlocks--;
++ if (bi->block_state == YAFFS_BLOCK_STATE_EMPTY) {
++ bi->block_state = YAFFS_BLOCK_STATE_ALLOCATING;
++ dev->seq_number++;
++ bi->seq_number = dev->seq_number;
++ dev->n_erased_blocks--;
+ T(YAFFS_TRACE_ALLOCATE,
+ (TSTR("Allocated block %d, seq %d, %d left" TENDSTR),
-+ dev->allocationBlockFinder, dev->sequenceNumber,
-+ dev->nErasedBlocks));
-+ return dev->allocationBlockFinder;
++ dev->alloc_block_finder, dev->seq_number,
++ dev->n_erased_blocks));
++ return dev->alloc_block_finder;
+ }
+ }
+
+ T(YAFFS_TRACE_ALWAYS,
+ (TSTR
+ ("yaffs tragedy: no more erased blocks, but there should have been %d"
-+ TENDSTR), dev->nErasedBlocks));
++ TENDSTR), dev->n_erased_blocks));
+
+ return -1;
+}
+
-+
-+
-+static int yaffs_CalcCheckpointBlocksRequired(yaffs_Device *dev)
-+{
-+ if (!dev->nCheckpointBlocksRequired &&
-+ dev->isYaffs2) {
-+ /* Not a valid value so recalculate */
-+ int nBytes = 0;
-+ int nBlocks;
-+ int devBlocks = (dev->endBlock - dev->startBlock + 1);
-+ int tnodeSize;
-+
-+ tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+
-+ if (tnodeSize < sizeof(yaffs_Tnode))
-+ tnodeSize = sizeof(yaffs_Tnode);
-+
-+ nBytes += sizeof(yaffs_CheckpointValidity);
-+ nBytes += sizeof(yaffs_CheckpointDevice);
-+ nBytes += devBlocks * sizeof(yaffs_BlockInfo);
-+ nBytes += devBlocks * dev->chunkBitmapStride;
-+ nBytes += (sizeof(yaffs_CheckpointObject) + sizeof(__u32)) * (dev->nObjectsCreated - dev->nFreeObjects);
-+ nBytes += (tnodeSize + sizeof(__u32)) * (dev->nTnodesCreated - dev->nFreeTnodes);
-+ nBytes += sizeof(yaffs_CheckpointValidity);
-+ nBytes += sizeof(__u32); /* checksum*/
-+
-+ /* Round up and add 2 blocks to allow for some bad blocks, so add 3 */
-+
-+ nBlocks = (nBytes/(dev->nDataBytesPerChunk * dev->nChunksPerBlock)) + 3;
-+
-+ dev->nCheckpointBlocksRequired = nBlocks;
-+ }
-+
-+ return dev->nCheckpointBlocksRequired;
-+}
-+
+/*
+ * Check if there's space to allocate...
-+ * Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()?
++ * Thinks.... do we need top make this ths same as yaffs_get_free_chunks()?
+ */
-+static int yaffs_CheckSpaceForAllocation(yaffs_Device *dev)
++int yaffs_check_alloc_available(struct yaffs_dev *dev, int n_chunks)
+{
-+ int reservedChunks;
-+ int reservedBlocks = dev->nReservedBlocks;
-+ int checkpointBlocks;
++ int reserved_chunks;
++ int reserved_blocks = dev->param.n_reserved_blocks;
++ int checkpt_blocks;
+
-+ if (dev->isYaffs2) {
-+ checkpointBlocks = yaffs_CalcCheckpointBlocksRequired(dev) -
-+ dev->blocksInCheckpoint;
-+ if (checkpointBlocks < 0)
-+ checkpointBlocks = 0;
-+ } else {
-+ checkpointBlocks = 0;
-+ }
++ checkpt_blocks = yaffs_calc_checkpt_blocks_required(dev);
+
-+ reservedChunks = ((reservedBlocks + checkpointBlocks) * dev->nChunksPerBlock);
++ reserved_chunks =
++ ((reserved_blocks + checkpt_blocks) * dev->param.chunks_per_block);
+
-+ return (dev->nFreeChunks > reservedChunks);
++ return (dev->n_free_chunks > (reserved_chunks + n_chunks));
+}
+
-+static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
-+ yaffs_BlockInfo **blockUsedPtr)
++static int yaffs_alloc_chunk(struct yaffs_dev *dev, int use_reserver,
++ struct yaffs_block_info **block_ptr)
+{
-+ int retVal;
-+ yaffs_BlockInfo *bi;
++ int ret_val;
++ struct yaffs_block_info *bi;
+
-+ if (dev->allocationBlock < 0) {
++ if (dev->alloc_block < 0) {
+ /* Get next block to allocate off */
-+ dev->allocationBlock = yaffs_FindBlockForAllocation(dev);
-+ dev->allocationPage = 0;
++ dev->alloc_block = yaffs_find_alloc_block(dev);
++ dev->alloc_page = 0;
+ }
+
-+ if (!useReserve && !yaffs_CheckSpaceForAllocation(dev)) {
++ if (!use_reserver && !yaffs_check_alloc_available(dev, 1)) {
+ /* Not enough space to allocate unless we're allowed to use the reserve. */
+ return -1;
+ }
+
-+ if (dev->nErasedBlocks < dev->nReservedBlocks
-+ && dev->allocationPage == 0) {
++ if (dev->n_erased_blocks < dev->param.n_reserved_blocks
++ && dev->alloc_page == 0) {
+ T(YAFFS_TRACE_ALLOCATE, (TSTR("Allocating reserve" TENDSTR)));
+ }
+
+ /* Next page please.... */
-+ if (dev->allocationBlock >= 0) {
-+ bi = yaffs_GetBlockInfo(dev, dev->allocationBlock);
++ if (dev->alloc_block >= 0) {
++ bi = yaffs_get_block_info(dev, dev->alloc_block);
+
-+ retVal = (dev->allocationBlock * dev->nChunksPerBlock) +
-+ dev->allocationPage;
-+ bi->pagesInUse++;
-+ yaffs_SetChunkBit(dev, dev->allocationBlock,
-+ dev->allocationPage);
++ ret_val = (dev->alloc_block * dev->param.chunks_per_block) +
++ dev->alloc_page;
++ bi->pages_in_use++;
++ yaffs_set_chunk_bit(dev, dev->alloc_block, dev->alloc_page);
+
-+ dev->allocationPage++;
++ dev->alloc_page++;
+
-+ dev->nFreeChunks--;
++ dev->n_free_chunks--;
+
+ /* If the block is full set the state to full */
-+ if (dev->allocationPage >= dev->nChunksPerBlock) {
-+ bi->blockState = YAFFS_BLOCK_STATE_FULL;
-+ dev->allocationBlock = -1;
++ if (dev->alloc_page >= dev->param.chunks_per_block) {
++ bi->block_state = YAFFS_BLOCK_STATE_FULL;
++ dev->alloc_block = -1;
+ }
+
-+ if (blockUsedPtr)
-+ *blockUsedPtr = bi;
++ if (block_ptr)
++ *block_ptr = bi;
+
-+ return retVal;
++ return ret_val;
+ }
+
+ T(YAFFS_TRACE_ERROR,
-+ (TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
++ (TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
+
+ return -1;
+}
+
-+static int yaffs_GetErasedChunks(yaffs_Device *dev)
++static int yaffs_get_erased_chunks(struct yaffs_dev *dev)
+{
+ int n;
+
-+ n = dev->nErasedBlocks * dev->nChunksPerBlock;
++ n = dev->n_erased_blocks * dev->param.chunks_per_block;
+
-+ if (dev->allocationBlock > 0)
-+ n += (dev->nChunksPerBlock - dev->allocationPage);
++ if (dev->alloc_block > 0)
++ n += (dev->param.chunks_per_block - dev->alloc_page);
+
+ return n;
+
+}
+
-+static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block,
-+ int wholeBlock)
++/*
++ * yaffs_skip_rest_of_block() skips over the rest of the allocation block
++ * if we don't want to write to it.
++ */
++void yaffs_skip_rest_of_block(struct yaffs_dev *dev)
++{
++ if (dev->alloc_block > 0) {
++ struct yaffs_block_info *bi =
++ yaffs_get_block_info(dev, dev->alloc_block);
++ if (bi->block_state == YAFFS_BLOCK_STATE_ALLOCATING) {
++ bi->block_state = YAFFS_BLOCK_STATE_FULL;
++ dev->alloc_block = -1;
++ }
++ }
++}
++
++static int yaffs_gc_block(struct yaffs_dev *dev, int block, int whole_block)
+{
-+ int oldChunk;
-+ int newChunk;
-+ int markNAND;
-+ int retVal = YAFFS_OK;
-+ int cleanups = 0;
++ int old_chunk;
++ int new_chunk;
++ int mark_flash;
++ int ret_val = YAFFS_OK;
+ int i;
-+ int isCheckpointBlock;
-+ int matchingChunk;
-+ int maxCopies;
-+
-+ int chunksBefore = yaffs_GetErasedChunks(dev);
-+ int chunksAfter;
++ int is_checkpt_block;
++ int matching_chunk;
++ int max_copies;
+
-+ yaffs_ExtendedTags tags;
++ int chunks_before = yaffs_get_erased_chunks(dev);
++ int chunks_after;
+
-+ yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, block);
++ struct yaffs_ext_tags tags;
+
-+ yaffs_Object *object;
++ struct yaffs_block_info *bi = yaffs_get_block_info(dev, block);
+
-+ isCheckpointBlock = (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT);
++ struct yaffs_obj *object;
+
-+ bi->blockState = YAFFS_BLOCK_STATE_COLLECTING;
++ is_checkpt_block = (bi->block_state == YAFFS_BLOCK_STATE_CHECKPOINT);
+
+ T(YAFFS_TRACE_TRACING,
-+ (TSTR("Collecting block %d, in use %d, shrink %d, wholeBlock %d" TENDSTR),
-+ block,
-+ bi->pagesInUse,
-+ bi->hasShrinkHeader,
-+ wholeBlock));
++ (TSTR
++ ("Collecting block %d, in use %d, shrink %d, whole_block %d"
++ TENDSTR), block, bi->pages_in_use, bi->has_shrink_hdr,
++ whole_block));
+
-+ /*yaffs_VerifyFreeChunks(dev); */
++ /*yaffs_verify_free_chunks(dev); */
+
-+ bi->hasShrinkHeader = 0; /* clear the flag so that the block can erase */
++ if (bi->block_state == YAFFS_BLOCK_STATE_FULL)
++ bi->block_state = YAFFS_BLOCK_STATE_COLLECTING;
+
-+ /* Take off the number of soft deleted entries because
-+ * they're going to get really deleted during GC.
-+ */
-+ dev->nFreeChunks -= bi->softDeletions;
++ bi->has_shrink_hdr = 0; /* clear the flag so that the block can erase */
+
-+ dev->isDoingGC = 1;
++ dev->gc_disable = 1;
+
-+ if (isCheckpointBlock ||
-+ !yaffs_StillSomeChunkBits(dev, block)) {
++ if (is_checkpt_block || !yaffs_still_some_chunks(dev, block)) {
+ T(YAFFS_TRACE_TRACING,
-+ (TSTR
-+ ("Collecting block %d that has no chunks in use" TENDSTR),
-+ block));
-+ yaffs_BlockBecameDirty(dev, block);
++ (TSTR
++ ("Collecting block %d that has no chunks in use" TENDSTR),
++ block));
++ yaffs_block_became_dirty(dev, block);
+ } else {
+
-+ __u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
++ u8 *buffer = yaffs_get_temp_buffer(dev, __LINE__);
+
-+ yaffs_VerifyBlock(dev, bi, block);
++ yaffs_verify_blk(dev, bi, block);
+
-+ maxCopies = (wholeBlock) ? dev->nChunksPerBlock : 10;
-+ oldChunk = block * dev->nChunksPerBlock + dev->gcChunk;
++ max_copies = (whole_block) ? dev->param.chunks_per_block : 5;
++ old_chunk = block * dev->param.chunks_per_block + dev->gc_chunk;
+
-+ for (/* init already done */;
-+ retVal == YAFFS_OK &&
-+ dev->gcChunk < dev->nChunksPerBlock &&
-+ (bi->blockState == YAFFS_BLOCK_STATE_COLLECTING) &&
-+ maxCopies > 0;
-+ dev->gcChunk++, oldChunk++) {
-+ if (yaffs_CheckChunkBit(dev, block, dev->gcChunk)) {
++ for ( /* init already done */ ;
++ ret_val == YAFFS_OK &&
++ dev->gc_chunk < dev->param.chunks_per_block &&
++ (bi->block_state == YAFFS_BLOCK_STATE_COLLECTING) &&
++ max_copies > 0; dev->gc_chunk++, old_chunk++) {
++ if (yaffs_check_chunk_bit(dev, block, dev->gc_chunk)) {
+
+ /* This page is in use and might need to be copied off */
+
-+ maxCopies--;
++ max_copies--;
+
-+ markNAND = 1;
++ mark_flash = 1;
+
-+ yaffs_InitialiseTags(&tags);
++ yaffs_init_tags(&tags);
+
-+ yaffs_ReadChunkWithTagsFromNAND(dev, oldChunk,
-+ buffer, &tags);
++ yaffs_rd_chunk_tags_nand(dev, old_chunk,
++ buffer, &tags);
+
-+ object =
-+ yaffs_FindObjectByNumber(dev,
-+ tags.objectId);
++ object = yaffs_find_by_number(dev, tags.obj_id);
+
+ T(YAFFS_TRACE_GC_DETAIL,
+ (TSTR
-+ ("Collecting chunk in block %d, %d %d %d " TENDSTR),
-+ dev->gcChunk, tags.objectId, tags.chunkId,
-+ tags.byteCount));
-+
-+ if (object && !yaffs_SkipVerification(dev)) {
-+ if (tags.chunkId == 0)
-+ matchingChunk = object->hdrChunk;
-+ else if (object->softDeleted)
-+ matchingChunk = oldChunk; /* Defeat the test */
++ ("Collecting chunk in block %d, %d %d %d "
++ TENDSTR), dev->gc_chunk, tags.obj_id,
++ tags.chunk_id, tags.n_bytes));
++
++ if (object && !yaffs_skip_verification(dev)) {
++ if (tags.chunk_id == 0)
++ matching_chunk =
++ object->hdr_chunk;
++ else if (object->soft_del)
++ matching_chunk = old_chunk; /* Defeat the test */
+ else
-+ matchingChunk = yaffs_FindChunkInFile(object, tags.chunkId, NULL);
++ matching_chunk =
++ yaffs_find_chunk_in_file
++ (object, tags.chunk_id,
++ NULL);
+
-+ if (oldChunk != matchingChunk)
++ if (old_chunk != matching_chunk)
+ T(YAFFS_TRACE_ERROR,
-+ (TSTR("gc: page in gc mismatch: %d %d %d %d"TENDSTR),
-+ oldChunk, matchingChunk, tags.objectId, tags.chunkId));
++ (TSTR
++ ("gc: page in gc mismatch: %d %d %d %d"
++ TENDSTR), old_chunk,
++ matching_chunk, tags.obj_id,
++ tags.chunk_id));
+
+ }
+
@@ -7035,40 +3990,50 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ T(YAFFS_TRACE_ERROR,
+ (TSTR
+ ("page %d in gc has no object: %d %d %d "
-+ TENDSTR), oldChunk,
-+ tags.objectId, tags.chunkId, tags.byteCount));
++ TENDSTR), old_chunk,
++ tags.obj_id, tags.chunk_id,
++ tags.n_bytes));
+ }
+
+ if (object &&
+ object->deleted &&
-+ object->softDeleted &&
-+ tags.chunkId != 0) {
++ object->soft_del && tags.chunk_id != 0) {
+ /* Data chunk in a soft deleted file, throw it away
+ * It's a soft deleted data chunk,
+ * No need to copy this, just forget about it and
+ * fix up the object.
+ */
+
-+ object->nDataChunks--;
++ /* Free chunks already includes softdeleted chunks.
++ * How ever this chunk is going to soon be really deleted
++ * which will increment free chunks.
++ * We have to decrement free chunks so this works out properly.
++ */
++ dev->n_free_chunks--;
++ bi->soft_del_pages--;
+
-+ if (object->nDataChunks <= 0) {
++ object->n_data_chunks--;
++
++ if (object->n_data_chunks <= 0) {
+ /* remeber to clean up the object */
-+ dev->gcCleanupList[cleanups] =
-+ tags.objectId;
-+ cleanups++;
++ dev->gc_cleanup_list[dev->
++ n_clean_ups]
++ = tags.obj_id;
++ dev->n_clean_ups++;
+ }
-+ markNAND = 0;
++ mark_flash = 0;
+ } else if (0) {
-+ /* Todo object && object->deleted && object->nDataChunks == 0 */
++ /* Todo object && object->deleted && object->n_data_chunks == 0 */
+ /* Deleted object header with no data chunks.
+ * Can be discarded and the file deleted.
+ */
-+ object->hdrChunk = 0;
-+ yaffs_FreeTnode(object->myDev,
-+ object->variant.
-+ fileVariant.top);
-+ object->variant.fileVariant.top = NULL;
-+ yaffs_DoGenericObjectDeletion(object);
++ object->hdr_chunk = 0;
++ yaffs_free_tnode(object->my_dev,
++ object->
++ variant.file_variant.
++ top);
++ object->variant.file_variant.top = NULL;
++ yaffs_generic_obj_del(object);
+
+ } else if (object) {
+ /* It's either a data chunk in a live file or
@@ -7076,99 +4041,293 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ * NB Need to keep the ObjectHeaders of deleted files
+ * until the whole file has been deleted off
+ */
-+ tags.serialNumber++;
++ tags.serial_number++;
+
-+ dev->nGCCopies++;
++ dev->n_gc_copies++;
+
-+ if (tags.chunkId == 0) {
++ if (tags.chunk_id == 0) {
+ /* It is an object Id,
+ * We need to nuke the shrinkheader flags first
-+ * We no longer want the shrinkHeader flag since its work is done
++ * Also need to clean up shadowing.
++ * We no longer want the shrink_header flag since its work is done
+ * and if it is left in place it will mess up scanning.
+ */
+
-+ yaffs_ObjectHeader *oh;
-+ oh = (yaffs_ObjectHeader *)buffer;
-+ oh->isShrink = 0;
-+ tags.extraIsShrinkHeader = 0;
-+
-+ yaffs_VerifyObjectHeader(object, oh, &tags, 1);
-+ }
-+
-+ newChunk =
-+ yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &tags, 1);
++ struct yaffs_obj_hdr *oh;
++ oh = (struct yaffs_obj_hdr *)
++ buffer;
++
++ oh->is_shrink = 0;
++ tags.extra_is_shrink = 0;
++
++ oh->shadows_obj = 0;
++ oh->inband_shadowed_obj_id = 0;
++ tags.extra_shadows = 0;
++
++ /* Update file size */
++ if (object->variant_type ==
++ YAFFS_OBJECT_TYPE_FILE) {
++ oh->file_size =
++ object->variant.
++ file_variant.
++ file_size;
++ tags.extra_length =
++ oh->file_size;
++ }
+
-+ if (newChunk < 0) {
-+ retVal = YAFFS_FAIL;
++ yaffs_verify_oh(object, oh,
++ &tags, 1);
++ new_chunk =
++ yaffs_write_new_chunk(dev,
++ (u8 *)
++ oh,
++ &tags,
++ 1);
++ } else {
++ new_chunk =
++ yaffs_write_new_chunk(dev,
++ buffer,
++ &tags,
++ 1);
++ }
++
++ if (new_chunk < 0) {
++ ret_val = YAFFS_FAIL;
+ } else {
+
+ /* Ok, now fix up the Tnodes etc. */
+
-+ if (tags.chunkId == 0) {
++ if (tags.chunk_id == 0) {
+ /* It's a header */
-+ object->hdrChunk = newChunk;
-+ object->serial = tags.serialNumber;
++ object->hdr_chunk =
++ new_chunk;
++ object->serial =
++ tags.serial_number;
+ } else {
+ /* It's a data chunk */
-+ yaffs_PutChunkIntoFile
-+ (object,
-+ tags.chunkId,
-+ newChunk, 0);
++ int ok;
++ ok = yaffs_put_chunk_in_file(object, tags.chunk_id, new_chunk, 0);
+ }
+ }
+ }
+
-+ if (retVal == YAFFS_OK)
-+ yaffs_DeleteChunk(dev, oldChunk, markNAND, __LINE__);
++ if (ret_val == YAFFS_OK)
++ yaffs_chunk_del(dev, old_chunk,
++ mark_flash, __LINE__);
+
+ }
+ }
+
-+ yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
++ yaffs_release_temp_buffer(dev, buffer, __LINE__);
+
++ }
++
++ yaffs_verify_collected_blk(dev, bi, block);
+
++ if (bi->block_state == YAFFS_BLOCK_STATE_COLLECTING) {
++ /*
++ * The gc did not complete. Set block state back to FULL
++ * because checkpointing does not restore gc.
++ */
++ bi->block_state = YAFFS_BLOCK_STATE_FULL;
++ } else {
++ /* The gc completed. */
+ /* Do any required cleanups */
-+ for (i = 0; i < cleanups; i++) {
++ for (i = 0; i < dev->n_clean_ups; i++) {
+ /* Time to delete the file too */
+ object =
-+ yaffs_FindObjectByNumber(dev,
-+ dev->gcCleanupList[i]);
++ yaffs_find_by_number(dev, dev->gc_cleanup_list[i]);
+ if (object) {
-+ yaffs_FreeTnode(dev,
-+ object->variant.fileVariant.
-+ top);
-+ object->variant.fileVariant.top = NULL;
++ yaffs_free_tnode(dev,
++ object->variant.
++ file_variant.top);
++ object->variant.file_variant.top = NULL;
+ T(YAFFS_TRACE_GC,
+ (TSTR
+ ("yaffs: About to finally delete object %d"
-+ TENDSTR), object->objectId));
-+ yaffs_DoGenericObjectDeletion(object);
-+ object->myDev->nDeletedFiles--;
++ TENDSTR), object->obj_id));
++ yaffs_generic_obj_del(object);
++ object->my_dev->n_deleted_files--;
+ }
+
+ }
+
++ chunks_after = yaffs_get_erased_chunks(dev);
++ if (chunks_before >= chunks_after) {
++ T(YAFFS_TRACE_GC,
++ (TSTR
++ ("gc did not increase free chunks before %d after %d"
++ TENDSTR), chunks_before, chunks_after));
++ }
++ dev->gc_block = 0;
++ dev->gc_chunk = 0;
++ dev->n_clean_ups = 0;
+ }
+
-+ yaffs_VerifyCollectedBlock(dev, bi, block);
++ dev->gc_disable = 0;
+
-+ chunksAfter = yaffs_GetErasedChunks(dev);
-+ if (chunksBefore >= chunksAfter) {
-+ T(YAFFS_TRACE_GC,
-+ (TSTR
-+ ("gc did not increase free chunks before %d after %d"
-+ TENDSTR), chunksBefore, chunksAfter));
++ return ret_val;
++}
++
++/*
++ * FindBlockForgarbageCollection is used to select the dirtiest block (or close enough)
++ * for garbage collection.
++ */
++
++static unsigned yaffs_find_gc_block(struct yaffs_dev *dev,
++ int aggressive, int background)
++{
++ int i;
++ int iterations;
++ unsigned selected = 0;
++ int prioritised = 0;
++ int prioritised_exist = 0;
++ struct yaffs_block_info *bi;
++ int threshold;
++
++ /* First let's see if we need to grab a prioritised block */
++ if (dev->has_pending_prioritised_gc && !aggressive) {
++ dev->gc_dirtiest = 0;
++ bi = dev->block_info;
++ for (i = dev->internal_start_block;
++ i <= dev->internal_end_block && !selected; i++) {
++
++ if (bi->gc_prioritise) {
++ prioritised_exist = 1;
++ if (bi->block_state == YAFFS_BLOCK_STATE_FULL &&
++ yaffs_block_ok_for_gc(dev, bi)) {
++ selected = i;
++ prioritised = 1;
++ }
++ }
++ bi++;
++ }
++
++ /*
++ * If there is a prioritised block and none was selected then
++ * this happened because there is at least one old dirty block gumming
++ * up the works. Let's gc the oldest dirty block.
++ */
++
++ if (prioritised_exist &&
++ !selected && dev->oldest_dirty_block > 0)
++ selected = dev->oldest_dirty_block;
++
++ if (!prioritised_exist) /* None found, so we can clear this */
++ dev->has_pending_prioritised_gc = 0;
+ }
+
-+ /* If the gc completed then clear the current gcBlock so that we find another. */
-+ if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING) {
-+ dev->gcBlock = -1;
-+ dev->gcChunk = 0;
++ /* If we're doing aggressive GC then we are happy to take a less-dirty block, and
++ * search harder.
++ * else (we're doing a leasurely gc), then we only bother to do this if the
++ * block has only a few pages in use.
++ */
++
++ if (!selected) {
++ int pages_used;
++ int n_blocks =
++ dev->internal_end_block - dev->internal_start_block + 1;
++ if (aggressive) {
++ threshold = dev->param.chunks_per_block;
++ iterations = n_blocks;
++ } else {
++ int max_threshold;
++
++ if (background)
++ max_threshold = dev->param.chunks_per_block / 2;
++ else
++ max_threshold = dev->param.chunks_per_block / 8;
++
++ if (max_threshold < YAFFS_GC_PASSIVE_THRESHOLD)
++ max_threshold = YAFFS_GC_PASSIVE_THRESHOLD;
++
++ threshold = background ? (dev->gc_not_done + 2) * 2 : 0;
++ if (threshold < YAFFS_GC_PASSIVE_THRESHOLD)
++ threshold = YAFFS_GC_PASSIVE_THRESHOLD;
++ if (threshold > max_threshold)
++ threshold = max_threshold;
++
++ iterations = n_blocks / 16 + 1;
++ if (iterations > 100)
++ iterations = 100;
++ }
++
++ for (i = 0;
++ i < iterations &&
++ (dev->gc_dirtiest < 1 ||
++ dev->gc_pages_in_use > YAFFS_GC_GOOD_ENOUGH); i++) {
++ dev->gc_block_finder++;
++ if (dev->gc_block_finder < dev->internal_start_block ||
++ dev->gc_block_finder > dev->internal_end_block)
++ dev->gc_block_finder =
++ dev->internal_start_block;
++
++ bi = yaffs_get_block_info(dev, dev->gc_block_finder);
++
++ pages_used = bi->pages_in_use - bi->soft_del_pages;
++
++ if (bi->block_state == YAFFS_BLOCK_STATE_FULL &&
++ pages_used < dev->param.chunks_per_block &&
++ (dev->gc_dirtiest < 1
++ || pages_used < dev->gc_pages_in_use)
++ && yaffs_block_ok_for_gc(dev, bi)) {
++ dev->gc_dirtiest = dev->gc_block_finder;
++ dev->gc_pages_in_use = pages_used;
++ }
++ }
++
++ if (dev->gc_dirtiest > 0 && dev->gc_pages_in_use <= threshold)
++ selected = dev->gc_dirtiest;
++ }
++
++ /*
++ * If nothing has been selected for a while, try selecting the oldest dirty
++ * because that's gumming up the works.
++ */
++
++ if (!selected && dev->param.is_yaffs2 &&
++ dev->gc_not_done >= (background ? 10 : 20)) {
++ yaffs2_find_oldest_dirty_seq(dev);
++ if (dev->oldest_dirty_block > 0) {
++ selected = dev->oldest_dirty_block;
++ dev->gc_dirtiest = selected;
++ dev->oldest_dirty_gc_count++;
++ bi = yaffs_get_block_info(dev, selected);
++ dev->gc_pages_in_use =
++ bi->pages_in_use - bi->soft_del_pages;
++ } else {
++ dev->gc_not_done = 0;
++ }
+ }
+
-+ dev->isDoingGC = 0;
++ if (selected) {
++ T(YAFFS_TRACE_GC,
++ (TSTR
++ ("GC Selected block %d with %d free, prioritised:%d"
++ TENDSTR), selected,
++ dev->param.chunks_per_block - dev->gc_pages_in_use,
++ prioritised));
++
++ dev->n_gc_blocks++;
++ if (background)
++ dev->bg_gcs++;
++
++ dev->gc_dirtiest = 0;
++ dev->gc_pages_in_use = 0;
++ dev->gc_not_done = 0;
++ if (dev->refresh_skip > 0)
++ dev->refresh_skip--;
++ } else {
++ dev->gc_not_done++;
++ T(YAFFS_TRACE_GC,
++ (TSTR
++ ("GC none: finder %d skip %d threshold %d dirtiest %d using %d oldest %d%s"
++ TENDSTR), dev->gc_block_finder, dev->gc_not_done, threshold,
++ dev->gc_dirtiest, dev->gc_pages_in_use,
++ dev->oldest_dirty_block, background ? " bg" : ""));
++ }
+
-+ return retVal;
++ return selected;
+}
+
+/* New garbage collector
@@ -7180,225 +4339,210 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ * The idea is to help clear out space in a more spread-out manner.
+ * Dunno if it really does anything useful.
+ */
-+static int yaffs_CheckGarbageCollection(yaffs_Device *dev)
++static int yaffs_check_gc(struct yaffs_dev *dev, int background)
+{
-+ int block;
-+ int aggressive;
-+ int gcOk = YAFFS_OK;
-+ int maxTries = 0;
++ int aggressive = 0;
++ int gc_ok = YAFFS_OK;
++ int max_tries = 0;
++ int min_erased;
++ int erased_chunks;
++ int checkpt_block_adjust;
+
-+ int checkpointBlockAdjust;
++ if (dev->param.gc_control && (dev->param.gc_control(dev) & 1) == 0)
++ return YAFFS_OK;
+
-+ if (dev->isDoingGC) {
++ if (dev->gc_disable) {
+ /* Bail out so we don't get recursive gc */
+ return YAFFS_OK;
+ }
+
+ /* This loop should pass the first time.
-+ * We'll only see looping here if the erase of the collected block fails.
++ * We'll only see looping here if the collection does not increase space.
+ */
+
+ do {
-+ maxTries++;
++ max_tries++;
+
-+ checkpointBlockAdjust = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
-+ if (checkpointBlockAdjust < 0)
-+ checkpointBlockAdjust = 0;
++ checkpt_block_adjust = yaffs_calc_checkpt_blocks_required(dev);
+
-+ if (dev->nErasedBlocks < (dev->nReservedBlocks + checkpointBlockAdjust + 2)) {
-+ /* We need a block soon...*/
++ min_erased =
++ dev->param.n_reserved_blocks + checkpt_block_adjust + 1;
++ erased_chunks =
++ dev->n_erased_blocks * dev->param.chunks_per_block;
++
++ /* If we need a block soon then do aggressive gc. */
++ if (dev->n_erased_blocks < min_erased)
+ aggressive = 1;
-+ } else {
-+ /* We're in no hurry */
-+ aggressive = 0;
-+ }
++ else {
++ if (!background
++ && erased_chunks > (dev->n_free_chunks / 4))
++ break;
+
-+ if (dev->gcBlock <= 0) {
-+ dev->gcBlock = yaffs_FindBlockForGarbageCollection(dev, aggressive);
-+ dev->gcChunk = 0;
++ if (dev->gc_skip > 20)
++ dev->gc_skip = 20;
++ if (erased_chunks < dev->n_free_chunks / 2 ||
++ dev->gc_skip < 1 || background)
++ aggressive = 0;
++ else {
++ dev->gc_skip--;
++ break;
++ }
+ }
+
-+ block = dev->gcBlock;
++ dev->gc_skip = 5;
+
-+ if (block > 0) {
-+ dev->garbageCollections++;
++ /* If we don't already have a block being gc'd then see if we should start another */
++
++ if (dev->gc_block < 1 && !aggressive) {
++ dev->gc_block = yaffs2_find_refresh_block(dev);
++ dev->gc_chunk = 0;
++ dev->n_clean_ups = 0;
++ }
++ if (dev->gc_block < 1) {
++ dev->gc_block =
++ yaffs_find_gc_block(dev, aggressive, background);
++ dev->gc_chunk = 0;
++ dev->n_clean_ups = 0;
++ }
++
++ if (dev->gc_block > 0) {
++ dev->all_gcs++;
+ if (!aggressive)
-+ dev->passiveGarbageCollections++;
++ dev->passive_gc_count++;
+
+ T(YAFFS_TRACE_GC,
+ (TSTR
-+ ("yaffs: GC erasedBlocks %d aggressive %d" TENDSTR),
-+ dev->nErasedBlocks, aggressive));
++ ("yaffs: GC n_erased_blocks %d aggressive %d"
++ TENDSTR), dev->n_erased_blocks, aggressive));
+
-+ gcOk = yaffs_GarbageCollectBlock(dev, block, aggressive);
++ gc_ok = yaffs_gc_block(dev, dev->gc_block, aggressive);
+ }
+
-+ if (dev->nErasedBlocks < (dev->nReservedBlocks) && block > 0) {
++ if (dev->n_erased_blocks < (dev->param.n_reserved_blocks)
++ && dev->gc_block > 0) {
+ T(YAFFS_TRACE_GC,
+ (TSTR
-+ ("yaffs: GC !!!no reclaim!!! erasedBlocks %d after try %d block %d"
-+ TENDSTR), dev->nErasedBlocks, maxTries, block));
++ ("yaffs: GC !!!no reclaim!!! n_erased_blocks %d after try %d block %d"
++ TENDSTR), dev->n_erased_blocks, max_tries,
++ dev->gc_block));
+ }
-+ } while ((dev->nErasedBlocks < dev->nReservedBlocks) &&
-+ (block > 0) &&
-+ (maxTries < 2));
++ } while ((dev->n_erased_blocks < dev->param.n_reserved_blocks) &&
++ (dev->gc_block > 0) && (max_tries < 2));
+
-+ return aggressive ? gcOk : YAFFS_OK;
++ return aggressive ? gc_ok : YAFFS_OK;
++}
++
++/*
++ * yaffs_bg_gc()
++ * Garbage collects. Intended to be called from a background thread.
++ * Returns non-zero if at least half the free chunks are erased.
++ */
++int yaffs_bg_gc(struct yaffs_dev *dev, unsigned urgency)
++{
++ int erased_chunks = dev->n_erased_blocks * dev->param.chunks_per_block;
++
++ T(YAFFS_TRACE_BACKGROUND, (TSTR("Background gc %u" TENDSTR), urgency));
++
++ yaffs_check_gc(dev, 1);
++ return erased_chunks > dev->n_free_chunks / 2;
+}
+
+/*------------------------- TAGS --------------------------------*/
+
-+static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId,
-+ int chunkInObject)
++static int yaffs_tags_match(const struct yaffs_ext_tags *tags, int obj_id,
++ int chunk_obj)
+{
-+ return (tags->chunkId == chunkInObject &&
-+ tags->objectId == objectId && !tags->chunkDeleted) ? 1 : 0;
++ return (tags->chunk_id == chunk_obj &&
++ tags->obj_id == obj_id && !tags->is_deleted) ? 1 : 0;
+
+}
+
-+
+/*-------------------- Data file manipulation -----------------*/
+
-+static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
-+ yaffs_ExtendedTags *tags)
++static int yaffs_find_chunk_in_file(struct yaffs_obj *in, int inode_chunk,
++ struct yaffs_ext_tags *tags)
+{
+ /*Get the Tnode, then get the level 0 offset chunk offset */
-+ yaffs_Tnode *tn;
-+ int theChunk = -1;
-+ yaffs_ExtendedTags localTags;
-+ int retVal = -1;
++ struct yaffs_tnode *tn;
++ int the_chunk = -1;
++ struct yaffs_ext_tags local_tags;
++ int ret_val = -1;
+
-+ yaffs_Device *dev = in->myDev;
++ struct yaffs_dev *dev = in->my_dev;
+
+ if (!tags) {
+ /* Passed a NULL, so use our own tags space */
-+ tags = &localTags;
++ tags = &local_tags;
+ }
+
-+ tn = yaffs_FindLevel0Tnode(dev, &in->variant.fileVariant, chunkInInode);
++ tn = yaffs_find_tnode_0(dev, &in->variant.file_variant, inode_chunk);
+
+ if (tn) {
-+ theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
++ the_chunk = yaffs_get_group_base(dev, tn, inode_chunk);
+
-+ retVal =
-+ yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
-+ chunkInInode);
++ ret_val =
++ yaffs_find_chunk_in_group(dev, the_chunk, tags, in->obj_id,
++ inode_chunk);
+ }
-+ return retVal;
++ return ret_val;
+}
+
-+static int yaffs_FindAndDeleteChunkInFile(yaffs_Object *in, int chunkInInode,
-+ yaffs_ExtendedTags *tags)
++static int yaffs_find_del_file_chunk(struct yaffs_obj *in, int inode_chunk,
++ struct yaffs_ext_tags *tags)
+{
+ /* Get the Tnode, then get the level 0 offset chunk offset */
-+ yaffs_Tnode *tn;
-+ int theChunk = -1;
-+ yaffs_ExtendedTags localTags;
++ struct yaffs_tnode *tn;
++ int the_chunk = -1;
++ struct yaffs_ext_tags local_tags;
+
-+ yaffs_Device *dev = in->myDev;
-+ int retVal = -1;
++ struct yaffs_dev *dev = in->my_dev;
++ int ret_val = -1;
+
+ if (!tags) {
+ /* Passed a NULL, so use our own tags space */
-+ tags = &localTags;
++ tags = &local_tags;
+ }
+
-+ tn = yaffs_FindLevel0Tnode(dev, &in->variant.fileVariant, chunkInInode);
++ tn = yaffs_find_tnode_0(dev, &in->variant.file_variant, inode_chunk);
+
+ if (tn) {
+
-+ theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
++ the_chunk = yaffs_get_group_base(dev, tn, inode_chunk);
+
-+ retVal =
-+ yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
-+ chunkInInode);
++ ret_val =
++ yaffs_find_chunk_in_group(dev, the_chunk, tags, in->obj_id,
++ inode_chunk);
+
+ /* Delete the entry in the filestructure (if found) */
-+ if (retVal != -1)
-+ yaffs_PutLevel0Tnode(dev, tn, chunkInInode, 0);
-+ }
-+
-+ return retVal;
-+}
-+
-+#ifdef YAFFS_PARANOID
-+
-+static int yaffs_CheckFileSanity(yaffs_Object *in)
-+{
-+ int chunk;
-+ int nChunks;
-+ int fSize;
-+ int failed = 0;
-+ int objId;
-+ yaffs_Tnode *tn;
-+ yaffs_Tags localTags;
-+ yaffs_Tags *tags = &localTags;
-+ int theChunk;
-+ int chunkDeleted;
-+
-+ if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
-+ return YAFFS_FAIL;
-+
-+ objId = in->objectId;
-+ fSize = in->variant.fileVariant.fileSize;
-+ nChunks =
-+ (fSize + in->myDev->nDataBytesPerChunk - 1) / in->myDev->nDataBytesPerChunk;
-+
-+ for (chunk = 1; chunk <= nChunks; chunk++) {
-+ tn = yaffs_FindLevel0Tnode(in->myDev, &in->variant.fileVariant,
-+ chunk);
-+
-+ if (tn) {
-+
-+ theChunk = yaffs_GetChunkGroupBase(dev, tn, chunk);
-+
-+ if (yaffs_CheckChunkBits
-+ (dev, theChunk / dev->nChunksPerBlock,
-+ theChunk % dev->nChunksPerBlock)) {
-+
-+ yaffs_ReadChunkTagsFromNAND(in->myDev, theChunk,
-+ tags,
-+ &chunkDeleted);
-+ if (yaffs_TagsMatch
-+ (tags, in->objectId, chunk, chunkDeleted)) {
-+ /* found it; */
-+
-+ }
-+ } else {
-+
-+ failed = 1;
-+ }
-+
-+ } else {
-+ /* T(("No level 0 found for %d\n", chunk)); */
-+ }
++ if (ret_val != -1)
++ yaffs_load_tnode_0(dev, tn, inode_chunk, 0);
+ }
+
-+ return failed ? YAFFS_FAIL : YAFFS_OK;
++ return ret_val;
+}
+
-+#endif
-+
-+static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
-+ int chunkInNAND, int inScan)
++int yaffs_put_chunk_in_file(struct yaffs_obj *in, int inode_chunk,
++ int nand_chunk, int in_scan)
+{
-+ /* NB inScan is zero unless scanning.
-+ * For forward scanning, inScan is > 0;
-+ * for backward scanning inScan is < 0
++ /* NB in_scan is zero unless scanning.
++ * For forward scanning, in_scan is > 0;
++ * for backward scanning in_scan is < 0
++ *
++ * nand_chunk = 0 is a dummy insert to make sure the tnodes are there.
+ */
+
-+ yaffs_Tnode *tn;
-+ yaffs_Device *dev = in->myDev;
-+ int existingChunk;
-+ yaffs_ExtendedTags existingTags;
-+ yaffs_ExtendedTags newTags;
-+ unsigned existingSerial, newSerial;
++ struct yaffs_tnode *tn;
++ struct yaffs_dev *dev = in->my_dev;
++ int existing_cunk;
++ struct yaffs_ext_tags existing_tags;
++ struct yaffs_ext_tags new_tags;
++ unsigned existing_serial, new_serial;
+
-+ if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
++ if (in->variant_type != YAFFS_OBJECT_TYPE_FILE) {
+ /* Just ignore an attempt at putting a chunk into a non-file during scanning
+ * If it is not during Scanning then something went wrong!
+ */
-+ if (!inScan) {
++ if (!in_scan) {
+ T(YAFFS_TRACE_ERROR,
+ (TSTR
+ ("yaffs tragedy:attempt to put data chunk into a non-file"
@@ -7406,20 +4550,23 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ YBUG();
+ }
+
-+ yaffs_DeleteChunk(dev, chunkInNAND, 1, __LINE__);
++ yaffs_chunk_del(dev, nand_chunk, 1, __LINE__);
+ return YAFFS_OK;
+ }
+
-+ tn = yaffs_AddOrFindLevel0Tnode(dev,
-+ &in->variant.fileVariant,
-+ chunkInInode,
-+ NULL);
++ tn = yaffs_add_find_tnode_0(dev,
++ &in->variant.file_variant,
++ inode_chunk, NULL);
+ if (!tn)
+ return YAFFS_FAIL;
+
-+ existingChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
++ if (!nand_chunk)
++ /* Dummy insert, bail now */
++ return YAFFS_OK;
++
++ existing_cunk = yaffs_get_group_base(dev, tn, inode_chunk);
+
-+ if (inScan != 0) {
++ if (in_scan != 0) {
+ /* If we're scanning then we need to test for duplicates
+ * NB This does not need to be efficient since it should only ever
+ * happen when the power fails during a write, then only one
@@ -7429,8 +4576,8 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ * Update: For backward scanning we don't need to re-read tags so this is quite cheap.
+ */
+
-+ if (existingChunk > 0) {
-+ /* NB Right now existing chunk will not be real chunkId if the device >= 32MB
++ if (existing_cunk > 0) {
++ /* NB Right now existing chunk will not be real chunk_id if the chunk group size > 1
+ * thus we have to do a FindChunkInFile to get the real chunk id.
+ *
+ * We have a duplicate now we need to decide which one to use:
@@ -7440,19 +4587,19 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ * YAFFS1: Get both sets of tags and compare serial numbers.
+ */
+
-+ if (inScan > 0) {
++ if (in_scan > 0) {
+ /* Only do this for forward scanning */
-+ yaffs_ReadChunkWithTagsFromNAND(dev,
-+ chunkInNAND,
-+ NULL, &newTags);
++ yaffs_rd_chunk_tags_nand(dev,
++ nand_chunk,
++ NULL, &new_tags);
+
+ /* Do a proper find */
-+ existingChunk =
-+ yaffs_FindChunkInFile(in, chunkInInode,
-+ &existingTags);
++ existing_cunk =
++ yaffs_find_chunk_in_file(in, inode_chunk,
++ &existing_tags);
+ }
+
-+ if (existingChunk <= 0) {
++ if (existing_cunk <= 0) {
+ /*Hoosterman - how did this happen? */
+
+ T(YAFFS_TRACE_ERROR,
@@ -7466,274 +4613,264 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ * not be loaded during a scan
+ */
+
-+ if (inScan > 0) {
-+ newSerial = newTags.serialNumber;
-+ existingSerial = existingTags.serialNumber;
++ if (in_scan > 0) {
++ new_serial = new_tags.serial_number;
++ existing_serial = existing_tags.serial_number;
+ }
+
-+ if ((inScan > 0) &&
-+ (in->myDev->isYaffs2 ||
-+ existingChunk <= 0 ||
-+ ((existingSerial + 1) & 3) == newSerial)) {
++ if ((in_scan > 0) &&
++ (existing_cunk <= 0 ||
++ ((existing_serial + 1) & 3) == new_serial)) {
+ /* Forward scanning.
+ * Use new
+ * Delete the old one and drop through to update the tnode
+ */
-+ yaffs_DeleteChunk(dev, existingChunk, 1,
-+ __LINE__);
++ yaffs_chunk_del(dev, existing_cunk, 1,
++ __LINE__);
+ } else {
+ /* Backward scanning or we want to use the existing one
+ * Use existing.
+ * Delete the new one and return early so that the tnode isn't changed
+ */
-+ yaffs_DeleteChunk(dev, chunkInNAND, 1,
-+ __LINE__);
++ yaffs_chunk_del(dev, nand_chunk, 1, __LINE__);
+ return YAFFS_OK;
+ }
+ }
+
+ }
+
-+ if (existingChunk == 0)
-+ in->nDataChunks++;
++ if (existing_cunk == 0)
++ in->n_data_chunks++;
+
-+ yaffs_PutLevel0Tnode(dev, tn, chunkInInode, chunkInNAND);
++ yaffs_load_tnode_0(dev, tn, inode_chunk, nand_chunk);
+
+ return YAFFS_OK;
+}
+
-+static int yaffs_ReadChunkDataFromObject(yaffs_Object *in, int chunkInInode,
-+ __u8 *buffer)
++static int yaffs_rd_data_obj(struct yaffs_obj *in, int inode_chunk, u8 * buffer)
+{
-+ int chunkInNAND = yaffs_FindChunkInFile(in, chunkInInode, NULL);
++ int nand_chunk = yaffs_find_chunk_in_file(in, inode_chunk, NULL);
+
-+ if (chunkInNAND >= 0)
-+ return yaffs_ReadChunkWithTagsFromNAND(in->myDev, chunkInNAND,
++ if (nand_chunk >= 0)
++ return yaffs_rd_chunk_tags_nand(in->my_dev, nand_chunk,
+ buffer, NULL);
+ else {
+ T(YAFFS_TRACE_NANDACCESS,
+ (TSTR("Chunk %d not found zero instead" TENDSTR),
-+ chunkInNAND));
++ nand_chunk));
+ /* get sane (zero) data if you read a hole */
-+ memset(buffer, 0, in->myDev->nDataBytesPerChunk);
++ memset(buffer, 0, in->my_dev->data_bytes_per_chunk);
+ return 0;
+ }
+
+}
+
-+void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn)
++void yaffs_chunk_del(struct yaffs_dev *dev, int chunk_id, int mark_flash,
++ int lyn)
+{
+ int block;
+ int page;
-+ yaffs_ExtendedTags tags;
-+ yaffs_BlockInfo *bi;
++ struct yaffs_ext_tags tags;
++ struct yaffs_block_info *bi;
+
-+ if (chunkId <= 0)
++ if (chunk_id <= 0)
+ return;
+
-+ dev->nDeletions++;
-+ block = chunkId / dev->nChunksPerBlock;
-+ page = chunkId % dev->nChunksPerBlock;
-+
++ dev->n_deletions++;
++ block = chunk_id / dev->param.chunks_per_block;
++ page = chunk_id % dev->param.chunks_per_block;
+
-+ if (!yaffs_CheckChunkBit(dev, block, page))
++ if (!yaffs_check_chunk_bit(dev, block, page))
+ T(YAFFS_TRACE_VERIFY,
-+ (TSTR("Deleting invalid chunk %d"TENDSTR),
-+ chunkId));
++ (TSTR("Deleting invalid chunk %d" TENDSTR), chunk_id));
+
-+ bi = yaffs_GetBlockInfo(dev, block);
++ bi = yaffs_get_block_info(dev, block);
++
++ yaffs2_update_oldest_dirty_seq(dev, block, bi);
+
+ T(YAFFS_TRACE_DELETION,
-+ (TSTR("line %d delete of chunk %d" TENDSTR), lyn, chunkId));
++ (TSTR("line %d delete of chunk %d" TENDSTR), lyn, chunk_id));
+
-+ if (markNAND &&
-+ bi->blockState != YAFFS_BLOCK_STATE_COLLECTING && !dev->isYaffs2) {
++ if (!dev->param.is_yaffs2 && mark_flash &&
++ bi->block_state != YAFFS_BLOCK_STATE_COLLECTING) {
+
-+ yaffs_InitialiseTags(&tags);
++ yaffs_init_tags(&tags);
+
-+ tags.chunkDeleted = 1;
++ tags.is_deleted = 1;
+
-+ yaffs_WriteChunkWithTagsToNAND(dev, chunkId, NULL, &tags);
-+ yaffs_HandleUpdateChunk(dev, chunkId, &tags);
++ yaffs_wr_chunk_tags_nand(dev, chunk_id, NULL, &tags);
++ yaffs_handle_chunk_update(dev, chunk_id, &tags);
+ } else {
-+ dev->nUnmarkedDeletions++;
++ dev->n_unmarked_deletions++;
+ }
+
+ /* Pull out of the management area.
+ * If the whole block became dirty, this will kick off an erasure.
+ */
-+ if (bi->blockState == YAFFS_BLOCK_STATE_ALLOCATING ||
-+ bi->blockState == YAFFS_BLOCK_STATE_FULL ||
-+ bi->blockState == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
-+ bi->blockState == YAFFS_BLOCK_STATE_COLLECTING) {
-+ dev->nFreeChunks++;
++ if (bi->block_state == YAFFS_BLOCK_STATE_ALLOCATING ||
++ bi->block_state == YAFFS_BLOCK_STATE_FULL ||
++ bi->block_state == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
++ bi->block_state == YAFFS_BLOCK_STATE_COLLECTING) {
++ dev->n_free_chunks++;
+
-+ yaffs_ClearChunkBit(dev, block, page);
++ yaffs_clear_chunk_bit(dev, block, page);
+
-+ bi->pagesInUse--;
++ bi->pages_in_use--;
+
-+ if (bi->pagesInUse == 0 &&
-+ !bi->hasShrinkHeader &&
-+ bi->blockState != YAFFS_BLOCK_STATE_ALLOCATING &&
-+ bi->blockState != YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
-+ yaffs_BlockBecameDirty(dev, block);
++ if (bi->pages_in_use == 0 &&
++ !bi->has_shrink_hdr &&
++ bi->block_state != YAFFS_BLOCK_STATE_ALLOCATING &&
++ bi->block_state != YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
++ yaffs_block_became_dirty(dev, block);
+ }
+
+ }
+
+}
+
-+static int yaffs_WriteChunkDataToObject(yaffs_Object *in, int chunkInInode,
-+ const __u8 *buffer, int nBytes,
-+ int useReserve)
++static int yaffs_wr_data_obj(struct yaffs_obj *in, int inode_chunk,
++ const u8 * buffer, int n_bytes, int use_reserve)
+{
+ /* Find old chunk Need to do this to get serial number
+ * Write new one and patch into tree.
+ * Invalidate old tags.
+ */
+
-+ int prevChunkId;
-+ yaffs_ExtendedTags prevTags;
++ int prev_chunk_id;
++ struct yaffs_ext_tags prev_tags;
+
-+ int newChunkId;
-+ yaffs_ExtendedTags newTags;
++ int new_chunk_id;
++ struct yaffs_ext_tags new_tags;
+
-+ yaffs_Device *dev = in->myDev;
++ struct yaffs_dev *dev = in->my_dev;
+
-+ yaffs_CheckGarbageCollection(dev);
++ yaffs_check_gc(dev, 0);
+
-+ /* Get the previous chunk at this location in the file if it exists */
-+ prevChunkId = yaffs_FindChunkInFile(in, chunkInInode, &prevTags);
++ /* Get the previous chunk at this location in the file if it exists.
++ * If it does not exist then put a zero into the tree. This creates
++ * the tnode now, rather than later when it is harder to clean up.
++ */
++ prev_chunk_id = yaffs_find_chunk_in_file(in, inode_chunk, &prev_tags);
++ if (prev_chunk_id < 1 &&
++ !yaffs_put_chunk_in_file(in, inode_chunk, 0, 0))
++ return 0;
+
+ /* Set up new tags */
-+ yaffs_InitialiseTags(&newTags);
++ yaffs_init_tags(&new_tags);
+
-+ newTags.chunkId = chunkInInode;
-+ newTags.objectId = in->objectId;
-+ newTags.serialNumber =
-+ (prevChunkId >= 0) ? prevTags.serialNumber + 1 : 1;
-+ newTags.byteCount = nBytes;
++ new_tags.chunk_id = inode_chunk;
++ new_tags.obj_id = in->obj_id;
++ new_tags.serial_number =
++ (prev_chunk_id > 0) ? prev_tags.serial_number + 1 : 1;
++ new_tags.n_bytes = n_bytes;
+
-+ if (nBytes < 1 || nBytes > dev->totalBytesPerChunk) {
++ if (n_bytes < 1 || n_bytes > dev->param.total_bytes_per_chunk) {
+ T(YAFFS_TRACE_ERROR,
-+ (TSTR("Writing %d bytes to chunk!!!!!!!!!" TENDSTR), nBytes));
++ (TSTR("Writing %d bytes to chunk!!!!!!!!!" TENDSTR),
++ n_bytes));
+ YBUG();
+ }
+
-+ newChunkId =
-+ yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &newTags,
-+ useReserve);
++ new_chunk_id =
++ yaffs_write_new_chunk(dev, buffer, &new_tags, use_reserve);
+
-+ if (newChunkId >= 0) {
-+ yaffs_PutChunkIntoFile(in, chunkInInode, newChunkId, 0);
++ if (new_chunk_id > 0) {
++ yaffs_put_chunk_in_file(in, inode_chunk, new_chunk_id, 0);
+
-+ if (prevChunkId >= 0)
-+ yaffs_DeleteChunk(dev, prevChunkId, 1, __LINE__);
++ if (prev_chunk_id > 0)
++ yaffs_chunk_del(dev, prev_chunk_id, 1, __LINE__);
+
-+ yaffs_CheckFileSanity(in);
++ yaffs_verify_file_sane(in);
+ }
-+ return newChunkId;
++ return new_chunk_id;
+
+}
+
+/* UpdateObjectHeader updates the header on NAND for an object.
+ * If name is not NULL, then that new name is used.
+ */
-+int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force,
-+ int isShrink, int shadows)
++int yaffs_update_oh(struct yaffs_obj *in, const YCHAR * name, int force,
++ int is_shrink, int shadows, struct yaffs_xattr_mod *xmod)
+{
+
-+ yaffs_BlockInfo *bi;
++ struct yaffs_block_info *bi;
+
-+ yaffs_Device *dev = in->myDev;
++ struct yaffs_dev *dev = in->my_dev;
+
-+ int prevChunkId;
-+ int retVal = 0;
++ int prev_chunk_id;
++ int ret_val = 0;
+ int result = 0;
+
-+ int newChunkId;
-+ yaffs_ExtendedTags newTags;
-+ yaffs_ExtendedTags oldTags;
-+
-+ __u8 *buffer = NULL;
-+ YCHAR oldName[YAFFS_MAX_NAME_LENGTH + 1];
++ int new_chunk_id;
++ struct yaffs_ext_tags new_tags;
++ struct yaffs_ext_tags old_tags;
++ const YCHAR *alias = NULL;
+
-+ yaffs_ObjectHeader *oh = NULL;
++ u8 *buffer = NULL;
++ YCHAR old_name[YAFFS_MAX_NAME_LENGTH + 1];
+
-+ yaffs_strcpy(oldName, _Y("silly old name"));
++ struct yaffs_obj_hdr *oh = NULL;
+
++ yaffs_strcpy(old_name, _Y("silly old name"));
+
-+ if (!in->fake ||
-+ in == dev->rootDir || /* The rootDir should also be saved */
-+ force) {
++ if (!in->fake || in == dev->root_dir || /* The root_dir should also be saved */
++ force || xmod) {
+
-+ yaffs_CheckGarbageCollection(dev);
-+ yaffs_CheckObjectDetailsLoaded(in);
++ yaffs_check_gc(dev, 0);
++ yaffs_check_obj_details_loaded(in);
+
-+ buffer = yaffs_GetTempBuffer(in->myDev, __LINE__);
-+ oh = (yaffs_ObjectHeader *) buffer;
++ buffer = yaffs_get_temp_buffer(in->my_dev, __LINE__);
++ oh = (struct yaffs_obj_hdr *)buffer;
+
-+ prevChunkId = in->hdrChunk;
++ prev_chunk_id = in->hdr_chunk;
+
-+ if (prevChunkId > 0) {
-+ result = yaffs_ReadChunkWithTagsFromNAND(dev, prevChunkId,
-+ buffer, &oldTags);
++ if (prev_chunk_id > 0) {
++ result = yaffs_rd_chunk_tags_nand(dev, prev_chunk_id,
++ buffer, &old_tags);
+
-+ yaffs_VerifyObjectHeader(in, oh, &oldTags, 0);
++ yaffs_verify_oh(in, oh, &old_tags, 0);
+
-+ memcpy(oldName, oh->name, sizeof(oh->name));
-+ }
-+
-+ memset(buffer, 0xFF, dev->nDataBytesPerChunk);
++ memcpy(old_name, oh->name, sizeof(oh->name));
++ memset(buffer, 0xFF, sizeof(struct yaffs_obj_hdr));
++ } else {
++ memset(buffer, 0xFF, dev->data_bytes_per_chunk);
++ }
+
-+ oh->type = in->variantType;
++ oh->type = in->variant_type;
+ oh->yst_mode = in->yst_mode;
-+ oh->shadowsObject = oh->inbandShadowsObject = shadows;
++ oh->shadows_obj = oh->inband_shadowed_obj_id = shadows;
++
++ yaffs_load_attribs_oh(oh, in);
+
-+#ifdef CONFIG_YAFFS_WINCE
-+ oh->win_atime[0] = in->win_atime[0];
-+ oh->win_ctime[0] = in->win_ctime[0];
-+ oh->win_mtime[0] = in->win_mtime[0];
-+ oh->win_atime[1] = in->win_atime[1];
-+ oh->win_ctime[1] = in->win_ctime[1];
-+ oh->win_mtime[1] = in->win_mtime[1];
-+#else
-+ oh->yst_uid = in->yst_uid;
-+ oh->yst_gid = in->yst_gid;
-+ oh->yst_atime = in->yst_atime;
-+ oh->yst_mtime = in->yst_mtime;
-+ oh->yst_ctime = in->yst_ctime;
-+ oh->yst_rdev = in->yst_rdev;
-+#endif
+ if (in->parent)
-+ oh->parentObjectId = in->parent->objectId;
++ oh->parent_obj_id = in->parent->obj_id;
+ else
-+ oh->parentObjectId = 0;
++ oh->parent_obj_id = 0;
+
+ if (name && *name) {
+ memset(oh->name, 0, sizeof(oh->name));
-+ yaffs_strncpy(oh->name, name, YAFFS_MAX_NAME_LENGTH);
-+ } else if (prevChunkId >= 0)
-+ memcpy(oh->name, oldName, sizeof(oh->name));
-+ else
++ yaffs_load_oh_from_name(dev, oh->name, name);
++ } else if (prev_chunk_id > 0) {
++ memcpy(oh->name, old_name, sizeof(oh->name));
++ } else {
+ memset(oh->name, 0, sizeof(oh->name));
++ }
+
-+ oh->isShrink = isShrink;
++ oh->is_shrink = is_shrink;
+
-+ switch (in->variantType) {
++ switch (in->variant_type) {
+ case YAFFS_OBJECT_TYPE_UNKNOWN:
+ /* Should not happen */
+ break;
+ case YAFFS_OBJECT_TYPE_FILE:
-+ oh->fileSize =
-+ (oh->parentObjectId == YAFFS_OBJECTID_DELETED
-+ || oh->parentObjectId ==
-+ YAFFS_OBJECTID_UNLINKED) ? 0 : in->variant.
-+ fileVariant.fileSize;
++ oh->file_size =
++ (oh->parent_obj_id == YAFFS_OBJECTID_DELETED
++ || oh->parent_obj_id ==
++ YAFFS_OBJECTID_UNLINKED) ? 0 : in->
++ variant.file_variant.file_size;
+ break;
+ case YAFFS_OBJECT_TYPE_HARDLINK:
-+ oh->equivalentObjectId =
-+ in->variant.hardLinkVariant.equivalentObjectId;
++ oh->equiv_id = in->variant.hardlink_variant.equiv_id;
+ break;
+ case YAFFS_OBJECT_TYPE_SPECIAL:
+ /* Do nothing */
@@ -7742,121 +4879,126 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ /* Do nothing */
+ break;
+ case YAFFS_OBJECT_TYPE_SYMLINK:
-+ yaffs_strncpy(oh->alias,
-+ in->variant.symLinkVariant.alias,
-+ YAFFS_MAX_ALIAS_LENGTH);
++ alias = in->variant.symlink_variant.alias;
++ if (!alias)
++ alias = _Y("no alias");
++ yaffs_strncpy(oh->alias, alias, YAFFS_MAX_ALIAS_LENGTH);
+ oh->alias[YAFFS_MAX_ALIAS_LENGTH] = 0;
+ break;
+ }
+
++ /* process any xattrib modifications */
++ if (xmod)
++ yaffs_apply_xattrib_mod(in, (char *)buffer, xmod);
++
+ /* Tags */
-+ yaffs_InitialiseTags(&newTags);
++ yaffs_init_tags(&new_tags);
+ in->serial++;
-+ newTags.chunkId = 0;
-+ newTags.objectId = in->objectId;
-+ newTags.serialNumber = in->serial;
++ new_tags.chunk_id = 0;
++ new_tags.obj_id = in->obj_id;
++ new_tags.serial_number = in->serial;
+
+ /* Add extra info for file header */
+
-+ newTags.extraHeaderInfoAvailable = 1;
-+ newTags.extraParentObjectId = oh->parentObjectId;
-+ newTags.extraFileLength = oh->fileSize;
-+ newTags.extraIsShrinkHeader = oh->isShrink;
-+ newTags.extraEquivalentObjectId = oh->equivalentObjectId;
-+ newTags.extraShadows = (oh->shadowsObject > 0) ? 1 : 0;
-+ newTags.extraObjectType = in->variantType;
++ new_tags.extra_available = 1;
++ new_tags.extra_parent_id = oh->parent_obj_id;
++ new_tags.extra_length = oh->file_size;
++ new_tags.extra_is_shrink = oh->is_shrink;
++ new_tags.extra_equiv_id = oh->equiv_id;
++ new_tags.extra_shadows = (oh->shadows_obj > 0) ? 1 : 0;
++ new_tags.extra_obj_type = in->variant_type;
+
-+ yaffs_VerifyObjectHeader(in, oh, &newTags, 1);
++ yaffs_verify_oh(in, oh, &new_tags, 1);
+
+ /* Create new chunk in NAND */
-+ newChunkId =
-+ yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &newTags,
-+ (prevChunkId >= 0) ? 1 : 0);
++ new_chunk_id =
++ yaffs_write_new_chunk(dev, buffer, &new_tags,
++ (prev_chunk_id > 0) ? 1 : 0);
+
-+ if (newChunkId >= 0) {
++ if (new_chunk_id >= 0) {
+
-+ in->hdrChunk = newChunkId;
++ in->hdr_chunk = new_chunk_id;
+
-+ if (prevChunkId >= 0) {
-+ yaffs_DeleteChunk(dev, prevChunkId, 1,
-+ __LINE__);
++ if (prev_chunk_id > 0) {
++ yaffs_chunk_del(dev, prev_chunk_id, 1,
++ __LINE__);
+ }
+
-+ if (!yaffs_ObjectHasCachedWriteData(in))
++ if (!yaffs_obj_cache_dirty(in))
+ in->dirty = 0;
+
+ /* If this was a shrink, then mark the block that the chunk lives on */
-+ if (isShrink) {
-+ bi = yaffs_GetBlockInfo(in->myDev,
-+ newChunkId / in->myDev->nChunksPerBlock);
-+ bi->hasShrinkHeader = 1;
++ if (is_shrink) {
++ bi = yaffs_get_block_info(in->my_dev,
++ new_chunk_id /
++ in->my_dev->param.
++ chunks_per_block);
++ bi->has_shrink_hdr = 1;
+ }
+
+ }
+
-+ retVal = newChunkId;
++ ret_val = new_chunk_id;
+
+ }
+
+ if (buffer)
-+ yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
++ yaffs_release_temp_buffer(dev, buffer, __LINE__);
+
-+ return retVal;
++ return ret_val;
+}
+
+/*------------------------ Short Operations Cache ----------------------------------------
-+ * In many situations where there is no high level buffering (eg WinCE) a lot of
++ * In many situations where there is no high level buffering a lot of
+ * reads might be short sequential reads, and a lot of writes may be short
+ * sequential writes. eg. scanning/writing a jpeg file.
-+ * In these cases, a short read/write cache can provide a huge perfomance benefit
-+ * with dumb-as-a-rock code.
-+ * In Linux, the page cache provides read buffering aand the short op cache provides write
-+ * buffering.
++ * In these cases, a short read/write cache can provide a huge perfomance
++ * benefit with dumb-as-a-rock code.
++ * In Linux, the page cache provides read buffering and the short op cache
++ * provides write buffering.
+ *
+ * There are a limited number (~10) of cache chunks per device so that we don't
+ * need a very intelligent search.
+ */
+
-+static int yaffs_ObjectHasCachedWriteData(yaffs_Object *obj)
++static int yaffs_obj_cache_dirty(struct yaffs_obj *obj)
+{
-+ yaffs_Device *dev = obj->myDev;
++ struct yaffs_dev *dev = obj->my_dev;
+ int i;
-+ yaffs_ChunkCache *cache;
-+ int nCaches = obj->myDev->nShortOpCaches;
++ struct yaffs_cache *cache;
++ int n_caches = obj->my_dev->param.n_caches;
+
-+ for (i = 0; i < nCaches; i++) {
-+ cache = &dev->srCache[i];
-+ if (cache->object == obj &&
-+ cache->dirty)
++ for (i = 0; i < n_caches; i++) {
++ cache = &dev->cache[i];
++ if (cache->object == obj && cache->dirty)
+ return 1;
+ }
+
+ return 0;
+}
+
-+
-+static void yaffs_FlushFilesChunkCache(yaffs_Object *obj)
++static void yaffs_flush_file_cache(struct yaffs_obj *obj)
+{
-+ yaffs_Device *dev = obj->myDev;
++ struct yaffs_dev *dev = obj->my_dev;
+ int lowest = -99; /* Stop compiler whining. */
+ int i;
-+ yaffs_ChunkCache *cache;
-+ int chunkWritten = 0;
-+ int nCaches = obj->myDev->nShortOpCaches;
++ struct yaffs_cache *cache;
++ int chunk_written = 0;
++ int n_caches = obj->my_dev->param.n_caches;
+
-+ if (nCaches > 0) {
++ if (n_caches > 0) {
+ do {
+ cache = NULL;
+
+ /* Find the dirty cache for this object with the lowest chunk id. */
-+ for (i = 0; i < nCaches; i++) {
-+ if (dev->srCache[i].object == obj &&
-+ dev->srCache[i].dirty) {
++ for (i = 0; i < n_caches; i++) {
++ if (dev->cache[i].object == obj &&
++ dev->cache[i].dirty) {
+ if (!cache
-+ || dev->srCache[i].chunkId <
++ || dev->cache[i].chunk_id <
+ lowest) {
-+ cache = &dev->srCache[i];
-+ lowest = cache->chunkId;
++ cache = &dev->cache[i];
++ lowest = cache->chunk_id;
+ }
+ }
+ }
@@ -7864,37 +5006,38 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ if (cache && !cache->locked) {
+ /* Write it out and free it up */
+
-+ chunkWritten =
-+ yaffs_WriteChunkDataToObject(cache->object,
-+ cache->chunkId,
-+ cache->data,
-+ cache->nBytes,
-+ 1);
++ chunk_written =
++ yaffs_wr_data_obj(cache->object,
++ cache->chunk_id,
++ cache->data,
++ cache->n_bytes, 1);
+ cache->dirty = 0;
+ cache->object = NULL;
+ }
+
-+ } while (cache && chunkWritten > 0);
++ } while (cache && chunk_written > 0);
+
+ if (cache) {
+ /* Hoosterman, disk full while writing cache out. */
+ T(YAFFS_TRACE_ERROR,
-+ (TSTR("yaffs tragedy: no space during cache write" TENDSTR)));
++ (TSTR
++ ("yaffs tragedy: no space during cache write"
++ TENDSTR)));
+
+ }
+ }
+
+}
+
-+/*yaffs_FlushEntireDeviceCache(dev)
++/*yaffs_flush_whole_cache(dev)
+ *
+ *
+ */
+
-+void yaffs_FlushEntireDeviceCache(yaffs_Device *dev)
++void yaffs_flush_whole_cache(struct yaffs_dev *dev)
+{
-+ yaffs_Object *obj;
-+ int nCaches = dev->nShortOpCaches;
++ struct yaffs_obj *obj;
++ int n_caches = dev->param.n_caches;
+ int i;
+
+ /* Find a dirty object in the cache and flush it...
@@ -7902,51 +5045,49 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ */
+ do {
+ obj = NULL;
-+ for (i = 0; i < nCaches && !obj; i++) {
-+ if (dev->srCache[i].object &&
-+ dev->srCache[i].dirty)
-+ obj = dev->srCache[i].object;
++ for (i = 0; i < n_caches && !obj; i++) {
++ if (dev->cache[i].object && dev->cache[i].dirty)
++ obj = dev->cache[i].object;
+
+ }
+ if (obj)
-+ yaffs_FlushFilesChunkCache(obj);
++ yaffs_flush_file_cache(obj);
+
+ } while (obj);
+
+}
+
-+
+/* Grab us a cache chunk for use.
+ * First look for an empty one.
+ * Then look for the least recently used non-dirty one.
+ * Then look for the least recently used dirty one...., flush and look again.
+ */
-+static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device *dev)
++static struct yaffs_cache *yaffs_grab_chunk_worker(struct yaffs_dev *dev)
+{
+ int i;
+
-+ if (dev->nShortOpCaches > 0) {
-+ for (i = 0; i < dev->nShortOpCaches; i++) {
-+ if (!dev->srCache[i].object)
-+ return &dev->srCache[i];
++ if (dev->param.n_caches > 0) {
++ for (i = 0; i < dev->param.n_caches; i++) {
++ if (!dev->cache[i].object)
++ return &dev->cache[i];
+ }
+ }
+
+ return NULL;
+}
+
-+static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device *dev)
++static struct yaffs_cache *yaffs_grab_chunk_cache(struct yaffs_dev *dev)
+{
-+ yaffs_ChunkCache *cache;
-+ yaffs_Object *theObj;
++ struct yaffs_cache *cache;
++ struct yaffs_obj *the_obj;
+ int usage;
+ int i;
+ int pushout;
+
-+ if (dev->nShortOpCaches > 0) {
++ if (dev->param.n_caches > 0) {
+ /* Try find a non-dirty one... */
+
-+ cache = yaffs_GrabChunkCacheWorker(dev);
++ cache = yaffs_grab_chunk_worker(dev);
+
+ if (!cache) {
+ /* They were all dirty, find the last recently used object and flush
@@ -7957,48 +5098,49 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+
+ /* With locking we can't assume we can use entry zero */
+
-+ theObj = NULL;
++ the_obj = NULL;
+ usage = -1;
+ cache = NULL;
+ pushout = -1;
+
-+ for (i = 0; i < dev->nShortOpCaches; i++) {
-+ if (dev->srCache[i].object &&
-+ !dev->srCache[i].locked &&
-+ (dev->srCache[i].lastUse < usage || !cache)) {
-+ usage = dev->srCache[i].lastUse;
-+ theObj = dev->srCache[i].object;
-+ cache = &dev->srCache[i];
++ for (i = 0; i < dev->param.n_caches; i++) {
++ if (dev->cache[i].object &&
++ !dev->cache[i].locked &&
++ (dev->cache[i].last_use < usage
++ || !cache)) {
++ usage = dev->cache[i].last_use;
++ the_obj = dev->cache[i].object;
++ cache = &dev->cache[i];
+ pushout = i;
+ }
+ }
+
+ if (!cache || cache->dirty) {
+ /* Flush and try again */
-+ yaffs_FlushFilesChunkCache(theObj);
-+ cache = yaffs_GrabChunkCacheWorker(dev);
++ yaffs_flush_file_cache(the_obj);
++ cache = yaffs_grab_chunk_worker(dev);
+ }
+
+ }
+ return cache;
-+ } else
++ } else {
+ return NULL;
-+
++ }
+}
+
+/* Find a cached chunk */
-+static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object *obj,
-+ int chunkId)
++static struct yaffs_cache *yaffs_find_chunk_cache(const struct yaffs_obj *obj,
++ int chunk_id)
+{
-+ yaffs_Device *dev = obj->myDev;
++ struct yaffs_dev *dev = obj->my_dev;
+ int i;
-+ if (dev->nShortOpCaches > 0) {
-+ for (i = 0; i < dev->nShortOpCaches; i++) {
-+ if (dev->srCache[i].object == obj &&
-+ dev->srCache[i].chunkId == chunkId) {
-+ dev->cacheHits++;
++ if (dev->param.n_caches > 0) {
++ for (i = 0; i < dev->param.n_caches; i++) {
++ if (dev->cache[i].object == obj &&
++ dev->cache[i].chunk_id == chunk_id) {
++ dev->cache_hits++;
+
-+ return &dev->srCache[i];
++ return &dev->cache[i];
+ }
+ }
+ }
@@ -8006,25 +5148,25 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+}
+
+/* Mark the chunk for the least recently used algorithym */
-+static void yaffs_UseChunkCache(yaffs_Device *dev, yaffs_ChunkCache *cache,
-+ int isAWrite)
++static void yaffs_use_cache(struct yaffs_dev *dev, struct yaffs_cache *cache,
++ int is_write)
+{
+
-+ if (dev->nShortOpCaches > 0) {
-+ if (dev->srLastUse < 0 || dev->srLastUse > 100000000) {
++ if (dev->param.n_caches > 0) {
++ if (dev->cache_last_use < 0 || dev->cache_last_use > 100000000) {
+ /* Reset the cache usages */
+ int i;
-+ for (i = 1; i < dev->nShortOpCaches; i++)
-+ dev->srCache[i].lastUse = 0;
++ for (i = 1; i < dev->param.n_caches; i++)
++ dev->cache[i].last_use = 0;
+
-+ dev->srLastUse = 0;
++ dev->cache_last_use = 0;
+ }
+
-+ dev->srLastUse++;
++ dev->cache_last_use++;
+
-+ cache->lastUse = dev->srLastUse;
++ cache->last_use = dev->cache_last_use;
+
-+ if (isAWrite)
++ if (is_write)
+ cache->dirty = 1;
+ }
+}
@@ -8033,10 +5175,11 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ * Do this when a whole page gets written,
+ * ie the short cache for this page is no longer valid.
+ */
-+static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId)
++static void yaffs_invalidate_chunk_cache(struct yaffs_obj *object, int chunk_id)
+{
-+ if (object->myDev->nShortOpCaches > 0) {
-+ yaffs_ChunkCache *cache = yaffs_FindChunkCache(object, chunkId);
++ if (object->my_dev->param.n_caches > 0) {
++ struct yaffs_cache *cache =
++ yaffs_find_chunk_cache(object, chunk_id);
+
+ if (cache)
+ cache->object = NULL;
@@ -8046,584 +5189,18 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+/* Invalidate all the cache pages associated with this object
+ * Do this whenever ther file is deleted or resized.
+ */
-+static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in)
++static void yaffs_invalidate_whole_cache(struct yaffs_obj *in)
+{
+ int i;
-+ yaffs_Device *dev = in->myDev;
++ struct yaffs_dev *dev = in->my_dev;
+
-+ if (dev->nShortOpCaches > 0) {
++ if (dev->param.n_caches > 0) {
+ /* Invalidate it. */
-+ for (i = 0; i < dev->nShortOpCaches; i++) {
-+ if (dev->srCache[i].object == in)
-+ dev->srCache[i].object = NULL;
-+ }
-+ }
-+}
-+
-+/*--------------------- Checkpointing --------------------*/
-+
-+
-+static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev, int head)
-+{
-+ yaffs_CheckpointValidity cp;
-+
-+ memset(&cp, 0, sizeof(cp));
-+
-+ cp.structType = sizeof(cp);
-+ cp.magic = YAFFS_MAGIC;
-+ cp.version = YAFFS_CHECKPOINT_VERSION;
-+ cp.head = (head) ? 1 : 0;
-+
-+ return (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp)) ?
-+ 1 : 0;
-+}
-+
-+static int yaffs_ReadCheckpointValidityMarker(yaffs_Device *dev, int head)
-+{
-+ yaffs_CheckpointValidity cp;
-+ int ok;
-+
-+ ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
-+
-+ if (ok)
-+ ok = (cp.structType == sizeof(cp)) &&
-+ (cp.magic == YAFFS_MAGIC) &&
-+ (cp.version == YAFFS_CHECKPOINT_VERSION) &&
-+ (cp.head == ((head) ? 1 : 0));
-+ return ok ? 1 : 0;
-+}
-+
-+static void yaffs_DeviceToCheckpointDevice(yaffs_CheckpointDevice *cp,
-+ yaffs_Device *dev)
-+{
-+ cp->nErasedBlocks = dev->nErasedBlocks;
-+ cp->allocationBlock = dev->allocationBlock;
-+ cp->allocationPage = dev->allocationPage;
-+ cp->nFreeChunks = dev->nFreeChunks;
-+
-+ cp->nDeletedFiles = dev->nDeletedFiles;
-+ cp->nUnlinkedFiles = dev->nUnlinkedFiles;
-+ cp->nBackgroundDeletions = dev->nBackgroundDeletions;
-+ cp->sequenceNumber = dev->sequenceNumber;
-+ cp->oldestDirtySequence = dev->oldestDirtySequence;
-+
-+}
-+
-+static void yaffs_CheckpointDeviceToDevice(yaffs_Device *dev,
-+ yaffs_CheckpointDevice *cp)
-+{
-+ dev->nErasedBlocks = cp->nErasedBlocks;
-+ dev->allocationBlock = cp->allocationBlock;
-+ dev->allocationPage = cp->allocationPage;
-+ dev->nFreeChunks = cp->nFreeChunks;
-+
-+ dev->nDeletedFiles = cp->nDeletedFiles;
-+ dev->nUnlinkedFiles = cp->nUnlinkedFiles;
-+ dev->nBackgroundDeletions = cp->nBackgroundDeletions;
-+ dev->sequenceNumber = cp->sequenceNumber;
-+ dev->oldestDirtySequence = cp->oldestDirtySequence;
-+}
-+
-+
-+static int yaffs_WriteCheckpointDevice(yaffs_Device *dev)
-+{
-+ yaffs_CheckpointDevice cp;
-+ __u32 nBytes;
-+ __u32 nBlocks = (dev->internalEndBlock - dev->internalStartBlock + 1);
-+
-+ int ok;
-+
-+ /* Write device runtime values*/
-+ yaffs_DeviceToCheckpointDevice(&cp, dev);
-+ cp.structType = sizeof(cp);
-+
-+ ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
-+
-+ /* Write block info */
-+ if (ok) {
-+ nBytes = nBlocks * sizeof(yaffs_BlockInfo);
-+ ok = (yaffs_CheckpointWrite(dev, dev->blockInfo, nBytes) == nBytes);
-+ }
-+
-+ /* Write chunk bits */
-+ if (ok) {
-+ nBytes = nBlocks * dev->chunkBitmapStride;
-+ ok = (yaffs_CheckpointWrite(dev, dev->chunkBits, nBytes) == nBytes);
-+ }
-+ return ok ? 1 : 0;
-+
-+}
-+
-+static int yaffs_ReadCheckpointDevice(yaffs_Device *dev)
-+{
-+ yaffs_CheckpointDevice cp;
-+ __u32 nBytes;
-+ __u32 nBlocks = (dev->internalEndBlock - dev->internalStartBlock + 1);
-+
-+ int ok;
-+
-+ ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
-+ if (!ok)
-+ return 0;
-+
-+ if (cp.structType != sizeof(cp))
-+ return 0;
-+
-+
-+ yaffs_CheckpointDeviceToDevice(dev, &cp);
-+
-+ nBytes = nBlocks * sizeof(yaffs_BlockInfo);
-+
-+ ok = (yaffs_CheckpointRead(dev, dev->blockInfo, nBytes) == nBytes);
-+
-+ if (!ok)
-+ return 0;
-+ nBytes = nBlocks * dev->chunkBitmapStride;
-+
-+ ok = (yaffs_CheckpointRead(dev, dev->chunkBits, nBytes) == nBytes);
-+
-+ return ok ? 1 : 0;
-+}
-+
-+static void yaffs_ObjectToCheckpointObject(yaffs_CheckpointObject *cp,
-+ yaffs_Object *obj)
-+{
-+
-+ cp->objectId = obj->objectId;
-+ cp->parentId = (obj->parent) ? obj->parent->objectId : 0;
-+ cp->hdrChunk = obj->hdrChunk;
-+ cp->variantType = obj->variantType;
-+ cp->deleted = obj->deleted;
-+ cp->softDeleted = obj->softDeleted;
-+ cp->unlinked = obj->unlinked;
-+ cp->fake = obj->fake;
-+ cp->renameAllowed = obj->renameAllowed;
-+ cp->unlinkAllowed = obj->unlinkAllowed;
-+ cp->serial = obj->serial;
-+ cp->nDataChunks = obj->nDataChunks;
-+
-+ if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-+ cp->fileSizeOrEquivalentObjectId = obj->variant.fileVariant.fileSize;
-+ else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
-+ cp->fileSizeOrEquivalentObjectId = obj->variant.hardLinkVariant.equivalentObjectId;
-+}
-+
-+static int yaffs_CheckpointObjectToObject(yaffs_Object *obj, yaffs_CheckpointObject *cp)
-+{
-+
-+ yaffs_Object *parent;
-+
-+ if (obj->variantType != cp->variantType) {
-+ T(YAFFS_TRACE_ERROR, (TSTR("Checkpoint read object %d type %d "
-+ TCONT("chunk %d does not match existing object type %d")
-+ TENDSTR), cp->objectId, cp->variantType, cp->hdrChunk,
-+ obj->variantType));
-+ return 0;
-+ }
-+
-+ obj->objectId = cp->objectId;
-+
-+ if (cp->parentId)
-+ parent = yaffs_FindOrCreateObjectByNumber(
-+ obj->myDev,
-+ cp->parentId,
-+ YAFFS_OBJECT_TYPE_DIRECTORY);
-+ else
-+ parent = NULL;
-+
-+ if (parent) {
-+ if (parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+ T(YAFFS_TRACE_ALWAYS, (TSTR("Checkpoint read object %d parent %d type %d"
-+ TCONT(" chunk %d Parent type, %d, not directory")
-+ TENDSTR),
-+ cp->objectId, cp->parentId, cp->variantType,
-+ cp->hdrChunk, parent->variantType));
-+ return 0;
-+ }
-+ yaffs_AddObjectToDirectory(parent, obj);
-+ }
-+
-+ obj->hdrChunk = cp->hdrChunk;
-+ obj->variantType = cp->variantType;
-+ obj->deleted = cp->deleted;
-+ obj->softDeleted = cp->softDeleted;
-+ obj->unlinked = cp->unlinked;
-+ obj->fake = cp->fake;
-+ obj->renameAllowed = cp->renameAllowed;
-+ obj->unlinkAllowed = cp->unlinkAllowed;
-+ obj->serial = cp->serial;
-+ obj->nDataChunks = cp->nDataChunks;
-+
-+ if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-+ obj->variant.fileVariant.fileSize = cp->fileSizeOrEquivalentObjectId;
-+ else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
-+ obj->variant.hardLinkVariant.equivalentObjectId = cp->fileSizeOrEquivalentObjectId;
-+
-+ if (obj->hdrChunk > 0)
-+ obj->lazyLoaded = 1;
-+ return 1;
-+}
-+
-+
-+
-+static int yaffs_CheckpointTnodeWorker(yaffs_Object *in, yaffs_Tnode *tn,
-+ __u32 level, int chunkOffset)
-+{
-+ int i;
-+ yaffs_Device *dev = in->myDev;
-+ int ok = 1;
-+ int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+
-+ if (tnodeSize < sizeof(yaffs_Tnode))
-+ tnodeSize = sizeof(yaffs_Tnode);
-+
-+
-+ if (tn) {
-+ if (level > 0) {
-+
-+ for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
-+ if (tn->internal[i]) {
-+ ok = yaffs_CheckpointTnodeWorker(in,
-+ tn->internal[i],
-+ level - 1,
-+ (chunkOffset<<YAFFS_TNODES_INTERNAL_BITS) + i);
-+ }
-+ }
-+ } else if (level == 0) {
-+ __u32 baseOffset = chunkOffset << YAFFS_TNODES_LEVEL0_BITS;
-+ ok = (yaffs_CheckpointWrite(dev, &baseOffset, sizeof(baseOffset)) == sizeof(baseOffset));
-+ if (ok)
-+ ok = (yaffs_CheckpointWrite(dev, tn, tnodeSize) == tnodeSize);
-+ }
-+ }
-+
-+ return ok;
-+
-+}
-+
-+static int yaffs_WriteCheckpointTnodes(yaffs_Object *obj)
-+{
-+ __u32 endMarker = ~0;
-+ int ok = 1;
-+
-+ if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
-+ ok = yaffs_CheckpointTnodeWorker(obj,
-+ obj->variant.fileVariant.top,
-+ obj->variant.fileVariant.topLevel,
-+ 0);
-+ if (ok)
-+ ok = (yaffs_CheckpointWrite(obj->myDev, &endMarker, sizeof(endMarker)) ==
-+ sizeof(endMarker));
-+ }
-+
-+ return ok ? 1 : 0;
-+}
-+
-+static int yaffs_ReadCheckpointTnodes(yaffs_Object *obj)
-+{
-+ __u32 baseChunk;
-+ int ok = 1;
-+ yaffs_Device *dev = obj->myDev;
-+ yaffs_FileStructure *fileStructPtr = &obj->variant.fileVariant;
-+ yaffs_Tnode *tn;
-+ int nread = 0;
-+ int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+
-+ if (tnodeSize < sizeof(yaffs_Tnode))
-+ tnodeSize = sizeof(yaffs_Tnode);
-+
-+ ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
-+
-+ while (ok && (~baseChunk)) {
-+ nread++;
-+ /* Read level 0 tnode */
-+
-+
-+ tn = yaffs_GetTnodeRaw(dev);
-+ if (tn)
-+ ok = (yaffs_CheckpointRead(dev, tn, tnodeSize) == tnodeSize);
-+ else
-+ ok = 0;
-+
-+ if (tn && ok)
-+ ok = yaffs_AddOrFindLevel0Tnode(dev,
-+ fileStructPtr,
-+ baseChunk,
-+ tn) ? 1 : 0;
-+
-+ if (ok)
-+ ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
-+
-+ }
-+
-+ T(YAFFS_TRACE_CHECKPOINT, (
-+ TSTR("Checkpoint read tnodes %d records, last %d. ok %d" TENDSTR),
-+ nread, baseChunk, ok));
-+
-+ return ok ? 1 : 0;
-+}
-+
-+
-+static int yaffs_WriteCheckpointObjects(yaffs_Device *dev)
-+{
-+ yaffs_Object *obj;
-+ yaffs_CheckpointObject cp;
-+ int i;
-+ int ok = 1;
-+ struct ylist_head *lh;
-+
-+
-+ /* Iterate through the objects in each hash entry,
-+ * dumping them to the checkpointing stream.
-+ */
-+
-+ for (i = 0; ok && i < YAFFS_NOBJECT_BUCKETS; i++) {
-+ ylist_for_each(lh, &dev->objectBucket[i].list) {
-+ if (lh) {
-+ obj = ylist_entry(lh, yaffs_Object, hashLink);
-+ if (!obj->deferedFree) {
-+ yaffs_ObjectToCheckpointObject(&cp, obj);
-+ cp.structType = sizeof(cp);
-+
-+ T(YAFFS_TRACE_CHECKPOINT, (
-+ TSTR("Checkpoint write object %d parent %d type %d chunk %d obj addr %x" TENDSTR),
-+ cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk, (unsigned) obj));
-+
-+ ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
-+
-+ if (ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-+ ok = yaffs_WriteCheckpointTnodes(obj);
-+ }
-+ }
-+ }
-+ }
-+
-+ /* Dump end of list */
-+ memset(&cp, 0xFF, sizeof(yaffs_CheckpointObject));
-+ cp.structType = sizeof(cp);
-+
-+ if (ok)
-+ ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
-+
-+ return ok ? 1 : 0;
-+}
-+
-+static int yaffs_ReadCheckpointObjects(yaffs_Device *dev)
-+{
-+ yaffs_Object *obj;
-+ yaffs_CheckpointObject cp;
-+ int ok = 1;
-+ int done = 0;
-+ yaffs_Object *hardList = NULL;
-+
-+ while (ok && !done) {
-+ ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
-+ if (cp.structType != sizeof(cp)) {
-+ T(YAFFS_TRACE_CHECKPOINT, (TSTR("struct size %d instead of %d ok %d"TENDSTR),
-+ cp.structType, sizeof(cp), ok));
-+ ok = 0;
-+ }
-+
-+ T(YAFFS_TRACE_CHECKPOINT, (TSTR("Checkpoint read object %d parent %d type %d chunk %d " TENDSTR),
-+ cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk));
-+
-+ if (ok && cp.objectId == ~0)
-+ done = 1;
-+ else if (ok) {
-+ obj = yaffs_FindOrCreateObjectByNumber(dev, cp.objectId, cp.variantType);
-+ if (obj) {
-+ ok = yaffs_CheckpointObjectToObject(obj, &cp);
-+ if (!ok)
-+ break;
-+ if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
-+ ok = yaffs_ReadCheckpointTnodes(obj);
-+ } else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
-+ obj->hardLinks.next =
-+ (struct ylist_head *) hardList;
-+ hardList = obj;
-+ }
-+ } else
-+ ok = 0;
++ for (i = 0; i < dev->param.n_caches; i++) {
++ if (dev->cache[i].object == in)
++ dev->cache[i].object = NULL;
+ }
+ }
-+
-+ if (ok)
-+ yaffs_HardlinkFixup(dev, hardList);
-+
-+ return ok ? 1 : 0;
-+}
-+
-+static int yaffs_WriteCheckpointSum(yaffs_Device *dev)
-+{
-+ __u32 checkpointSum;
-+ int ok;
-+
-+ yaffs_GetCheckpointSum(dev, &checkpointSum);
-+
-+ ok = (yaffs_CheckpointWrite(dev, &checkpointSum, sizeof(checkpointSum)) == sizeof(checkpointSum));
-+
-+ if (!ok)
-+ return 0;
-+
-+ return 1;
-+}
-+
-+static int yaffs_ReadCheckpointSum(yaffs_Device *dev)
-+{
-+ __u32 checkpointSum0;
-+ __u32 checkpointSum1;
-+ int ok;
-+
-+ yaffs_GetCheckpointSum(dev, &checkpointSum0);
-+
-+ ok = (yaffs_CheckpointRead(dev, &checkpointSum1, sizeof(checkpointSum1)) == sizeof(checkpointSum1));
-+
-+ if (!ok)
-+ return 0;
-+
-+ if (checkpointSum0 != checkpointSum1)
-+ return 0;
-+
-+ return 1;
-+}
-+
-+
-+static int yaffs_WriteCheckpointData(yaffs_Device *dev)
-+{
-+ int ok = 1;
-+
-+ if (dev->skipCheckpointWrite || !dev->isYaffs2) {
-+ T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint write" TENDSTR)));
-+ ok = 0;
-+ }
-+
-+ if (ok)
-+ ok = yaffs_CheckpointOpen(dev, 1);
-+
-+ if (ok) {
-+ T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR)));
-+ ok = yaffs_WriteCheckpointValidityMarker(dev, 1);
-+ }
-+ if (ok) {
-+ T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint device" TENDSTR)));
-+ ok = yaffs_WriteCheckpointDevice(dev);
-+ }
-+ if (ok) {
-+ T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint objects" TENDSTR)));
-+ ok = yaffs_WriteCheckpointObjects(dev);
-+ }
-+ if (ok) {
-+ T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR)));
-+ ok = yaffs_WriteCheckpointValidityMarker(dev, 0);
-+ }
-+
-+ if (ok)
-+ ok = yaffs_WriteCheckpointSum(dev);
-+
-+ if (!yaffs_CheckpointClose(dev))
-+ ok = 0;
-+
-+ if (ok)
-+ dev->isCheckpointed = 1;
-+ else
-+ dev->isCheckpointed = 0;
-+
-+ return dev->isCheckpointed;
-+}
-+
-+static int yaffs_ReadCheckpointData(yaffs_Device *dev)
-+{
-+ int ok = 1;
-+
-+ if (dev->skipCheckpointRead || !dev->isYaffs2) {
-+ T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint read" TENDSTR)));
-+ ok = 0;
-+ }
-+
-+ if (ok)
-+ ok = yaffs_CheckpointOpen(dev, 0); /* open for read */
-+
-+ if (ok) {
-+ T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR)));
-+ ok = yaffs_ReadCheckpointValidityMarker(dev, 1);
-+ }
-+ if (ok) {
-+ T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint device" TENDSTR)));
-+ ok = yaffs_ReadCheckpointDevice(dev);
-+ }
-+ if (ok) {
-+ T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint objects" TENDSTR)));
-+ ok = yaffs_ReadCheckpointObjects(dev);
-+ }
-+ if (ok) {
-+ T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR)));
-+ ok = yaffs_ReadCheckpointValidityMarker(dev, 0);
-+ }
-+
-+ if (ok) {
-+ ok = yaffs_ReadCheckpointSum(dev);
-+ T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint checksum %d" TENDSTR), ok));
-+ }
-+
-+ if (!yaffs_CheckpointClose(dev))
-+ ok = 0;
-+
-+ if (ok)
-+ dev->isCheckpointed = 1;
-+ else
-+ dev->isCheckpointed = 0;
-+
-+ return ok ? 1 : 0;
-+
-+}
-+
-+static void yaffs_InvalidateCheckpoint(yaffs_Device *dev)
-+{
-+ if (dev->isCheckpointed ||
-+ dev->blocksInCheckpoint > 0) {
-+ dev->isCheckpointed = 0;
-+ yaffs_CheckpointInvalidateStream(dev);
-+ if (dev->superBlock && dev->markSuperBlockDirty)
-+ dev->markSuperBlockDirty(dev->superBlock);
-+ }
-+}
-+
-+
-+int yaffs_CheckpointSave(yaffs_Device *dev)
-+{
-+
-+ T(YAFFS_TRACE_CHECKPOINT, (TSTR("save entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
-+
-+ yaffs_VerifyObjects(dev);
-+ yaffs_VerifyBlocks(dev);
-+ yaffs_VerifyFreeChunks(dev);
-+
-+ if (!dev->isCheckpointed) {
-+ yaffs_InvalidateCheckpoint(dev);
-+ yaffs_WriteCheckpointData(dev);
-+ }
-+
-+ T(YAFFS_TRACE_ALWAYS, (TSTR("save exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
-+
-+ return dev->isCheckpointed;
-+}
-+
-+int yaffs_CheckpointRestore(yaffs_Device *dev)
-+{
-+ int retval;
-+ T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
-+
-+ retval = yaffs_ReadCheckpointData(dev);
-+
-+ if (dev->isCheckpointed) {
-+ yaffs_VerifyObjects(dev);
-+ yaffs_VerifyBlocks(dev);
-+ yaffs_VerifyFreeChunks(dev);
-+ }
-+
-+ T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
-+
-+ return retval;
+}
+
+/*--------------------- File read/write ------------------------
@@ -8636,590 +5213,582 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ * Curve-balls: the first chunk might also be the last chunk.
+ */
+
-+int yaffs_ReadDataFromFile(yaffs_Object *in, __u8 *buffer, loff_t offset,
-+ int nBytes)
++int yaffs_file_rd(struct yaffs_obj *in, u8 * buffer, loff_t offset, int n_bytes)
+{
+
+ int chunk;
-+ __u32 start;
-+ int nToCopy;
-+ int n = nBytes;
-+ int nDone = 0;
-+ yaffs_ChunkCache *cache;
++ u32 start;
++ int n_copy;
++ int n = n_bytes;
++ int n_done = 0;
++ struct yaffs_cache *cache;
+
-+ yaffs_Device *dev;
++ struct yaffs_dev *dev;
+
-+ dev = in->myDev;
++ dev = in->my_dev;
+
+ while (n > 0) {
-+ /* chunk = offset / dev->nDataBytesPerChunk + 1; */
-+ /* start = offset % dev->nDataBytesPerChunk; */
-+ yaffs_AddrToChunk(dev, offset, &chunk, &start);
++ /* chunk = offset / dev->data_bytes_per_chunk + 1; */
++ /* start = offset % dev->data_bytes_per_chunk; */
++ yaffs_addr_to_chunk(dev, offset, &chunk, &start);
+ chunk++;
+
+ /* OK now check for the curveball where the start and end are in
+ * the same chunk.
+ */
-+ if ((start + n) < dev->nDataBytesPerChunk)
-+ nToCopy = n;
++ if ((start + n) < dev->data_bytes_per_chunk)
++ n_copy = n;
+ else
-+ nToCopy = dev->nDataBytesPerChunk - start;
++ n_copy = dev->data_bytes_per_chunk - start;
+
-+ cache = yaffs_FindChunkCache(in, chunk);
++ cache = yaffs_find_chunk_cache(in, chunk);
+
+ /* If the chunk is already in the cache or it is less than a whole chunk
+ * or we're using inband tags then use the cache (if there is caching)
+ * else bypass the cache.
+ */
-+ if (cache || nToCopy != dev->nDataBytesPerChunk || dev->inbandTags) {
-+ if (dev->nShortOpCaches > 0) {
++ if (cache || n_copy != dev->data_bytes_per_chunk
++ || dev->param.inband_tags) {
++ if (dev->param.n_caches > 0) {
+
+ /* If we can't find the data in the cache, then load it up. */
+
+ if (!cache) {
-+ cache = yaffs_GrabChunkCache(in->myDev);
++ cache =
++ yaffs_grab_chunk_cache(in->my_dev);
+ cache->object = in;
-+ cache->chunkId = chunk;
++ cache->chunk_id = chunk;
+ cache->dirty = 0;
+ cache->locked = 0;
-+ yaffs_ReadChunkDataFromObject(in, chunk,
-+ cache->
-+ data);
-+ cache->nBytes = 0;
++ yaffs_rd_data_obj(in, chunk,
++ cache->data);
++ cache->n_bytes = 0;
+ }
+
-+ yaffs_UseChunkCache(dev, cache, 0);
++ yaffs_use_cache(dev, cache, 0);
+
+ cache->locked = 1;
+
-+
-+ memcpy(buffer, &cache->data[start], nToCopy);
++ memcpy(buffer, &cache->data[start], n_copy);
+
+ cache->locked = 0;
+ } else {
-+ /* Read into the local buffer then copy..*/
++ /* Read into the local buffer then copy.. */
+
-+ __u8 *localBuffer =
-+ yaffs_GetTempBuffer(dev, __LINE__);
-+ yaffs_ReadChunkDataFromObject(in, chunk,
-+ localBuffer);
++ u8 *local_buffer =
++ yaffs_get_temp_buffer(dev, __LINE__);
++ yaffs_rd_data_obj(in, chunk, local_buffer);
+
-+ memcpy(buffer, &localBuffer[start], nToCopy);
++ memcpy(buffer, &local_buffer[start], n_copy);
+
-+
-+ yaffs_ReleaseTempBuffer(dev, localBuffer,
-+ __LINE__);
++ yaffs_release_temp_buffer(dev, local_buffer,
++ __LINE__);
+ }
+
+ } else {
+
+ /* A full chunk. Read directly into the supplied buffer. */
-+ yaffs_ReadChunkDataFromObject(in, chunk, buffer);
++ yaffs_rd_data_obj(in, chunk, buffer);
+
+ }
+
-+ n -= nToCopy;
-+ offset += nToCopy;
-+ buffer += nToCopy;
-+ nDone += nToCopy;
++ n -= n_copy;
++ offset += n_copy;
++ buffer += n_copy;
++ n_done += n_copy;
+
+ }
+
-+ return nDone;
++ return n_done;
+}
+
-+int yaffs_WriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset,
-+ int nBytes, int writeThrough)
++int yaffs_do_file_wr(struct yaffs_obj *in, const u8 * buffer, loff_t offset,
++ int n_bytes, int write_trhrough)
+{
+
+ int chunk;
-+ __u32 start;
-+ int nToCopy;
-+ int n = nBytes;
-+ int nDone = 0;
-+ int nToWriteBack;
-+ int startOfWrite = offset;
-+ int chunkWritten = 0;
-+ __u32 nBytesRead;
-+ __u32 chunkStart;
-+
-+ yaffs_Device *dev;
-+
-+ dev = in->myDev;
-+
-+ while (n > 0 && chunkWritten >= 0) {
-+ /* chunk = offset / dev->nDataBytesPerChunk + 1; */
-+ /* start = offset % dev->nDataBytesPerChunk; */
-+ yaffs_AddrToChunk(dev, offset, &chunk, &start);
-+
-+ if (chunk * dev->nDataBytesPerChunk + start != offset ||
-+ start >= dev->nDataBytesPerChunk) {
-+ T(YAFFS_TRACE_ERROR, (
-+ TSTR("AddrToChunk of offset %d gives chunk %d start %d"
-+ TENDSTR),
-+ (int)offset, chunk, start));
++ u32 start;
++ int n_copy;
++ int n = n_bytes;
++ int n_done = 0;
++ int n_writeback;
++ int start_write = offset;
++ int chunk_written = 0;
++ u32 n_bytes_read;
++ u32 chunk_start;
++
++ struct yaffs_dev *dev;
++
++ dev = in->my_dev;
++
++ while (n > 0 && chunk_written >= 0) {
++ yaffs_addr_to_chunk(dev, offset, &chunk, &start);
++
++ if (chunk * dev->data_bytes_per_chunk + start != offset ||
++ start >= dev->data_bytes_per_chunk) {
++ T(YAFFS_TRACE_ERROR,
++ (TSTR
++ ("AddrToChunk of offset %d gives chunk %d start %d"
++ TENDSTR), (int)offset, chunk, start));
+ }
-+ chunk++;
++ chunk++; /* File pos to chunk in file offset */
+
+ /* OK now check for the curveball where the start and end are in
+ * the same chunk.
+ */
+
-+ if ((start + n) < dev->nDataBytesPerChunk) {
-+ nToCopy = n;
++ if ((start + n) < dev->data_bytes_per_chunk) {
++ n_copy = n;
+
+ /* Now folks, to calculate how many bytes to write back....
+ * If we're overwriting and not writing to then end of file then
+ * we need to write back as much as was there before.
+ */
+
-+ chunkStart = ((chunk - 1) * dev->nDataBytesPerChunk);
++ chunk_start = ((chunk - 1) * dev->data_bytes_per_chunk);
+
-+ if (chunkStart > in->variant.fileVariant.fileSize)
-+ nBytesRead = 0; /* Past end of file */
++ if (chunk_start > in->variant.file_variant.file_size)
++ n_bytes_read = 0; /* Past end of file */
+ else
-+ nBytesRead = in->variant.fileVariant.fileSize - chunkStart;
++ n_bytes_read =
++ in->variant.file_variant.file_size -
++ chunk_start;
+
-+ if (nBytesRead > dev->nDataBytesPerChunk)
-+ nBytesRead = dev->nDataBytesPerChunk;
++ if (n_bytes_read > dev->data_bytes_per_chunk)
++ n_bytes_read = dev->data_bytes_per_chunk;
+
-+ nToWriteBack =
-+ (nBytesRead >
-+ (start + n)) ? nBytesRead : (start + n);
++ n_writeback =
++ (n_bytes_read >
++ (start + n)) ? n_bytes_read : (start + n);
+
-+ if (nToWriteBack < 0 || nToWriteBack > dev->nDataBytesPerChunk)
++ if (n_writeback < 0
++ || n_writeback > dev->data_bytes_per_chunk)
+ YBUG();
+
+ } else {
-+ nToCopy = dev->nDataBytesPerChunk - start;
-+ nToWriteBack = dev->nDataBytesPerChunk;
++ n_copy = dev->data_bytes_per_chunk - start;
++ n_writeback = dev->data_bytes_per_chunk;
+ }
+
-+ if (nToCopy != dev->nDataBytesPerChunk || dev->inbandTags) {
++ if (n_copy != dev->data_bytes_per_chunk
++ || dev->param.inband_tags) {
+ /* An incomplete start or end chunk (or maybe both start and end chunk),
+ * or we're using inband tags, so we want to use the cache buffers.
+ */
-+ if (dev->nShortOpCaches > 0) {
-+ yaffs_ChunkCache *cache;
++ if (dev->param.n_caches > 0) {
++ struct yaffs_cache *cache;
+ /* If we can't find the data in the cache, then load the cache */
-+ cache = yaffs_FindChunkCache(in, chunk);
++ cache = yaffs_find_chunk_cache(in, chunk);
+
+ if (!cache
-+ && yaffs_CheckSpaceForAllocation(in->
-+ myDev)) {
-+ cache = yaffs_GrabChunkCache(in->myDev);
++ && yaffs_check_alloc_available(dev, 1)) {
++ cache = yaffs_grab_chunk_cache(dev);
+ cache->object = in;
-+ cache->chunkId = chunk;
++ cache->chunk_id = chunk;
+ cache->dirty = 0;
+ cache->locked = 0;
-+ yaffs_ReadChunkDataFromObject(in, chunk,
-+ cache->
-+ data);
++ yaffs_rd_data_obj(in, chunk,
++ cache->data);
+ } else if (cache &&
-+ !cache->dirty &&
-+ !yaffs_CheckSpaceForAllocation(in->myDev)) {
++ !cache->dirty &&
++ !yaffs_check_alloc_available(dev,
++ 1)) {
+ /* Drop the cache if it was a read cache item and
+ * no space check has been made for it.
+ */
-+ cache = NULL;
++ cache = NULL;
+ }
+
+ if (cache) {
-+ yaffs_UseChunkCache(dev, cache, 1);
++ yaffs_use_cache(dev, cache, 1);
+ cache->locked = 1;
+
-+
+ memcpy(&cache->data[start], buffer,
-+ nToCopy);
-+
++ n_copy);
+
+ cache->locked = 0;
-+ cache->nBytes = nToWriteBack;
++ cache->n_bytes = n_writeback;
+
-+ if (writeThrough) {
-+ chunkWritten =
-+ yaffs_WriteChunkDataToObject
++ if (write_trhrough) {
++ chunk_written =
++ yaffs_wr_data_obj
+ (cache->object,
-+ cache->chunkId,
-+ cache->data, cache->nBytes,
-+ 1);
++ cache->chunk_id,
++ cache->data,
++ cache->n_bytes, 1);
+ cache->dirty = 0;
+ }
+
+ } else {
-+ chunkWritten = -1; /* fail the write */
++ chunk_written = -1; /* fail the write */
+ }
+ } else {
+ /* An incomplete start or end chunk (or maybe both start and end chunk)
+ * Read into the local buffer then copy, then copy over and write back.
+ */
+
-+ __u8 *localBuffer =
-+ yaffs_GetTempBuffer(dev, __LINE__);
-+
-+ yaffs_ReadChunkDataFromObject(in, chunk,
-+ localBuffer);
-+
++ u8 *local_buffer =
++ yaffs_get_temp_buffer(dev, __LINE__);
+
++ yaffs_rd_data_obj(in, chunk, local_buffer);
+
-+ memcpy(&localBuffer[start], buffer, nToCopy);
++ memcpy(&local_buffer[start], buffer, n_copy);
+
-+ chunkWritten =
-+ yaffs_WriteChunkDataToObject(in, chunk,
-+ localBuffer,
-+ nToWriteBack,
-+ 0);
++ chunk_written =
++ yaffs_wr_data_obj(in, chunk,
++ local_buffer,
++ n_writeback, 0);
+
-+ yaffs_ReleaseTempBuffer(dev, localBuffer,
-+ __LINE__);
++ yaffs_release_temp_buffer(dev, local_buffer,
++ __LINE__);
+
+ }
+
+ } else {
+ /* A full chunk. Write directly from the supplied buffer. */
+
-+
-+
-+ chunkWritten =
-+ yaffs_WriteChunkDataToObject(in, chunk, buffer,
-+ dev->nDataBytesPerChunk,
-+ 0);
++ chunk_written =
++ yaffs_wr_data_obj(in, chunk, buffer,
++ dev->data_bytes_per_chunk, 0);
+
+ /* Since we've overwritten the cached data, we better invalidate it. */
-+ yaffs_InvalidateChunkCache(in, chunk);
++ yaffs_invalidate_chunk_cache(in, chunk);
+ }
+
-+ if (chunkWritten >= 0) {
-+ n -= nToCopy;
-+ offset += nToCopy;
-+ buffer += nToCopy;
-+ nDone += nToCopy;
++ if (chunk_written >= 0) {
++ n -= n_copy;
++ offset += n_copy;
++ buffer += n_copy;
++ n_done += n_copy;
+ }
+
+ }
+
+ /* Update file object */
+
-+ if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize)
-+ in->variant.fileVariant.fileSize = (startOfWrite + nDone);
++ if ((start_write + n_done) > in->variant.file_variant.file_size)
++ in->variant.file_variant.file_size = (start_write + n_done);
+
+ in->dirty = 1;
+
-+ return nDone;
++ return n_done;
+}
+
++int yaffs_wr_file(struct yaffs_obj *in, const u8 * buffer, loff_t offset,
++ int n_bytes, int write_trhrough)
++{
++ yaffs2_handle_hole(in, offset);
++ return yaffs_do_file_wr(in, buffer, offset, n_bytes, write_trhrough);
++}
+
+/* ---------------------- File resizing stuff ------------------ */
+
-+static void yaffs_PruneResizedChunks(yaffs_Object *in, int newSize)
++static void yaffs_prune_chunks(struct yaffs_obj *in, int new_size)
+{
+
-+ yaffs_Device *dev = in->myDev;
-+ int oldFileSize = in->variant.fileVariant.fileSize;
++ struct yaffs_dev *dev = in->my_dev;
++ int old_size = in->variant.file_variant.file_size;
+
-+ int lastDel = 1 + (oldFileSize - 1) / dev->nDataBytesPerChunk;
++ int last_del = 1 + (old_size - 1) / dev->data_bytes_per_chunk;
+
-+ int startDel = 1 + (newSize + dev->nDataBytesPerChunk - 1) /
-+ dev->nDataBytesPerChunk;
++ int start_del = 1 + (new_size + dev->data_bytes_per_chunk - 1) /
++ dev->data_bytes_per_chunk;
+ int i;
-+ int chunkId;
++ int chunk_id;
+
+ /* Delete backwards so that we don't end up with holes if
+ * power is lost part-way through the operation.
+ */
-+ for (i = lastDel; i >= startDel; i--) {
++ for (i = last_del; i >= start_del; i--) {
+ /* NB this could be optimised somewhat,
+ * eg. could retrieve the tags and write them without
-+ * using yaffs_DeleteChunk
++ * using yaffs_chunk_del
+ */
+
-+ chunkId = yaffs_FindAndDeleteChunkInFile(in, i, NULL);
-+ if (chunkId > 0) {
-+ if (chunkId <
-+ (dev->internalStartBlock * dev->nChunksPerBlock)
-+ || chunkId >=
-+ ((dev->internalEndBlock +
-+ 1) * dev->nChunksPerBlock)) {
++ chunk_id = yaffs_find_del_file_chunk(in, i, NULL);
++ if (chunk_id > 0) {
++ if (chunk_id <
++ (dev->internal_start_block *
++ dev->param.chunks_per_block)
++ || chunk_id >=
++ ((dev->internal_end_block +
++ 1) * dev->param.chunks_per_block)) {
+ T(YAFFS_TRACE_ALWAYS,
-+ (TSTR("Found daft chunkId %d for %d" TENDSTR),
-+ chunkId, i));
++ (TSTR
++ ("Found daft chunk_id %d for %d" TENDSTR),
++ chunk_id, i));
+ } else {
-+ in->nDataChunks--;
-+ yaffs_DeleteChunk(dev, chunkId, 1, __LINE__);
++ in->n_data_chunks--;
++ yaffs_chunk_del(dev, chunk_id, 1, __LINE__);
+ }
+ }
+ }
+
+}
+
-+int yaffs_ResizeFile(yaffs_Object *in, loff_t newSize)
++void yaffs_resize_file_down(struct yaffs_obj *obj, loff_t new_size)
+{
++ int new_full;
++ u32 new_partial;
++ struct yaffs_dev *dev = obj->my_dev;
+
-+ int oldFileSize = in->variant.fileVariant.fileSize;
-+ __u32 newSizeOfPartialChunk;
-+ int newFullChunks;
++ yaffs_addr_to_chunk(dev, new_size, &new_full, &new_partial);
+
-+ yaffs_Device *dev = in->myDev;
++ yaffs_prune_chunks(obj, new_size);
+
-+ yaffs_AddrToChunk(dev, newSize, &newFullChunks, &newSizeOfPartialChunk);
++ if (new_partial != 0) {
++ int last_chunk = 1 + new_full;
++ u8 *local_buffer = yaffs_get_temp_buffer(dev, __LINE__);
+
-+ yaffs_FlushFilesChunkCache(in);
-+ yaffs_InvalidateWholeChunkCache(in);
++ /* Got to read and rewrite the last chunk with its new size and zero pad */
++ yaffs_rd_data_obj(obj, last_chunk, local_buffer);
++ memset(local_buffer + new_partial, 0,
++ dev->data_bytes_per_chunk - new_partial);
+
-+ yaffs_CheckGarbageCollection(dev);
++ yaffs_wr_data_obj(obj, last_chunk, local_buffer,
++ new_partial, 1);
+
-+ if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
-+ return YAFFS_FAIL;
-+
-+ if (newSize == oldFileSize)
-+ return YAFFS_OK;
-+
-+ if (newSize < oldFileSize) {
-+
-+ yaffs_PruneResizedChunks(in, newSize);
++ yaffs_release_temp_buffer(dev, local_buffer, __LINE__);
++ }
+
-+ if (newSizeOfPartialChunk != 0) {
-+ int lastChunk = 1 + newFullChunks;
++ obj->variant.file_variant.file_size = new_size;
+
-+ __u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__);
++ yaffs_prune_tree(dev, &obj->variant.file_variant);
++}
+
-+ /* Got to read and rewrite the last chunk with its new size and zero pad */
-+ yaffs_ReadChunkDataFromObject(in, lastChunk,
-+ localBuffer);
++int yaffs_resize_file(struct yaffs_obj *in, loff_t new_size)
++{
++ struct yaffs_dev *dev = in->my_dev;
++ int old_size = in->variant.file_variant.file_size;
+
-+ memset(localBuffer + newSizeOfPartialChunk, 0,
-+ dev->nDataBytesPerChunk - newSizeOfPartialChunk);
++ yaffs_flush_file_cache(in);
++ yaffs_invalidate_whole_cache(in);
+
-+ yaffs_WriteChunkDataToObject(in, lastChunk, localBuffer,
-+ newSizeOfPartialChunk, 1);
++ yaffs_check_gc(dev, 0);
+
-+ yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__);
-+ }
++ if (in->variant_type != YAFFS_OBJECT_TYPE_FILE)
++ return YAFFS_FAIL;
+
-+ in->variant.fileVariant.fileSize = newSize;
++ if (new_size == old_size)
++ return YAFFS_OK;
+
-+ yaffs_PruneFileStructure(dev, &in->variant.fileVariant);
++ if (new_size > old_size) {
++ yaffs2_handle_hole(in, new_size);
++ in->variant.file_variant.file_size = new_size;
+ } else {
-+ /* newsSize > oldFileSize */
-+ in->variant.fileVariant.fileSize = newSize;
++ /* new_size < old_size */
++ yaffs_resize_file_down(in, new_size);
+ }
+
-+
-+ /* Write a new object header.
++ /* Write a new object header to reflect the resize.
+ * show we've shrunk the file, if need be
-+ * Do this only if the file is not in the deleted directories.
++ * Do this only if the file is not in the deleted directories
++ * and is not shadowed.
+ */
+ if (in->parent &&
-+ in->parent->objectId != YAFFS_OBJECTID_UNLINKED &&
-+ in->parent->objectId != YAFFS_OBJECTID_DELETED)
-+ yaffs_UpdateObjectHeader(in, NULL, 0,
-+ (newSize < oldFileSize) ? 1 : 0, 0);
++ !in->is_shadowed &&
++ in->parent->obj_id != YAFFS_OBJECTID_UNLINKED &&
++ in->parent->obj_id != YAFFS_OBJECTID_DELETED)
++ yaffs_update_oh(in, NULL, 0, 0, 0, NULL);
+
+ return YAFFS_OK;
+}
+
-+loff_t yaffs_GetFileSize(yaffs_Object *obj)
++int yaffs_flush_file(struct yaffs_obj *in, int update_time, int data_sync)
+{
-+ obj = yaffs_GetEquivalentObject(obj);
-+
-+ switch (obj->variantType) {
-+ case YAFFS_OBJECT_TYPE_FILE:
-+ return obj->variant.fileVariant.fileSize;
-+ case YAFFS_OBJECT_TYPE_SYMLINK:
-+ return yaffs_strlen(obj->variant.symLinkVariant.alias);
-+ default:
-+ return 0;
-+ }
-+}
-+
-+
-+
-+int yaffs_FlushFile(yaffs_Object *in, int updateTime)
-+{
-+ int retVal;
++ int ret_val;
+ if (in->dirty) {
-+ yaffs_FlushFilesChunkCache(in);
-+ if (updateTime) {
-+#ifdef CONFIG_YAFFS_WINCE
-+ yfsd_WinFileTimeNow(in->win_mtime);
-+#else
-+
-+ in->yst_mtime = Y_CURRENT_TIME;
-+
-+#endif
++ yaffs_flush_file_cache(in);
++ if (data_sync) /* Only sync data */
++ ret_val = YAFFS_OK;
++ else {
++ if (update_time)
++ yaffs_load_current_time(in, 0, 0);
++
++ ret_val = (yaffs_update_oh(in, NULL, 0, 0, 0, NULL) >=
++ 0) ? YAFFS_OK : YAFFS_FAIL;
+ }
-+
-+ retVal = (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >=
-+ 0) ? YAFFS_OK : YAFFS_FAIL;
+ } else {
-+ retVal = YAFFS_OK;
++ ret_val = YAFFS_OK;
+ }
+
-+ return retVal;
++ return ret_val;
+
+}
+
-+static int yaffs_DoGenericObjectDeletion(yaffs_Object *in)
++static int yaffs_generic_obj_del(struct yaffs_obj *in)
+{
+
+ /* First off, invalidate the file's data in the cache, without flushing. */
-+ yaffs_InvalidateWholeChunkCache(in);
++ yaffs_invalidate_whole_cache(in);
+
-+ if (in->myDev->isYaffs2 && (in->parent != in->myDev->deletedDir)) {
++ if (in->my_dev->param.is_yaffs2 && (in->parent != in->my_dev->del_dir)) {
+ /* Move to the unlinked directory so we have a record that it was deleted. */
-+ yaffs_ChangeObjectName(in, in->myDev->deletedDir, _Y("deleted"), 0, 0);
++ yaffs_change_obj_name(in, in->my_dev->del_dir, _Y("deleted"), 0,
++ 0);
+
+ }
+
-+ yaffs_RemoveObjectFromDirectory(in);
-+ yaffs_DeleteChunk(in->myDev, in->hdrChunk, 1, __LINE__);
-+ in->hdrChunk = 0;
++ yaffs_remove_obj_from_dir(in);
++ yaffs_chunk_del(in->my_dev, in->hdr_chunk, 1, __LINE__);
++ in->hdr_chunk = 0;
+
-+ yaffs_FreeObject(in);
++ yaffs_free_obj(in);
+ return YAFFS_OK;
+
+}
+
-+/* yaffs_DeleteFile deletes the whole file data
++/* yaffs_del_file deletes the whole file data
+ * and the inode associated with the file.
+ * It does not delete the links associated with the file.
+ */
-+static int yaffs_UnlinkFileIfNeeded(yaffs_Object *in)
++static int yaffs_unlink_file_if_needed(struct yaffs_obj *in)
+{
+
-+ int retVal;
-+ int immediateDeletion = 0;
++ int ret_val;
++ int del_now = 0;
++ struct yaffs_dev *dev = in->my_dev;
+
-+#ifdef __KERNEL__
-+ if (!in->myInode)
-+ immediateDeletion = 1;
-+#else
-+ if (in->inUse <= 0)
-+ immediateDeletion = 1;
-+#endif
++ if (!in->my_inode)
++ del_now = 1;
+
-+ if (immediateDeletion) {
-+ retVal =
-+ yaffs_ChangeObjectName(in, in->myDev->deletedDir,
-+ _Y("deleted"), 0, 0);
++ if (del_now) {
++ ret_val =
++ yaffs_change_obj_name(in, in->my_dev->del_dir,
++ _Y("deleted"), 0, 0);
+ T(YAFFS_TRACE_TRACING,
+ (TSTR("yaffs: immediate deletion of file %d" TENDSTR),
-+ in->objectId));
++ in->obj_id));
+ in->deleted = 1;
-+ in->myDev->nDeletedFiles++;
-+ if (1 || in->myDev->isYaffs2)
-+ yaffs_ResizeFile(in, 0);
-+ yaffs_SoftDeleteFile(in);
++ in->my_dev->n_deleted_files++;
++ if (dev->param.disable_soft_del || dev->param.is_yaffs2)
++ yaffs_resize_file(in, 0);
++ yaffs_soft_del_file(in);
+ } else {
-+ retVal =
-+ yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,
-+ _Y("unlinked"), 0, 0);
++ ret_val =
++ yaffs_change_obj_name(in, in->my_dev->unlinked_dir,
++ _Y("unlinked"), 0, 0);
+ }
+
-+
-+ return retVal;
++ return ret_val;
+}
+
-+int yaffs_DeleteFile(yaffs_Object *in)
++int yaffs_del_file(struct yaffs_obj *in)
+{
-+ int retVal = YAFFS_OK;
-+ int deleted = in->deleted;
++ int ret_val = YAFFS_OK;
++ int deleted; /* Need to cache value on stack if in is freed */
++ struct yaffs_dev *dev = in->my_dev;
+
-+ yaffs_ResizeFile(in, 0);
++ if (dev->param.disable_soft_del || dev->param.is_yaffs2)
++ yaffs_resize_file(in, 0);
+
-+ if (in->nDataChunks > 0) {
++ if (in->n_data_chunks > 0) {
+ /* Use soft deletion if there is data in the file.
+ * That won't be the case if it has been resized to zero.
+ */
+ if (!in->unlinked)
-+ retVal = yaffs_UnlinkFileIfNeeded(in);
++ ret_val = yaffs_unlink_file_if_needed(in);
++
++ deleted = in->deleted;
+
-+ if (retVal == YAFFS_OK && in->unlinked && !in->deleted) {
++ if (ret_val == YAFFS_OK && in->unlinked && !in->deleted) {
+ in->deleted = 1;
+ deleted = 1;
-+ in->myDev->nDeletedFiles++;
-+ yaffs_SoftDeleteFile(in);
++ in->my_dev->n_deleted_files++;
++ yaffs_soft_del_file(in);
+ }
+ return deleted ? YAFFS_OK : YAFFS_FAIL;
+ } else {
+ /* The file has no data chunks so we toss it immediately */
-+ yaffs_FreeTnode(in->myDev, in->variant.fileVariant.top);
-+ in->variant.fileVariant.top = NULL;
-+ yaffs_DoGenericObjectDeletion(in);
++ yaffs_free_tnode(in->my_dev, in->variant.file_variant.top);
++ in->variant.file_variant.top = NULL;
++ yaffs_generic_obj_del(in);
+
+ return YAFFS_OK;
+ }
+}
+
-+static int yaffs_DeleteDirectory(yaffs_Object *in)
++static int yaffs_is_non_empty_dir(struct yaffs_obj *obj)
+{
-+ /* First check that the directory is empty. */
-+ if (ylist_empty(&in->variant.directoryVariant.children))
-+ return yaffs_DoGenericObjectDeletion(in);
++ return (obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY) &&
++ !(list_empty(&obj->variant.dir_variant.children));
++}
+
-+ return YAFFS_FAIL;
++static int yaffs_del_dir(struct yaffs_obj *obj)
++{
++ /* First check that the directory is empty. */
++ if (yaffs_is_non_empty_dir(obj))
++ return YAFFS_FAIL;
+
++ return yaffs_generic_obj_del(obj);
+}
+
-+static int yaffs_DeleteSymLink(yaffs_Object *in)
++static int yaffs_del_symlink(struct yaffs_obj *in)
+{
-+ YFREE(in->variant.symLinkVariant.alias);
++ if (in->variant.symlink_variant.alias)
++ YFREE(in->variant.symlink_variant.alias);
++ in->variant.symlink_variant.alias = NULL;
+
-+ return yaffs_DoGenericObjectDeletion(in);
++ return yaffs_generic_obj_del(in);
+}
+
-+static int yaffs_DeleteHardLink(yaffs_Object *in)
++static int yaffs_del_link(struct yaffs_obj *in)
+{
+ /* remove this hardlink from the list assocaited with the equivalent
+ * object
+ */
-+ ylist_del_init(&in->hardLinks);
-+ return yaffs_DoGenericObjectDeletion(in);
++ list_del_init(&in->hard_links);
++ return yaffs_generic_obj_del(in);
+}
+
-+int yaffs_DeleteObject(yaffs_Object *obj)
++int yaffs_del_obj(struct yaffs_obj *obj)
+{
-+int retVal = -1;
-+ switch (obj->variantType) {
++ int ret_val = -1;
++ switch (obj->variant_type) {
+ case YAFFS_OBJECT_TYPE_FILE:
-+ retVal = yaffs_DeleteFile(obj);
++ ret_val = yaffs_del_file(obj);
+ break;
+ case YAFFS_OBJECT_TYPE_DIRECTORY:
-+ return yaffs_DeleteDirectory(obj);
++ if (!list_empty(&obj->variant.dir_variant.dirty)) {
++ T(YAFFS_TRACE_BACKGROUND,
++ (TSTR
++ ("Remove object %d from dirty directories" TENDSTR),
++ obj->obj_id));
++ list_del_init(&obj->variant.dir_variant.dirty);
++ }
++ return yaffs_del_dir(obj);
+ break;
+ case YAFFS_OBJECT_TYPE_SYMLINK:
-+ retVal = yaffs_DeleteSymLink(obj);
++ ret_val = yaffs_del_symlink(obj);
+ break;
+ case YAFFS_OBJECT_TYPE_HARDLINK:
-+ retVal = yaffs_DeleteHardLink(obj);
++ ret_val = yaffs_del_link(obj);
+ break;
+ case YAFFS_OBJECT_TYPE_SPECIAL:
-+ retVal = yaffs_DoGenericObjectDeletion(obj);
++ ret_val = yaffs_generic_obj_del(obj);
+ break;
+ case YAFFS_OBJECT_TYPE_UNKNOWN:
-+ retVal = 0;
++ ret_val = 0;
+ break; /* should not happen. */
+ }
+
-+ return retVal;
++ return ret_val;
+}
+
-+static int yaffs_UnlinkWorker(yaffs_Object *obj)
++static int yaffs_unlink_worker(struct yaffs_obj *obj)
+{
+
-+ int immediateDeletion = 0;
++ int del_now = 0;
+
-+#ifdef __KERNEL__
-+ if (!obj->myInode)
-+ immediateDeletion = 1;
-+#else
-+ if (obj->inUse <= 0)
-+ immediateDeletion = 1;
-+#endif
++ if (!obj->my_inode)
++ del_now = 1;
++
++ if (obj)
++ yaffs_update_parent(obj->parent);
+
-+ if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
-+ return yaffs_DeleteHardLink(obj);
-+ } else if (!ylist_empty(&obj->hardLinks)) {
++ if (obj->variant_type == YAFFS_OBJECT_TYPE_HARDLINK) {
++ return yaffs_del_link(obj);
++ } else if (!list_empty(&obj->hard_links)) {
+ /* Curve ball: We're unlinking an object that has a hardlink.
+ *
+ * This problem arises because we are not strictly following
@@ -9229,79 +5798,87 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ * Instead, we do the following:
+ * - Select a hardlink.
+ * - Unhook it from the hard links
-+ * - Unhook it from its parent directory (so that the rename can work)
++ * - Move it from its parent directory (so that the rename can work)
+ * - Rename the object to the hardlink's name.
+ * - Delete the hardlink
+ */
+
-+ yaffs_Object *hl;
-+ int retVal;
++ struct yaffs_obj *hl;
++ struct yaffs_obj *parent;
++ int ret_val;
+ YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
+
-+ hl = ylist_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
++ hl = list_entry(obj->hard_links.next, struct yaffs_obj,
++ hard_links);
++
++ yaffs_get_obj_name(hl, name, YAFFS_MAX_NAME_LENGTH + 1);
++ parent = hl->parent;
+
-+ ylist_del_init(&hl->hardLinks);
-+ ylist_del_init(&hl->siblings);
++ list_del_init(&hl->hard_links);
+
-+ yaffs_GetObjectName(hl, name, YAFFS_MAX_NAME_LENGTH + 1);
++ yaffs_add_obj_to_dir(obj->my_dev->unlinked_dir, hl);
+
-+ retVal = yaffs_ChangeObjectName(obj, hl->parent, name, 0, 0);
++ ret_val = yaffs_change_obj_name(obj, parent, name, 0, 0);
+
-+ if (retVal == YAFFS_OK)
-+ retVal = yaffs_DoGenericObjectDeletion(hl);
++ if (ret_val == YAFFS_OK)
++ ret_val = yaffs_generic_obj_del(hl);
+
-+ return retVal;
++ return ret_val;
+
-+ } else if (immediateDeletion) {
-+ switch (obj->variantType) {
++ } else if (del_now) {
++ switch (obj->variant_type) {
+ case YAFFS_OBJECT_TYPE_FILE:
-+ return yaffs_DeleteFile(obj);
++ return yaffs_del_file(obj);
+ break;
+ case YAFFS_OBJECT_TYPE_DIRECTORY:
-+ return yaffs_DeleteDirectory(obj);
++ list_del_init(&obj->variant.dir_variant.dirty);
++ return yaffs_del_dir(obj);
+ break;
+ case YAFFS_OBJECT_TYPE_SYMLINK:
-+ return yaffs_DeleteSymLink(obj);
++ return yaffs_del_symlink(obj);
+ break;
+ case YAFFS_OBJECT_TYPE_SPECIAL:
-+ return yaffs_DoGenericObjectDeletion(obj);
++ return yaffs_generic_obj_del(obj);
+ break;
+ case YAFFS_OBJECT_TYPE_HARDLINK:
+ case YAFFS_OBJECT_TYPE_UNKNOWN:
+ default:
+ return YAFFS_FAIL;
+ }
-+ } else
-+ return yaffs_ChangeObjectName(obj, obj->myDev->unlinkedDir,
-+ _Y("unlinked"), 0, 0);
++ } else if (yaffs_is_non_empty_dir(obj)) {
++ return YAFFS_FAIL;
++ } else {
++ return yaffs_change_obj_name(obj, obj->my_dev->unlinked_dir,
++ _Y("unlinked"), 0, 0);
++ }
+}
+
-+
-+static int yaffs_UnlinkObject(yaffs_Object *obj)
++static int yaffs_unlink_obj(struct yaffs_obj *obj)
+{
+
-+ if (obj && obj->unlinkAllowed)
-+ return yaffs_UnlinkWorker(obj);
++ if (obj && obj->unlink_allowed)
++ return yaffs_unlink_worker(obj);
+
+ return YAFFS_FAIL;
+
+}
-+int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name)
++
++int yaffs_unlinker(struct yaffs_obj *dir, const YCHAR * name)
+{
-+ yaffs_Object *obj;
++ struct yaffs_obj *obj;
+
-+ obj = yaffs_FindObjectByName(dir, name);
-+ return yaffs_UnlinkObject(obj);
++ obj = yaffs_find_by_name(dir, name);
++ return yaffs_unlink_obj(obj);
+}
+
+/*----------------------- Initialisation Scanning ---------------------- */
+
-+static void yaffs_HandleShadowedObject(yaffs_Device *dev, int objId,
-+ int backwardScanning)
++void yaffs_handle_shadowed_obj(struct yaffs_dev *dev, int obj_id,
++ int backward_scanning)
+{
-+ yaffs_Object *obj;
++ struct yaffs_obj *obj;
+
-+ if (!backwardScanning) {
++ if (!backward_scanning) {
+ /* Handle YAFFS1 forward scanning case
+ * For YAFFS1 we always do the deletion
+ */
@@ -9310,7 +5887,8 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ /* Handle YAFFS2 case (backward scanning)
+ * If the shadowed object exists then ignore.
+ */
-+ if (yaffs_FindObjectByNumber(dev, objId))
++ obj = yaffs_find_by_number(dev, obj_id);
++ if (obj)
+ return;
+ }
+
@@ -9318,1365 +5896,322 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ * We put it in unlinked dir to be cleaned up after the scanning
+ */
+ obj =
-+ yaffs_FindOrCreateObjectByNumber(dev, objId,
-+ YAFFS_OBJECT_TYPE_FILE);
++ yaffs_find_or_create_by_number(dev, obj_id, YAFFS_OBJECT_TYPE_FILE);
+ if (!obj)
+ return;
-+ yaffs_AddObjectToDirectory(dev->unlinkedDir, obj);
-+ obj->variant.fileVariant.shrinkSize = 0;
++ obj->is_shadowed = 1;
++ yaffs_add_obj_to_dir(dev->unlinked_dir, obj);
++ obj->variant.file_variant.shrink_size = 0;
+ obj->valid = 1; /* So that we don't read any other info for this file */
+
+}
+
-+typedef struct {
-+ int seq;
-+ int block;
-+} yaffs_BlockIndex;
-+
-+
-+static void yaffs_HardlinkFixup(yaffs_Device *dev, yaffs_Object *hardList)
++void yaffs_link_fixup(struct yaffs_dev *dev, struct yaffs_obj *hard_list)
+{
-+ yaffs_Object *hl;
-+ yaffs_Object *in;
++ struct yaffs_obj *hl;
++ struct yaffs_obj *in;
+
-+ while (hardList) {
-+ hl = hardList;
-+ hardList = (yaffs_Object *) (hardList->hardLinks.next);
++ while (hard_list) {
++ hl = hard_list;
++ hard_list = (struct yaffs_obj *)(hard_list->hard_links.next);
+
-+ in = yaffs_FindObjectByNumber(dev,
-+ hl->variant.hardLinkVariant.
-+ equivalentObjectId);
++ in = yaffs_find_by_number(dev,
++ hl->variant.
++ hardlink_variant.equiv_id);
+
+ if (in) {
+ /* Add the hardlink pointers */
-+ hl->variant.hardLinkVariant.equivalentObject = in;
-+ ylist_add(&hl->hardLinks, &in->hardLinks);
++ hl->variant.hardlink_variant.equiv_obj = in;
++ list_add(&hl->hard_links, &in->hard_links);
+ } else {
+ /* Todo Need to report/handle this better.
+ * Got a problem... hardlink to a non-existant object
+ */
-+ hl->variant.hardLinkVariant.equivalentObject = NULL;
-+ YINIT_LIST_HEAD(&hl->hardLinks);
++ hl->variant.hardlink_variant.equiv_obj = NULL;
++ INIT_LIST_HEAD(&hl->hard_links);
+
+ }
+ }
+}
+
-+
-+
-+
-+
-+static int ybicmp(const void *a, const void *b)
-+{
-+ register int aseq = ((yaffs_BlockIndex *)a)->seq;
-+ register int bseq = ((yaffs_BlockIndex *)b)->seq;
-+ register int ablock = ((yaffs_BlockIndex *)a)->block;
-+ register int bblock = ((yaffs_BlockIndex *)b)->block;
-+ if (aseq == bseq)
-+ return ablock - bblock;
-+ else
-+ return aseq - bseq;
-+}
-+
-+
-+struct yaffs_ShadowFixerStruct {
-+ int objectId;
-+ int shadowedId;
-+ struct yaffs_ShadowFixerStruct *next;
-+};
-+
-+
-+static void yaffs_StripDeletedObjects(yaffs_Device *dev)
++static void yaffs_strip_deleted_objs(struct yaffs_dev *dev)
+{
+ /*
-+ * Sort out state of unlinked and deleted objects after scanning.
-+ */
-+ struct ylist_head *i;
-+ struct ylist_head *n;
-+ yaffs_Object *l;
++ * Sort out state of unlinked and deleted objects after scanning.
++ */
++ struct list_head *i;
++ struct list_head *n;
++ struct yaffs_obj *l;
++
++ if (dev->read_only)
++ return;
+
+ /* Soft delete all the unlinked files */
-+ ylist_for_each_safe(i, n,
-+ &dev->unlinkedDir->variant.directoryVariant.children) {
++ list_for_each_safe(i, n,
++ &dev->unlinked_dir->variant.dir_variant.children) {
+ if (i) {
-+ l = ylist_entry(i, yaffs_Object, siblings);
-+ yaffs_DeleteObject(l);
++ l = list_entry(i, struct yaffs_obj, siblings);
++ yaffs_del_obj(l);
+ }
+ }
+
-+ ylist_for_each_safe(i, n,
-+ &dev->deletedDir->variant.directoryVariant.children) {
++ list_for_each_safe(i, n, &dev->del_dir->variant.dir_variant.children) {
+ if (i) {
-+ l = ylist_entry(i, yaffs_Object, siblings);
-+ yaffs_DeleteObject(l);
++ l = list_entry(i, struct yaffs_obj, siblings);
++ yaffs_del_obj(l);
+ }
+ }
+
+}
+
-+static int yaffs_Scan(yaffs_Device *dev)
-+{
-+ yaffs_ExtendedTags tags;
-+ int blk;
-+ int blockIterator;
-+ int startIterator;
-+ int endIterator;
-+ int result;
-+
-+ int chunk;
-+ int c;
-+ int deleted;
-+ yaffs_BlockState state;
-+ yaffs_Object *hardList = NULL;
-+ yaffs_BlockInfo *bi;
-+ __u32 sequenceNumber;
-+ yaffs_ObjectHeader *oh;
-+ yaffs_Object *in;
-+ yaffs_Object *parent;
-+
-+ int alloc_failed = 0;
-+
-+ struct yaffs_ShadowFixerStruct *shadowFixerList = NULL;
-+
-+
-+ __u8 *chunkData;
-+
-+
-+
-+ T(YAFFS_TRACE_SCAN,
-+ (TSTR("yaffs_Scan starts intstartblk %d intendblk %d..." TENDSTR),
-+ dev->internalStartBlock, dev->internalEndBlock));
-+
-+ chunkData = yaffs_GetTempBuffer(dev, __LINE__);
-+
-+ dev->sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER;
-+
-+ /* Scan all the blocks to determine their state */
-+ for (blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) {
-+ bi = yaffs_GetBlockInfo(dev, blk);
-+ yaffs_ClearChunkBits(dev, blk);
-+ bi->pagesInUse = 0;
-+ bi->softDeletions = 0;
-+
-+ yaffs_QueryInitialBlockState(dev, blk, &state, &sequenceNumber);
-+
-+ bi->blockState = state;
-+ bi->sequenceNumber = sequenceNumber;
-+
-+ if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
-+ bi->blockState = state = YAFFS_BLOCK_STATE_DEAD;
-+
-+ T(YAFFS_TRACE_SCAN_DEBUG,
-+ (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
-+ state, sequenceNumber));
-+
-+ if (state == YAFFS_BLOCK_STATE_DEAD) {
-+ T(YAFFS_TRACE_BAD_BLOCKS,
-+ (TSTR("block %d is bad" TENDSTR), blk));
-+ } else if (state == YAFFS_BLOCK_STATE_EMPTY) {
-+ T(YAFFS_TRACE_SCAN_DEBUG,
-+ (TSTR("Block empty " TENDSTR)));
-+ dev->nErasedBlocks++;
-+ dev->nFreeChunks += dev->nChunksPerBlock;
-+ }
-+ }
-+
-+ startIterator = dev->internalStartBlock;
-+ endIterator = dev->internalEndBlock;
-+
-+ /* For each block.... */
-+ for (blockIterator = startIterator; !alloc_failed && blockIterator <= endIterator;
-+ blockIterator++) {
-+
-+ YYIELD();
-+
-+ YYIELD();
-+
-+ blk = blockIterator;
-+
-+ bi = yaffs_GetBlockInfo(dev, blk);
-+ state = bi->blockState;
-+
-+ deleted = 0;
++/*
++ * This code iterates through all the objects making sure that they are rooted.
++ * Any unrooted objects are re-rooted in lost+found.
++ * An object needs to be in one of:
++ * - Directly under deleted, unlinked
++ * - Directly or indirectly under root.
++ *
++ * Note:
++ * This code assumes that we don't ever change the current relationships between
++ * directories:
++ * root_dir->parent == unlinked_dir->parent == del_dir->parent == NULL
++ * lost-n-found->parent == root_dir
++ *
++ * This fixes the problem where directories might have inadvertently been deleted
++ * leaving the object "hanging" without being rooted in the directory tree.
++ */
+
-+ /* For each chunk in each block that needs scanning....*/
-+ for (c = 0; !alloc_failed && c < dev->nChunksPerBlock &&
-+ state == YAFFS_BLOCK_STATE_NEEDS_SCANNING; c++) {
-+ /* Read the tags and decide what to do */
-+ chunk = blk * dev->nChunksPerBlock + c;
++static int yaffs_has_null_parent(struct yaffs_dev *dev, struct yaffs_obj *obj)
++{
++ return (obj == dev->del_dir ||
++ obj == dev->unlinked_dir || obj == dev->root_dir);
++}
+
-+ result = yaffs_ReadChunkWithTagsFromNAND(dev, chunk, NULL,
-+ &tags);
++static void yaffs_fix_hanging_objs(struct yaffs_dev *dev)
++{
++ struct yaffs_obj *obj;
++ struct yaffs_obj *parent;
++ int i;
++ struct list_head *lh;
++ struct list_head *n;
++ int depth_limit;
++ int hanging;
+
-+ /* Let's have a good look at this chunk... */
++ if (dev->read_only)
++ return;
+
-+ if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED || tags.chunkDeleted) {
-+ /* YAFFS1 only...
-+ * A deleted chunk
-+ */
-+ deleted++;
-+ dev->nFreeChunks++;
-+ /*T((" %d %d deleted\n",blk,c)); */
-+ } else if (!tags.chunkUsed) {
-+ /* An unassigned chunk in the block
-+ * This means that either the block is empty or
-+ * this is the one being allocated from
-+ */
++ /* Iterate through the objects in each hash entry,
++ * looking at each object.
++ * Make sure it is rooted.
++ */
+
-+ if (c == 0) {
-+ /* We're looking at the first chunk in the block so the block is unused */
-+ state = YAFFS_BLOCK_STATE_EMPTY;
-+ dev->nErasedBlocks++;
++ for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
++ list_for_each_safe(lh, n, &dev->obj_bucket[i].list) {
++ if (lh) {
++ obj =
++ list_entry(lh, struct yaffs_obj, hash_link);
++ parent = obj->parent;
++
++ if (yaffs_has_null_parent(dev, obj)) {
++ /* These directories are not hanging */
++ hanging = 0;
++ } else if (!parent
++ || parent->variant_type !=
++ YAFFS_OBJECT_TYPE_DIRECTORY) {
++ hanging = 1;
++ } else if (yaffs_has_null_parent(dev, parent)) {
++ hanging = 0;
+ } else {
-+ /* this is the block being allocated from */
-+ T(YAFFS_TRACE_SCAN,
-+ (TSTR
-+ (" Allocating from %d %d" TENDSTR),
-+ blk, c));
-+ state = YAFFS_BLOCK_STATE_ALLOCATING;
-+ dev->allocationBlock = blk;
-+ dev->allocationPage = c;
-+ dev->allocationBlockFinder = blk;
-+ /* Set it to here to encourage the allocator to go forth from here. */
-+
-+ }
-+
-+ dev->nFreeChunks += (dev->nChunksPerBlock - c);
-+ } else if (tags.chunkId > 0) {
-+ /* chunkId > 0 so it is a data chunk... */
-+ unsigned int endpos;
-+
-+ yaffs_SetChunkBit(dev, blk, c);
-+ bi->pagesInUse++;
-+
-+ in = yaffs_FindOrCreateObjectByNumber(dev,
-+ tags.
-+ objectId,
-+ YAFFS_OBJECT_TYPE_FILE);
-+ /* PutChunkIntoFile checks for a clash (two data chunks with
-+ * the same chunkId).
-+ */
-+
-+ if (!in)
-+ alloc_failed = 1;
-+
-+ if (in) {
-+ if (!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk, 1))
-+ alloc_failed = 1;
-+ }
-+
-+ endpos =
-+ (tags.chunkId - 1) * dev->nDataBytesPerChunk +
-+ tags.byteCount;
-+ if (in &&
-+ in->variantType == YAFFS_OBJECT_TYPE_FILE
-+ && in->variant.fileVariant.scannedFileSize <
-+ endpos) {
-+ in->variant.fileVariant.
-+ scannedFileSize = endpos;
-+ if (!dev->useHeaderFileSize) {
-+ in->variant.fileVariant.
-+ fileSize =
-+ in->variant.fileVariant.
-+ scannedFileSize;
-+ }
-+
-+ }
-+ /* T((" %d %d data %d %d\n",blk,c,tags.objectId,tags.chunkId)); */
-+ } else {
-+ /* chunkId == 0, so it is an ObjectHeader.
-+ * Thus, we read in the object header and make the object
-+ */
-+ yaffs_SetChunkBit(dev, blk, c);
-+ bi->pagesInUse++;
-+
-+ result = yaffs_ReadChunkWithTagsFromNAND(dev, chunk,
-+ chunkData,
-+ NULL);
-+
-+ oh = (yaffs_ObjectHeader *) chunkData;
-+
-+ in = yaffs_FindObjectByNumber(dev,
-+ tags.objectId);
-+ if (in && in->variantType != oh->type) {
-+ /* This should not happen, but somehow
-+ * Wev'e ended up with an objectId that has been reused but not yet
-+ * deleted, and worse still it has changed type. Delete the old object.
++ /*
++ * Need to follow the parent chain to see if it is hanging.
+ */
-+
-+ yaffs_DeleteObject(in);
-+
-+ in = 0;
-+ }
-+
-+ in = yaffs_FindOrCreateObjectByNumber(dev,
-+ tags.
-+ objectId,
-+ oh->type);
-+
-+ if (!in)
-+ alloc_failed = 1;
-+
-+ if (in && oh->shadowsObject > 0) {
-+
-+ struct yaffs_ShadowFixerStruct *fixer;
-+ fixer = YMALLOC(sizeof(struct yaffs_ShadowFixerStruct));
-+ if (fixer) {
-+ fixer->next = shadowFixerList;
-+ shadowFixerList = fixer;
-+ fixer->objectId = tags.objectId;
-+ fixer->shadowedId = oh->shadowsObject;
++ hanging = 0;
++ depth_limit = 100;
++
++ while (parent != dev->root_dir &&
++ parent->parent &&
++ parent->parent->variant_type ==
++ YAFFS_OBJECT_TYPE_DIRECTORY
++ && depth_limit > 0) {
++ parent = parent->parent;
++ depth_limit--;
+ }
-+
++ if (parent != dev->root_dir)
++ hanging = 1;
+ }
-+
-+ if (in && in->valid) {
-+ /* We have already filled this one. We have a duplicate and need to resolve it. */
-+
-+ unsigned existingSerial = in->serial;
-+ unsigned newSerial = tags.serialNumber;
-+
-+ if (((existingSerial + 1) & 3) == newSerial) {
-+ /* Use new one - destroy the exisiting one */
-+ yaffs_DeleteChunk(dev,
-+ in->hdrChunk,
-+ 1, __LINE__);
-+ in->valid = 0;
-+ } else {
-+ /* Use existing - destroy this one. */
-+ yaffs_DeleteChunk(dev, chunk, 1,
-+ __LINE__);
-+ }
-+ }
-+
-+ if (in && !in->valid &&
-+ (tags.objectId == YAFFS_OBJECTID_ROOT ||
-+ tags.objectId == YAFFS_OBJECTID_LOSTNFOUND)) {
-+ /* We only load some info, don't fiddle with directory structure */
-+ in->valid = 1;
-+ in->variantType = oh->type;
-+
-+ in->yst_mode = oh->yst_mode;
-+#ifdef CONFIG_YAFFS_WINCE
-+ in->win_atime[0] = oh->win_atime[0];
-+ in->win_ctime[0] = oh->win_ctime[0];
-+ in->win_mtime[0] = oh->win_mtime[0];
-+ in->win_atime[1] = oh->win_atime[1];
-+ in->win_ctime[1] = oh->win_ctime[1];
-+ in->win_mtime[1] = oh->win_mtime[1];
-+#else
-+ in->yst_uid = oh->yst_uid;
-+ in->yst_gid = oh->yst_gid;
-+ in->yst_atime = oh->yst_atime;
-+ in->yst_mtime = oh->yst_mtime;
-+ in->yst_ctime = oh->yst_ctime;
-+ in->yst_rdev = oh->yst_rdev;
-+#endif
-+ in->hdrChunk = chunk;
-+ in->serial = tags.serialNumber;
-+
-+ } else if (in && !in->valid) {
-+ /* we need to load this info */
-+
-+ in->valid = 1;
-+ in->variantType = oh->type;
-+
-+ in->yst_mode = oh->yst_mode;
-+#ifdef CONFIG_YAFFS_WINCE
-+ in->win_atime[0] = oh->win_atime[0];
-+ in->win_ctime[0] = oh->win_ctime[0];
-+ in->win_mtime[0] = oh->win_mtime[0];
-+ in->win_atime[1] = oh->win_atime[1];
-+ in->win_ctime[1] = oh->win_ctime[1];
-+ in->win_mtime[1] = oh->win_mtime[1];
-+#else
-+ in->yst_uid = oh->yst_uid;
-+ in->yst_gid = oh->yst_gid;
-+ in->yst_atime = oh->yst_atime;
-+ in->yst_mtime = oh->yst_mtime;
-+ in->yst_ctime = oh->yst_ctime;
-+ in->yst_rdev = oh->yst_rdev;
-+#endif
-+ in->hdrChunk = chunk;
-+ in->serial = tags.serialNumber;
-+
-+ yaffs_SetObjectName(in, oh->name);
-+ in->dirty = 0;
-+
-+ /* directory stuff...
-+ * hook up to parent
-+ */
-+
-+ parent =
-+ yaffs_FindOrCreateObjectByNumber
-+ (dev, oh->parentObjectId,
-+ YAFFS_OBJECT_TYPE_DIRECTORY);
-+ if (!parent)
-+ alloc_failed = 1;
-+ if (parent && parent->variantType ==
-+ YAFFS_OBJECT_TYPE_UNKNOWN) {
-+ /* Set up as a directory */
-+ parent->variantType =
-+ YAFFS_OBJECT_TYPE_DIRECTORY;
-+ YINIT_LIST_HEAD(&parent->variant.
-+ directoryVariant.
-+ children);
-+ } else if (!parent || parent->variantType !=
-+ YAFFS_OBJECT_TYPE_DIRECTORY) {
-+ /* Hoosterman, another problem....
-+ * We're trying to use a non-directory as a directory
-+ */
-+
-+ T(YAFFS_TRACE_ERROR,
-+ (TSTR
-+ ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
-+ TENDSTR)));
-+ parent = dev->lostNFoundDir;
-+ }
-+
-+ yaffs_AddObjectToDirectory(parent, in);
-+
-+ if (0 && (parent == dev->deletedDir ||
-+ parent == dev->unlinkedDir)) {
-+ in->deleted = 1; /* If it is unlinked at start up then it wants deleting */
-+ dev->nDeletedFiles++;
-+ }
-+ /* Note re hardlinks.
-+ * Since we might scan a hardlink before its equivalent object is scanned
-+ * we put them all in a list.
-+ * After scanning is complete, we should have all the objects, so we run through this
-+ * list and fix up all the chains.
-+ */
-+
-+ switch (in->variantType) {
-+ case YAFFS_OBJECT_TYPE_UNKNOWN:
-+ /* Todo got a problem */
-+ break;
-+ case YAFFS_OBJECT_TYPE_FILE:
-+ if (dev->useHeaderFileSize)
-+
-+ in->variant.fileVariant.
-+ fileSize =
-+ oh->fileSize;
-+
-+ break;
-+ case YAFFS_OBJECT_TYPE_HARDLINK:
-+ in->variant.hardLinkVariant.
-+ equivalentObjectId =
-+ oh->equivalentObjectId;
-+ in->hardLinks.next =
-+ (struct ylist_head *)
-+ hardList;
-+ hardList = in;
-+ break;
-+ case YAFFS_OBJECT_TYPE_DIRECTORY:
-+ /* Do nothing */
-+ break;
-+ case YAFFS_OBJECT_TYPE_SPECIAL:
-+ /* Do nothing */
-+ break;
-+ case YAFFS_OBJECT_TYPE_SYMLINK:
-+ in->variant.symLinkVariant.alias =
-+ yaffs_CloneString(oh->alias);
-+ if (!in->variant.symLinkVariant.alias)
-+ alloc_failed = 1;
-+ break;
-+ }
-+
-+/*
-+ if (parent == dev->deletedDir) {
-+ yaffs_DestroyObject(in);
-+ bi->hasShrinkHeader = 1;
-+ }
-+*/
++ if (hanging) {
++ T(YAFFS_TRACE_SCAN,
++ (TSTR
++ ("Hanging object %d moved to lost and found"
++ TENDSTR), obj->obj_id));
++ yaffs_add_obj_to_dir(dev->lost_n_found,
++ obj);
+ }
+ }
+ }
-+
-+ if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
-+ /* If we got this far while scanning, then the block is fully allocated.*/
-+ state = YAFFS_BLOCK_STATE_FULL;
-+ }
-+
-+ bi->blockState = state;
-+
-+ /* Now let's see if it was dirty */
-+ if (bi->pagesInUse == 0 &&
-+ !bi->hasShrinkHeader &&
-+ bi->blockState == YAFFS_BLOCK_STATE_FULL) {
-+ yaffs_BlockBecameDirty(dev, blk);
-+ }
-+
+ }
++}
+
++/*
++ * Delete directory contents for cleaning up lost and found.
++ */
++static void yaffs_del_dir_contents(struct yaffs_obj *dir)
++{
++ struct yaffs_obj *obj;
++ struct list_head *lh;
++ struct list_head *n;
+
-+ /* Ok, we've done all the scanning.
-+ * Fix up the hard link chains.
-+ * We should now have scanned all the objects, now it's time to add these
-+ * hardlinks.
-+ */
++ if (dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
++ YBUG();
+
-+ yaffs_HardlinkFixup(dev, hardList);
++ list_for_each_safe(lh, n, &dir->variant.dir_variant.children) {
++ if (lh) {
++ obj = list_entry(lh, struct yaffs_obj, siblings);
++ if (obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY)
++ yaffs_del_dir_contents(obj);
+
-+ /* Fix up any shadowed objects */
-+ {
-+ struct yaffs_ShadowFixerStruct *fixer;
-+ yaffs_Object *obj;
++ T(YAFFS_TRACE_SCAN,
++ (TSTR("Deleting lost_found object %d" TENDSTR),
++ obj->obj_id));
+
-+ while (shadowFixerList) {
-+ fixer = shadowFixerList;
-+ shadowFixerList = fixer->next;
-+ /* Complete the rename transaction by deleting the shadowed object
-+ * then setting the object header to unshadowed.
++ /* Need to use UnlinkObject since Delete would not handle
++ * hardlinked objects correctly.
+ */
-+ obj = yaffs_FindObjectByNumber(dev, fixer->shadowedId);
-+ if (obj)
-+ yaffs_DeleteObject(obj);
-+
-+ obj = yaffs_FindObjectByNumber(dev, fixer->objectId);
-+
-+ if (obj)
-+ yaffs_UpdateObjectHeader(obj, NULL, 1, 0, 0);
-+
-+ YFREE(fixer);
++ yaffs_unlink_obj(obj);
+ }
+ }
+
-+ yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
-+
-+ if (alloc_failed)
-+ return YAFFS_FAIL;
-+
-+ T(YAFFS_TRACE_SCAN, (TSTR("yaffs_Scan ends" TENDSTR)));
-+
++}
+
-+ return YAFFS_OK;
++static void yaffs_empty_l_n_f(struct yaffs_dev *dev)
++{
++ yaffs_del_dir_contents(dev->lost_n_found);
+}
+
-+static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in)
++static void yaffs_check_obj_details_loaded(struct yaffs_obj *in)
+{
-+ __u8 *chunkData;
-+ yaffs_ObjectHeader *oh;
-+ yaffs_Device *dev;
-+ yaffs_ExtendedTags tags;
++ u8 *chunk_data;
++ struct yaffs_obj_hdr *oh;
++ struct yaffs_dev *dev;
++ struct yaffs_ext_tags tags;
+ int result;
+ int alloc_failed = 0;
+
+ if (!in)
+ return;
+
-+ dev = in->myDev;
-+
-+#if 0
-+ T(YAFFS_TRACE_SCAN, (TSTR("details for object %d %s loaded" TENDSTR),
-+ in->objectId,
-+ in->lazyLoaded ? "not yet" : "already"));
-+#endif
++ dev = in->my_dev;
+
-+ if (in->lazyLoaded && in->hdrChunk > 0) {
-+ in->lazyLoaded = 0;
-+ chunkData = yaffs_GetTempBuffer(dev, __LINE__);
++ if (in->lazy_loaded && in->hdr_chunk > 0) {
++ in->lazy_loaded = 0;
++ chunk_data = yaffs_get_temp_buffer(dev, __LINE__);
+
-+ result = yaffs_ReadChunkWithTagsFromNAND(dev, in->hdrChunk, chunkData, &tags);
-+ oh = (yaffs_ObjectHeader *) chunkData;
++ result =
++ yaffs_rd_chunk_tags_nand(dev, in->hdr_chunk, chunk_data,
++ &tags);
++ oh = (struct yaffs_obj_hdr *)chunk_data;
+
+ in->yst_mode = oh->yst_mode;
-+#ifdef CONFIG_YAFFS_WINCE
-+ in->win_atime[0] = oh->win_atime[0];
-+ in->win_ctime[0] = oh->win_ctime[0];
-+ in->win_mtime[0] = oh->win_mtime[0];
-+ in->win_atime[1] = oh->win_atime[1];
-+ in->win_ctime[1] = oh->win_ctime[1];
-+ in->win_mtime[1] = oh->win_mtime[1];
-+#else
-+ in->yst_uid = oh->yst_uid;
-+ in->yst_gid = oh->yst_gid;
-+ in->yst_atime = oh->yst_atime;
-+ in->yst_mtime = oh->yst_mtime;
-+ in->yst_ctime = oh->yst_ctime;
-+ in->yst_rdev = oh->yst_rdev;
-+
-+#endif
-+ yaffs_SetObjectName(in, oh->name);
-+
-+ if (in->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+ in->variant.symLinkVariant.alias =
-+ yaffs_CloneString(oh->alias);
-+ if (!in->variant.symLinkVariant.alias)
-+ alloc_failed = 1; /* Not returned to caller */
++ yaffs_load_attribs(in, oh);
++ yaffs_set_obj_name_from_oh(in, oh);
++
++ if (in->variant_type == YAFFS_OBJECT_TYPE_SYMLINK) {
++ in->variant.symlink_variant.alias =
++ yaffs_clone_str(oh->alias);
++ if (!in->variant.symlink_variant.alias)
++ alloc_failed = 1; /* Not returned to caller */
+ }
+
-+ yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
++ yaffs_release_temp_buffer(dev, chunk_data, __LINE__);
+ }
+}
+
-+static int yaffs_ScanBackwards(yaffs_Device *dev)
-+{
-+ yaffs_ExtendedTags tags;
-+ int blk;
-+ int blockIterator;
-+ int startIterator;
-+ int endIterator;
-+ int nBlocksToScan = 0;
-+
-+ int chunk;
-+ int result;
-+ int c;
-+ int deleted;
-+ yaffs_BlockState state;
-+ yaffs_Object *hardList = NULL;
-+ yaffs_BlockInfo *bi;
-+ __u32 sequenceNumber;
-+ yaffs_ObjectHeader *oh;
-+ yaffs_Object *in;
-+ yaffs_Object *parent;
-+ int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
-+ int itsUnlinked;
-+ __u8 *chunkData;
-+
-+ int fileSize;
-+ int isShrink;
-+ int foundChunksInBlock;
-+ int equivalentObjectId;
-+ int alloc_failed = 0;
-+
-+
-+ yaffs_BlockIndex *blockIndex = NULL;
-+ int altBlockIndex = 0;
-+
-+ if (!dev->isYaffs2) {
-+ T(YAFFS_TRACE_SCAN,
-+ (TSTR("yaffs_ScanBackwards is only for YAFFS2!" TENDSTR)));
-+ return YAFFS_FAIL;
-+ }
-+
-+ T(YAFFS_TRACE_SCAN,
-+ (TSTR
-+ ("yaffs_ScanBackwards starts intstartblk %d intendblk %d..."
-+ TENDSTR), dev->internalStartBlock, dev->internalEndBlock));
-+
-+
-+ dev->sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER;
-+
-+ blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
-+
-+ if (!blockIndex) {
-+ blockIndex = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockIndex));
-+ altBlockIndex = 1;
-+ }
-+
-+ if (!blockIndex) {
-+ T(YAFFS_TRACE_SCAN,
-+ (TSTR("yaffs_Scan() could not allocate block index!" TENDSTR)));
-+ return YAFFS_FAIL;
-+ }
-+
-+ dev->blocksInCheckpoint = 0;
-+
-+ chunkData = yaffs_GetTempBuffer(dev, __LINE__);
-+
-+ /* Scan all the blocks to determine their state */
-+ for (blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) {
-+ bi = yaffs_GetBlockInfo(dev, blk);
-+ yaffs_ClearChunkBits(dev, blk);
-+ bi->pagesInUse = 0;
-+ bi->softDeletions = 0;
-+
-+ yaffs_QueryInitialBlockState(dev, blk, &state, &sequenceNumber);
-+
-+ bi->blockState = state;
-+ bi->sequenceNumber = sequenceNumber;
-+
-+ if (bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA)
-+ bi->blockState = state = YAFFS_BLOCK_STATE_CHECKPOINT;
-+ if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
-+ bi->blockState = state = YAFFS_BLOCK_STATE_DEAD;
-+
-+ T(YAFFS_TRACE_SCAN_DEBUG,
-+ (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
-+ state, sequenceNumber));
-+
-+
-+ if (state == YAFFS_BLOCK_STATE_CHECKPOINT) {
-+ dev->blocksInCheckpoint++;
-+
-+ } else if (state == YAFFS_BLOCK_STATE_DEAD) {
-+ T(YAFFS_TRACE_BAD_BLOCKS,
-+ (TSTR("block %d is bad" TENDSTR), blk));
-+ } else if (state == YAFFS_BLOCK_STATE_EMPTY) {
-+ T(YAFFS_TRACE_SCAN_DEBUG,
-+ (TSTR("Block empty " TENDSTR)));
-+ dev->nErasedBlocks++;
-+ dev->nFreeChunks += dev->nChunksPerBlock;
-+ } else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
-+
-+ /* Determine the highest sequence number */
-+ if (sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
-+ sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
-+
-+ blockIndex[nBlocksToScan].seq = sequenceNumber;
-+ blockIndex[nBlocksToScan].block = blk;
-+
-+ nBlocksToScan++;
-+
-+ if (sequenceNumber >= dev->sequenceNumber)
-+ dev->sequenceNumber = sequenceNumber;
-+ } else {
-+ /* TODO: Nasty sequence number! */
-+ T(YAFFS_TRACE_SCAN,
-+ (TSTR
-+ ("Block scanning block %d has bad sequence number %d"
-+ TENDSTR), blk, sequenceNumber));
-+
-+ }
-+ }
-+ }
-+
-+ T(YAFFS_TRACE_SCAN,
-+ (TSTR("%d blocks to be sorted..." TENDSTR), nBlocksToScan));
-+
-+
-+
-+ YYIELD();
-+
-+ /* Sort the blocks */
-+#ifndef CONFIG_YAFFS_USE_OWN_SORT
-+ {
-+ /* Use qsort now. */
-+ yaffs_qsort(blockIndex, nBlocksToScan, sizeof(yaffs_BlockIndex), ybicmp);
-+ }
-+#else
-+ {
-+ /* Dungy old bubble sort... */
-+
-+ yaffs_BlockIndex temp;
-+ int i;
-+ int j;
-+
-+ for (i = 0; i < nBlocksToScan; i++)
-+ for (j = i + 1; j < nBlocksToScan; j++)
-+ if (blockIndex[i].seq > blockIndex[j].seq) {
-+ temp = blockIndex[j];
-+ blockIndex[j] = blockIndex[i];
-+ blockIndex[i] = temp;
-+ }
-+ }
-+#endif
-+
-+ YYIELD();
-+
-+ T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR)));
-+
-+ /* Now scan the blocks looking at the data. */
-+ startIterator = 0;
-+ endIterator = nBlocksToScan - 1;
-+ T(YAFFS_TRACE_SCAN_DEBUG,
-+ (TSTR("%d blocks to be scanned" TENDSTR), nBlocksToScan));
-+
-+ /* For each block.... backwards */
-+ for (blockIterator = endIterator; !alloc_failed && blockIterator >= startIterator;
-+ blockIterator--) {
-+ /* Cooperative multitasking! This loop can run for so
-+ long that watchdog timers expire. */
-+ YYIELD();
-+
-+ /* get the block to scan in the correct order */
-+ blk = blockIndex[blockIterator].block;
-+
-+ bi = yaffs_GetBlockInfo(dev, blk);
-+
-+
-+ state = bi->blockState;
-+
-+ deleted = 0;
-+
-+ /* For each chunk in each block that needs scanning.... */
-+ foundChunksInBlock = 0;
-+ for (c = dev->nChunksPerBlock - 1;
-+ !alloc_failed && c >= 0 &&
-+ (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
-+ state == YAFFS_BLOCK_STATE_ALLOCATING); c--) {
-+ /* Scan backwards...
-+ * Read the tags and decide what to do
-+ */
-+
-+ chunk = blk * dev->nChunksPerBlock + c;
-+
-+ result = yaffs_ReadChunkWithTagsFromNAND(dev, chunk, NULL,
-+ &tags);
-+
-+ /* Let's have a good look at this chunk... */
-+
-+ if (!tags.chunkUsed) {
-+ /* An unassigned chunk in the block.
-+ * If there are used chunks after this one, then
-+ * it is a chunk that was skipped due to failing the erased
-+ * check. Just skip it so that it can be deleted.
-+ * But, more typically, We get here when this is an unallocated
-+ * chunk and his means that either the block is empty or
-+ * this is the one being allocated from
-+ */
-+
-+ if (foundChunksInBlock) {
-+ /* This is a chunk that was skipped due to failing the erased check */
-+ } else if (c == 0) {
-+ /* We're looking at the first chunk in the block so the block is unused */
-+ state = YAFFS_BLOCK_STATE_EMPTY;
-+ dev->nErasedBlocks++;
-+ } else {
-+ if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
-+ state == YAFFS_BLOCK_STATE_ALLOCATING) {
-+ if (dev->sequenceNumber == bi->sequenceNumber) {
-+ /* this is the block being allocated from */
-+
-+ T(YAFFS_TRACE_SCAN,
-+ (TSTR
-+ (" Allocating from %d %d"
-+ TENDSTR), blk, c));
-+
-+ state = YAFFS_BLOCK_STATE_ALLOCATING;
-+ dev->allocationBlock = blk;
-+ dev->allocationPage = c;
-+ dev->allocationBlockFinder = blk;
-+ } else {
-+ /* This is a partially written block that is not
-+ * the current allocation block. This block must have
-+ * had a write failure, so set up for retirement.
-+ */
-+
-+ /* bi->needsRetiring = 1; ??? TODO */
-+ bi->gcPrioritise = 1;
-+
-+ T(YAFFS_TRACE_ALWAYS,
-+ (TSTR("Partially written block %d detected" TENDSTR),
-+ blk));
-+ }
-+ }
-+ }
-+
-+ dev->nFreeChunks++;
-+
-+ } else if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED) {
-+ T(YAFFS_TRACE_SCAN,
-+ (TSTR(" Unfixed ECC in chunk(%d:%d), chunk ignored"TENDSTR),
-+ blk, c));
-+
-+ dev->nFreeChunks++;
-+
-+ } else if (tags.chunkId > 0) {
-+ /* chunkId > 0 so it is a data chunk... */
-+ unsigned int endpos;
-+ __u32 chunkBase =
-+ (tags.chunkId - 1) * dev->nDataBytesPerChunk;
-+
-+ foundChunksInBlock = 1;
-+
-+
-+ yaffs_SetChunkBit(dev, blk, c);
-+ bi->pagesInUse++;
-+
-+ in = yaffs_FindOrCreateObjectByNumber(dev,
-+ tags.
-+ objectId,
-+ YAFFS_OBJECT_TYPE_FILE);
-+ if (!in) {
-+ /* Out of memory */
-+ alloc_failed = 1;
-+ }
-+
-+ if (in &&
-+ in->variantType == YAFFS_OBJECT_TYPE_FILE
-+ && chunkBase <
-+ in->variant.fileVariant.shrinkSize) {
-+ /* This has not been invalidated by a resize */
-+ if (!yaffs_PutChunkIntoFile(in, tags.chunkId,
-+ chunk, -1)) {
-+ alloc_failed = 1;
-+ }
-+
-+ /* File size is calculated by looking at the data chunks if we have not
-+ * seen an object header yet. Stop this practice once we find an object header.
-+ */
-+ endpos =
-+ (tags.chunkId -
-+ 1) * dev->nDataBytesPerChunk +
-+ tags.byteCount;
-+
-+ if (!in->valid && /* have not got an object header yet */
-+ in->variant.fileVariant.
-+ scannedFileSize < endpos) {
-+ in->variant.fileVariant.
-+ scannedFileSize = endpos;
-+ in->variant.fileVariant.
-+ fileSize =
-+ in->variant.fileVariant.
-+ scannedFileSize;
-+ }
-+
-+ } else if (in) {
-+ /* This chunk has been invalidated by a resize, so delete */
-+ yaffs_DeleteChunk(dev, chunk, 1, __LINE__);
-+
-+ }
-+ } else {
-+ /* chunkId == 0, so it is an ObjectHeader.
-+ * Thus, we read in the object header and make the object
-+ */
-+ foundChunksInBlock = 1;
-+
-+ yaffs_SetChunkBit(dev, blk, c);
-+ bi->pagesInUse++;
-+
-+ oh = NULL;
-+ in = NULL;
-+
-+ if (tags.extraHeaderInfoAvailable) {
-+ in = yaffs_FindOrCreateObjectByNumber
-+ (dev, tags.objectId,
-+ tags.extraObjectType);
-+ if (!in)
-+ alloc_failed = 1;
-+ }
-+
-+ if (!in ||
-+#ifdef CONFIG_YAFFS_DISABLE_LAZY_LOAD
-+ !in->valid ||
-+#endif
-+ tags.extraShadows ||
-+ (!in->valid &&
-+ (tags.objectId == YAFFS_OBJECTID_ROOT ||
-+ tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))) {
-+
-+ /* If we don't have valid info then we need to read the chunk
-+ * TODO In future we can probably defer reading the chunk and
-+ * living with invalid data until needed.
-+ */
-+
-+ result = yaffs_ReadChunkWithTagsFromNAND(dev,
-+ chunk,
-+ chunkData,
-+ NULL);
-+
-+ oh = (yaffs_ObjectHeader *) chunkData;
-+
-+ if (dev->inbandTags) {
-+ /* Fix up the header if they got corrupted by inband tags */
-+ oh->shadowsObject = oh->inbandShadowsObject;
-+ oh->isShrink = oh->inbandIsShrink;
-+ }
-+
-+ if (!in) {
-+ in = yaffs_FindOrCreateObjectByNumber(dev, tags.objectId, oh->type);
-+ if (!in)
-+ alloc_failed = 1;
-+ }
-+
-+ }
-+
-+ if (!in) {
-+ /* TODO Hoosterman we have a problem! */
-+ T(YAFFS_TRACE_ERROR,
-+ (TSTR
-+ ("yaffs tragedy: Could not make object for object %d at chunk %d during scan"
-+ TENDSTR), tags.objectId, chunk));
-+ continue;
-+ }
-+
-+ if (in->valid) {
-+ /* We have already filled this one.
-+ * We have a duplicate that will be discarded, but
-+ * we first have to suck out resize info if it is a file.
-+ */
-+
-+ if ((in->variantType == YAFFS_OBJECT_TYPE_FILE) &&
-+ ((oh &&
-+ oh->type == YAFFS_OBJECT_TYPE_FILE) ||
-+ (tags.extraHeaderInfoAvailable &&
-+ tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))) {
-+ __u32 thisSize =
-+ (oh) ? oh->fileSize : tags.
-+ extraFileLength;
-+ __u32 parentObjectId =
-+ (oh) ? oh->
-+ parentObjectId : tags.
-+ extraParentObjectId;
-+
-+
-+ isShrink =
-+ (oh) ? oh->isShrink : tags.
-+ extraIsShrinkHeader;
-+
-+ /* If it is deleted (unlinked at start also means deleted)
-+ * we treat the file size as being zeroed at this point.
-+ */
-+ if (parentObjectId ==
-+ YAFFS_OBJECTID_DELETED
-+ || parentObjectId ==
-+ YAFFS_OBJECTID_UNLINKED) {
-+ thisSize = 0;
-+ isShrink = 1;
-+ }
-+
-+ if (isShrink &&
-+ in->variant.fileVariant.
-+ shrinkSize > thisSize) {
-+ in->variant.fileVariant.
-+ shrinkSize =
-+ thisSize;
-+ }
-+
-+ if (isShrink)
-+ bi->hasShrinkHeader = 1;
-+
-+ }
-+ /* Use existing - destroy this one. */
-+ yaffs_DeleteChunk(dev, chunk, 1, __LINE__);
-+
-+ }
-+
-+ if (!in->valid && in->variantType !=
-+ (oh ? oh->type : tags.extraObjectType))
-+ T(YAFFS_TRACE_ERROR, (
-+ TSTR("yaffs tragedy: Bad object type, "
-+ TCONT("%d != %d, for object %d at chunk ")
-+ TCONT("%d during scan")
-+ TENDSTR), oh ?
-+ oh->type : tags.extraObjectType,
-+ in->variantType, tags.objectId,
-+ chunk));
-+
-+ if (!in->valid &&
-+ (tags.objectId == YAFFS_OBJECTID_ROOT ||
-+ tags.objectId ==
-+ YAFFS_OBJECTID_LOSTNFOUND)) {
-+ /* We only load some info, don't fiddle with directory structure */
-+ in->valid = 1;
-+
-+ if (oh) {
-+ in->variantType = oh->type;
-+
-+ in->yst_mode = oh->yst_mode;
-+#ifdef CONFIG_YAFFS_WINCE
-+ in->win_atime[0] = oh->win_atime[0];
-+ in->win_ctime[0] = oh->win_ctime[0];
-+ in->win_mtime[0] = oh->win_mtime[0];
-+ in->win_atime[1] = oh->win_atime[1];
-+ in->win_ctime[1] = oh->win_ctime[1];
-+ in->win_mtime[1] = oh->win_mtime[1];
-+#else
-+ in->yst_uid = oh->yst_uid;
-+ in->yst_gid = oh->yst_gid;
-+ in->yst_atime = oh->yst_atime;
-+ in->yst_mtime = oh->yst_mtime;
-+ in->yst_ctime = oh->yst_ctime;
-+ in->yst_rdev = oh->yst_rdev;
-+
-+#endif
-+ } else {
-+ in->variantType = tags.extraObjectType;
-+ in->lazyLoaded = 1;
-+ }
-+
-+ in->hdrChunk = chunk;
-+
-+ } else if (!in->valid) {
-+ /* we need to load this info */
-+
-+ in->valid = 1;
-+ in->hdrChunk = chunk;
-+
-+ if (oh) {
-+ in->variantType = oh->type;
-+
-+ in->yst_mode = oh->yst_mode;
-+#ifdef CONFIG_YAFFS_WINCE
-+ in->win_atime[0] = oh->win_atime[0];
-+ in->win_ctime[0] = oh->win_ctime[0];
-+ in->win_mtime[0] = oh->win_mtime[0];
-+ in->win_atime[1] = oh->win_atime[1];
-+ in->win_ctime[1] = oh->win_ctime[1];
-+ in->win_mtime[1] = oh->win_mtime[1];
-+#else
-+ in->yst_uid = oh->yst_uid;
-+ in->yst_gid = oh->yst_gid;
-+ in->yst_atime = oh->yst_atime;
-+ in->yst_mtime = oh->yst_mtime;
-+ in->yst_ctime = oh->yst_ctime;
-+ in->yst_rdev = oh->yst_rdev;
-+#endif
-+
-+ if (oh->shadowsObject > 0)
-+ yaffs_HandleShadowedObject(dev,
-+ oh->
-+ shadowsObject,
-+ 1);
-+
-+
-+ yaffs_SetObjectName(in, oh->name);
-+ parent =
-+ yaffs_FindOrCreateObjectByNumber
-+ (dev, oh->parentObjectId,
-+ YAFFS_OBJECT_TYPE_DIRECTORY);
-+
-+ fileSize = oh->fileSize;
-+ isShrink = oh->isShrink;
-+ equivalentObjectId = oh->equivalentObjectId;
-+
-+ } else {
-+ in->variantType = tags.extraObjectType;
-+ parent =
-+ yaffs_FindOrCreateObjectByNumber
-+ (dev, tags.extraParentObjectId,
-+ YAFFS_OBJECT_TYPE_DIRECTORY);
-+ fileSize = tags.extraFileLength;
-+ isShrink = tags.extraIsShrinkHeader;
-+ equivalentObjectId = tags.extraEquivalentObjectId;
-+ in->lazyLoaded = 1;
-+
-+ }
-+ in->dirty = 0;
-+
-+ if (!parent)
-+ alloc_failed = 1;
-+
-+ /* directory stuff...
-+ * hook up to parent
-+ */
-+
-+ if (parent && parent->variantType ==
-+ YAFFS_OBJECT_TYPE_UNKNOWN) {
-+ /* Set up as a directory */
-+ parent->variantType =
-+ YAFFS_OBJECT_TYPE_DIRECTORY;
-+ YINIT_LIST_HEAD(&parent->variant.
-+ directoryVariant.
-+ children);
-+ } else if (!parent || parent->variantType !=
-+ YAFFS_OBJECT_TYPE_DIRECTORY) {
-+ /* Hoosterman, another problem....
-+ * We're trying to use a non-directory as a directory
-+ */
-+
-+ T(YAFFS_TRACE_ERROR,
-+ (TSTR
-+ ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
-+ TENDSTR)));
-+ parent = dev->lostNFoundDir;
-+ }
-+
-+ yaffs_AddObjectToDirectory(parent, in);
-+
-+ itsUnlinked = (parent == dev->deletedDir) ||
-+ (parent == dev->unlinkedDir);
-+
-+ if (isShrink) {
-+ /* Mark the block as having a shrinkHeader */
-+ bi->hasShrinkHeader = 1;
-+ }
-+
-+ /* Note re hardlinks.
-+ * Since we might scan a hardlink before its equivalent object is scanned
-+ * we put them all in a list.
-+ * After scanning is complete, we should have all the objects, so we run
-+ * through this list and fix up all the chains.
-+ */
-+
-+ switch (in->variantType) {
-+ case YAFFS_OBJECT_TYPE_UNKNOWN:
-+ /* Todo got a problem */
-+ break;
-+ case YAFFS_OBJECT_TYPE_FILE:
-+
-+ if (in->variant.fileVariant.
-+ scannedFileSize < fileSize) {
-+ /* This covers the case where the file size is greater
-+ * than where the data is
-+ * This will happen if the file is resized to be larger
-+ * than its current data extents.
-+ */
-+ in->variant.fileVariant.fileSize = fileSize;
-+ in->variant.fileVariant.scannedFileSize =
-+ in->variant.fileVariant.fileSize;
-+ }
-+
-+ if (isShrink &&
-+ in->variant.fileVariant.shrinkSize > fileSize) {
-+ in->variant.fileVariant.shrinkSize = fileSize;
-+ }
-+
-+ break;
-+ case YAFFS_OBJECT_TYPE_HARDLINK:
-+ if (!itsUnlinked) {
-+ in->variant.hardLinkVariant.equivalentObjectId =
-+ equivalentObjectId;
-+ in->hardLinks.next =
-+ (struct ylist_head *) hardList;
-+ hardList = in;
-+ }
-+ break;
-+ case YAFFS_OBJECT_TYPE_DIRECTORY:
-+ /* Do nothing */
-+ break;
-+ case YAFFS_OBJECT_TYPE_SPECIAL:
-+ /* Do nothing */
-+ break;
-+ case YAFFS_OBJECT_TYPE_SYMLINK:
-+ if (oh) {
-+ in->variant.symLinkVariant.alias =
-+ yaffs_CloneString(oh->alias);
-+ if (!in->variant.symLinkVariant.alias)
-+ alloc_failed = 1;
-+ }
-+ break;
-+ }
-+
-+ }
-+
-+ }
-+
-+ } /* End of scanning for each chunk */
-+
-+ if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
-+ /* If we got this far while scanning, then the block is fully allocated. */
-+ state = YAFFS_BLOCK_STATE_FULL;
-+ }
-+
-+ bi->blockState = state;
-+
-+ /* Now let's see if it was dirty */
-+ if (bi->pagesInUse == 0 &&
-+ !bi->hasShrinkHeader &&
-+ bi->blockState == YAFFS_BLOCK_STATE_FULL) {
-+ yaffs_BlockBecameDirty(dev, blk);
-+ }
-+
-+ }
-+
-+ if (altBlockIndex)
-+ YFREE_ALT(blockIndex);
-+ else
-+ YFREE(blockIndex);
-+
-+ /* Ok, we've done all the scanning.
-+ * Fix up the hard link chains.
-+ * We should now have scanned all the objects, now it's time to add these
-+ * hardlinks.
-+ */
-+ yaffs_HardlinkFixup(dev, hardList);
-+
-+
-+ yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
-+
-+ if (alloc_failed)
-+ return YAFFS_FAIL;
-+
-+ T(YAFFS_TRACE_SCAN, (TSTR("yaffs_ScanBackwards ends" TENDSTR)));
-+
-+ return YAFFS_OK;
-+}
-+
+/*------------------------------ Directory Functions ----------------------------- */
+
-+static void yaffs_VerifyObjectInDirectory(yaffs_Object *obj)
-+{
-+ struct ylist_head *lh;
-+ yaffs_Object *listObj;
-+
-+ int count = 0;
-+
-+ if (!obj) {
-+ T(YAFFS_TRACE_ALWAYS, (TSTR("No object to verify" TENDSTR)));
-+ YBUG();
-+ return;
-+ }
-+
-+ if (yaffs_SkipVerification(obj->myDev))
-+ return;
++/*
++ *yaffs_update_parent() handles fixing a directories mtime and ctime when a new
++ * link (ie. name) is created or deleted in the directory.
++ *
++ * ie.
++ * create dir/a : update dir's mtime/ctime
++ * rm dir/a: update dir's mtime/ctime
++ * modify dir/a: don't update dir's mtimme/ctime
++ *
++ * This can be handled immediately or defered. Defering helps reduce the number
++ * of updates when many files in a directory are changed within a brief period.
++ *
++ * If the directory updating is defered then yaffs_update_dirty_dirs must be
++ * called periodically.
++ */
+
-+ if (!obj->parent) {
-+ T(YAFFS_TRACE_ALWAYS, (TSTR("Object does not have parent" TENDSTR)));
-+ YBUG();
++static void yaffs_update_parent(struct yaffs_obj *obj)
++{
++ struct yaffs_dev *dev;
++ if (!obj)
+ return;
-+ }
-+
-+ if (obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+ T(YAFFS_TRACE_ALWAYS, (TSTR("Parent is not directory" TENDSTR)));
-+ YBUG();
-+ }
-+
-+ /* Iterate through the objects in each hash entry */
-+
-+ ylist_for_each(lh, &obj->parent->variant.directoryVariant.children) {
-+ if (lh) {
-+ listObj = ylist_entry(lh, yaffs_Object, siblings);
-+ yaffs_VerifyObject(listObj);
-+ if (obj == listObj)
-+ count++;
++ dev = obj->my_dev;
++ obj->dirty = 1;
++ yaffs_load_current_time(obj, 0, 1);
++ if (dev->param.defered_dir_update) {
++ struct list_head *link = &obj->variant.dir_variant.dirty;
++
++ if (list_empty(link)) {
++ list_add(link, &dev->dirty_dirs);
++ T(YAFFS_TRACE_BACKGROUND,
++ (TSTR("Added object %d to dirty directories" TENDSTR),
++ obj->obj_id));
+ }
-+ }
+
-+ if (count != 1) {
-+ T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory %d times" TENDSTR), count));
-+ YBUG();
-+ }
++ } else {
++ yaffs_update_oh(obj, NULL, 0, 0, 0, NULL);
++ }
+}
+
-+static void yaffs_VerifyDirectory(yaffs_Object *directory)
++void yaffs_update_dirty_dirs(struct yaffs_dev *dev)
+{
-+ struct ylist_head *lh;
-+ yaffs_Object *listObj;
++ struct list_head *link;
++ struct yaffs_obj *obj;
++ struct yaffs_dir_var *d_s;
++ union yaffs_obj_var *o_v;
+
-+ if (!directory) {
-+ YBUG();
-+ return;
-+ }
++ T(YAFFS_TRACE_BACKGROUND, (TSTR("Update dirty directories" TENDSTR)));
+
-+ if (yaffs_SkipFullVerification(directory->myDev))
-+ return;
++ while (!list_empty(&dev->dirty_dirs)) {
++ link = dev->dirty_dirs.next;
++ list_del_init(link);
+
-+ if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+ T(YAFFS_TRACE_ALWAYS, (TSTR("Directory has wrong type: %d" TENDSTR), directory->variantType));
-+ YBUG();
-+ }
++ d_s = list_entry(link, struct yaffs_dir_var, dirty);
++ o_v = list_entry(d_s, union yaffs_obj_var, dir_variant);
++ obj = list_entry(o_v, struct yaffs_obj, variant);
+
-+ /* Iterate through the objects in each hash entry */
++ T(YAFFS_TRACE_BACKGROUND,
++ (TSTR("Update directory %d" TENDSTR), obj->obj_id));
+
-+ ylist_for_each(lh, &directory->variant.directoryVariant.children) {
-+ if (lh) {
-+ listObj = ylist_entry(lh, yaffs_Object, siblings);
-+ if (listObj->parent != directory) {
-+ T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory list has wrong parent %p" TENDSTR), listObj->parent));
-+ YBUG();
-+ }
-+ yaffs_VerifyObjectInDirectory(listObj);
-+ }
++ if (obj->dirty)
++ yaffs_update_oh(obj, NULL, 0, 0, 0, NULL);
+ }
+}
+
-+
-+static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj)
++static void yaffs_remove_obj_from_dir(struct yaffs_obj *obj)
+{
-+ yaffs_Device *dev = obj->myDev;
-+ yaffs_Object *parent;
++ struct yaffs_dev *dev = obj->my_dev;
++ struct yaffs_obj *parent;
+
-+ yaffs_VerifyObjectInDirectory(obj);
++ yaffs_verify_obj_in_dir(obj);
+ parent = obj->parent;
+
-+ yaffs_VerifyDirectory(parent);
++ yaffs_verify_dir(parent);
+
-+ if (dev && dev->removeObjectCallback)
-+ dev->removeObjectCallback(obj);
++ if (dev && dev->param.remove_obj_fn)
++ dev->param.remove_obj_fn(obj);
+
-+
-+ ylist_del_init(&obj->siblings);
++ list_del_init(&obj->siblings);
+ obj->parent = NULL;
+
-+ yaffs_VerifyDirectory(parent);
++ yaffs_verify_dir(parent);
+}
+
-+
-+static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
-+ yaffs_Object *obj)
++void yaffs_add_obj_to_dir(struct yaffs_obj *directory, struct yaffs_obj *obj)
+{
+ if (!directory) {
+ T(YAFFS_TRACE_ALWAYS,
@@ -10686,7 +6221,7 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ YBUG();
+ return;
+ }
-+ if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
++ if (directory->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
+ T(YAFFS_TRACE_ALWAYS,
+ (TSTR
+ ("tragedy: Trying to add an object to a non-directory"
@@ -10699,36 +6234,34 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ YBUG();
+ }
+
++ yaffs_verify_dir(directory);
+
-+ yaffs_VerifyDirectory(directory);
-+
-+ yaffs_RemoveObjectFromDirectory(obj);
-+
++ yaffs_remove_obj_from_dir(obj);
+
+ /* Now add it */
-+ ylist_add(&obj->siblings, &directory->variant.directoryVariant.children);
++ list_add(&obj->siblings, &directory->variant.dir_variant.children);
+ obj->parent = directory;
+
-+ if (directory == obj->myDev->unlinkedDir
-+ || directory == obj->myDev->deletedDir) {
++ if (directory == obj->my_dev->unlinked_dir
++ || directory == obj->my_dev->del_dir) {
+ obj->unlinked = 1;
-+ obj->myDev->nUnlinkedFiles++;
-+ obj->renameAllowed = 0;
++ obj->my_dev->n_unlinked_files++;
++ obj->rename_allowed = 0;
+ }
+
-+ yaffs_VerifyDirectory(directory);
-+ yaffs_VerifyObjectInDirectory(obj);
++ yaffs_verify_dir(directory);
++ yaffs_verify_obj_in_dir(obj);
+}
+
-+yaffs_Object *yaffs_FindObjectByName(yaffs_Object *directory,
-+ const YCHAR *name)
++struct yaffs_obj *yaffs_find_by_name(struct yaffs_obj *directory,
++ const YCHAR * name)
+{
+ int sum;
+
-+ struct ylist_head *i;
++ struct list_head *i;
+ YCHAR buffer[YAFFS_MAX_NAME_LENGTH + 1];
+
-+ yaffs_Object *l;
++ struct yaffs_obj *l;
+
+ if (!name)
+ return NULL;
@@ -10736,40 +6269,41 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ if (!directory) {
+ T(YAFFS_TRACE_ALWAYS,
+ (TSTR
-+ ("tragedy: yaffs_FindObjectByName: null pointer directory"
++ ("tragedy: yaffs_find_by_name: null pointer directory"
+ TENDSTR)));
+ YBUG();
+ return NULL;
+ }
-+ if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
++ if (directory->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
+ T(YAFFS_TRACE_ALWAYS,
-+ (TSTR
-+ ("tragedy: yaffs_FindObjectByName: non-directory" TENDSTR)));
++ (TSTR("tragedy: yaffs_find_by_name: non-directory" TENDSTR)));
+ YBUG();
+ }
+
-+ sum = yaffs_CalcNameSum(name);
++ sum = yaffs_calc_name_sum(name);
+
-+ ylist_for_each(i, &directory->variant.directoryVariant.children) {
++ list_for_each(i, &directory->variant.dir_variant.children) {
+ if (i) {
-+ l = ylist_entry(i, yaffs_Object, siblings);
++ l = list_entry(i, struct yaffs_obj, siblings);
+
+ if (l->parent != directory)
+ YBUG();
+
-+ yaffs_CheckObjectDetailsLoaded(l);
++ yaffs_check_obj_details_loaded(l);
+
+ /* Special case for lost-n-found */
-+ if (l->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
-+ if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0)
++ if (l->obj_id == YAFFS_OBJECTID_LOSTNFOUND) {
++ if (!yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME))
+ return l;
-+ } else if (yaffs_SumCompare(l->sum, sum) || l->hdrChunk <= 0) {
++ } else if (yaffs_sum_cmp(l->sum, sum)
++ || l->hdr_chunk <= 0) {
+ /* LostnFound chunk called Objxxx
+ * Do a real check
+ */
-+ yaffs_GetObjectName(l, buffer,
-+ YAFFS_MAX_NAME_LENGTH);
-+ if (yaffs_strncmp(name, buffer, YAFFS_MAX_NAME_LENGTH) == 0)
++ yaffs_get_obj_name(l, buffer,
++ YAFFS_MAX_NAME_LENGTH + 1);
++ if (yaffs_strncmp
++ (name, buffer, YAFFS_MAX_NAME_LENGTH) == 0)
+ return l;
+ }
+ }
@@ -10778,148 +6312,214 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ return NULL;
+}
+
-+
-+#if 0
-+int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
-+ int (*fn) (yaffs_Object *))
-+{
-+ struct ylist_head *i;
-+ yaffs_Object *l;
-+
-+ if (!theDir) {
-+ T(YAFFS_TRACE_ALWAYS,
-+ (TSTR
-+ ("tragedy: yaffs_FindObjectByName: null pointer directory"
-+ TENDSTR)));
-+ YBUG();
-+ return YAFFS_FAIL;
-+ }
-+ if (theDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+ T(YAFFS_TRACE_ALWAYS,
-+ (TSTR
-+ ("tragedy: yaffs_FindObjectByName: non-directory" TENDSTR)));
-+ YBUG();
-+ return YAFFS_FAIL;
-+ }
-+
-+ ylist_for_each(i, &theDir->variant.directoryVariant.children) {
-+ if (i) {
-+ l = ylist_entry(i, yaffs_Object, siblings);
-+ if (l && !fn(l))
-+ return YAFFS_FAIL;
-+ }
-+ }
-+
-+ return YAFFS_OK;
-+
-+}
-+#endif
-+
+/* GetEquivalentObject dereferences any hard links to get to the
+ * actual object.
+ */
+
-+yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj)
++struct yaffs_obj *yaffs_get_equivalent_obj(struct yaffs_obj *obj)
+{
-+ if (obj && obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
++ if (obj && obj->variant_type == YAFFS_OBJECT_TYPE_HARDLINK) {
+ /* We want the object id of the equivalent object, not this one */
-+ obj = obj->variant.hardLinkVariant.equivalentObject;
-+ yaffs_CheckObjectDetailsLoaded(obj);
++ obj = obj->variant.hardlink_variant.equiv_obj;
++ yaffs_check_obj_details_loaded(obj);
+ }
+ return obj;
+}
+
-+int yaffs_GetObjectName(yaffs_Object *obj, YCHAR *name, int buffSize)
-+{
-+ memset(name, 0, buffSize * sizeof(YCHAR));
-+
-+ yaffs_CheckObjectDetailsLoaded(obj);
++/*
++ * A note or two on object names.
++ * * If the object name is missing, we then make one up in the form objnnn
++ *
++ * * ASCII names are stored in the object header's name field from byte zero
++ * * Unicode names are historically stored starting from byte zero.
++ *
++ * Then there are automatic Unicode names...
++ * The purpose of these is to save names in a way that can be read as
++ * ASCII or Unicode names as appropriate, thus allowing a Unicode and ASCII
++ * system to share files.
++ *
++ * These automatic unicode are stored slightly differently...
++ * - If the name can fit in the ASCII character space then they are saved as
++ * ascii names as per above.
++ * - If the name needs Unicode then the name is saved in Unicode
++ * starting at oh->name[1].
+
-+ if (obj->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
-+ yaffs_strncpy(name, YAFFS_LOSTNFOUND_NAME, buffSize - 1);
-+ } else if (obj->hdrChunk <= 0) {
-+ YCHAR locName[20];
-+ YCHAR numString[20];
-+ YCHAR *x = &numString[19];
-+ unsigned v = obj->objectId;
-+ numString[19] = 0;
++ */
++static void yaffs_fix_null_name(struct yaffs_obj *obj, YCHAR * name,
++ int buffer_size)
++{
++ /* Create an object name if we could not find one. */
++ if (yaffs_strnlen(name, YAFFS_MAX_NAME_LENGTH) == 0) {
++ YCHAR local_name[20];
++ YCHAR num_string[20];
++ YCHAR *x = &num_string[19];
++ unsigned v = obj->obj_id;
++ num_string[19] = 0;
+ while (v > 0) {
+ x--;
+ *x = '0' + (v % 10);
+ v /= 10;
+ }
+ /* make up a name */
-+ yaffs_strcpy(locName, YAFFS_LOSTNFOUND_PREFIX);
-+ yaffs_strcat(locName, x);
-+ yaffs_strncpy(name, locName, buffSize - 1);
++ yaffs_strcpy(local_name, YAFFS_LOSTNFOUND_PREFIX);
++ yaffs_strcat(local_name, x);
++ yaffs_strncpy(name, local_name, buffer_size - 1);
++ }
++}
++
++static void yaffs_load_name_from_oh(struct yaffs_dev *dev, YCHAR * name,
++ const YCHAR * oh_name, int buff_size)
++{
++#ifdef CONFIG_YAFFS_AUTO_UNICODE
++ if (dev->param.auto_unicode) {
++ if (*oh_name) {
++ /* It is an ASCII name, so do an ASCII to unicode conversion */
++ const char *ascii_oh_name = (const char *)oh_name;
++ int n = buff_size - 1;
++ while (n > 0 && *ascii_oh_name) {
++ *name = *ascii_oh_name;
++ name++;
++ ascii_oh_name++;
++ n--;
++ }
++ } else {
++ yaffs_strncpy(name, oh_name + 1, buff_size - 1);
++ }
++ } else {
++#else
++ {
++#endif
++ yaffs_strncpy(name, oh_name, buff_size - 1);
++ }
++}
+
++static void yaffs_load_oh_from_name(struct yaffs_dev *dev, YCHAR * oh_name,
++ const YCHAR * name)
++{
++#ifdef CONFIG_YAFFS_AUTO_UNICODE
++
++ int is_ascii;
++ YCHAR *w;
++
++ if (dev->param.auto_unicode) {
++
++ is_ascii = 1;
++ w = name;
++
++ /* Figure out if the name will fit in ascii character set */
++ while (is_ascii && *w) {
++ if ((*w) & 0xff00)
++ is_ascii = 0;
++ w++;
++ }
++
++ if (is_ascii) {
++ /* It is an ASCII name, so do a unicode to ascii conversion */
++ char *ascii_oh_name = (char *)oh_name;
++ int n = YAFFS_MAX_NAME_LENGTH - 1;
++ while (n > 0 && *name) {
++ *ascii_oh_name = *name;
++ name++;
++ ascii_oh_name++;
++ n--;
++ }
++ } else {
++ /* It is a unicode name, so save starting at the second YCHAR */
++ *oh_name = 0;
++ yaffs_strncpy(oh_name + 1, name,
++ YAFFS_MAX_NAME_LENGTH - 2);
++ }
++ } else {
++#else
++ {
++#endif
++ yaffs_strncpy(oh_name, name, YAFFS_MAX_NAME_LENGTH - 1);
++ }
++
++}
++
++int yaffs_get_obj_name(struct yaffs_obj *obj, YCHAR * name, int buffer_size)
++{
++ memset(name, 0, buffer_size * sizeof(YCHAR));
++
++ yaffs_check_obj_details_loaded(obj);
++
++ if (obj->obj_id == YAFFS_OBJECTID_LOSTNFOUND) {
++ yaffs_strncpy(name, YAFFS_LOSTNFOUND_NAME, buffer_size - 1);
++ }
++#ifndef CONFIG_YAFFS_NO_SHORT_NAMES
++ else if (obj->short_name[0]) {
++ yaffs_strcpy(name, obj->short_name);
+ }
-+#ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
-+ else if (obj->shortName[0])
-+ yaffs_strcpy(name, obj->shortName);
+#endif
-+ else {
++ else if (obj->hdr_chunk > 0) {
+ int result;
-+ __u8 *buffer = yaffs_GetTempBuffer(obj->myDev, __LINE__);
++ u8 *buffer = yaffs_get_temp_buffer(obj->my_dev, __LINE__);
+
-+ yaffs_ObjectHeader *oh = (yaffs_ObjectHeader *) buffer;
++ struct yaffs_obj_hdr *oh = (struct yaffs_obj_hdr *)buffer;
+
-+ memset(buffer, 0, obj->myDev->nDataBytesPerChunk);
++ memset(buffer, 0, obj->my_dev->data_bytes_per_chunk);
+
-+ if (obj->hdrChunk > 0) {
-+ result = yaffs_ReadChunkWithTagsFromNAND(obj->myDev,
-+ obj->hdrChunk, buffer,
-+ NULL);
++ if (obj->hdr_chunk > 0) {
++ result = yaffs_rd_chunk_tags_nand(obj->my_dev,
++ obj->hdr_chunk,
++ buffer, NULL);
+ }
-+ yaffs_strncpy(name, oh->name, buffSize - 1);
++ yaffs_load_name_from_oh(obj->my_dev, name, oh->name,
++ buffer_size);
+
-+ yaffs_ReleaseTempBuffer(obj->myDev, buffer, __LINE__);
++ yaffs_release_temp_buffer(obj->my_dev, buffer, __LINE__);
+ }
+
-+ return yaffs_strlen(name);
++ yaffs_fix_null_name(obj, name, buffer_size);
++
++ return yaffs_strnlen(name, YAFFS_MAX_NAME_LENGTH);
+}
+
-+int yaffs_GetObjectFileLength(yaffs_Object *obj)
++int yaffs_get_obj_length(struct yaffs_obj *obj)
+{
+ /* Dereference any hard linking */
-+ obj = yaffs_GetEquivalentObject(obj);
++ obj = yaffs_get_equivalent_obj(obj);
+
-+ if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-+ return obj->variant.fileVariant.fileSize;
-+ if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
-+ return yaffs_strlen(obj->variant.symLinkVariant.alias);
-+ else {
++ if (obj->variant_type == YAFFS_OBJECT_TYPE_FILE)
++ return obj->variant.file_variant.file_size;
++ if (obj->variant_type == YAFFS_OBJECT_TYPE_SYMLINK) {
++ if (!obj->variant.symlink_variant.alias)
++ return 0;
++ return yaffs_strnlen(obj->variant.symlink_variant.alias,
++ YAFFS_MAX_ALIAS_LENGTH);
++ } else {
+ /* Only a directory should drop through to here */
-+ return obj->myDev->nDataBytesPerChunk;
++ return obj->my_dev->data_bytes_per_chunk;
+ }
+}
+
-+int yaffs_GetObjectLinkCount(yaffs_Object *obj)
++int yaffs_get_obj_link_count(struct yaffs_obj *obj)
+{
+ int count = 0;
-+ struct ylist_head *i;
++ struct list_head *i;
+
+ if (!obj->unlinked)
-+ count++; /* the object itself */
++ count++; /* the object itself */
+
-+ ylist_for_each(i, &obj->hardLinks)
-+ count++; /* add the hard links; */
++ list_for_each(i, &obj->hard_links)
++ count++; /* add the hard links; */
+
+ return count;
+}
+
-+int yaffs_GetObjectInode(yaffs_Object *obj)
++int yaffs_get_obj_inode(struct yaffs_obj *obj)
+{
-+ obj = yaffs_GetEquivalentObject(obj);
++ obj = yaffs_get_equivalent_obj(obj);
+
-+ return obj->objectId;
++ return obj->obj_id;
+}
+
-+unsigned yaffs_GetObjectType(yaffs_Object *obj)
++unsigned yaffs_get_obj_type(struct yaffs_obj *obj)
+{
-+ obj = yaffs_GetEquivalentObject(obj);
++ obj = yaffs_get_equivalent_obj(obj);
+
-+ switch (obj->variantType) {
++ switch (obj->variant_type) {
+ case YAFFS_OBJECT_TYPE_FILE:
+ return DT_REG;
+ break;
@@ -10947,158 +6547,207 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ }
+}
+
-+YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj)
++YCHAR *yaffs_get_symlink_alias(struct yaffs_obj *obj)
+{
-+ obj = yaffs_GetEquivalentObject(obj);
-+ if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
-+ return yaffs_CloneString(obj->variant.symLinkVariant.alias);
++ obj = yaffs_get_equivalent_obj(obj);
++ if (obj->variant_type == YAFFS_OBJECT_TYPE_SYMLINK)
++ return yaffs_clone_str(obj->variant.symlink_variant.alias);
+ else
-+ return yaffs_CloneString(_Y(""));
++ return yaffs_clone_str(_Y(""));
+}
+
-+#ifndef CONFIG_YAFFS_WINCE
-+
-+int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr)
++static int yaffs_do_xattrib_mod(struct yaffs_obj *obj, int set,
++ const YCHAR * name, const void *value, int size,
++ int flags)
+{
-+ unsigned int valid = attr->ia_valid;
++ struct yaffs_xattr_mod xmod;
+
-+ if (valid & ATTR_MODE)
-+ obj->yst_mode = attr->ia_mode;
-+ if (valid & ATTR_UID)
-+ obj->yst_uid = attr->ia_uid;
-+ if (valid & ATTR_GID)
-+ obj->yst_gid = attr->ia_gid;
++ int result;
+
-+ if (valid & ATTR_ATIME)
-+ obj->yst_atime = Y_TIME_CONVERT(attr->ia_atime);
-+ if (valid & ATTR_CTIME)
-+ obj->yst_ctime = Y_TIME_CONVERT(attr->ia_ctime);
-+ if (valid & ATTR_MTIME)
-+ obj->yst_mtime = Y_TIME_CONVERT(attr->ia_mtime);
++ xmod.set = set;
++ xmod.name = name;
++ xmod.data = value;
++ xmod.size = size;
++ xmod.flags = flags;
++ xmod.result = -ENOSPC;
+
-+ if (valid & ATTR_SIZE)
-+ yaffs_ResizeFile(obj, attr->ia_size);
++ result = yaffs_update_oh(obj, NULL, 0, 0, 0, &xmod);
++
++ if (result > 0)
++ return xmod.result;
++ else
++ return -ENOSPC;
++}
+
-+ yaffs_UpdateObjectHeader(obj, NULL, 1, 0, 0);
++static int yaffs_apply_xattrib_mod(struct yaffs_obj *obj, char *buffer,
++ struct yaffs_xattr_mod *xmod)
++{
++ int retval = 0;
++ int x_offs = sizeof(struct yaffs_obj_hdr);
++ struct yaffs_dev *dev = obj->my_dev;
++ int x_size = dev->data_bytes_per_chunk - sizeof(struct yaffs_obj_hdr);
+
-+ return YAFFS_OK;
++ char *x_buffer = buffer + x_offs;
++
++ if (xmod->set)
++ retval =
++ nval_set(x_buffer, x_size, xmod->name, xmod->data,
++ xmod->size, xmod->flags);
++ else
++ retval = nval_del(x_buffer, x_size, xmod->name);
++
++ obj->has_xattr = nval_hasvalues(x_buffer, x_size);
++ obj->xattr_known = 1;
+
++ xmod->result = retval;
++
++ return retval;
+}
-+int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr)
++
++static int yaffs_do_xattrib_fetch(struct yaffs_obj *obj, const YCHAR * name,
++ void *value, int size)
+{
-+ unsigned int valid = 0;
++ char *buffer = NULL;
++ int result;
++ struct yaffs_ext_tags tags;
++ struct yaffs_dev *dev = obj->my_dev;
++ int x_offs = sizeof(struct yaffs_obj_hdr);
++ int x_size = dev->data_bytes_per_chunk - sizeof(struct yaffs_obj_hdr);
+
-+ attr->ia_mode = obj->yst_mode;
-+ valid |= ATTR_MODE;
-+ attr->ia_uid = obj->yst_uid;
-+ valid |= ATTR_UID;
-+ attr->ia_gid = obj->yst_gid;
-+ valid |= ATTR_GID;
++ char *x_buffer;
+
-+ Y_TIME_CONVERT(attr->ia_atime) = obj->yst_atime;
-+ valid |= ATTR_ATIME;
-+ Y_TIME_CONVERT(attr->ia_ctime) = obj->yst_ctime;
-+ valid |= ATTR_CTIME;
-+ Y_TIME_CONVERT(attr->ia_mtime) = obj->yst_mtime;
-+ valid |= ATTR_MTIME;
++ int retval = 0;
+
-+ attr->ia_size = yaffs_GetFileSize(obj);
-+ valid |= ATTR_SIZE;
++ if (obj->hdr_chunk < 1)
++ return -ENODATA;
+
-+ attr->ia_valid = valid;
++ /* If we know that the object has no xattribs then don't do all the
++ * reading and parsing.
++ */
++ if (obj->xattr_known && !obj->has_xattr) {
++ if (name)
++ return -ENODATA;
++ else
++ return 0;
++ }
+
-+ return YAFFS_OK;
-+}
++ buffer = (char *)yaffs_get_temp_buffer(dev, __LINE__);
++ if (!buffer)
++ return -ENOMEM;
+
-+#endif
++ result =
++ yaffs_rd_chunk_tags_nand(dev, obj->hdr_chunk, (u8 *) buffer, &tags);
+
-+#if 0
-+int yaffs_DumpObject(yaffs_Object *obj)
++ if (result != YAFFS_OK)
++ retval = -ENOENT;
++ else {
++ x_buffer = buffer + x_offs;
++
++ if (!obj->xattr_known) {
++ obj->has_xattr = nval_hasvalues(x_buffer, x_size);
++ obj->xattr_known = 1;
++ }
++
++ if (name)
++ retval = nval_get(x_buffer, x_size, name, value, size);
++ else
++ retval = nval_list(x_buffer, x_size, value, size);
++ }
++ yaffs_release_temp_buffer(dev, (u8 *) buffer, __LINE__);
++ return retval;
++}
++
++int yaffs_set_xattrib(struct yaffs_obj *obj, const YCHAR * name,
++ const void *value, int size, int flags)
+{
-+ YCHAR name[257];
++ return yaffs_do_xattrib_mod(obj, 1, name, value, size, flags);
++}
+
-+ yaffs_GetObjectName(obj, name, 256);
++int yaffs_remove_xattrib(struct yaffs_obj *obj, const YCHAR * name)
++{
++ return yaffs_do_xattrib_mod(obj, 0, name, NULL, 0, 0);
++}
+
-+ T(YAFFS_TRACE_ALWAYS,
-+ (TSTR
-+ ("Object %d, inode %d \"%s\"\n dirty %d valid %d serial %d sum %d"
-+ " chunk %d type %d size %d\n"
-+ TENDSTR), obj->objectId, yaffs_GetObjectInode(obj), name,
-+ obj->dirty, obj->valid, obj->serial, obj->sum, obj->hdrChunk,
-+ yaffs_GetObjectType(obj), yaffs_GetObjectFileLength(obj)));
++int yaffs_get_xattrib(struct yaffs_obj *obj, const YCHAR * name, void *value,
++ int size)
++{
++ return yaffs_do_xattrib_fetch(obj, name, value, size);
++}
+
-+ return YAFFS_OK;
++int yaffs_list_xattrib(struct yaffs_obj *obj, char *buffer, int size)
++{
++ return yaffs_do_xattrib_fetch(obj, NULL, buffer, size);
+}
-+#endif
+
+/*---------------------------- Initialisation code -------------------------------------- */
+
-+static int yaffs_CheckDevFunctions(const yaffs_Device *dev)
++static int yaffs_check_dev_fns(const struct yaffs_dev *dev)
+{
+
+ /* Common functions, gotta have */
-+ if (!dev->eraseBlockInNAND || !dev->initialiseNAND)
++ if (!dev->param.erase_fn || !dev->param.initialise_flash_fn)
+ return 0;
+
+#ifdef CONFIG_YAFFS_YAFFS2
+
+ /* Can use the "with tags" style interface for yaffs1 or yaffs2 */
-+ if (dev->writeChunkWithTagsToNAND &&
-+ dev->readChunkWithTagsFromNAND &&
-+ !dev->writeChunkToNAND &&
-+ !dev->readChunkFromNAND &&
-+ dev->markNANDBlockBad && dev->queryNANDBlock)
++ if (dev->param.write_chunk_tags_fn &&
++ dev->param.read_chunk_tags_fn &&
++ !dev->param.write_chunk_fn &&
++ !dev->param.read_chunk_fn &&
++ dev->param.bad_block_fn && dev->param.query_block_fn)
+ return 1;
+#endif
+
+ /* Can use the "spare" style interface for yaffs1 */
-+ if (!dev->isYaffs2 &&
-+ !dev->writeChunkWithTagsToNAND &&
-+ !dev->readChunkWithTagsFromNAND &&
-+ dev->writeChunkToNAND &&
-+ dev->readChunkFromNAND &&
-+ !dev->markNANDBlockBad && !dev->queryNANDBlock)
++ if (!dev->param.is_yaffs2 &&
++ !dev->param.write_chunk_tags_fn &&
++ !dev->param.read_chunk_tags_fn &&
++ dev->param.write_chunk_fn &&
++ dev->param.read_chunk_fn &&
++ !dev->param.bad_block_fn && !dev->param.query_block_fn)
+ return 1;
+
+ return 0; /* bad */
+}
+
-+
-+static int yaffs_CreateInitialDirectories(yaffs_Device *dev)
++static int yaffs_create_initial_dir(struct yaffs_dev *dev)
+{
+ /* Initialise the unlinked, deleted, root and lost and found directories */
+
-+ dev->lostNFoundDir = dev->rootDir = NULL;
-+ dev->unlinkedDir = dev->deletedDir = NULL;
++ dev->lost_n_found = dev->root_dir = NULL;
++ dev->unlinked_dir = dev->del_dir = NULL;
+
-+ dev->unlinkedDir =
-+ yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_UNLINKED, S_IFDIR);
++ dev->unlinked_dir =
++ yaffs_create_fake_dir(dev, YAFFS_OBJECTID_UNLINKED, S_IFDIR);
+
-+ dev->deletedDir =
-+ yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_DELETED, S_IFDIR);
++ dev->del_dir =
++ yaffs_create_fake_dir(dev, YAFFS_OBJECTID_DELETED, S_IFDIR);
+
-+ dev->rootDir =
-+ yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_ROOT,
-+ YAFFS_ROOT_MODE | S_IFDIR);
-+ dev->lostNFoundDir =
-+ yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_LOSTNFOUND,
-+ YAFFS_LOSTNFOUND_MODE | S_IFDIR);
++ dev->root_dir =
++ yaffs_create_fake_dir(dev, YAFFS_OBJECTID_ROOT,
++ YAFFS_ROOT_MODE | S_IFDIR);
++ dev->lost_n_found =
++ yaffs_create_fake_dir(dev, YAFFS_OBJECTID_LOSTNFOUND,
++ YAFFS_LOSTNFOUND_MODE | S_IFDIR);
+
-+ if (dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir) {
-+ yaffs_AddObjectToDirectory(dev->rootDir, dev->lostNFoundDir);
++ if (dev->lost_n_found && dev->root_dir && dev->unlinked_dir
++ && dev->del_dir) {
++ yaffs_add_obj_to_dir(dev->root_dir, dev->lost_n_found);
+ return YAFFS_OK;
+ }
+
+ return YAFFS_FAIL;
+}
+
-+int yaffs_GutsInitialise(yaffs_Device *dev)
++int yaffs_guts_initialise(struct yaffs_dev *dev)
+{
+ int init_failed = 0;
+ unsigned x;
+ int bits;
+
-+ T(YAFFS_TRACE_TRACING, (TSTR("yaffs: yaffs_GutsInitialise()" TENDSTR)));
++ T(YAFFS_TRACE_TRACING,
++ (TSTR("yaffs: yaffs_guts_initialise()" TENDSTR)));
+
+ /* Check stuff that must be set */
+
@@ -11107,52 +6756,48 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ return YAFFS_FAIL;
+ }
+
-+ dev->internalStartBlock = dev->startBlock;
-+ dev->internalEndBlock = dev->endBlock;
-+ dev->blockOffset = 0;
-+ dev->chunkOffset = 0;
-+ dev->nFreeChunks = 0;
++ dev->internal_start_block = dev->param.start_block;
++ dev->internal_end_block = dev->param.end_block;
++ dev->block_offset = 0;
++ dev->chunk_offset = 0;
++ dev->n_free_chunks = 0;
+
-+ dev->gcBlock = -1;
++ dev->gc_block = 0;
+
-+ if (dev->startBlock == 0) {
-+ dev->internalStartBlock = dev->startBlock + 1;
-+ dev->internalEndBlock = dev->endBlock + 1;
-+ dev->blockOffset = 1;
-+ dev->chunkOffset = dev->nChunksPerBlock;
++ if (dev->param.start_block == 0) {
++ dev->internal_start_block = dev->param.start_block + 1;
++ dev->internal_end_block = dev->param.end_block + 1;
++ dev->block_offset = 1;
++ dev->chunk_offset = dev->param.chunks_per_block;
+ }
+
+ /* Check geometry parameters. */
+
-+ if ((!dev->inbandTags && dev->isYaffs2 && dev->totalBytesPerChunk < 1024) ||
-+ (!dev->isYaffs2 && dev->totalBytesPerChunk < 512) ||
-+ (dev->inbandTags && !dev->isYaffs2) ||
-+ dev->nChunksPerBlock < 2 ||
-+ dev->nReservedBlocks < 2 ||
-+ dev->internalStartBlock <= 0 ||
-+ dev->internalEndBlock <= 0 ||
-+ dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2)) { /* otherwise it is too small */
++ if ((!dev->param.inband_tags && dev->param.is_yaffs2 && dev->param.total_bytes_per_chunk < 1024) || (!dev->param.is_yaffs2 && dev->param.total_bytes_per_chunk < 512) || (dev->param.inband_tags && !dev->param.is_yaffs2) || dev->param.chunks_per_block < 2 || dev->param.n_reserved_blocks < 2 || dev->internal_start_block <= 0 || dev->internal_end_block <= 0 || dev->internal_end_block <= (dev->internal_start_block + dev->param.n_reserved_blocks + 2)) { /* otherwise it is too small */
+ T(YAFFS_TRACE_ALWAYS,
+ (TSTR
-+ ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s, inbandTags %d "
-+ TENDSTR), dev->totalBytesPerChunk, dev->isYaffs2 ? "2" : "", dev->inbandTags));
++ ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s, inband_tags %d "
++ TENDSTR), dev->param.total_bytes_per_chunk,
++ dev->param.is_yaffs2 ? "2" : "", dev->param.inband_tags));
+ return YAFFS_FAIL;
+ }
+
-+ if (yaffs_InitialiseNAND(dev) != YAFFS_OK) {
++ if (yaffs_init_nand(dev) != YAFFS_OK) {
+ T(YAFFS_TRACE_ALWAYS,
+ (TSTR("yaffs: InitialiseNAND failed" TENDSTR)));
+ return YAFFS_FAIL;
+ }
+
+ /* Sort out space for inband tags, if required */
-+ if (dev->inbandTags)
-+ dev->nDataBytesPerChunk = dev->totalBytesPerChunk - sizeof(yaffs_PackedTags2TagsPart);
++ if (dev->param.inband_tags)
++ dev->data_bytes_per_chunk =
++ dev->param.total_bytes_per_chunk -
++ sizeof(struct yaffs_packed_tags2_tags_only);
+ else
-+ dev->nDataBytesPerChunk = dev->totalBytesPerChunk;
++ dev->data_bytes_per_chunk = dev->param.total_bytes_per_chunk;
+
+ /* Got the right mix of functions? */
-+ if (!yaffs_CheckDevFunctions(dev)) {
++ if (!yaffs_check_dev_fns(dev)) {
+ /* Function missing */
+ T(YAFFS_TRACE_ALWAYS,
+ (TSTR
@@ -11161,14 +6806,7 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ return YAFFS_FAIL;
+ }
+
-+ /* This is really a compilation check. */
-+ if (!yaffs_CheckStructures()) {
-+ T(YAFFS_TRACE_ALWAYS,
-+ (TSTR("yaffs_CheckStructures failed\n" TENDSTR)));
-+ return YAFFS_FAIL;
-+ }
-+
-+ if (dev->isMounted) {
++ if (dev->is_mounted) {
+ T(YAFFS_TRACE_ALWAYS,
+ (TSTR("yaffs: device already mounted\n" TENDSTR)));
+ return YAFFS_FAIL;
@@ -11176,59 +6814,63 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+
+ /* Finished with most checks. One or two more checks happen later on too. */
+
-+ dev->isMounted = 1;
++ dev->is_mounted = 1;
+
+ /* OK now calculate a few things for the device */
+
+ /*
+ * Calculate all the chunk size manipulation numbers:
+ */
-+ x = dev->nDataBytesPerChunk;
-+ /* We always use dev->chunkShift and dev->chunkDiv */
-+ dev->chunkShift = Shifts(x);
-+ x >>= dev->chunkShift;
-+ dev->chunkDiv = x;
-+ /* We only use chunk mask if chunkDiv is 1 */
-+ dev->chunkMask = (1<<dev->chunkShift) - 1;
++ x = dev->data_bytes_per_chunk;
++ /* We always use dev->chunk_shift and dev->chunk_div */
++ dev->chunk_shift = calc_shifts(x);
++ x >>= dev->chunk_shift;
++ dev->chunk_div = x;
++ /* We only use chunk mask if chunk_div is 1 */
++ dev->chunk_mask = (1 << dev->chunk_shift) - 1;
+
+ /*
-+ * Calculate chunkGroupBits.
-+ * We need to find the next power of 2 > than internalEndBlock
++ * Calculate chunk_grp_bits.
++ * We need to find the next power of 2 > than internal_end_block
+ */
+
-+ x = dev->nChunksPerBlock * (dev->internalEndBlock + 1);
++ x = dev->param.chunks_per_block * (dev->internal_end_block + 1);
+
-+ bits = ShiftsGE(x);
++ bits = calc_shifts_ceiling(x);
+
+ /* Set up tnode width if wide tnodes are enabled. */
-+ if (!dev->wideTnodesDisabled) {
++ if (!dev->param.wide_tnodes_disabled) {
+ /* bits must be even so that we end up with 32-bit words */
+ if (bits & 1)
+ bits++;
+ if (bits < 16)
-+ dev->tnodeWidth = 16;
++ dev->tnode_width = 16;
+ else
-+ dev->tnodeWidth = bits;
-+ } else
-+ dev->tnodeWidth = 16;
++ dev->tnode_width = bits;
++ } else {
++ dev->tnode_width = 16;
++ }
+
-+ dev->tnodeMask = (1<<dev->tnodeWidth)-1;
++ dev->tnode_mask = (1 << dev->tnode_width) - 1;
+
+ /* Level0 Tnodes are 16 bits or wider (if wide tnodes are enabled),
+ * so if the bitwidth of the
+ * chunk range we're using is greater than 16 we need
-+ * to figure out chunk shift and chunkGroupSize
++ * to figure out chunk shift and chunk_grp_size
+ */
+
-+ if (bits <= dev->tnodeWidth)
-+ dev->chunkGroupBits = 0;
++ if (bits <= dev->tnode_width)
++ dev->chunk_grp_bits = 0;
+ else
-+ dev->chunkGroupBits = bits - dev->tnodeWidth;
++ dev->chunk_grp_bits = bits - dev->tnode_width;
+
++ dev->tnode_size = (dev->tnode_width * YAFFS_NTNODES_LEVEL0) / 8;
++ if (dev->tnode_size < sizeof(struct yaffs_tnode))
++ dev->tnode_size = sizeof(struct yaffs_tnode);
+
-+ dev->chunkGroupSize = 1 << dev->chunkGroupBits;
++ dev->chunk_grp_size = 1 << dev->chunk_grp_bits;
+
-+ if (dev->nChunksPerBlock < dev->chunkGroupSize) {
++ if (dev->param.chunks_per_block < dev->chunk_grp_size) {
+ /* We have a problem because the soft delete won't work if
+ * the chunk group size > chunks per block.
+ * This can be remedied by using larger "virtual blocks".
@@ -11242,309 +6884,264 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.c linux-2.6.34/fs/yaffs2/yaffs_
+ /* OK, we've finished verifying the device, lets continue with initialisation */
+
+ /* More device initialisation */
-+ dev->garbageCollections = 0;
-+ dev->passiveGarbageCollections = 0;
-+ dev->currentDirtyChecker = 0;
-+ dev->bufferedBlock = -1;
-+ dev->doingBufferedBlockRewrite = 0;
-+ dev->nDeletedFiles = 0;
-+ dev->nBackgroundDeletions = 0;
-+ dev->nUnlinkedFiles = 0;
-+ dev->eccFixed = 0;
-+ dev->eccUnfixed = 0;
-+ dev->tagsEccFixed = 0;
-+ dev->tagsEccUnfixed = 0;
-+ dev->nErasureFailures = 0;
-+ dev->nErasedBlocks = 0;
-+ dev->isDoingGC = 0;
-+ dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */
++ dev->all_gcs = 0;
++ dev->passive_gc_count = 0;
++ dev->oldest_dirty_gc_count = 0;
++ dev->bg_gcs = 0;
++ dev->gc_block_finder = 0;
++ dev->buffered_block = -1;
++ dev->doing_buffered_block_rewrite = 0;
++ dev->n_deleted_files = 0;
++ dev->n_bg_deletions = 0;
++ dev->n_unlinked_files = 0;
++ dev->n_ecc_fixed = 0;
++ dev->n_ecc_unfixed = 0;
++ dev->n_tags_ecc_fixed = 0;
++ dev->n_tags_ecc_unfixed = 0;
++ dev->n_erase_failures = 0;
++ dev->n_erased_blocks = 0;
++ dev->gc_disable = 0;
++ dev->has_pending_prioritised_gc = 1; /* Assume the worst for now, will get fixed on first GC */
++ INIT_LIST_HEAD(&dev->dirty_dirs);
++ dev->oldest_dirty_seq = 0;
++ dev->oldest_dirty_block = 0;
+
+ /* Initialise temporary buffers and caches. */
-+ if (!yaffs_InitialiseTempBuffers(dev))
++ if (!yaffs_init_tmp_buffers(dev))
+ init_failed = 1;
+
-+ dev->srCache = NULL;
-+ dev->gcCleanupList = NULL;
++ dev->cache = NULL;
++ dev->gc_cleanup_list = NULL;
+
-+
-+ if (!init_failed &&
-+ dev->nShortOpCaches > 0) {
++ if (!init_failed && dev->param.n_caches > 0) {
+ int i;
+ void *buf;
-+ int srCacheBytes = dev->nShortOpCaches * sizeof(yaffs_ChunkCache);
++ int cache_bytes =
++ dev->param.n_caches * sizeof(struct yaffs_cache);
+
-+ if (dev->nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES)
-+ dev->nShortOpCaches = YAFFS_MAX_SHORT_OP_CACHES;
++ if (dev->param.n_caches > YAFFS_MAX_SHORT_OP_CACHES)
++ dev->param.n_caches = YAFFS_MAX_SHORT_OP_CACHES;
+
-+ dev->srCache = YMALLOC(srCacheBytes);
++ dev->cache = YMALLOC(cache_bytes);
+
-+ buf = (__u8 *) dev->srCache;
++ buf = (u8 *) dev->cache;
+
-+ if (dev->srCache)
-+ memset(dev->srCache, 0, srCacheBytes);
++ if (dev->cache)
++ memset(dev->cache, 0, cache_bytes);
+
-+ for (i = 0; i < dev->nShortOpCaches && buf; i++) {
-+ dev->srCache[i].object = NULL;
-+ dev->srCache[i].lastUse = 0;
-+ dev->srCache[i].dirty = 0;
-+ dev->srCache[i].data = buf = YMALLOC_DMA(dev->totalBytesPerChunk);
++ for (i = 0; i < dev->param.n_caches && buf; i++) {
++ dev->cache[i].object = NULL;
++ dev->cache[i].last_use = 0;
++ dev->cache[i].dirty = 0;
++ dev->cache[i].data = buf =
++ YMALLOC_DMA(dev->param.total_bytes_per_chunk);
+ }
+ if (!buf)
+ init_failed = 1;
+
-+ dev->srLastUse = 0;
++ dev->cache_last_use = 0;
+ }
+
-+ dev->cacheHits = 0;
++ dev->cache_hits = 0;
+
+ if (!init_failed) {
-+ dev->gcCleanupList = YMALLOC(dev->nChunksPerBlock * sizeof(__u32));
-+ if (!dev->gcCleanupList)
++ dev->gc_cleanup_list =
++ YMALLOC(dev->param.chunks_per_block * sizeof(u32));
++ if (!dev->gc_cleanup_list)
+ init_failed = 1;
+ }
+
-+ if (dev->isYaffs2)
-+ dev->useHeaderFileSize = 1;
++ if (dev->param.is_yaffs2)
++ dev->param.use_header_file_size = 1;
+
-+ if (!init_failed && !yaffs_InitialiseBlocks(dev))
++ if (!init_failed && !yaffs_init_blocks(dev))
+ init_failed = 1;
+
-+ yaffs_InitialiseTnodes(dev);
-+ yaffs_InitialiseObjects(dev);
++ yaffs_init_tnodes_and_objs(dev);
+
-+ if (!init_failed && !yaffs_CreateInitialDirectories(dev))
++ if (!init_failed && !yaffs_create_initial_dir(dev))
+ init_failed = 1;
+
-+
+ if (!init_failed) {
+ /* Now scan the flash. */
-+ if (dev->isYaffs2) {
-+ if (yaffs_CheckpointRestore(dev)) {
-+ yaffs_CheckObjectDetailsLoaded(dev->rootDir);
-+ T(YAFFS_TRACE_ALWAYS,
-+ (TSTR("yaffs: restored from checkpoint" TENDSTR)));
++ if (dev->param.is_yaffs2) {
++ if (yaffs2_checkpt_restore(dev)) {
++ yaffs_check_obj_details_loaded(dev->root_dir);
++ T(YAFFS_TRACE_CHECKPOINT | YAFFS_TRACE_MOUNT,
++ (TSTR
++ ("yaffs: restored from checkpoint"
++ TENDSTR)));
+ } else {
+
+ /* Clean up the mess caused by an aborted checkpoint load
+ * and scan backwards.
+ */
-+ yaffs_DeinitialiseBlocks(dev);
-+ yaffs_DeinitialiseTnodes(dev);
-+ yaffs_DeinitialiseObjects(dev);
++ yaffs_deinit_blocks(dev);
+
++ yaffs_deinit_tnodes_and_objs(dev);
+
-+ dev->nErasedBlocks = 0;
-+ dev->nFreeChunks = 0;
-+ dev->allocationBlock = -1;
-+ dev->allocationPage = -1;
-+ dev->nDeletedFiles = 0;
-+ dev->nUnlinkedFiles = 0;
-+ dev->nBackgroundDeletions = 0;
-+ dev->oldestDirtySequence = 0;
++ dev->n_erased_blocks = 0;
++ dev->n_free_chunks = 0;
++ dev->alloc_block = -1;
++ dev->alloc_page = -1;
++ dev->n_deleted_files = 0;
++ dev->n_unlinked_files = 0;
++ dev->n_bg_deletions = 0;
+
-+ if (!init_failed && !yaffs_InitialiseBlocks(dev))
++ if (!init_failed && !yaffs_init_blocks(dev))
+ init_failed = 1;
+
-+ yaffs_InitialiseTnodes(dev);
-+ yaffs_InitialiseObjects(dev);
++ yaffs_init_tnodes_and_objs(dev);
+
-+ if (!init_failed && !yaffs_CreateInitialDirectories(dev))
++ if (!init_failed
++ && !yaffs_create_initial_dir(dev))
+ init_failed = 1;
+
-+ if (!init_failed && !yaffs_ScanBackwards(dev))
++ if (!init_failed && !yaffs2_scan_backwards(dev))
+ init_failed = 1;
+ }
-+ } else if (!yaffs_Scan(dev))
-+ init_failed = 1;
++ } else if (!yaffs1_scan(dev)) {
++ init_failed = 1;
++ }
+
-+ yaffs_StripDeletedObjects(dev);
++ yaffs_strip_deleted_objs(dev);
++ yaffs_fix_hanging_objs(dev);
++ if (dev->param.empty_lost_n_found)
++ yaffs_empty_l_n_f(dev);
+ }
+
+ if (init_failed) {
+ /* Clean up the mess */
+ T(YAFFS_TRACE_TRACING,
-+ (TSTR("yaffs: yaffs_GutsInitialise() aborted.\n" TENDSTR)));
++ (TSTR("yaffs: yaffs_guts_initialise() aborted.\n" TENDSTR)));
+
-+ yaffs_Deinitialise(dev);
++ yaffs_deinitialise(dev);
+ return YAFFS_FAIL;
+ }
+
+ /* Zero out stats */
-+ dev->nPageReads = 0;
-+ dev->nPageWrites = 0;
-+ dev->nBlockErasures = 0;
-+ dev->nGCCopies = 0;
-+ dev->nRetriedWrites = 0;
++ dev->n_page_reads = 0;
++ dev->n_page_writes = 0;
++ dev->n_erasures = 0;
++ dev->n_gc_copies = 0;
++ dev->n_retired_writes = 0;
+
-+ dev->nRetiredBlocks = 0;
++ dev->n_retired_blocks = 0;
+
-+ yaffs_VerifyFreeChunks(dev);
-+ yaffs_VerifyBlocks(dev);
++ yaffs_verify_free_chunks(dev);
++ yaffs_verify_blocks(dev);
+
++ /* Clean up any aborted checkpoint data */
++ if (!dev->is_checkpointed && dev->blocks_in_checkpt > 0)
++ yaffs2_checkpt_invalidate(dev);
+
+ T(YAFFS_TRACE_TRACING,
-+ (TSTR("yaffs: yaffs_GutsInitialise() done.\n" TENDSTR)));
++ (TSTR("yaffs: yaffs_guts_initialise() done.\n" TENDSTR)));
+ return YAFFS_OK;
+
+}
+
-+void yaffs_Deinitialise(yaffs_Device *dev)
++void yaffs_deinitialise(struct yaffs_dev *dev)
+{
-+ if (dev->isMounted) {
++ if (dev->is_mounted) {
+ int i;
+
-+ yaffs_DeinitialiseBlocks(dev);
-+ yaffs_DeinitialiseTnodes(dev);
-+ yaffs_DeinitialiseObjects(dev);
-+ if (dev->nShortOpCaches > 0 &&
-+ dev->srCache) {
++ yaffs_deinit_blocks(dev);
++ yaffs_deinit_tnodes_and_objs(dev);
++ if (dev->param.n_caches > 0 && dev->cache) {
+
-+ for (i = 0; i < dev->nShortOpCaches; i++) {
-+ if (dev->srCache[i].data)
-+ YFREE(dev->srCache[i].data);
-+ dev->srCache[i].data = NULL;
++ for (i = 0; i < dev->param.n_caches; i++) {
++ if (dev->cache[i].data)
++ YFREE(dev->cache[i].data);
++ dev->cache[i].data = NULL;
+ }
+
-+ YFREE(dev->srCache);
-+ dev->srCache = NULL;
++ YFREE(dev->cache);
++ dev->cache = NULL;
+ }
+
-+ YFREE(dev->gcCleanupList);
++ YFREE(dev->gc_cleanup_list);
+
+ for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
-+ YFREE(dev->tempBuffer[i].buffer);
++ YFREE(dev->temp_buffer[i].buffer);
+
-+ dev->isMounted = 0;
++ dev->is_mounted = 0;
+
-+ if (dev->deinitialiseNAND)
-+ dev->deinitialiseNAND(dev);
++ if (dev->param.deinitialise_flash_fn)
++ dev->param.deinitialise_flash_fn(dev);
+ }
+}
+
-+static int yaffs_CountFreeChunks(yaffs_Device *dev)
++int yaffs_count_free_chunks(struct yaffs_dev *dev)
+{
-+ int nFree;
++ int n_free = 0;
+ int b;
+
-+ yaffs_BlockInfo *blk;
++ struct yaffs_block_info *blk;
+
-+ for (nFree = 0, b = dev->internalStartBlock; b <= dev->internalEndBlock;
-+ b++) {
-+ blk = yaffs_GetBlockInfo(dev, b);
-+
-+ switch (blk->blockState) {
++ blk = dev->block_info;
++ for (b = dev->internal_start_block; b <= dev->internal_end_block; b++) {
++ switch (blk->block_state) {
+ case YAFFS_BLOCK_STATE_EMPTY:
+ case YAFFS_BLOCK_STATE_ALLOCATING:
+ case YAFFS_BLOCK_STATE_COLLECTING:
+ case YAFFS_BLOCK_STATE_FULL:
-+ nFree +=
-+ (dev->nChunksPerBlock - blk->pagesInUse +
-+ blk->softDeletions);
++ n_free +=
++ (dev->param.chunks_per_block - blk->pages_in_use +
++ blk->soft_del_pages);
+ break;
+ default:
+ break;
+ }
++ blk++;
+ }
+
-+ return nFree;
++ return n_free;
+}
+
-+int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev)
++int yaffs_get_n_free_chunks(struct yaffs_dev *dev)
+{
+ /* This is what we report to the outside world */
+
-+ int nFree;
-+ int nDirtyCacheChunks;
-+ int blocksForCheckpoint;
++ int n_free;
++ int n_dirty_caches;
++ int blocks_for_checkpt;
+ int i;
+
-+#if 1
-+ nFree = dev->nFreeChunks;
-+#else
-+ nFree = yaffs_CountFreeChunks(dev);
-+#endif
-+
-+ nFree += dev->nDeletedFiles;
++ n_free = dev->n_free_chunks;
++ n_free += dev->n_deleted_files;
+
+ /* Now count the number of dirty chunks in the cache and subtract those */
+
-+ for (nDirtyCacheChunks = 0, i = 0; i < dev->nShortOpCaches; i++) {
-+ if (dev->srCache[i].dirty)
-+ nDirtyCacheChunks++;
++ for (n_dirty_caches = 0, i = 0; i < dev->param.n_caches; i++) {
++ if (dev->cache[i].dirty)
++ n_dirty_caches++;
+ }
+
-+ nFree -= nDirtyCacheChunks;
++ n_free -= n_dirty_caches;
+
-+ nFree -= ((dev->nReservedBlocks + 1) * dev->nChunksPerBlock);
++ n_free -=
++ ((dev->param.n_reserved_blocks + 1) * dev->param.chunks_per_block);
+
+ /* Now we figure out how much to reserve for the checkpoint and report that... */
-+ blocksForCheckpoint = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
-+ if (blocksForCheckpoint < 0)
-+ blocksForCheckpoint = 0;
++ blocks_for_checkpt = yaffs_calc_checkpt_blocks_required(dev);
+
-+ nFree -= (blocksForCheckpoint * dev->nChunksPerBlock);
++ n_free -= (blocks_for_checkpt * dev->param.chunks_per_block);
+
-+ if (nFree < 0)
-+ nFree = 0;
++ if (n_free < 0)
++ n_free = 0;
+
-+ return nFree;
++ return n_free;
+
+}
-+
-+static int yaffs_freeVerificationFailures;
-+
-+static void yaffs_VerifyFreeChunks(yaffs_Device *dev)
-+{
-+ int counted;
-+ int difference;
-+
-+ if (yaffs_SkipVerification(dev))
-+ return;
-+
-+ counted = yaffs_CountFreeChunks(dev);
-+
-+ difference = dev->nFreeChunks - counted;
-+
-+ if (difference) {
-+ T(YAFFS_TRACE_ALWAYS,
-+ (TSTR("Freechunks verification failure %d %d %d" TENDSTR),
-+ dev->nFreeChunks, counted, difference));
-+ yaffs_freeVerificationFailures++;
-+ }
-+}
-+
-+/*---------------------------------------- YAFFS test code ----------------------*/
-+
-+#define yaffs_CheckStruct(structure, syze, name) \
-+ do { \
-+ if (sizeof(structure) != syze) { \
-+ T(YAFFS_TRACE_ALWAYS, (TSTR("%s should be %d but is %d\n" TENDSTR),\
-+ name, syze, sizeof(structure))); \
-+ return YAFFS_FAIL; \
-+ } \
-+ } while (0)
-+
-+static int yaffs_CheckStructures(void)
-+{
-+/* yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags"); */
-+/* yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion"); */
-+/* yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare"); */
-+#ifndef CONFIG_YAFFS_TNODE_LIST_DEBUG
-+ yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode");
-+#endif
-+#ifndef CONFIG_YAFFS_WINCE
-+ yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader");
-+#endif
-+ return YAFFS_OK;
-+}
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.h linux-2.6.34/fs/yaffs2/yaffs_guts.h
---- linux-2.6.34.orig/fs/yaffs2/yaffs_guts.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffs_guts.h 2010-05-20 20:16:22.301615823 +0200
-@@ -0,0 +1,904 @@
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_guts.h linux-2.6.36/fs/yaffs2/yaffs_guts.h
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_guts.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_guts.h 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,914 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
++ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
@@ -11559,7 +7156,6 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.h linux-2.6.34/fs/yaffs2/yaffs_
+#ifndef __YAFFS_GUTS_H__
+#define __YAFFS_GUTS_H__
+
-+#include "devextras.h"
+#include "yportenv.h"
+
+#define YAFFS_OK 1
@@ -11595,18 +7191,16 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.h linux-2.6.34/fs/yaffs2/yaffs_
+
+#define YAFFS_MAX_CHUNK_ID 0x000FFFFF
+
-+#define YAFFS_UNUSED_OBJECT_ID 0x0003FFFF
-+
+#define YAFFS_ALLOCATION_NOBJECTS 100
+#define YAFFS_ALLOCATION_NTNODES 100
+#define YAFFS_ALLOCATION_NLINKS 100
+
+#define YAFFS_NOBJECT_BUCKETS 256
+
-+
+#define YAFFS_OBJECT_SPACE 0x40000
++#define YAFFS_MAX_OBJECT_ID (YAFFS_OBJECT_SPACE -1)
+
-+#define YAFFS_CHECKPOINT_VERSION 3
++#define YAFFS_CHECKPOINT_VERSION 4
+
+#ifdef CONFIG_YAFFS_UNICODE
+#define YAFFS_MAX_NAME_LENGTH 127
@@ -11624,13 +7218,11 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.h linux-2.6.34/fs/yaffs2/yaffs_
+#define YAFFS_OBJECTID_UNLINKED 3
+#define YAFFS_OBJECTID_DELETED 4
+
-+/* Sseudo object ids for checkpointing */
++/* Pseudo object ids for checkpointing */
+#define YAFFS_OBJECTID_SB_HEADER 0x10
+#define YAFFS_OBJECTID_CHECKPOINT_DATA 0x20
+#define YAFFS_SEQUENCE_CHECKPOINT_DATA 0x21
+
-+/* */
-+
+#define YAFFS_MAX_SHORT_OP_CACHES 20
+
+#define YAFFS_N_TEMP_BUFFERS 6
@@ -11655,21 +7247,15 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.h linux-2.6.34/fs/yaffs2/yaffs_
+#define YAFFS_SEQUENCE_BAD_BLOCK 0xFFFF0000
+
+/* ChunkCache is used for short read/write operations.*/
-+typedef struct {
-+ struct yaffs_ObjectStruct *object;
-+ int chunkId;
-+ int lastUse;
++struct yaffs_cache {
++ struct yaffs_obj *object;
++ int chunk_id;
++ int last_use;
+ int dirty;
-+ int nBytes; /* Only valid if the cache is dirty */
++ int n_bytes; /* Only valid if the cache is dirty */
+ int locked; /* Can't push out or flush while locked. */
-+#ifdef CONFIG_YAFFS_YAFFS2
-+ __u8 *data;
-+#else
-+ __u8 data[YAFFS_BYTES_PER_CHUNK];
-+#endif
-+} yaffs_ChunkCache;
-+
-+
++ u8 *data;
++};
+
+/* Tags structures in RAM
+ * NB This uses bitfield. Bitfields should not straddle a u32 boundary otherwise
@@ -11677,110 +7263,112 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.h linux-2.6.34/fs/yaffs2/yaffs_
+ */
+
+#ifndef CONFIG_YAFFS_NO_YAFFS1
-+typedef struct {
-+ unsigned chunkId:20;
-+ unsigned serialNumber:2;
-+ unsigned byteCountLSB:10;
-+ unsigned objectId:18;
++struct yaffs_tags {
++ unsigned chunk_id:20;
++ unsigned serial_number:2;
++ unsigned n_bytes_lsb:10;
++ unsigned obj_id:18;
+ unsigned ecc:12;
-+ unsigned byteCountMSB:2;
-+} yaffs_Tags;
++ unsigned n_bytes_msb:2;
++};
+
-+typedef union {
-+ yaffs_Tags asTags;
-+ __u8 asBytes[8];
-+} yaffs_TagsUnion;
++union yaffs_tags_union {
++ struct yaffs_tags as_tags;
++ u8 as_bytes[8];
++};
+
+#endif
+
+/* Stuff used for extended tags in YAFFS2 */
+
-+typedef enum {
++enum yaffs_ecc_result {
+ YAFFS_ECC_RESULT_UNKNOWN,
+ YAFFS_ECC_RESULT_NO_ERROR,
+ YAFFS_ECC_RESULT_FIXED,
+ YAFFS_ECC_RESULT_UNFIXED
-+} yaffs_ECCResult;
++};
+
-+typedef enum {
++enum yaffs_obj_type {
+ YAFFS_OBJECT_TYPE_UNKNOWN,
+ YAFFS_OBJECT_TYPE_FILE,
+ YAFFS_OBJECT_TYPE_SYMLINK,
+ YAFFS_OBJECT_TYPE_DIRECTORY,
+ YAFFS_OBJECT_TYPE_HARDLINK,
+ YAFFS_OBJECT_TYPE_SPECIAL
-+} yaffs_ObjectType;
++};
+
+#define YAFFS_OBJECT_TYPE_MAX YAFFS_OBJECT_TYPE_SPECIAL
+
-+typedef struct {
++struct yaffs_ext_tags {
+
-+ unsigned validMarker0;
-+ unsigned chunkUsed; /* Status of the chunk: used or unused */
-+ unsigned objectId; /* If 0 then this is not part of an object (unused) */
-+ unsigned chunkId; /* If 0 then this is a header, else a data chunk */
-+ unsigned byteCount; /* Only valid for data chunks */
++ unsigned validity0;
++ unsigned chunk_used; /* Status of the chunk: used or unused */
++ unsigned obj_id; /* If 0 then this is not part of an object (unused) */
++ unsigned chunk_id; /* If 0 then this is a header, else a data chunk */
++ unsigned n_bytes; /* Only valid for data chunks */
+
+ /* The following stuff only has meaning when we read */
-+ yaffs_ECCResult eccResult;
-+ unsigned blockBad;
++ enum yaffs_ecc_result ecc_result;
++ unsigned block_bad;
+
+ /* YAFFS 1 stuff */
-+ unsigned chunkDeleted; /* The chunk is marked deleted */
-+ unsigned serialNumber; /* Yaffs1 2-bit serial number */
++ unsigned is_deleted; /* The chunk is marked deleted */
++ unsigned serial_number; /* Yaffs1 2-bit serial number */
+
+ /* YAFFS2 stuff */
-+ unsigned sequenceNumber; /* The sequence number of this block */
++ unsigned seq_number; /* The sequence number of this block */
+
+ /* Extra info if this is an object header (YAFFS2 only) */
+
-+ unsigned extraHeaderInfoAvailable; /* There is extra info available if this is not zero */
-+ unsigned extraParentObjectId; /* The parent object */
-+ unsigned extraIsShrinkHeader; /* Is it a shrink header? */
-+ unsigned extraShadows; /* Does this shadow another object? */
++ unsigned extra_available; /* There is extra info available if this is not zero */
++ unsigned extra_parent_id; /* The parent object */
++ unsigned extra_is_shrink; /* Is it a shrink header? */
++ unsigned extra_shadows; /* Does this shadow another object? */
+
-+ yaffs_ObjectType extraObjectType; /* What object type? */
++ enum yaffs_obj_type extra_obj_type; /* What object type? */
+
-+ unsigned extraFileLength; /* Length if it is a file */
-+ unsigned extraEquivalentObjectId; /* Equivalent object Id if it is a hard link */
++ unsigned extra_length; /* Length if it is a file */
++ unsigned extra_equiv_id; /* Equivalent object Id if it is a hard link */
+
-+ unsigned validMarker1;
++ unsigned validity1;
+
-+} yaffs_ExtendedTags;
++};
+
+/* Spare structure for YAFFS1 */
-+typedef struct {
-+ __u8 tagByte0;
-+ __u8 tagByte1;
-+ __u8 tagByte2;
-+ __u8 tagByte3;
-+ __u8 pageStatus; /* set to 0 to delete the chunk */
-+ __u8 blockStatus;
-+ __u8 tagByte4;
-+ __u8 tagByte5;
-+ __u8 ecc1[3];
-+ __u8 tagByte6;
-+ __u8 tagByte7;
-+ __u8 ecc2[3];
-+} yaffs_Spare;
++struct yaffs_spare {
++ u8 tb0;
++ u8 tb1;
++ u8 tb2;
++ u8 tb3;
++ u8 page_status; /* set to 0 to delete the chunk */
++ u8 block_status;
++ u8 tb4;
++ u8 tb5;
++ u8 ecc1[3];
++ u8 tb6;
++ u8 tb7;
++ u8 ecc2[3];
++};
+
+/*Special structure for passing through to mtd */
-+struct yaffs_NANDSpare {
-+ yaffs_Spare spare;
++struct yaffs_nand_spare {
++ struct yaffs_spare spare;
+ int eccres1;
+ int eccres2;
+};
+
+/* Block data in RAM */
+
-+typedef enum {
++enum yaffs_block_state {
+ YAFFS_BLOCK_STATE_UNKNOWN = 0,
+
+ YAFFS_BLOCK_STATE_SCANNING,
++ /* Being scanned */
++
+ YAFFS_BLOCK_STATE_NEEDS_SCANNING,
+ /* The block might have something on it (ie it is allocating or full, perhaps empty)
+ * but it needs to be scanned to determine its true state.
-+ * This state is only valid during yaffs_Scan.
++ * This state is only valid during scanning.
+ * NB We tolerate empty because the pre-scanner might be incapable of deciding
+ * However, if this state is returned on a YAFFS2 device, then we expect a sequence number
+ */
@@ -11792,126 +7380,104 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.h linux-2.6.34/fs/yaffs2/yaffs_
+ /* This block is partially allocated.
+ * At least one page holds valid data.
+ * This is the one currently being used for page
-+ * allocation. Should never be more than one of these
++ * allocation. Should never be more than one of these.
++ * If a block is only partially allocated at mount it is treated as full.
+ */
+
+ YAFFS_BLOCK_STATE_FULL,
+ /* All the pages in this block have been allocated.
++ * If a block was only partially allocated when mounted we treat
++ * it as fully allocated.
+ */
+
+ YAFFS_BLOCK_STATE_DIRTY,
-+ /* All pages have been allocated and deleted.
++ /* The block was full and now all chunks have been deleted.
+ * Erase me, reuse me.
+ */
+
+ YAFFS_BLOCK_STATE_CHECKPOINT,
-+ /* This block is assigned to holding checkpoint data.
-+ */
++ /* This block is assigned to holding checkpoint data. */
+
+ YAFFS_BLOCK_STATE_COLLECTING,
+ /* This block is being garbage collected */
+
+ YAFFS_BLOCK_STATE_DEAD
-+ /* This block has failed and is not in use */
-+} yaffs_BlockState;
++ /* This block has failed and is not in use */
++};
+
+#define YAFFS_NUMBER_OF_BLOCK_STATES (YAFFS_BLOCK_STATE_DEAD + 1)
+
++struct yaffs_block_info {
+
-+typedef struct {
-+
-+ int softDeletions:10; /* number of soft deleted pages */
-+ int pagesInUse:10; /* number of pages in use */
-+ unsigned blockState:4; /* One of the above block states. NB use unsigned because enum is sometimes an int */
-+ __u32 needsRetiring:1; /* Data has failed on this block, need to get valid data off */
-+ /* and retire the block. */
-+ __u32 skipErasedCheck:1; /* If this is set we can skip the erased check on this block */
-+ __u32 gcPrioritise:1; /* An ECC check or blank check has failed on this block.
++ int soft_del_pages:10; /* number of soft deleted pages */
++ int pages_in_use:10; /* number of pages in use */
++ unsigned block_state:4; /* One of the above block states. NB use unsigned because enum is sometimes an int */
++ u32 needs_retiring:1; /* Data has failed on this block, need to get valid data off */
++ /* and retire the block. */
++ u32 skip_erased_check:1; /* If this is set we can skip the erased check on this block */
++ u32 gc_prioritise:1; /* An ECC check or blank check has failed on this block.
+ It should be prioritised for GC */
-+ __u32 chunkErrorStrikes:3; /* How many times we've had ecc etc failures on this block and tried to reuse it */
++ u32 chunk_error_strikes:3; /* How many times we've had ecc etc failures on this block and tried to reuse it */
+
+#ifdef CONFIG_YAFFS_YAFFS2
-+ __u32 hasShrinkHeader:1; /* This block has at least one shrink object header */
-+ __u32 sequenceNumber; /* block sequence number for yaffs2 */
++ u32 has_shrink_hdr:1; /* This block has at least one shrink object header */
++ u32 seq_number; /* block sequence number for yaffs2 */
+#endif
+
-+} yaffs_BlockInfo;
++};
+
+/* -------------------------- Object structure -------------------------------*/
+/* This is the object structure as stored on NAND */
+
-+typedef struct {
-+ yaffs_ObjectType type;
++struct yaffs_obj_hdr {
++ enum yaffs_obj_type type;
+
+ /* Apply to everything */
-+ int parentObjectId;
-+ __u16 sum__NoLongerUsed; /* checksum of name. No longer used */
++ int parent_obj_id;
++ u16 sum_no_longer_used; /* checksum of name. No longer used */
+ YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
+
+ /* The following apply to directories, files, symlinks - not hard links */
-+ __u32 yst_mode; /* protection */
++ u32 yst_mode; /* protection */
+
-+#ifdef CONFIG_YAFFS_WINCE
-+ __u32 notForWinCE[5];
-+#else
-+ __u32 yst_uid;
-+ __u32 yst_gid;
-+ __u32 yst_atime;
-+ __u32 yst_mtime;
-+ __u32 yst_ctime;
-+#endif
++ u32 yst_uid;
++ u32 yst_gid;
++ u32 yst_atime;
++ u32 yst_mtime;
++ u32 yst_ctime;
+
+ /* File size applies to files only */
-+ int fileSize;
++ int file_size;
+
+ /* Equivalent object id applies to hard links only. */
-+ int equivalentObjectId;
++ int equiv_id;
+
+ /* Alias is for symlinks only. */
+ YCHAR alias[YAFFS_MAX_ALIAS_LENGTH + 1];
+
-+ __u32 yst_rdev; /* device stuff for block and char devices (major/min) */
-+
-+#ifdef CONFIG_YAFFS_WINCE
-+ __u32 win_ctime[2];
-+ __u32 win_atime[2];
-+ __u32 win_mtime[2];
-+#else
-+ __u32 roomToGrow[6];
++ u32 yst_rdev; /* device stuff for block and char devices (major/min) */
+
-+#endif
-+ __u32 inbandShadowsObject;
-+ __u32 inbandIsShrink;
++ u32 win_ctime[2];
++ u32 win_atime[2];
++ u32 win_mtime[2];
+
-+ __u32 reservedSpace[2];
-+ int shadowsObject; /* This object header shadows the specified object if > 0 */
++ u32 inband_shadowed_obj_id;
++ u32 inband_is_shrink;
+
-+ /* isShrink applies to object headers written when we shrink the file (ie resize) */
-+ __u32 isShrink;
++ u32 reserved[2];
++ int shadows_obj; /* This object header shadows the specified object if > 0 */
+
-+} yaffs_ObjectHeader;
-+
-+/*--------------------------- Tnode -------------------------- */
-+
-+union yaffs_Tnode_union {
-+#ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-+ union yaffs_Tnode_union *internal[YAFFS_NTNODES_INTERNAL + 1];
-+#else
-+ union yaffs_Tnode_union *internal[YAFFS_NTNODES_INTERNAL];
-+#endif
-+/* __u16 level0[YAFFS_NTNODES_LEVEL0]; */
++ /* is_shrink applies to object headers written when we shrink the file (ie resize) */
++ u32 is_shrink;
+
+};
+
-+typedef union yaffs_Tnode_union yaffs_Tnode;
++/*--------------------------- Tnode -------------------------- */
+
-+struct yaffs_TnodeList_struct {
-+ struct yaffs_TnodeList_struct *next;
-+ yaffs_Tnode *tnodes;
++struct yaffs_tnode {
++ struct yaffs_tnode *internal[YAFFS_NTNODES_INTERNAL];
+};
+
-+typedef struct yaffs_TnodeList_struct yaffs_TnodeList;
-+
+/*------------------------ Object -----------------------------*/
+/* An object can be one of:
+ * - a directory (no data, has children links
@@ -11920,539 +7486,683 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_guts.h linux-2.6.34/fs/yaffs2/yaffs_
+ * - a hard link
+ */
+
-+typedef struct {
-+ __u32 fileSize;
-+ __u32 scannedFileSize;
-+ __u32 shrinkSize;
-+ int topLevel;
-+ yaffs_Tnode *top;
-+} yaffs_FileStructure;
++struct yaffs_file_var {
++ u32 file_size;
++ u32 scanned_size;
++ u32 shrink_size;
++ int top_level;
++ struct yaffs_tnode *top;
++};
+
-+typedef struct {
-+ struct ylist_head children; /* list of child links */
-+} yaffs_DirectoryStructure;
++struct yaffs_dir_var {
++ struct list_head children; /* list of child links */
++ struct list_head dirty; /* Entry for list of dirty directories */
++};
+
-+typedef struct {
++struct yaffs_symlink_var {
+ YCHAR *alias;
-+} yaffs_SymLinkStructure;
-+
-+typedef struct {
-+ struct yaffs_ObjectStruct *equivalentObject;
-+ __u32 equivalentObjectId;
-+} yaffs_HardLinkStructure;
-+
-+typedef union {
-+ yaffs_FileStructure fileVariant;
-+ yaffs_DirectoryStructure directoryVariant;
-+ yaffs_SymLinkStructure symLinkVariant;
-+ yaffs_HardLinkStructure hardLinkVariant;
-+} yaffs_ObjectVariant;
-+
-+struct yaffs_ObjectStruct {
-+ __u8 deleted:1; /* This should only apply to unlinked files. */
-+ __u8 softDeleted:1; /* it has also been soft deleted */
-+ __u8 unlinked:1; /* An unlinked file. The file should be in the unlinked directory.*/
-+ __u8 fake:1; /* A fake object has no presence on NAND. */
-+ __u8 renameAllowed:1; /* Some objects are not allowed to be renamed. */
-+ __u8 unlinkAllowed:1;
-+ __u8 dirty:1; /* the object needs to be written to flash */
-+ __u8 valid:1; /* When the file system is being loaded up, this
++};
++
++struct yaffs_hardlink_var {
++ struct yaffs_obj *equiv_obj;
++ u32 equiv_id;
++};
++
++union yaffs_obj_var {
++ struct yaffs_file_var file_variant;
++ struct yaffs_dir_var dir_variant;
++ struct yaffs_symlink_var symlink_variant;
++ struct yaffs_hardlink_var hardlink_variant;
++};
++
++struct yaffs_obj {
++ u8 deleted:1; /* This should only apply to unlinked files. */
++ u8 soft_del:1; /* it has also been soft deleted */
++ u8 unlinked:1; /* An unlinked file. The file should be in the unlinked directory. */
++ u8 fake:1; /* A fake object has no presence on NAND. */
++ u8 rename_allowed:1; /* Some objects are not allowed to be renamed. */
++ u8 unlink_allowed:1;
++ u8 dirty:1; /* the object needs to be written to flash */
++ u8 valid:1; /* When the file system is being loaded up, this
+ * object might be created before the data
+ * is available (ie. file data records appear before the header).
+ */
-+ __u8 lazyLoaded:1; /* This object has been lazy loaded and is missing some detail */
++ u8 lazy_loaded:1; /* This object has been lazy loaded and is missing some detail */
+
-+ __u8 deferedFree:1; /* For Linux kernel. Object is removed from NAND, but is
++ u8 defered_free:1; /* For Linux kernel. Object is removed from NAND, but is
+ * still in the inode cache. Free of object is defered.
+ * until the inode is released.
+ */
-+ __u8 beingCreated:1; /* This object is still being created so skip some checks. */
++ u8 being_created:1; /* This object is still being created so skip some checks. */
++ u8 is_shadowed:1; /* This object is shadowed on the way to being renamed. */
++
++ u8 xattr_known:1; /* We know if this has object has xattribs or not. */
++ u8 has_xattr:1; /* This object has xattribs. Valid if xattr_known. */
+
-+ __u8 serial; /* serial number of chunk in NAND. Cached here */
-+ __u16 sum; /* sum of the name to speed searching */
++ u8 serial; /* serial number of chunk in NAND. Cached here */
++ u16 sum; /* sum of the name to speed searching */
+
-+ struct yaffs_DeviceStruct *myDev; /* The device I'm on */
++ struct yaffs_dev *my_dev; /* The device I'm on */
+
-+ struct ylist_head hashLink; /* list of objects in this hash bucket */
++ struct list_head hash_link; /* list of objects in this hash bucket */
+
-+ struct ylist_head hardLinks; /* all the equivalent hard linked objects */
++ struct list_head hard_links; /* all the equivalent hard linked objects */
+
+ /* directory structure stuff */
+ /* also used for linking up the free list */
-+ struct yaffs_ObjectStruct *parent;
-+ struct ylist_head siblings;
++ struct yaffs_obj *parent;
++ struct list_head siblings;
+
+ /* Where's my object header in NAND? */
-+ int hdrChunk;
++ int hdr_chunk;
+
-+ int nDataChunks; /* Number of data chunks attached to the file. */
++ int n_data_chunks; /* Number of data chunks attached to the file. */
+
-+ __u32 objectId; /* the object id value */
++ u32 obj_id; /* the object id value */
+
-+ __u32 yst_mode;
++ u32 yst_mode;
+
-+#ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
-+ YCHAR shortName[YAFFS_SHORT_NAME_LENGTH + 1];
-+#endif
-+
-+#ifndef __KERNEL__
-+ __u32 inUse;
++#ifndef CONFIG_YAFFS_NO_SHORT_NAMES
++ YCHAR short_name[YAFFS_SHORT_NAME_LENGTH + 1];
+#endif
+
+#ifdef CONFIG_YAFFS_WINCE
-+ __u32 win_ctime[2];
-+ __u32 win_mtime[2];
-+ __u32 win_atime[2];
++ u32 win_ctime[2];
++ u32 win_mtime[2];
++ u32 win_atime[2];
+#else
-+ __u32 yst_uid;
-+ __u32 yst_gid;
-+ __u32 yst_atime;
-+ __u32 yst_mtime;
-+ __u32 yst_ctime;
++ u32 yst_uid;
++ u32 yst_gid;
++ u32 yst_atime;
++ u32 yst_mtime;
++ u32 yst_ctime;
+#endif
+
-+ __u32 yst_rdev;
++ u32 yst_rdev;
+
-+#ifdef __KERNEL__
-+ struct inode *myInode;
++ void *my_inode;
+
-+#endif
-+
-+ yaffs_ObjectType variantType;
-+
-+ yaffs_ObjectVariant variant;
-+
-+};
++ enum yaffs_obj_type variant_type;
+
-+typedef struct yaffs_ObjectStruct yaffs_Object;
++ union yaffs_obj_var variant;
+
-+struct yaffs_ObjectList_struct {
-+ yaffs_Object *objects;
-+ struct yaffs_ObjectList_struct *next;
+};
+
-+typedef struct yaffs_ObjectList_struct yaffs_ObjectList;
-+
-+typedef struct {
-+ struct ylist_head list;
++struct yaffs_obj_bucket {
++ struct list_head list;
+ int count;
-+} yaffs_ObjectBucket;
-+
++};
+
-+/* yaffs_CheckpointObject holds the definition of an object as dumped
++/* yaffs_checkpt_obj holds the definition of an object as dumped
+ * by checkpointing.
+ */
+
-+typedef struct {
-+ int structType;
-+ __u32 objectId;
-+ __u32 parentId;
-+ int hdrChunk;
-+ yaffs_ObjectType variantType:3;
-+ __u8 deleted:1;
-+ __u8 softDeleted:1;
-+ __u8 unlinked:1;
-+ __u8 fake:1;
-+ __u8 renameAllowed:1;
-+ __u8 unlinkAllowed:1;
-+ __u8 serial;
-+
-+ int nDataChunks;
-+ __u32 fileSizeOrEquivalentObjectId;
-+} yaffs_CheckpointObject;
++struct yaffs_checkpt_obj {
++ int struct_type;
++ u32 obj_id;
++ u32 parent_id;
++ int hdr_chunk;
++ enum yaffs_obj_type variant_type:3;
++ u8 deleted:1;
++ u8 soft_del:1;
++ u8 unlinked:1;
++ u8 fake:1;
++ u8 rename_allowed:1;
++ u8 unlink_allowed:1;
++ u8 serial;
++ int n_data_chunks;
++ u32 size_or_equiv_obj;
++};
+
+/*--------------------- Temporary buffers ----------------
+ *
+ * These are chunk-sized working buffers. Each device has a few
+ */
+
-+typedef struct {
-+ __u8 *buffer;
-+ int line; /* track from whence this buffer was allocated */
-+ int maxLine;
-+} yaffs_TempBuffer;
++struct yaffs_buffer {
++ u8 *buffer;
++ int line; /* track from whence this buffer was allocated */
++ int max_line;
++};
+
+/*----------------- Device ---------------------------------*/
+
-+struct yaffs_DeviceStruct {
-+ struct ylist_head devList;
-+ const char *name;
++struct yaffs_param {
++ const YCHAR *name;
+
-+ /* Entry parameters set up way early. Yaffs sets up the rest.*/
-+ int nDataBytesPerChunk; /* Should be a power of 2 >= 512 */
-+ int nChunksPerBlock; /* does not need to be a power of 2 */
-+ int spareBytesPerChunk; /* spare area size */
-+ int startBlock; /* Start block we're allowed to use */
-+ int endBlock; /* End block we're allowed to use */
-+ int nReservedBlocks; /* We want this tuneable so that we can reduce */
-+ /* reserved blocks on NOR and RAM. */
-+
-+
-+ /* Stuff used by the shared space checkpointing mechanism */
-+ /* If this value is zero, then this mechanism is disabled */
++ /*
++ * Entry parameters set up way early. Yaffs sets up the rest.
++ * The structure should be zeroed out before use so that unused
++ * and defualt values are zero.
++ */
+
-+/* int nCheckpointReservedBlocks; */ /* Blocks to reserve for checkpoint data */
++ int inband_tags; /* Use unband tags */
++ u32 total_bytes_per_chunk; /* Should be >= 512, does not need to be a power of 2 */
++ int chunks_per_block; /* does not need to be a power of 2 */
++ int spare_bytes_per_chunk; /* spare area size */
++ int start_block; /* Start block we're allowed to use */
++ int end_block; /* End block we're allowed to use */
++ int n_reserved_blocks; /* We want this tuneable so that we can reduce */
++ /* reserved blocks on NOR and RAM. */
++
++ int n_caches; /* If <= 0, then short op caching is disabled, else
++ * the number of short op caches (don't use too many).
++ * 10 to 20 is a good bet.
++ */
++ int use_nand_ecc; /* Flag to decide whether or not to use NANDECC on data (yaffs1) */
++ int no_tags_ecc; /* Flag to decide whether or not to do ECC on packed tags (yaffs2) */
+
++ int is_yaffs2; /* Use yaffs2 mode on this device */
+
-+ int nShortOpCaches; /* If <= 0, then short op caching is disabled, else
-+ * the number of short op caches (don't use too many)
-+ */
++ int empty_lost_n_found; /* Auto-empty lost+found directory on mount */
+
-+ int useHeaderFileSize; /* Flag to determine if we should use file sizes from the header */
++ int refresh_period; /* How often we should check to do a block refresh */
+
-+ int useNANDECC; /* Flag to decide whether or not to use NANDECC */
++ /* Checkpoint control. Can be set before or after initialisation */
++ u8 skip_checkpt_rd;
++ u8 skip_checkpt_wr;
+
-+ void *genericDevice; /* Pointer to device context
-+ * On an mtd this holds the mtd pointer.
-+ */
-+ void *superBlock;
++ int enable_xattr; /* Enable xattribs */
+
-+ /* NAND access functions (Must be set before calling YAFFS)*/
++ /* NAND access functions (Must be set before calling YAFFS) */
+
-+ int (*writeChunkToNAND) (struct yaffs_DeviceStruct *dev,
-+ int chunkInNAND, const __u8 *data,
-+ const yaffs_Spare *spare);
-+ int (*readChunkFromNAND) (struct yaffs_DeviceStruct *dev,
-+ int chunkInNAND, __u8 *data,
-+ yaffs_Spare *spare);
-+ int (*eraseBlockInNAND) (struct yaffs_DeviceStruct *dev,
-+ int blockInNAND);
-+ int (*initialiseNAND) (struct yaffs_DeviceStruct *dev);
-+ int (*deinitialiseNAND) (struct yaffs_DeviceStruct *dev);
++ int (*write_chunk_fn) (struct yaffs_dev * dev,
++ int nand_chunk, const u8 * data,
++ const struct yaffs_spare * spare);
++ int (*read_chunk_fn) (struct yaffs_dev * dev,
++ int nand_chunk, u8 * data,
++ struct yaffs_spare * spare);
++ int (*erase_fn) (struct yaffs_dev * dev, int flash_block);
++ int (*initialise_flash_fn) (struct yaffs_dev * dev);
++ int (*deinitialise_flash_fn) (struct yaffs_dev * dev);
+
+#ifdef CONFIG_YAFFS_YAFFS2
-+ int (*writeChunkWithTagsToNAND) (struct yaffs_DeviceStruct *dev,
-+ int chunkInNAND, const __u8 *data,
-+ const yaffs_ExtendedTags *tags);
-+ int (*readChunkWithTagsFromNAND) (struct yaffs_DeviceStruct *dev,
-+ int chunkInNAND, __u8 *data,
-+ yaffs_ExtendedTags *tags);
-+ int (*markNANDBlockBad) (struct yaffs_DeviceStruct *dev, int blockNo);
-+ int (*queryNANDBlock) (struct yaffs_DeviceStruct *dev, int blockNo,
-+ yaffs_BlockState *state, __u32 *sequenceNumber);
-+#endif
-+
-+ int isYaffs2;
-+
-+ /* The removeObjectCallback function must be supplied by OS flavours that
-+ * need it. The Linux kernel does not use this, but yaffs direct does use
-+ * it to implement the faster readdir
-+ */
-+ void (*removeObjectCallback)(struct yaffs_ObjectStruct *obj);
-+
-+ /* Callback to mark the superblock dirsty */
-+ void (*markSuperBlockDirty)(void *superblock);
++ int (*write_chunk_tags_fn) (struct yaffs_dev * dev,
++ int nand_chunk, const u8 * data,
++ const struct yaffs_ext_tags * tags);
++ int (*read_chunk_tags_fn) (struct yaffs_dev * dev,
++ int nand_chunk, u8 * data,
++ struct yaffs_ext_tags * tags);
++ int (*bad_block_fn) (struct yaffs_dev * dev, int block_no);
++ int (*query_block_fn) (struct yaffs_dev * dev, int block_no,
++ enum yaffs_block_state * state,
++ u32 * seq_number);
++#endif
+
-+ int wideTnodesDisabled; /* Set to disable wide tnodes */
++ /* The remove_obj_fn function must be supplied by OS flavours that
++ * need it.
++ * yaffs direct uses it to implement the faster readdir.
++ * Linux uses it to protect the directory during unlocking.
++ */
++ void (*remove_obj_fn) (struct yaffs_obj * obj);
+
-+ YCHAR *pathDividers; /* String of legal path dividers */
++ /* Callback to mark the superblock dirty */
++ void (*sb_dirty_fn) (struct yaffs_dev * dev);
+
++ /* Callback to control garbage collection. */
++ unsigned (*gc_control) (struct yaffs_dev * dev);
+
-+ /* End of stuff that must be set before initialisation. */
++ /* Debug control flags. Don't use unless you know what you're doing */
++ int use_header_file_size; /* Flag to determine if we should use file sizes from the header */
++ int disable_lazy_load; /* Disable lazy loading on this device */
++ int wide_tnodes_disabled; /* Set to disable wide tnodes */
++ int disable_soft_del; /* yaffs 1 only: Set to disable the use of softdeletion. */
+
-+ /* Checkpoint control. Can be set before or after initialisation */
-+ __u8 skipCheckpointRead;
-+ __u8 skipCheckpointWrite;
++ int defered_dir_update; /* Set to defer directory updates */
+
-+ /* Runtime parameters. Set up by YAFFS. */
++#ifdef CONFIG_YAFFS_AUTO_UNICODE
++ int auto_unicode;
++#endif
++ int always_check_erased; /* Force chunk erased check always on */
++};
+
-+ __u16 chunkGroupBits; /* 0 for devices <= 32MB. else log2(nchunks) - 16 */
-+ __u16 chunkGroupSize; /* == 2^^chunkGroupBits */
++struct yaffs_dev {
++ struct yaffs_param param;
+
-+ /* Stuff to support wide tnodes */
-+ __u32 tnodeWidth;
-+ __u32 tnodeMask;
++ /* Context storage. Holds extra OS specific data for this device */
+
-+ /* Stuff for figuring out file offset to chunk conversions */
-+ __u32 chunkShift; /* Shift value */
-+ __u32 chunkDiv; /* Divisor after shifting: 1 for power-of-2 sizes */
-+ __u32 chunkMask; /* Mask to use for power-of-2 case */
++ void *os_context;
++ void *driver_context;
+
-+ /* Stuff to handle inband tags */
-+ int inbandTags;
-+ __u32 totalBytesPerChunk;
++ struct list_head dev_list;
+
-+#ifdef __KERNEL__
++ /* Runtime parameters. Set up by YAFFS. */
++ int data_bytes_per_chunk;
+
-+ struct semaphore sem; /* Semaphore for waiting on erasure.*/
-+ struct semaphore grossLock; /* Gross locking semaphore */
-+ __u8 *spareBuffer; /* For mtdif2 use. Don't know the size of the buffer
-+ * at compile time so we have to allocate it.
++ /* Non-wide tnode stuff */
++ u16 chunk_grp_bits; /* Number of bits that need to be resolved if
++ * the tnodes are not wide enough.
+ */
-+ void (*putSuperFunc) (struct super_block *sb);
-+#endif
++ u16 chunk_grp_size; /* == 2^^chunk_grp_bits */
+
-+ int isMounted;
++ /* Stuff to support wide tnodes */
++ u32 tnode_width;
++ u32 tnode_mask;
++ u32 tnode_size;
+
-+ int isCheckpointed;
++ /* Stuff for figuring out file offset to chunk conversions */
++ u32 chunk_shift; /* Shift value */
++ u32 chunk_div; /* Divisor after shifting: 1 for power-of-2 sizes */
++ u32 chunk_mask; /* Mask to use for power-of-2 case */
+
++ int is_mounted;
++ int read_only;
++ int is_checkpointed;
+
+ /* Stuff to support block offsetting to support start block zero */
-+ int internalStartBlock;
-+ int internalEndBlock;
-+ int blockOffset;
-+ int chunkOffset;
-+
++ int internal_start_block;
++ int internal_end_block;
++ int block_offset;
++ int chunk_offset;
+
+ /* Runtime checkpointing stuff */
-+ int checkpointPageSequence; /* running sequence number of checkpoint pages */
-+ int checkpointByteCount;
-+ int checkpointByteOffset;
-+ __u8 *checkpointBuffer;
-+ int checkpointOpenForWrite;
-+ int blocksInCheckpoint;
-+ int checkpointCurrentChunk;
-+ int checkpointCurrentBlock;
-+ int checkpointNextBlock;
-+ int *checkpointBlockList;
-+ int checkpointMaxBlocks;
-+ __u32 checkpointSum;
-+ __u32 checkpointXor;
-+
-+ int nCheckpointBlocksRequired; /* Number of blocks needed to store current checkpoint set */
++ int checkpt_page_seq; /* running sequence number of checkpoint pages */
++ int checkpt_byte_count;
++ int checkpt_byte_offs;
++ u8 *checkpt_buffer;
++ int checkpt_open_write;
++ int blocks_in_checkpt;
++ int checkpt_cur_chunk;
++ int checkpt_cur_block;
++ int checkpt_next_block;
++ int *checkpt_block_list;
++ int checkpt_max_blocks;
++ u32 checkpt_sum;
++ u32 checkpt_xor;
++
++ int checkpoint_blocks_required; /* Number of blocks needed to store current checkpoint set */
+
+ /* Block Info */
-+ yaffs_BlockInfo *blockInfo;
-+ __u8 *chunkBits; /* bitmap of chunks in use */
-+ unsigned blockInfoAlt:1; /* was allocated using alternative strategy */
-+ unsigned chunkBitsAlt:1; /* was allocated using alternative strategy */
-+ int chunkBitmapStride; /* Number of bytes of chunkBits per block.
-+ * Must be consistent with nChunksPerBlock.
++ struct yaffs_block_info *block_info;
++ u8 *chunk_bits; /* bitmap of chunks in use */
++ unsigned block_info_alt:1; /* was allocated using alternative strategy */
++ unsigned chunk_bits_alt:1; /* was allocated using alternative strategy */
++ int chunk_bit_stride; /* Number of bytes of chunk_bits per block.
++ * Must be consistent with chunks_per_block.
+ */
+
-+ int nErasedBlocks;
-+ int allocationBlock; /* Current block being allocated off */
-+ __u32 allocationPage;
-+ int allocationBlockFinder; /* Used to search for next allocation block */
-+
-+ /* Runtime state */
-+ int nTnodesCreated;
-+ yaffs_Tnode *freeTnodes;
-+ int nFreeTnodes;
-+ yaffs_TnodeList *allocatedTnodeList;
-+
-+ int isDoingGC;
-+ int gcBlock;
-+ int gcChunk;
++ int n_erased_blocks;
++ int alloc_block; /* Current block being allocated off */
++ u32 alloc_page;
++ int alloc_block_finder; /* Used to search for next allocation block */
+
-+ int nObjectsCreated;
-+ yaffs_Object *freeObjects;
-+ int nFreeObjects;
++ /* Object and Tnode memory management */
++ void *allocator;
++ int n_obj;
++ int n_tnodes;
+
-+ int nHardLinks;
++ int n_hardlinks;
+
-+ yaffs_ObjectList *allocatedObjectList;
++ struct yaffs_obj_bucket obj_bucket[YAFFS_NOBJECT_BUCKETS];
++ u32 bucket_finder;
+
-+ yaffs_ObjectBucket objectBucket[YAFFS_NOBJECT_BUCKETS];
++ int n_free_chunks;
+
-+ int nFreeChunks;
++ /* Garbage collection control */
++ u32 *gc_cleanup_list; /* objects to delete at the end of a GC. */
++ u32 n_clean_ups;
+
-+ int currentDirtyChecker; /* Used to find current dirtiest block */
-+
-+ __u32 *gcCleanupList; /* objects to delete at the end of a GC. */
-+ int nonAggressiveSkip; /* GC state/mode */
-+
-+ /* Statistcs */
-+ int nPageWrites;
-+ int nPageReads;
-+ int nBlockErasures;
-+ int nErasureFailures;
-+ int nGCCopies;
-+ int garbageCollections;
-+ int passiveGarbageCollections;
-+ int nRetriedWrites;
-+ int nRetiredBlocks;
-+ int eccFixed;
-+ int eccUnfixed;
-+ int tagsEccFixed;
-+ int tagsEccUnfixed;
-+ int nDeletions;
-+ int nUnmarkedDeletions;
-+
-+ int hasPendingPrioritisedGCs; /* We think this device might have pending prioritised gcs */
++ unsigned has_pending_prioritised_gc; /* We think this device might have pending prioritised gcs */
++ unsigned gc_disable;
++ unsigned gc_block_finder;
++ unsigned gc_dirtiest;
++ unsigned gc_pages_in_use;
++ unsigned gc_not_done;
++ unsigned gc_block;
++ unsigned gc_chunk;
++ unsigned gc_skip;
+
+ /* Special directories */
-+ yaffs_Object *rootDir;
-+ yaffs_Object *lostNFoundDir;
++ struct yaffs_obj *root_dir;
++ struct yaffs_obj *lost_n_found;
+
+ /* Buffer areas for storing data to recover from write failures TODO
-+ * __u8 bufferedData[YAFFS_CHUNKS_PER_BLOCK][YAFFS_BYTES_PER_CHUNK];
-+ * yaffs_Spare bufferedSpare[YAFFS_CHUNKS_PER_BLOCK];
++ * u8 buffered_data[YAFFS_CHUNKS_PER_BLOCK][YAFFS_BYTES_PER_CHUNK];
++ * struct yaffs_spare buffered_spare[YAFFS_CHUNKS_PER_BLOCK];
+ */
+
-+ int bufferedBlock; /* Which block is buffered here? */
-+ int doingBufferedBlockRewrite;
-+
-+ yaffs_ChunkCache *srCache;
-+ int srLastUse;
++ int buffered_block; /* Which block is buffered here? */
++ int doing_buffered_block_rewrite;
+
-+ int cacheHits;
-+
-+ /* Stuff for background deletion and unlinked files.*/
-+ yaffs_Object *unlinkedDir; /* Directory where unlinked and deleted files live. */
-+ yaffs_Object *deletedDir; /* Directory where deleted objects are sent to disappear. */
-+ yaffs_Object *unlinkedDeletion; /* Current file being background deleted.*/
-+ int nDeletedFiles; /* Count of files awaiting deletion;*/
-+ int nUnlinkedFiles; /* Count of unlinked files. */
-+ int nBackgroundDeletions; /* Count of background deletions. */
++ struct yaffs_cache *cache;
++ int cache_last_use;
+
++ /* Stuff for background deletion and unlinked files. */
++ struct yaffs_obj *unlinked_dir; /* Directory where unlinked and deleted files live. */
++ struct yaffs_obj *del_dir; /* Directory where deleted objects are sent to disappear. */
++ struct yaffs_obj *unlinked_deletion; /* Current file being background deleted. */
++ int n_deleted_files; /* Count of files awaiting deletion; */
++ int n_unlinked_files; /* Count of unlinked files. */
++ int n_bg_deletions; /* Count of background deletions. */
+
+ /* Temporary buffer management */
-+ yaffs_TempBuffer tempBuffer[YAFFS_N_TEMP_BUFFERS];
-+ int maxTemp;
-+ int tempInUse;
-+ int unmanagedTempAllocations;
-+ int unmanagedTempDeallocations;
++ struct yaffs_buffer temp_buffer[YAFFS_N_TEMP_BUFFERS];
++ int max_temp;
++ int temp_in_use;
++ int unmanaged_buffer_allocs;
++ int unmanaged_buffer_deallocs;
+
+ /* yaffs2 runtime stuff */
-+ unsigned sequenceNumber; /* Sequence number of currently allocating block */
-+ unsigned oldestDirtySequence;
++ unsigned seq_number; /* Sequence number of currently allocating block */
++ unsigned oldest_dirty_seq;
++ unsigned oldest_dirty_block;
+
-+};
++ /* Block refreshing */
++ int refresh_skip; /* A skip down counter. Refresh happens when this gets to zero. */
+
-+typedef struct yaffs_DeviceStruct yaffs_Device;
++ /* Dirty directory handling */
++ struct list_head dirty_dirs; /* List of dirty directories */
+
-+/* The static layout of block usage etc is stored in the super block header */
-+typedef struct {
-+ int StructType;
-+ int version;
-+ int checkpointStartBlock;
-+ int checkpointEndBlock;
-+ int startBlock;
-+ int endBlock;
-+ int rfu[100];
-+} yaffs_SuperBlockHeader;
++ /* Statistcs */
++ u32 n_page_writes;
++ u32 n_page_reads;
++ u32 n_erasures;
++ u32 n_erase_failures;
++ u32 n_gc_copies;
++ u32 all_gcs;
++ u32 passive_gc_count;
++ u32 oldest_dirty_gc_count;
++ u32 n_gc_blocks;
++ u32 bg_gcs;
++ u32 n_retired_writes;
++ u32 n_retired_blocks;
++ u32 n_ecc_fixed;
++ u32 n_ecc_unfixed;
++ u32 n_tags_ecc_fixed;
++ u32 n_tags_ecc_unfixed;
++ u32 n_deletions;
++ u32 n_unmarked_deletions;
++ u32 refresh_count;
++ u32 cache_hits;
++
++};
+
+/* The CheckpointDevice structure holds the device information that changes at runtime and
+ * must be preserved over unmount/mount cycles.
+ */
-+typedef struct {
-+ int structType;
-+ int nErasedBlocks;
-+ int allocationBlock; /* Current block being allocated off */
-+ __u32 allocationPage;
-+ int nFreeChunks;
++struct yaffs_checkpt_dev {
++ int struct_type;
++ int n_erased_blocks;
++ int alloc_block; /* Current block being allocated off */
++ u32 alloc_page;
++ int n_free_chunks;
+
-+ int nDeletedFiles; /* Count of files awaiting deletion;*/
-+ int nUnlinkedFiles; /* Count of unlinked files. */
-+ int nBackgroundDeletions; /* Count of background deletions. */
++ int n_deleted_files; /* Count of files awaiting deletion; */
++ int n_unlinked_files; /* Count of unlinked files. */
++ int n_bg_deletions; /* Count of background deletions. */
+
+ /* yaffs2 runtime stuff */
-+ unsigned sequenceNumber; /* Sequence number of currently allocating block */
-+ unsigned oldestDirtySequence;
++ unsigned seq_number; /* Sequence number of currently allocating block */
+
-+} yaffs_CheckpointDevice;
++};
+
++struct yaffs_checkpt_validity {
++ int struct_type;
++ u32 magic;
++ u32 version;
++ u32 head;
++};
+
-+typedef struct {
-+ int structType;
-+ __u32 magic;
-+ __u32 version;
-+ __u32 head;
-+} yaffs_CheckpointValidity;
++struct yaffs_shadow_fixer {
++ int obj_id;
++ int shadowed_id;
++ struct yaffs_shadow_fixer *next;
++};
+
++/* Structure for doing xattr modifications */
++struct yaffs_xattr_mod {
++ int set; /* If 0 then this is a deletion */
++ const YCHAR *name;
++ const void *data;
++ int size;
++ int flags;
++ int result;
++};
+
+/*----------------------- YAFFS Functions -----------------------*/
+
-+int yaffs_GutsInitialise(yaffs_Device *dev);
-+void yaffs_Deinitialise(yaffs_Device *dev);
-+
-+int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev);
++int yaffs_guts_initialise(struct yaffs_dev *dev);
++void yaffs_deinitialise(struct yaffs_dev *dev);
+
-+int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName,
-+ yaffs_Object *newDir, const YCHAR *newName);
++int yaffs_get_n_free_chunks(struct yaffs_dev *dev);
+
-+int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name);
-+int yaffs_DeleteObject(yaffs_Object *obj);
++int yaffs_rename_obj(struct yaffs_obj *old_dir, const YCHAR * old_name,
++ struct yaffs_obj *new_dir, const YCHAR * new_name);
+
-+int yaffs_GetObjectName(yaffs_Object *obj, YCHAR *name, int buffSize);
-+int yaffs_GetObjectFileLength(yaffs_Object *obj);
-+int yaffs_GetObjectInode(yaffs_Object *obj);
-+unsigned yaffs_GetObjectType(yaffs_Object *obj);
-+int yaffs_GetObjectLinkCount(yaffs_Object *obj);
++int yaffs_unlinker(struct yaffs_obj *dir, const YCHAR * name);
++int yaffs_del_obj(struct yaffs_obj *obj);
+
-+int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr);
-+int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr);
++int yaffs_get_obj_name(struct yaffs_obj *obj, YCHAR * name, int buffer_size);
++int yaffs_get_obj_length(struct yaffs_obj *obj);
++int yaffs_get_obj_inode(struct yaffs_obj *obj);
++unsigned yaffs_get_obj_type(struct yaffs_obj *obj);
++int yaffs_get_obj_link_count(struct yaffs_obj *obj);
+
+/* File operations */
-+int yaffs_ReadDataFromFile(yaffs_Object *obj, __u8 *buffer, loff_t offset,
-+ int nBytes);
-+int yaffs_WriteDataToFile(yaffs_Object *obj, const __u8 *buffer, loff_t offset,
-+ int nBytes, int writeThrough);
-+int yaffs_ResizeFile(yaffs_Object *obj, loff_t newSize);
++int yaffs_file_rd(struct yaffs_obj *obj, u8 * buffer, loff_t offset,
++ int n_bytes);
++int yaffs_wr_file(struct yaffs_obj *obj, const u8 * buffer, loff_t offset,
++ int n_bytes, int write_trhrough);
++int yaffs_resize_file(struct yaffs_obj *obj, loff_t new_size);
++
++struct yaffs_obj *yaffs_create_file(struct yaffs_obj *parent,
++ const YCHAR * name, u32 mode, u32 uid,
++ u32 gid);
+
-+yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name,
-+ __u32 mode, __u32 uid, __u32 gid);
-+int yaffs_FlushFile(yaffs_Object *obj, int updateTime);
++int yaffs_flush_file(struct yaffs_obj *obj, int update_time, int data_sync);
+
+/* Flushing and checkpointing */
-+void yaffs_FlushEntireDeviceCache(yaffs_Device *dev);
++void yaffs_flush_whole_cache(struct yaffs_dev *dev);
+
-+int yaffs_CheckpointSave(yaffs_Device *dev);
-+int yaffs_CheckpointRestore(yaffs_Device *dev);
++int yaffs_checkpoint_save(struct yaffs_dev *dev);
++int yaffs_checkpoint_restore(struct yaffs_dev *dev);
+
+/* Directory operations */
-+yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name,
-+ __u32 mode, __u32 uid, __u32 gid);
-+yaffs_Object *yaffs_FindObjectByName(yaffs_Object *theDir, const YCHAR *name);
-+int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
-+ int (*fn) (yaffs_Object *));
-+
-+yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number);
++struct yaffs_obj *yaffs_create_dir(struct yaffs_obj *parent, const YCHAR * name,
++ u32 mode, u32 uid, u32 gid);
++struct yaffs_obj *yaffs_find_by_name(struct yaffs_obj *the_dir,
++ const YCHAR * name);
++struct yaffs_obj *yaffs_find_by_number(struct yaffs_dev *dev, u32 number);
+
+/* Link operations */
-+yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name,
-+ yaffs_Object *equivalentObject);
++struct yaffs_obj *yaffs_link_obj(struct yaffs_obj *parent, const YCHAR * name,
++ struct yaffs_obj *equiv_obj);
+
-+yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj);
++struct yaffs_obj *yaffs_get_equivalent_obj(struct yaffs_obj *obj);
+
+/* Symlink operations */
-+yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name,
-+ __u32 mode, __u32 uid, __u32 gid,
-+ const YCHAR *alias);
-+YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj);
++struct yaffs_obj *yaffs_create_symlink(struct yaffs_obj *parent,
++ const YCHAR * name, u32 mode, u32 uid,
++ u32 gid, const YCHAR * alias);
++YCHAR *yaffs_get_symlink_alias(struct yaffs_obj *obj);
+
+/* Special inodes (fifos, sockets and devices) */
-+yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name,
-+ __u32 mode, __u32 uid, __u32 gid, __u32 rdev);
++struct yaffs_obj *yaffs_create_special(struct yaffs_obj *parent,
++ const YCHAR * name, u32 mode, u32 uid,
++ u32 gid, u32 rdev);
++
++int yaffs_set_xattrib(struct yaffs_obj *obj, const YCHAR * name,
++ const void *value, int size, int flags);
++int yaffs_get_xattrib(struct yaffs_obj *obj, const YCHAR * name, void *value,
++ int size);
++int yaffs_list_xattrib(struct yaffs_obj *obj, char *buffer, int size);
++int yaffs_remove_xattrib(struct yaffs_obj *obj, const YCHAR * name);
+
+/* Special directories */
-+yaffs_Object *yaffs_Root(yaffs_Device *dev);
-+yaffs_Object *yaffs_LostNFound(yaffs_Device *dev);
++struct yaffs_obj *yaffs_root(struct yaffs_dev *dev);
++struct yaffs_obj *yaffs_lost_n_found(struct yaffs_dev *dev);
+
-+#ifdef CONFIG_YAFFS_WINCE
-+/* CONFIG_YAFFS_WINCE special stuff */
-+void yfsd_WinFileTimeNow(__u32 target[2]);
-+#endif
++void yaffs_handle_defered_free(struct yaffs_obj *obj);
+
-+#ifdef __KERNEL__
++void yaffs_update_dirty_dirs(struct yaffs_dev *dev);
+
-+void yaffs_HandleDeferedFree(yaffs_Object *obj);
-+#endif
++int yaffs_bg_gc(struct yaffs_dev *dev, unsigned urgency);
+
+/* Debug dump */
-+int yaffs_DumpObject(yaffs_Object *obj);
++int yaffs_dump_obj(struct yaffs_obj *obj);
++
++void yaffs_guts_test(struct yaffs_dev *dev);
++
++/* A few useful functions to be used within the core files*/
++void yaffs_chunk_del(struct yaffs_dev *dev, int chunk_id, int mark_flash,
++ int lyn);
++int yaffs_check_ff(u8 * buffer, int n_bytes);
++void yaffs_handle_chunk_error(struct yaffs_dev *dev,
++ struct yaffs_block_info *bi);
++
++u8 *yaffs_get_temp_buffer(struct yaffs_dev *dev, int line_no);
++void yaffs_release_temp_buffer(struct yaffs_dev *dev, u8 * buffer, int line_no);
++
++struct yaffs_obj *yaffs_find_or_create_by_number(struct yaffs_dev *dev,
++ int number,
++ enum yaffs_obj_type type);
++int yaffs_put_chunk_in_file(struct yaffs_obj *in, int inode_chunk,
++ int nand_chunk, int in_scan);
++void yaffs_set_obj_name(struct yaffs_obj *obj, const YCHAR * name);
++void yaffs_set_obj_name_from_oh(struct yaffs_obj *obj,
++ const struct yaffs_obj_hdr *oh);
++void yaffs_add_obj_to_dir(struct yaffs_obj *directory, struct yaffs_obj *obj);
++YCHAR *yaffs_clone_str(const YCHAR * str);
++void yaffs_link_fixup(struct yaffs_dev *dev, struct yaffs_obj *hard_list);
++void yaffs_block_became_dirty(struct yaffs_dev *dev, int block_no);
++int yaffs_update_oh(struct yaffs_obj *in, const YCHAR * name,
++ int force, int is_shrink, int shadows,
++ struct yaffs_xattr_mod *xop);
++void yaffs_handle_shadowed_obj(struct yaffs_dev *dev, int obj_id,
++ int backward_scanning);
++int yaffs_check_alloc_available(struct yaffs_dev *dev, int n_chunks);
++struct yaffs_tnode *yaffs_get_tnode(struct yaffs_dev *dev);
++struct yaffs_tnode *yaffs_add_find_tnode_0(struct yaffs_dev *dev,
++ struct yaffs_file_var *file_struct,
++ u32 chunk_id,
++ struct yaffs_tnode *passed_tn);
++
++int yaffs_do_file_wr(struct yaffs_obj *in, const u8 * buffer, loff_t offset,
++ int n_bytes, int write_trhrough);
++void yaffs_resize_file_down(struct yaffs_obj *obj, loff_t new_size);
++void yaffs_skip_rest_of_block(struct yaffs_dev *dev);
++
++int yaffs_count_free_chunks(struct yaffs_dev *dev);
++
++struct yaffs_tnode *yaffs_find_tnode_0(struct yaffs_dev *dev,
++ struct yaffs_file_var *file_struct,
++ u32 chunk_id);
++
++u32 yaffs_get_group_base(struct yaffs_dev *dev, struct yaffs_tnode *tn,
++ unsigned pos);
+
-+void yaffs_GutsTest(yaffs_Device *dev);
++#endif
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_linux.h linux-2.6.36/fs/yaffs2/yaffs_linux.h
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_linux.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_linux.h 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,41 @@
++/*
++ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
++ *
++ * Copyright (C) 2002-2010 Aleph One Ltd.
++ * for Toby Churchill Ltd and Brightstar Engineering
++ *
++ * Created by Charles Manning <charles@aleph1.co.uk>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 2.1 as
++ * published by the Free Software Foundation.
++ *
++ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
++ */
++
++#ifndef __YAFFS_LINUX_H__
++#define __YAFFS_LINUX_H__
++
++#include "yportenv.h"
++
++struct yaffs_linux_context {
++ struct list_head context_list; /* List of these we have mounted */
++ struct yaffs_dev *dev;
++ struct super_block *super;
++ struct task_struct *bg_thread; /* Background thread for this device */
++ int bg_running;
++ struct mutex gross_lock; /* Gross locking mutex*/
++ u8 *spare_buffer; /* For mtdif2 use. Don't know the size of the buffer
++ * at compile time so we have to allocate it.
++ */
++ struct list_head search_contexts;
++ void (*put_super_fn) (struct super_block * sb);
+
-+/* A few useful functions */
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags);
-+void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn);
-+int yaffs_CheckFF(__u8 *buffer, int nBytes);
-+void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi);
++ struct task_struct *readdir_process;
++ unsigned mount_id;
++};
+
-+__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo);
-+void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer, int lineNo);
++#define yaffs_dev_to_lc(dev) ((struct yaffs_linux_context *)((dev)->os_context))
++#define yaffs_dev_to_mtd(dev) ((struct mtd_info *)((dev)->driver_context))
+
+#endif
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffsinterface.h linux-2.6.34/fs/yaffs2/yaffsinterface.h
---- linux-2.6.34.orig/fs/yaffs2/yaffsinterface.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffsinterface.h 2010-05-20 20:16:22.301615823 +0200
-@@ -0,0 +1,21 @@
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif.c linux-2.6.36/fs/yaffs2/yaffs_mtdif.c
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_mtdif.c 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,54 @@
++/*
++ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
++ *
++ * Copyright (C) 2002-2010 Aleph One Ltd.
++ * for Toby Churchill Ltd and Brightstar Engineering
++ *
++ * Created by Charles Manning <charles@aleph1.co.uk>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include "yportenv.h"
++
++#include "yaffs_mtdif.h"
++
++#include "linux/mtd/mtd.h"
++#include "linux/types.h"
++#include "linux/time.h"
++#include "linux/mtd/nand.h"
++
++#include "yaffs_linux.h"
++
++int nandmtd_erase_block(struct yaffs_dev *dev, int block_no)
++{
++ struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
++ u32 addr =
++ ((loff_t) block_no) * dev->param.total_bytes_per_chunk
++ * dev->param.chunks_per_block;
++ struct erase_info ei;
++
++ int retval = 0;
++
++ ei.mtd = mtd;
++ ei.addr = addr;
++ ei.len = dev->param.total_bytes_per_chunk * dev->param.chunks_per_block;
++ ei.time = 1000;
++ ei.retries = 2;
++ ei.callback = NULL;
++ ei.priv = (u_long) dev;
++
++ retval = mtd->erase(mtd, &ei);
++
++ if (retval == 0)
++ return YAFFS_OK;
++ else
++ return YAFFS_FAIL;
++}
++
++int nandmtd_initialise(struct yaffs_dev *dev)
++{
++ return YAFFS_OK;
++}
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif.h linux-2.6.36/fs/yaffs2/yaffs_mtdif.h
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_mtdif.h 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,23 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
++ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
@@ -12464,23 +8174,26 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffsinterface.h linux-2.6.34/fs/yaffs2/ya
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
-+#ifndef __YAFFSINTERFACE_H__
-+#define __YAFFSINTERFACE_H__
++#ifndef __YAFFS_MTDIF_H__
++#define __YAFFS_MTDIF_H__
+
-+int yaffs_Initialise(unsigned nBlocks);
++#include "yaffs_guts.h"
+
++int nandmtd_erase_block(struct yaffs_dev *dev, int block_no);
++int nandmtd_initialise(struct yaffs_dev *dev);
+#endif
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif1.c linux-2.6.34/fs/yaffs2/yaffs_mtdif1.c
---- linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif1.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffs_mtdif1.c 2010-05-20 20:16:22.301615823 +0200
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif1.c linux-2.6.36/fs/yaffs2/yaffs_mtdif1.c
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif1.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_mtdif1.c 2010-11-18 18:15:51.000000000 +0100
@@ -0,0 +1,365 @@
+/*
+ * YAFFS: Yet another FFS. A NAND-flash specific file system.
-+ * yaffs_mtdif1.c NAND mtd interface functions for small-page NAND.
+ *
-+ * Copyright (C) 2002 Aleph One Ltd.
++ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
++ * Created by Charles Manning <charles@aleph1.co.uk>
++ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
@@ -12494,15 +8207,17 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif1.c linux-2.6.34/fs/yaffs2/yaff
+ *
+ * These functions are invoked via function pointers in yaffs_nand.c.
+ * This replaces functionality provided by functions in yaffs_mtdif.c
-+ * and the yaffs_TagsCompatability functions in yaffs_tagscompat.c that are
++ * and the yaffs_tags compatability functions in yaffs_tagscompat.c that are
+ * called in yaffs_mtdif.c when the function pointers are NULL.
-+ * We assume the MTD layer is performing ECC (useNANDECC is true).
++ * We assume the MTD layer is performing ECC (use_nand_ecc is true).
+ */
+
+#include "yportenv.h"
++#include "yaffs_trace.h"
+#include "yaffs_guts.h"
+#include "yaffs_packedtags1.h"
-+#include "yaffs_tagscompat.h" /* for yaffs_CalcTagsECC */
++#include "yaffs_tagscompat.h" /* for yaffs_calc_tags_ecc */
++#include "yaffs_linux.h"
+
+#include "linux/kernel.h"
+#include "linux/version.h"
@@ -12512,8 +8227,6 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif1.c linux-2.6.34/fs/yaffs2/yaff
+/* Don't compile this module if we don't have MTD's mtd_oob_ops interface */
+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
+
-+const char *yaffs_mtdif1_c_version = "$Id: yaffs_mtdif1.c,v 1.10 2009-03-09 07:41:10 charles Exp $";
-+
+#ifndef CONFIG_YAFFS_9BYTE_TAGS
+# define YTAG1_SIZE 8
+#else
@@ -12527,19 +8240,19 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif1.c linux-2.6.34/fs/yaffs2/yaff
+ * adjust 'oobfree' to match your existing Yaffs data.
+ *
+ * This nand_ecclayout scatters/gathers to/from the old-yaffs layout with the
-+ * pageStatus byte (at NAND spare offset 4) scattered/gathered from/to
++ * page_status byte (at NAND spare offset 4) scattered/gathered from/to
+ * the 9th byte.
+ *
+ * Old-style on-NAND format: T0,T1,T2,T3,P,B,T4,T5,E0,E1,E2,T6,T7,E3,E4,E5
-+ * We have/need PackedTags1 plus pageStatus: T0,T1,T2,T3,T4,T5,T6,T7,P
-+ * where Tn are the tag bytes, En are MTD's ECC bytes, P is the pageStatus
++ * We have/need packed_tags1 plus page_status: T0,T1,T2,T3,T4,T5,T6,T7,P
++ * where Tn are the tag bytes, En are MTD's ECC bytes, P is the page_status
+ * byte and B is the small-page bad-block indicator byte.
+ */
+static struct nand_ecclayout nand_oob_16 = {
+ .eccbytes = 6,
-+ .eccpos = { 8, 9, 10, 13, 14, 15 },
++ .eccpos = {8, 9, 10, 13, 14, 15},
+ .oobavail = 9,
-+ .oobfree = { { 0, 4 }, { 6, 2 }, { 11, 2 }, { 4, 1 } }
++ .oobfree = {{0, 4}, {6, 2}, {11, 2}, {4, 1}}
+};
+#endif
+
@@ -12549,12 +8262,12 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif1.c linux-2.6.34/fs/yaffs2/yaff
+ * compact (packed) form for storage in NAND. A mini-ECC runs over the
+ * contents of the tags meta-data; used to valid the tags when read.
+ *
-+ * - Pack ExtendedTags to PackedTags1 form
-+ * - Compute mini-ECC for PackedTags1
++ * - Pack ExtendedTags to packed_tags1 form
++ * - Compute mini-ECC for packed_tags1
+ * - Write data and packed tags to NAND.
+ *
-+ * Note: Due to the use of the PackedTags1 meta-data which does not include
-+ * a full sequence number (as found in the larger PackedTags2 form) it is
++ * Note: Due to the use of the packed_tags1 meta-data which does not include
++ * a full sequence number (as found in the larger packed_tags2 form) it is
+ * necessary for Yaffs to re-write a chunk/page (just once) to mark it as
+ * discarded and dirty. This is not ideal: newer NAND parts are supposed
+ * to be written just once. When Yaffs performs this operation, this
@@ -12564,69 +8277,68 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif1.c linux-2.6.34/fs/yaffs2/yaff
+ * Any underlying MTD error results in YAFFS_FAIL.
+ * Returns YAFFS_OK or YAFFS_FAIL.
+ */
-+int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device *dev,
-+ int chunkInNAND, const __u8 *data, const yaffs_ExtendedTags *etags)
++int nandmtd1_write_chunk_tags(struct yaffs_dev *dev,
++ int nand_chunk, const u8 * data,
++ const struct yaffs_ext_tags *etags)
+{
-+ struct mtd_info *mtd = dev->genericDevice;
-+ int chunkBytes = dev->nDataBytesPerChunk;
-+ loff_t addr = ((loff_t)chunkInNAND) * chunkBytes;
++ struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
++ int chunk_bytes = dev->data_bytes_per_chunk;
++ loff_t addr = ((loff_t) nand_chunk) * chunk_bytes;
+ struct mtd_oob_ops ops;
-+ yaffs_PackedTags1 pt1;
++ struct yaffs_packed_tags1 pt1;
+ int retval;
+
-+ /* we assume that PackedTags1 and yaffs_Tags are compatible */
-+ compile_time_assertion(sizeof(yaffs_PackedTags1) == 12);
-+ compile_time_assertion(sizeof(yaffs_Tags) == 8);
-+
-+ dev->nPageWrites++;
++ /* we assume that packed_tags1 and struct yaffs_tags are compatible */
++ compile_time_assertion(sizeof(struct yaffs_packed_tags1) == 12);
++ compile_time_assertion(sizeof(struct yaffs_tags) == 8);
+
-+ yaffs_PackTags1(&pt1, etags);
-+ yaffs_CalcTagsECC((yaffs_Tags *)&pt1);
++ yaffs_pack_tags1(&pt1, etags);
++ yaffs_calc_tags_ecc((struct yaffs_tags *)&pt1);
+
+ /* When deleting a chunk, the upper layer provides only skeletal
-+ * etags, one with chunkDeleted set. However, we need to update the
++ * etags, one with is_deleted set. However, we need to update the
+ * tags, not erase them completely. So we use the NAND write property
+ * that only zeroed-bits stick and set tag bytes to all-ones and
+ * zero just the (not) deleted bit.
+ */
+#ifndef CONFIG_YAFFS_9BYTE_TAGS
-+ if (etags->chunkDeleted) {
++ if (etags->is_deleted) {
+ memset(&pt1, 0xff, 8);
+ /* clear delete status bit to indicate deleted */
+ pt1.deleted = 0;
+ }
+#else
-+ ((__u8 *)&pt1)[8] = 0xff;
-+ if (etags->chunkDeleted) {
++ ((u8 *) & pt1)[8] = 0xff;
++ if (etags->is_deleted) {
+ memset(&pt1, 0xff, 8);
-+ /* zero pageStatus byte to indicate deleted */
-+ ((__u8 *)&pt1)[8] = 0;
++ /* zero page_status byte to indicate deleted */
++ ((u8 *) & pt1)[8] = 0;
+ }
+#endif
+
+ memset(&ops, 0, sizeof(ops));
+ ops.mode = MTD_OOB_AUTO;
-+ ops.len = (data) ? chunkBytes : 0;
++ ops.len = (data) ? chunk_bytes : 0;
+ ops.ooblen = YTAG1_SIZE;
-+ ops.datbuf = (__u8 *)data;
-+ ops.oobbuf = (__u8 *)&pt1;
++ ops.datbuf = (u8 *) data;
++ ops.oobbuf = (u8 *) & pt1;
+
+ retval = mtd->write_oob(mtd, addr, &ops);
+ if (retval) {
-+ yaffs_trace(YAFFS_TRACE_MTD,
-+ "write_oob failed, chunk %d, mtd error %d\n",
-+ chunkInNAND, retval);
++ T(YAFFS_TRACE_MTD,
++ (TSTR("write_oob failed, chunk %d, mtd error %d" TENDSTR),
++ nand_chunk, retval));
+ }
+ return retval ? YAFFS_FAIL : YAFFS_OK;
+}
+
-+/* Return with empty ExtendedTags but add eccResult.
++/* Return with empty ExtendedTags but add ecc_result.
+ */
-+static int rettags(yaffs_ExtendedTags *etags, int eccResult, int retval)
++static int rettags(struct yaffs_ext_tags *etags, int ecc_result, int retval)
+{
+ if (etags) {
+ memset(etags, 0, sizeof(*etags));
-+ etags->eccResult = eccResult;
++ etags->ecc_result = ecc_result;
+ }
+ return retval;
+}
@@ -12634,36 +8346,35 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif1.c linux-2.6.34/fs/yaffs2/yaff
+/* Read a chunk (page) from NAND.
+ *
+ * Caller expects ExtendedTags data to be usable even on error; that is,
-+ * all members except eccResult and blockBad are zeroed.
++ * all members except ecc_result and block_bad are zeroed.
+ *
+ * - Check ECC results for data (if applicable)
+ * - Check for blank/erased block (return empty ExtendedTags if blank)
-+ * - Check the PackedTags1 mini-ECC (correct if necessary/possible)
-+ * - Convert PackedTags1 to ExtendedTags
-+ * - Update eccResult and blockBad members to refect state.
++ * - Check the packed_tags1 mini-ECC (correct if necessary/possible)
++ * - Convert packed_tags1 to ExtendedTags
++ * - Update ecc_result and block_bad members to refect state.
+ *
+ * Returns YAFFS_OK or YAFFS_FAIL.
+ */
-+int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev,
-+ int chunkInNAND, __u8 *data, yaffs_ExtendedTags *etags)
++int nandmtd1_read_chunk_tags(struct yaffs_dev *dev,
++ int nand_chunk, u8 * data,
++ struct yaffs_ext_tags *etags)
+{
-+ struct mtd_info *mtd = dev->genericDevice;
-+ int chunkBytes = dev->nDataBytesPerChunk;
-+ loff_t addr = ((loff_t)chunkInNAND) * chunkBytes;
++ struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
++ int chunk_bytes = dev->data_bytes_per_chunk;
++ loff_t addr = ((loff_t) nand_chunk) * chunk_bytes;
+ int eccres = YAFFS_ECC_RESULT_NO_ERROR;
+ struct mtd_oob_ops ops;
-+ yaffs_PackedTags1 pt1;
++ struct yaffs_packed_tags1 pt1;
+ int retval;
+ int deleted;
+
-+ dev->nPageReads++;
-+
+ memset(&ops, 0, sizeof(ops));
+ ops.mode = MTD_OOB_AUTO;
-+ ops.len = (data) ? chunkBytes : 0;
++ ops.len = (data) ? chunk_bytes : 0;
+ ops.ooblen = YTAG1_SIZE;
+ ops.datbuf = data;
-+ ops.oobbuf = (__u8 *)&pt1;
++ ops.oobbuf = (u8 *) & pt1;
+
+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 20))
+ /* In MTD 2.6.18 to 2.6.19 nand_base.c:nand_do_read_oob() has a bug;
@@ -12676,9 +8387,9 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif1.c linux-2.6.34/fs/yaffs2/yaff
+ */
+ retval = mtd->read_oob(mtd, addr, &ops);
+ if (retval) {
-+ yaffs_trace(YAFFS_TRACE_MTD,
-+ "read_oob failed, chunk %d, mtd error %d\n",
-+ chunkInNAND, retval);
++ T(YAFFS_TRACE_MTD,
++ (TSTR("read_oob failed, chunk %d, mtd error %d" TENDSTR),
++ nand_chunk, retval));
+ }
+
+ switch (retval) {
@@ -12689,26 +8400,25 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif1.c linux-2.6.34/fs/yaffs2/yaff
+ case -EUCLEAN:
+ /* MTD's ECC fixed the data */
+ eccres = YAFFS_ECC_RESULT_FIXED;
-+ dev->eccFixed++;
++ dev->n_ecc_fixed++;
+ break;
+
+ case -EBADMSG:
+ /* MTD's ECC could not fix the data */
-+ dev->eccUnfixed++;
++ dev->n_ecc_unfixed++;
+ /* fall into... */
+ default:
+ rettags(etags, YAFFS_ECC_RESULT_UNFIXED, 0);
-+ etags->blockBad = (mtd->block_isbad)(mtd, addr);
++ etags->block_bad = (mtd->block_isbad) (mtd, addr);
+ return YAFFS_FAIL;
+ }
+
+ /* Check for a blank/erased chunk.
+ */
-+ if (yaffs_CheckFF((__u8 *)&pt1, 8)) {
-+ /* when blank, upper layers want eccResult to be <= NO_ERROR */
++ if (yaffs_check_ff((u8 *) & pt1, 8)) {
++ /* when blank, upper layers want ecc_result to be <= NO_ERROR */
+ return rettags(etags, YAFFS_ECC_RESULT_NO_ERROR, YAFFS_OK);
+ }
-+
+#ifndef CONFIG_YAFFS_9BYTE_TAGS
+ /* Read deleted status (bit) then return it to it's non-deleted
+ * state before performing tags mini-ECC check. pt1.deleted is
@@ -12717,37 +8427,37 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif1.c linux-2.6.34/fs/yaffs2/yaff
+ deleted = !pt1.deleted;
+ pt1.deleted = 1;
+#else
-+ deleted = (yaffs_CountBits(((__u8 *)&pt1)[8]) < 7);
++ deleted = (yaffs_count_bits(((u8 *) & pt1)[8]) < 7);
+#endif
+
+ /* Check the packed tags mini-ECC and correct if necessary/possible.
+ */
-+ retval = yaffs_CheckECCOnTags((yaffs_Tags *)&pt1);
++ retval = yaffs_check_tags_ecc((struct yaffs_tags *)&pt1);
+ switch (retval) {
+ case 0:
+ /* no tags error, use MTD result */
+ break;
+ case 1:
+ /* recovered tags-ECC error */
-+ dev->tagsEccFixed++;
++ dev->n_tags_ecc_fixed++;
+ if (eccres == YAFFS_ECC_RESULT_NO_ERROR)
+ eccres = YAFFS_ECC_RESULT_FIXED;
+ break;
+ default:
+ /* unrecovered tags-ECC error */
-+ dev->tagsEccUnfixed++;
++ dev->n_tags_ecc_unfixed++;
+ return rettags(etags, YAFFS_ECC_RESULT_UNFIXED, YAFFS_FAIL);
+ }
+
+ /* Unpack the tags to extended form and set ECC result.
-+ * [set shouldBeFF just to keep yaffs_UnpackTags1 happy]
++ * [set should_be_ff just to keep yaffs_unpack_tags1 happy]
+ */
-+ pt1.shouldBeFF = 0xFFFFFFFF;
-+ yaffs_UnpackTags1(etags, &pt1);
-+ etags->eccResult = eccres;
++ pt1.should_be_ff = 0xFFFFFFFF;
++ yaffs_unpack_tags1(etags, &pt1);
++ etags->ecc_result = eccres;
+
+ /* Set deleted state */
-+ etags->chunkDeleted = deleted;
++ etags->is_deleted = deleted;
+ return YAFFS_OK;
+}
+
@@ -12758,15 +8468,16 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif1.c linux-2.6.34/fs/yaffs2/yaff
+ *
+ * Returns YAFFS_OK or YAFFS_FAIL.
+ */
-+int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
++int nandmtd1_mark_block_bad(struct yaffs_dev *dev, int block_no)
+{
-+ struct mtd_info *mtd = dev->genericDevice;
-+ int blocksize = dev->nChunksPerBlock * dev->nDataBytesPerChunk;
++ struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
++ int blocksize = dev->param.chunks_per_block * dev->data_bytes_per_chunk;
+ int retval;
+
-+ yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad\n", blockNo);
++ T(YAFFS_TRACE_BAD_BLOCKS,
++ (TSTR("marking block %d bad" TENDSTR), block_no));
+
-+ retval = mtd->block_markbad(mtd, (loff_t)blocksize * blockNo);
++ retval = mtd->block_markbad(mtd, (loff_t) blocksize * block_no);
+ return (retval) ? YAFFS_FAIL : YAFFS_OK;
+}
+
@@ -12774,16 +8485,17 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif1.c linux-2.6.34/fs/yaffs2/yaff
+ *
+ * Returns YAFFS_OK or YAFFS_FAIL.
+ */
-+static int nandmtd1_TestPrerequists(struct mtd_info *mtd)
++static int nandmtd1_test_prerequists(struct mtd_info *mtd)
+{
+ /* 2.6.18 has mtd->ecclayout->oobavail */
+ /* 2.6.21 has mtd->ecclayout->oobavail and mtd->oobavail */
+ int oobavail = mtd->ecclayout->oobavail;
+
+ if (oobavail < YTAG1_SIZE) {
-+ yaffs_trace(YAFFS_TRACE_ERROR,
-+ "mtd device has only %d bytes for tags, need %d\n",
-+ oobavail, YTAG1_SIZE);
++ T(YAFFS_TRACE_ERROR,
++ (TSTR
++ ("mtd device has only %d bytes for tags, need %d" TENDSTR),
++ oobavail, YTAG1_SIZE));
+ return YAFFS_FAIL;
+ }
+ return YAFFS_OK;
@@ -12798,13 +8510,13 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif1.c linux-2.6.34/fs/yaffs2/yaff
+ *
+ * Always returns YAFFS_OK.
+ */
-+int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
-+ yaffs_BlockState *pState, __u32 *pSequenceNumber)
++int nandmtd1_query_block(struct yaffs_dev *dev, int block_no,
++ enum yaffs_block_state *state_ptr, u32 * seq_ptr)
+{
-+ struct mtd_info *mtd = dev->genericDevice;
-+ int chunkNo = blockNo * dev->nChunksPerBlock;
-+ loff_t addr = (loff_t)chunkNo * dev->nDataBytesPerChunk;
-+ yaffs_ExtendedTags etags;
++ struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
++ int chunk_num = block_no * dev->param.chunks_per_block;
++ loff_t addr = (loff_t) chunk_num * dev->data_bytes_per_chunk;
++ struct yaffs_ext_tags etags;
+ int state = YAFFS_BLOCK_STATE_DEAD;
+ int seqnum = 0;
+ int retval;
@@ -12812,41 +8524,41 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif1.c linux-2.6.34/fs/yaffs2/yaff
+ /* We don't yet have a good place to test for MTD config prerequists.
+ * Do it here as we are called during the initial scan.
+ */
-+ if (nandmtd1_TestPrerequists(mtd) != YAFFS_OK)
++ if (nandmtd1_test_prerequists(mtd) != YAFFS_OK)
+ return YAFFS_FAIL;
+
-+ retval = nandmtd1_ReadChunkWithTagsFromNAND(dev, chunkNo, NULL, &etags);
-+ etags.blockBad = (mtd->block_isbad)(mtd, addr);
-+ if (etags.blockBad) {
-+ yaffs_trace(YAFFS_TRACE_BAD_BLOCKS,
-+ "block %d is marked bad\n", blockNo);
++ retval = nandmtd1_read_chunk_tags(dev, chunk_num, NULL, &etags);
++ etags.block_bad = (mtd->block_isbad) (mtd, addr);
++ if (etags.block_bad) {
++ T(YAFFS_TRACE_BAD_BLOCKS,
++ (TSTR("block %d is marked bad" TENDSTR), block_no));
+ state = YAFFS_BLOCK_STATE_DEAD;
-+ } else if (etags.eccResult != YAFFS_ECC_RESULT_NO_ERROR) {
++ } else if (etags.ecc_result != YAFFS_ECC_RESULT_NO_ERROR) {
+ /* bad tags, need to look more closely */
+ state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
-+ } else if (etags.chunkUsed) {
++ } else if (etags.chunk_used) {
+ state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
-+ seqnum = etags.sequenceNumber;
++ seqnum = etags.seq_number;
+ } else {
+ state = YAFFS_BLOCK_STATE_EMPTY;
+ }
+
-+ *pState = state;
-+ *pSequenceNumber = seqnum;
++ *state_ptr = state;
++ *seq_ptr = seqnum;
+
+ /* query always succeeds */
+ return YAFFS_OK;
+}
+
-+#endif /*MTD_VERSION*/
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif1.h linux-2.6.34/fs/yaffs2/yaffs_mtdif1.h
---- linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif1.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffs_mtdif1.h 2010-05-20 20:16:22.311614862 +0200
-@@ -0,0 +1,28 @@
++#endif /*MTD_VERSION */
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif1.h linux-2.6.36/fs/yaffs2/yaffs_mtdif1.h
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif1.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_mtdif1.h 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,29 @@
+/*
+ * YAFFS: Yet another Flash File System. A NAND-flash specific file system.
+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
++ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * This program is free software; you can redistribute it and/or modify
@@ -12859,26 +8571,27 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif1.h linux-2.6.34/fs/yaffs2/yaff
+#ifndef __YAFFS_MTDIF1_H__
+#define __YAFFS_MTDIF1_H__
+
-+int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+ const __u8 *data, const yaffs_ExtendedTags *tags);
++int nandmtd1_write_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
++ const u8 * data,
++ const struct yaffs_ext_tags *tags);
+
-+int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+ __u8 *data, yaffs_ExtendedTags *tags);
++int nandmtd1_read_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
++ u8 * data, struct yaffs_ext_tags *tags);
+
-+int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
++int nandmtd1_mark_block_bad(struct yaffs_dev *dev, int block_no);
+
-+int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
-+ yaffs_BlockState *state, __u32 *sequenceNumber);
++int nandmtd1_query_block(struct yaffs_dev *dev, int block_no,
++ enum yaffs_block_state *state, u32 * seq_number);
+
+#endif
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif2.c linux-2.6.34/fs/yaffs2/yaffs_mtdif2.c
---- linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif2.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffs_mtdif2.c 2010-05-20 20:16:22.311614862 +0200
-@@ -0,0 +1,246 @@
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif2.c linux-2.6.36/fs/yaffs2/yaffs_mtdif2.c
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif2.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_mtdif2.c 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,261 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
++ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
@@ -12890,11 +8603,8 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif2.c linux-2.6.34/fs/yaffs2/yaff
+
+/* mtd interface for YAFFS2 */
+
-+const char *yaffs_mtdif2_c_version =
-+ "$Id: yaffs_mtdif2.c,v 1.23 2009-03-06 17:20:53 wookey Exp $";
-+
+#include "yportenv.h"
-+
++#include "yaffs_trace.h"
+
+#include "yaffs_mtdif2.h"
+
@@ -12904,15 +8614,17 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif2.c linux-2.6.34/fs/yaffs2/yaff
+
+#include "yaffs_packedtags2.h"
+
++#include "yaffs_linux.h"
++
+/* NB For use with inband tags....
-+ * We assume that the data buffer is of size totalBytersPerChunk so that we can also
++ * We assume that the data buffer is of size total_bytes_per_chunk so that we can also
+ * use it to load the tags.
+ */
-+int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+ const __u8 *data,
-+ const yaffs_ExtendedTags *tags)
++int nandmtd2_write_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
++ const u8 * data,
++ const struct yaffs_ext_tags *tags)
+{
-+ struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
++ struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
+ struct mtd_oob_ops ops;
+#else
@@ -12922,15 +8634,19 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif2.c linux-2.6.34/fs/yaffs2/yaff
+
+ loff_t addr;
+
-+ yaffs_PackedTags2 pt;
++ struct yaffs_packed_tags2 pt;
++
++ int packed_tags_size =
++ dev->param.no_tags_ecc ? sizeof(pt.t) : sizeof(pt);
++ void *packed_tags_ptr =
++ dev->param.no_tags_ecc ? (void *)&pt.t : (void *)&pt;
+
+ T(YAFFS_TRACE_MTD,
+ (TSTR
-+ ("nandmtd2_WriteChunkWithTagsToNAND chunk %d data %p tags %p"
-+ TENDSTR), chunkInNAND, data, tags));
-+
++ ("nandmtd2_write_chunk_tags chunk %d data %p tags %p"
++ TENDSTR), nand_chunk, data, tags));
+
-+ addr = ((loff_t) chunkInNAND) * dev->totalBytesPerChunk;
++ addr = ((loff_t) nand_chunk) * dev->param.total_bytes_per_chunk;
+
+ /* For yaffs2 writing there must be both data and tags.
+ * If we're using inband tags, then the tags are stuffed into
@@ -12938,31 +8654,35 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif2.c linux-2.6.34/fs/yaffs2/yaff
+ */
+ if (!data || !tags)
+ BUG();
-+ else if (dev->inbandTags) {
-+ yaffs_PackedTags2TagsPart *pt2tp;
-+ pt2tp = (yaffs_PackedTags2TagsPart *)(data + dev->nDataBytesPerChunk);
-+ yaffs_PackTags2TagsPart(pt2tp, tags);
-+ } else
-+ yaffs_PackTags2(&pt, tags);
++ else if (dev->param.inband_tags) {
++ struct yaffs_packed_tags2_tags_only *pt2tp;
++ pt2tp =
++ (struct yaffs_packed_tags2_tags_only *)(data +
++ dev->
++ data_bytes_per_chunk);
++ yaffs_pack_tags2_tags_only(pt2tp, tags);
++ } else {
++ yaffs_pack_tags2(&pt, tags, !dev->param.no_tags_ecc);
++ }
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
+ ops.mode = MTD_OOB_AUTO;
-+ ops.ooblen = (dev->inbandTags) ? 0 : sizeof(pt);
-+ ops.len = dev->totalBytesPerChunk;
++ ops.ooblen = (dev->param.inband_tags) ? 0 : packed_tags_size;
++ ops.len = dev->param.total_bytes_per_chunk;
+ ops.ooboffs = 0;
-+ ops.datbuf = (__u8 *)data;
-+ ops.oobbuf = (dev->inbandTags) ? NULL : (void *)&pt;
++ ops.datbuf = (u8 *) data;
++ ops.oobbuf = (dev->param.inband_tags) ? NULL : packed_tags_ptr;
+ retval = mtd->write_oob(mtd, addr, &ops);
+
+#else
-+ if (!dev->inbandTags) {
++ if (!dev->param.inband_tags) {
+ retval =
-+ mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
-+ &dummy, data, (__u8 *) &pt, NULL);
++ mtd->write_ecc(mtd, addr, dev->data_bytes_per_chunk,
++ &dummy, data, (u8 *) packed_tags_ptr, NULL);
+ } else {
+ retval =
-+ mtd->write(mtd, addr, dev->totalBytesPerChunk, &dummy,
-+ data);
++ mtd->write(mtd, addr, dev->param.total_bytes_per_chunk,
++ &dummy, data);
+ }
+#endif
+
@@ -12972,104 +8692,117 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif2.c linux-2.6.34/fs/yaffs2/yaff
+ return YAFFS_FAIL;
+}
+
-+int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+ __u8 *data, yaffs_ExtendedTags *tags)
++int nandmtd2_read_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
++ u8 * data, struct yaffs_ext_tags *tags)
+{
-+ struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
++ struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
+ struct mtd_oob_ops ops;
+#endif
+ size_t dummy;
+ int retval = 0;
-+ int localData = 0;
++ int local_data = 0;
++
++ loff_t addr = ((loff_t) nand_chunk) * dev->param.total_bytes_per_chunk;
+
-+ loff_t addr = ((loff_t) chunkInNAND) * dev->totalBytesPerChunk;
++ struct yaffs_packed_tags2 pt;
+
-+ yaffs_PackedTags2 pt;
++ int packed_tags_size =
++ dev->param.no_tags_ecc ? sizeof(pt.t) : sizeof(pt);
++ void *packed_tags_ptr =
++ dev->param.no_tags_ecc ? (void *)&pt.t : (void *)&pt;
+
+ T(YAFFS_TRACE_MTD,
+ (TSTR
-+ ("nandmtd2_ReadChunkWithTagsFromNAND chunk %d data %p tags %p"
-+ TENDSTR), chunkInNAND, data, tags));
++ ("nandmtd2_read_chunk_tags chunk %d data %p tags %p"
++ TENDSTR), nand_chunk, data, tags));
+
-+ if (dev->inbandTags) {
++ if (dev->param.inband_tags) {
+
+ if (!data) {
-+ localData = 1;
-+ data = yaffs_GetTempBuffer(dev, __LINE__);
++ local_data = 1;
++ data = yaffs_get_temp_buffer(dev, __LINE__);
+ }
+
-+
+ }
+
-+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+ if (dev->inbandTags || (data && !tags))
-+ retval = mtd->read(mtd, addr, dev->totalBytesPerChunk,
-+ &dummy, data);
++ if (dev->param.inband_tags || (data && !tags))
++ retval = mtd->read(mtd, addr, dev->param.total_bytes_per_chunk,
++ &dummy, data);
+ else if (tags) {
+ ops.mode = MTD_OOB_AUTO;
-+ ops.ooblen = sizeof(pt);
-+ ops.len = data ? dev->nDataBytesPerChunk : sizeof(pt);
++ ops.ooblen = packed_tags_size;
++ ops.len = data ? dev->data_bytes_per_chunk : packed_tags_size;
+ ops.ooboffs = 0;
+ ops.datbuf = data;
-+ ops.oobbuf = dev->spareBuffer;
++ ops.oobbuf = yaffs_dev_to_lc(dev)->spare_buffer;
+ retval = mtd->read_oob(mtd, addr, &ops);
+ }
+#else
-+ if (!dev->inbandTags && data && tags) {
++ if (!dev->param.inband_tags && data && tags) {
+
-+ retval = mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
-+ &dummy, data, dev->spareBuffer,
-+ NULL);
++ retval = mtd->read_ecc(mtd, addr, dev->data_bytes_per_chunk,
++ &dummy, data, dev->spare_buffer, NULL);
+ } else {
+ if (data)
+ retval =
-+ mtd->read(mtd, addr, dev->nDataBytesPerChunk, &dummy,
-+ data);
-+ if (!dev->inbandTags && tags)
++ mtd->read(mtd, addr, dev->data_bytes_per_chunk,
++ &dummy, data);
++ if (!dev->param.inband_tags && tags)
+ retval =
+ mtd->read_oob(mtd, addr, mtd->oobsize, &dummy,
-+ dev->spareBuffer);
++ dev->spare_buffer);
+ }
+#endif
+
-+
-+ if (dev->inbandTags) {
++ if (dev->param.inband_tags) {
+ if (tags) {
-+ yaffs_PackedTags2TagsPart *pt2tp;
-+ pt2tp = (yaffs_PackedTags2TagsPart *)&data[dev->nDataBytesPerChunk];
-+ yaffs_UnpackTags2TagsPart(tags, pt2tp);
++ struct yaffs_packed_tags2_tags_only *pt2tp;
++ pt2tp =
++ (struct yaffs_packed_tags2_tags_only *)&data[dev->
++ data_bytes_per_chunk];
++ yaffs_unpack_tags2_tags_only(tags, pt2tp);
+ }
+ } else {
+ if (tags) {
-+ memcpy(&pt, dev->spareBuffer, sizeof(pt));
-+ yaffs_UnpackTags2(tags, &pt);
++ memcpy(packed_tags_ptr,
++ yaffs_dev_to_lc(dev)->spare_buffer,
++ packed_tags_size);
++ yaffs_unpack_tags2(tags, &pt, !dev->param.no_tags_ecc);
+ }
+ }
+
-+ if (localData)
-+ yaffs_ReleaseTempBuffer(dev, data, __LINE__);
++ if (local_data)
++ yaffs_release_temp_buffer(dev, data, __LINE__);
+
-+ if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
-+ tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
++ if (tags && retval == -EBADMSG
++ && tags->ecc_result == YAFFS_ECC_RESULT_NO_ERROR) {
++ tags->ecc_result = YAFFS_ECC_RESULT_UNFIXED;
++ dev->n_ecc_unfixed++;
++ }
++ if (tags && retval == -EUCLEAN
++ && tags->ecc_result == YAFFS_ECC_RESULT_NO_ERROR) {
++ tags->ecc_result = YAFFS_ECC_RESULT_FIXED;
++ dev->n_ecc_fixed++;
++ }
+ if (retval == 0)
+ return YAFFS_OK;
+ else
+ return YAFFS_FAIL;
+}
+
-+int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
++int nandmtd2_mark_block_bad(struct yaffs_dev *dev, int block_no)
+{
-+ struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
++ struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
+ int retval;
+ T(YAFFS_TRACE_MTD,
-+ (TSTR("nandmtd2_MarkNANDBlockBad %d" TENDSTR), blockNo));
++ (TSTR("nandmtd2_mark_block_bad %d" TENDSTR), block_no));
+
+ retval =
+ mtd->block_markbad(mtd,
-+ blockNo * dev->nChunksPerBlock *
-+ dev->totalBytesPerChunk);
++ block_no * dev->param.chunks_per_block *
++ dev->param.total_bytes_per_chunk);
+
+ if (retval == 0)
+ return YAFFS_OK;
@@ -13078,57 +8811,52 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif2.c linux-2.6.34/fs/yaffs2/yaff
+
+}
+
-+int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
-+ yaffs_BlockState *state, __u32 *sequenceNumber)
++int nandmtd2_query_block(struct yaffs_dev *dev, int block_no,
++ enum yaffs_block_state *state, u32 * seq_number)
+{
-+ struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
++ struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
+ int retval;
+
-+ T(YAFFS_TRACE_MTD,
-+ (TSTR("nandmtd2_QueryNANDBlock %d" TENDSTR), blockNo));
++ T(YAFFS_TRACE_MTD, (TSTR("nandmtd2_query_block %d" TENDSTR), block_no));
+ retval =
+ mtd->block_isbad(mtd,
-+ blockNo * dev->nChunksPerBlock *
-+ dev->totalBytesPerChunk);
++ block_no * dev->param.chunks_per_block *
++ dev->param.total_bytes_per_chunk);
+
+ if (retval) {
+ T(YAFFS_TRACE_MTD, (TSTR("block is bad" TENDSTR)));
+
+ *state = YAFFS_BLOCK_STATE_DEAD;
-+ *sequenceNumber = 0;
++ *seq_number = 0;
+ } else {
-+ yaffs_ExtendedTags t;
-+ nandmtd2_ReadChunkWithTagsFromNAND(dev,
-+ blockNo *
-+ dev->nChunksPerBlock, NULL,
-+ &t);
-+
-+ if (t.chunkUsed) {
-+ *sequenceNumber = t.sequenceNumber;
++ struct yaffs_ext_tags t;
++ nandmtd2_read_chunk_tags(dev, block_no *
++ dev->param.chunks_per_block, NULL, &t);
++
++ if (t.chunk_used) {
++ *seq_number = t.seq_number;
+ *state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
+ } else {
-+ *sequenceNumber = 0;
++ *seq_number = 0;
+ *state = YAFFS_BLOCK_STATE_EMPTY;
+ }
+ }
+ T(YAFFS_TRACE_MTD,
-+ (TSTR("block is bad seq %d state %d" TENDSTR), *sequenceNumber,
-+ *state));
++ (TSTR("block is bad seq %d state %d" TENDSTR), *seq_number, *state));
+
+ if (retval == 0)
+ return YAFFS_OK;
+ else
+ return YAFFS_FAIL;
+}
-+
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif2.h linux-2.6.34/fs/yaffs2/yaffs_mtdif2.h
---- linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif2.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffs_mtdif2.h 2010-05-20 20:16:22.311614862 +0200
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif2.h linux-2.6.36/fs/yaffs2/yaffs_mtdif2.h
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif2.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_mtdif2.h 2010-11-18 18:15:51.000000000 +0100
@@ -0,0 +1,29 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
++ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
@@ -13144,24 +8872,24 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif2.h linux-2.6.34/fs/yaffs2/yaff
+#define __YAFFS_MTDIF2_H__
+
+#include "yaffs_guts.h"
-+int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+ const __u8 *data,
-+ const yaffs_ExtendedTags *tags);
-+int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+ __u8 *data, yaffs_ExtendedTags *tags);
-+int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
-+int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
-+ yaffs_BlockState *state, __u32 *sequenceNumber);
-+
-+#endif
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif.c linux-2.6.34/fs/yaffs2/yaffs_mtdif.c
---- linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffs_mtdif.c 2010-05-20 20:16:22.311614862 +0200
-@@ -0,0 +1,241 @@
++int nandmtd2_write_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
++ const u8 * data,
++ const struct yaffs_ext_tags *tags);
++int nandmtd2_read_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
++ u8 * data, struct yaffs_ext_tags *tags);
++int nandmtd2_mark_block_bad(struct yaffs_dev *dev, int block_no);
++int nandmtd2_query_block(struct yaffs_dev *dev, int block_no,
++ enum yaffs_block_state *state, u32 * seq_number);
++
++#endif
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_nameval.c linux-2.6.36/fs/yaffs2/yaffs_nameval.c
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_nameval.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_nameval.c 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,201 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
++ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
@@ -13171,242 +8899,202 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif.c linux-2.6.34/fs/yaffs2/yaffs
+ * published by the Free Software Foundation.
+ */
+
-+const char *yaffs_mtdif_c_version =
-+ "$Id: yaffs_mtdif.c,v 1.22 2009-03-06 17:20:51 wookey Exp $";
-+
-+#include "yportenv.h"
-+
-+
-+#include "yaffs_mtdif.h"
-+
-+#include "linux/mtd/mtd.h"
-+#include "linux/types.h"
-+#include "linux/time.h"
-+#include "linux/mtd/nand.h"
++/*
++ * This simple implementation of a name-value store assumes a small number of values and fits
++ * into a small finite buffer.
++ *
++ * Each attribute is stored as a record:
++ * sizeof(int) bytes record size.
++ * strnlen+1 bytes name null terminated.
++ * nbytes value.
++ * ----------
++ * total size stored in record size
++ *
++ * This code has not been tested with unicode yet.
++ */
+
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 18))
-+static struct nand_oobinfo yaffs_oobinfo = {
-+ .useecc = 1,
-+ .eccbytes = 6,
-+ .eccpos = {8, 9, 10, 13, 14, 15}
-+};
++#include "yaffs_nameval.h"
+
-+static struct nand_oobinfo yaffs_noeccinfo = {
-+ .useecc = 0,
-+};
-+#endif
++#include "yportenv.h"
+
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
-+static inline void translate_spare2oob(const yaffs_Spare *spare, __u8 *oob)
++static int nval_find(const char *xb, int xb_size, const YCHAR * name,
++ int *exist_size)
+{
-+ oob[0] = spare->tagByte0;
-+ oob[1] = spare->tagByte1;
-+ oob[2] = spare->tagByte2;
-+ oob[3] = spare->tagByte3;
-+ oob[4] = spare->tagByte4;
-+ oob[5] = spare->tagByte5 & 0x3f;
-+ oob[5] |= spare->blockStatus == 'Y' ? 0 : 0x80;
-+ oob[5] |= spare->pageStatus == 0 ? 0 : 0x40;
-+ oob[6] = spare->tagByte6;
-+ oob[7] = spare->tagByte7;
++ int pos = 0;
++ int size;
++
++ memcpy(&size, xb, sizeof(int));
++ while (size > 0 && (size < xb_size) && (pos + size < xb_size)) {
++ if (yaffs_strncmp
++ ((YCHAR *) (xb + pos + sizeof(int)), name, size) == 0) {
++ if (exist_size)
++ *exist_size = size;
++ return pos;
++ }
++ pos += size;
++ if (pos < xb_size - sizeof(int))
++ memcpy(&size, xb + pos, sizeof(int));
++ else
++ size = 0;
++ }
++ if (exist_size)
++ *exist_size = 0;
++ return -1;
+}
+
-+static inline void translate_oob2spare(yaffs_Spare *spare, __u8 *oob)
++static int nval_used(const char *xb, int xb_size)
+{
-+ struct yaffs_NANDSpare *nspare = (struct yaffs_NANDSpare *)spare;
-+ spare->tagByte0 = oob[0];
-+ spare->tagByte1 = oob[1];
-+ spare->tagByte2 = oob[2];
-+ spare->tagByte3 = oob[3];
-+ spare->tagByte4 = oob[4];
-+ spare->tagByte5 = oob[5] == 0xff ? 0xff : oob[5] & 0x3f;
-+ spare->blockStatus = oob[5] & 0x80 ? 0xff : 'Y';
-+ spare->pageStatus = oob[5] & 0x40 ? 0xff : 0;
-+ spare->ecc1[0] = spare->ecc1[1] = spare->ecc1[2] = 0xff;
-+ spare->tagByte6 = oob[6];
-+ spare->tagByte7 = oob[7];
-+ spare->ecc2[0] = spare->ecc2[1] = spare->ecc2[2] = 0xff;
++ int pos = 0;
++ int size;
+
-+ nspare->eccres1 = nspare->eccres2 = 0; /* FIXME */
++ memcpy(&size, xb + pos, sizeof(int));
++ while (size > 0 && (size < xb_size) && (pos + size < xb_size)) {
++ pos += size;
++ if (pos < xb_size - sizeof(int))
++ memcpy(&size, xb + pos, sizeof(int));
++ else
++ size = 0;
++ }
++ return pos;
+}
-+#endif
+
-+int nandmtd_WriteChunkToNAND(yaffs_Device *dev, int chunkInNAND,
-+ const __u8 *data, const yaffs_Spare *spare)
++int nval_del(char *xb, int xb_size, const YCHAR * name)
+{
-+ struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
-+ struct mtd_oob_ops ops;
-+#endif
-+ size_t dummy;
-+ int retval = 0;
++ int pos = nval_find(xb, xb_size, name, NULL);
++ int size;
+
-+ loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
-+ __u8 spareAsBytes[8]; /* OOB */
-+
-+ if (data && !spare)
-+ retval = mtd->write(mtd, addr, dev->nDataBytesPerChunk,
-+ &dummy, data);
-+ else if (spare) {
-+ if (dev->useNANDECC) {
-+ translate_spare2oob(spare, spareAsBytes);
-+ ops.mode = MTD_OOB_AUTO;
-+ ops.ooblen = 8; /* temp hack */
-+ } else {
-+ ops.mode = MTD_OOB_RAW;
-+ ops.ooblen = YAFFS_BYTES_PER_SPARE;
-+ }
-+ ops.len = data ? dev->nDataBytesPerChunk : ops.ooblen;
-+ ops.datbuf = (u8 *)data;
-+ ops.ooboffs = 0;
-+ ops.oobbuf = spareAsBytes;
-+ retval = mtd->write_oob(mtd, addr, &ops);
-+ }
-+#else
-+ __u8 *spareAsBytes = (__u8 *) spare;
-+
-+ if (data && spare) {
-+ if (dev->useNANDECC)
-+ retval =
-+ mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
-+ &dummy, data, spareAsBytes,
-+ &yaffs_oobinfo);
-+ else
-+ retval =
-+ mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
-+ &dummy, data, spareAsBytes,
-+ &yaffs_noeccinfo);
++ if (pos >= 0 && pos < xb_size) {
++ /* Find size, shift rest over this record, then zero out the rest of buffer */
++ memcpy(&size, xb + pos, sizeof(int));
++ memcpy(xb + pos, xb + pos + size, xb_size - (pos + size));
++ memset(xb + (xb_size - size), 0, size);
++ return 0;
+ } else {
-+ if (data)
-+ retval =
-+ mtd->write(mtd, addr, dev->nDataBytesPerChunk, &dummy,
-+ data);
-+ if (spare)
-+ retval =
-+ mtd->write_oob(mtd, addr, YAFFS_BYTES_PER_SPARE,
-+ &dummy, spareAsBytes);
-+ }
-+#endif
-+
-+ if (retval == 0)
-+ return YAFFS_OK;
-+ else
-+ return YAFFS_FAIL;
++ return -ENODATA;
++ }
+}
+
-+int nandmtd_ReadChunkFromNAND(yaffs_Device *dev, int chunkInNAND, __u8 *data,
-+ yaffs_Spare *spare)
++int nval_set(char *xb, int xb_size, const YCHAR * name, const char *buf,
++ int bsize, int flags)
+{
-+ struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
-+ struct mtd_oob_ops ops;
-+#endif
-+ size_t dummy;
-+ int retval = 0;
++ int pos;
++ int namelen = yaffs_strnlen(name, xb_size);
++ int reclen;
++ int size_exist = 0;
++ int space;
++ int start;
+
-+ loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
-+ __u8 spareAsBytes[8]; /* OOB */
-+
-+ if (data && !spare)
-+ retval = mtd->read(mtd, addr, dev->nDataBytesPerChunk,
-+ &dummy, data);
-+ else if (spare) {
-+ if (dev->useNANDECC) {
-+ ops.mode = MTD_OOB_AUTO;
-+ ops.ooblen = 8; /* temp hack */
-+ } else {
-+ ops.mode = MTD_OOB_RAW;
-+ ops.ooblen = YAFFS_BYTES_PER_SPARE;
-+ }
-+ ops.len = data ? dev->nDataBytesPerChunk : ops.ooblen;
-+ ops.datbuf = data;
-+ ops.ooboffs = 0;
-+ ops.oobbuf = spareAsBytes;
-+ retval = mtd->read_oob(mtd, addr, &ops);
-+ if (dev->useNANDECC)
-+ translate_oob2spare(spare, spareAsBytes);
-+ }
-+#else
-+ __u8 *spareAsBytes = (__u8 *) spare;
-+
-+ if (data && spare) {
-+ if (dev->useNANDECC) {
-+ /* Careful, this call adds 2 ints */
-+ /* to the end of the spare data. Calling function */
-+ /* should allocate enough memory for spare, */
-+ /* i.e. [YAFFS_BYTES_PER_SPARE+2*sizeof(int)]. */
-+ retval =
-+ mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
-+ &dummy, data, spareAsBytes,
-+ &yaffs_oobinfo);
-+ } else {
-+ retval =
-+ mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
-+ &dummy, data, spareAsBytes,
-+ &yaffs_noeccinfo);
-+ }
-+ } else {
-+ if (data)
-+ retval =
-+ mtd->read(mtd, addr, dev->nDataBytesPerChunk, &dummy,
-+ data);
-+ if (spare)
-+ retval =
-+ mtd->read_oob(mtd, addr, YAFFS_BYTES_PER_SPARE,
-+ &dummy, spareAsBytes);
++ pos = nval_find(xb, xb_size, name, &size_exist);
++
++ if (flags & XATTR_CREATE && pos >= 0)
++ return -EEXIST;
++ if (flags & XATTR_REPLACE && pos < 0)
++ return -ENODATA;
++
++ start = nval_used(xb, xb_size);
++ space = xb_size - start + size_exist;
++
++ reclen = (sizeof(int) + namelen + 1 + bsize);
++
++ if (reclen > space)
++ return -ENOSPC;
++
++ if (pos >= 0) {
++ nval_del(xb, xb_size, name);
++ start = nval_used(xb, xb_size);
+ }
-+#endif
+
-+ if (retval == 0)
-+ return YAFFS_OK;
-+ else
-+ return YAFFS_FAIL;
++ pos = start;
++
++ memcpy(xb + pos, &reclen, sizeof(int));
++ pos += sizeof(int);
++ yaffs_strncpy((YCHAR *) (xb + pos), name, reclen);
++ pos += (namelen + 1);
++ memcpy(xb + pos, buf, bsize);
++ return 0;
+}
+
-+int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
++int nval_get(const char *xb, int xb_size, const YCHAR * name, char *buf,
++ int bsize)
+{
-+ struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
-+ __u32 addr =
-+ ((loff_t) blockNumber) * dev->nDataBytesPerChunk
-+ * dev->nChunksPerBlock;
-+ struct erase_info ei;
-+ int retval = 0;
++ int pos = nval_find(xb, xb_size, name, NULL);
++ int size;
+
-+ ei.mtd = mtd;
-+ ei.addr = addr;
-+ ei.len = dev->nDataBytesPerChunk * dev->nChunksPerBlock;
-+ ei.time = 1000;
-+ ei.retries = 2;
-+ ei.callback = NULL;
-+ ei.priv = (u_long) dev;
++ if (pos >= 0 && pos < xb_size) {
+
-+ /* Todo finish off the ei if required */
++ memcpy(&size, xb + pos, sizeof(int));
++ pos += sizeof(int); /* advance past record length */
++ size -= sizeof(int);
+
-+ sema_init(&dev->sem, 0);
++ /* Advance over name string */
++ while (xb[pos] && size > 0 && pos < xb_size) {
++ pos++;
++ size--;
++ }
++ /*Advance over NUL */
++ pos++;
++ size--;
+
-+ retval = mtd->erase(mtd, &ei);
++ if (size <= bsize) {
++ memcpy(buf, xb + pos, size);
++ return size;
++ }
+
-+ if (retval == 0)
-+ return YAFFS_OK;
++ }
++ if (pos >= 0)
++ return -ERANGE;
+ else
-+ return YAFFS_FAIL;
++ return -ENODATA;
+}
+
-+int nandmtd_InitialiseNAND(yaffs_Device *dev)
++int nval_list(const char *xb, int xb_size, char *buf, int bsize)
+{
-+ return YAFFS_OK;
++ int pos = 0;
++ int size;
++ int name_len;
++ int ncopied = 0;
++ int filled = 0;
++
++ memcpy(&size, xb + pos, sizeof(int));
++ while (size > sizeof(int) && size <= xb_size && (pos + size) < xb_size
++ && !filled) {
++ pos += sizeof(int);
++ size -= sizeof(int);
++ name_len = yaffs_strnlen((YCHAR *) (xb + pos), size);
++ if (ncopied + name_len + 1 < bsize) {
++ memcpy(buf, xb + pos, name_len * sizeof(YCHAR));
++ buf += name_len;
++ *buf = '\0';
++ buf++;
++ if (sizeof(YCHAR) > 1) {
++ *buf = '\0';
++ buf++;
++ }
++ ncopied += (name_len + 1);
++ } else {
++ filled = 1;
++ }
++ pos += size;
++ if (pos < xb_size - sizeof(int))
++ memcpy(&size, xb + pos, sizeof(int));
++ else
++ size = 0;
++ }
++ return ncopied;
+}
+
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif.h linux-2.6.34/fs/yaffs2/yaffs_mtdif.h
---- linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffs_mtdif.h 2010-05-20 20:16:22.311614862 +0200
-@@ -0,0 +1,32 @@
++int nval_hasvalues(const char *xb, int xb_size)
++{
++ return nval_used(xb, xb_size) > 0;
++}
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_nameval.h linux-2.6.36/fs/yaffs2/yaffs_nameval.h
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_nameval.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_nameval.h 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,28 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
++ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
@@ -13418,31 +9106,27 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_mtdif.h linux-2.6.34/fs/yaffs2/yaffs
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
-+#ifndef __YAFFS_MTDIF_H__
-+#define __YAFFS_MTDIF_H__
-+
-+#include "yaffs_guts.h"
++#ifndef __NAMEVAL_H__
++#define __NAMEVAL_H__
+
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 18))
-+extern struct nand_oobinfo yaffs_oobinfo;
-+extern struct nand_oobinfo yaffs_noeccinfo;
-+#endif
++#include "yportenv.h"
+
-+int nandmtd_WriteChunkToNAND(yaffs_Device *dev, int chunkInNAND,
-+ const __u8 *data, const yaffs_Spare *spare);
-+int nandmtd_ReadChunkFromNAND(yaffs_Device *dev, int chunkInNAND, __u8 *data,
-+ yaffs_Spare *spare);
-+int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber);
-+int nandmtd_InitialiseNAND(yaffs_Device *dev);
++int nval_del(char *xb, int xb_size, const YCHAR * name);
++int nval_set(char *xb, int xb_size, const YCHAR * name, const char *buf,
++ int bsize, int flags);
++int nval_get(const char *xb, int xb_size, const YCHAR * name, char *buf,
++ int bsize);
++int nval_list(const char *xb, int xb_size, char *buf, int bsize);
++int nval_hasvalues(const char *xb, int xb_size);
+#endif
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_nand.c linux-2.6.34/fs/yaffs2/yaffs_nand.c
---- linux-2.6.34.orig/fs/yaffs2/yaffs_nand.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffs_nand.c 2010-05-20 20:16:22.311614862 +0200
-@@ -0,0 +1,135 @@
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_nand.c linux-2.6.36/fs/yaffs2/yaffs_nand.c
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_nand.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_nand.c 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,128 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
++ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
@@ -13452,179 +9136,129 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_nand.c linux-2.6.34/fs/yaffs2/yaffs_
+ * published by the Free Software Foundation.
+ */
+
-+const char *yaffs_nand_c_version =
-+ "$Id: yaffs_nand.c,v 1.10 2009-03-06 17:20:54 wookey Exp $";
-+
+#include "yaffs_nand.h"
+#include "yaffs_tagscompat.h"
+#include "yaffs_tagsvalidity.h"
+
+#include "yaffs_getblockinfo.h"
+
-+int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+ __u8 *buffer,
-+ yaffs_ExtendedTags *tags)
++int yaffs_rd_chunk_tags_nand(struct yaffs_dev *dev, int nand_chunk,
++ u8 * buffer, struct yaffs_ext_tags *tags)
+{
+ int result;
-+ yaffs_ExtendedTags localTags;
++ struct yaffs_ext_tags local_tags;
+
-+ int realignedChunkInNAND = chunkInNAND - dev->chunkOffset;
++ int realigned_chunk = nand_chunk - dev->chunk_offset;
++
++ dev->n_page_reads++;
+
+ /* If there are no tags provided, use local tags to get prioritised gc working */
+ if (!tags)
-+ tags = &localTags;
++ tags = &local_tags;
+
-+ if (dev->readChunkWithTagsFromNAND)
-+ result = dev->readChunkWithTagsFromNAND(dev, realignedChunkInNAND, buffer,
-+ tags);
++ if (dev->param.read_chunk_tags_fn)
++ result =
++ dev->param.read_chunk_tags_fn(dev, realigned_chunk, buffer,
++ tags);
+ else
-+ result = yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(dev,
-+ realignedChunkInNAND,
-+ buffer,
-+ tags);
-+ if (tags &&
-+ tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR) {
++ result = yaffs_tags_compat_rd(dev,
++ realigned_chunk, buffer, tags);
++ if (tags && tags->ecc_result > YAFFS_ECC_RESULT_NO_ERROR) {
+
-+ yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock);
-+ yaffs_HandleChunkError(dev, bi);
++ struct yaffs_block_info *bi;
++ bi = yaffs_get_block_info(dev,
++ nand_chunk /
++ dev->param.chunks_per_block);
++ yaffs_handle_chunk_error(dev, bi);
+ }
+
+ return result;
+}
+
-+int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
-+ int chunkInNAND,
-+ const __u8 *buffer,
-+ yaffs_ExtendedTags *tags)
++int yaffs_wr_chunk_tags_nand(struct yaffs_dev *dev,
++ int nand_chunk,
++ const u8 * buffer, struct yaffs_ext_tags *tags)
+{
-+ chunkInNAND -= dev->chunkOffset;
+
++ dev->n_page_writes++;
++
++ nand_chunk -= dev->chunk_offset;
+
+ if (tags) {
-+ tags->sequenceNumber = dev->sequenceNumber;
-+ tags->chunkUsed = 1;
-+ if (!yaffs_ValidateTags(tags)) {
++ tags->seq_number = dev->seq_number;
++ tags->chunk_used = 1;
++ if (!yaffs_validate_tags(tags)) {
+ T(YAFFS_TRACE_ERROR,
+ (TSTR("Writing uninitialised tags" TENDSTR)));
+ YBUG();
+ }
+ T(YAFFS_TRACE_WRITE,
-+ (TSTR("Writing chunk %d tags %d %d" TENDSTR), chunkInNAND,
-+ tags->objectId, tags->chunkId));
++ (TSTR("Writing chunk %d tags %d %d" TENDSTR), nand_chunk,
++ tags->obj_id, tags->chunk_id));
+ } else {
+ T(YAFFS_TRACE_ERROR, (TSTR("Writing with no tags" TENDSTR)));
+ YBUG();
+ }
+
-+ if (dev->writeChunkWithTagsToNAND)
-+ return dev->writeChunkWithTagsToNAND(dev, chunkInNAND, buffer,
-+ tags);
++ if (dev->param.write_chunk_tags_fn)
++ return dev->param.write_chunk_tags_fn(dev, nand_chunk, buffer,
++ tags);
+ else
-+ return yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(dev,
-+ chunkInNAND,
-+ buffer,
-+ tags);
++ return yaffs_tags_compat_wr(dev, nand_chunk, buffer, tags);
+}
+
-+int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo)
++int yaffs_mark_bad(struct yaffs_dev *dev, int block_no)
+{
-+ blockNo -= dev->blockOffset;
++ block_no -= dev->block_offset;
+
-+;
-+ if (dev->markNANDBlockBad)
-+ return dev->markNANDBlockBad(dev, blockNo);
++ if (dev->param.bad_block_fn)
++ return dev->param.bad_block_fn(dev, block_no);
+ else
-+ return yaffs_TagsCompatabilityMarkNANDBlockBad(dev, blockNo);
++ return yaffs_tags_compat_mark_bad(dev, block_no);
+}
+
-+int yaffs_QueryInitialBlockState(yaffs_Device *dev,
-+ int blockNo,
-+ yaffs_BlockState *state,
-+ __u32 *sequenceNumber)
++int yaffs_query_init_block_state(struct yaffs_dev *dev,
++ int block_no,
++ enum yaffs_block_state *state,
++ u32 * seq_number)
+{
-+ blockNo -= dev->blockOffset;
++ block_no -= dev->block_offset;
+
-+ if (dev->queryNANDBlock)
-+ return dev->queryNANDBlock(dev, blockNo, state, sequenceNumber);
++ if (dev->param.query_block_fn)
++ return dev->param.query_block_fn(dev, block_no, state,
++ seq_number);
+ else
-+ return yaffs_TagsCompatabilityQueryNANDBlock(dev, blockNo,
-+ state,
-+ sequenceNumber);
++ return yaffs_tags_compat_query_block(dev, block_no,
++ state, seq_number);
+}
+
-+
-+int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
-+ int blockInNAND)
++int yaffs_erase_block(struct yaffs_dev *dev, int flash_block)
+{
+ int result;
+
-+ blockInNAND -= dev->blockOffset;
++ flash_block -= dev->block_offset;
+
++ dev->n_erasures++;
+
-+ dev->nBlockErasures++;
-+ result = dev->eraseBlockInNAND(dev, blockInNAND);
++ result = dev->param.erase_fn(dev, flash_block);
+
+ return result;
+}
+
-+int yaffs_InitialiseNAND(struct yaffs_DeviceStruct *dev)
++int yaffs_init_nand(struct yaffs_dev *dev)
+{
-+ return dev->initialiseNAND(dev);
++ if (dev->param.initialise_flash_fn)
++ return dev->param.initialise_flash_fn(dev);
++ return YAFFS_OK;
+}
-+
-+
-+
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_nandemul2k.h linux-2.6.34/fs/yaffs2/yaffs_nandemul2k.h
---- linux-2.6.34.orig/fs/yaffs2/yaffs_nandemul2k.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffs_nandemul2k.h 2010-05-20 20:16:22.311614862 +0200
-@@ -0,0 +1,39 @@
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_nand.h linux-2.6.36/fs/yaffs2/yaffs_nand.h
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_nand.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_nand.h 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,38 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
-+ * for Toby Churchill Ltd and Brightstar Engineering
-+ *
-+ * Created by Charles Manning <charles@aleph1.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 2.1 as
-+ * published by the Free Software Foundation.
-+ *
-+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
-+ */
-+
-+/* Interface to emulated NAND functions (2k page size) */
-+
-+#ifndef __YAFFS_NANDEMUL2K_H__
-+#define __YAFFS_NANDEMUL2K_H__
-+
-+#include "yaffs_guts.h"
-+
-+int nandemul2k_WriteChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
-+ int chunkInNAND, const __u8 *data,
-+ const yaffs_ExtendedTags *tags);
-+int nandemul2k_ReadChunkWithTagsFromNAND(struct yaffs_DeviceStruct *dev,
-+ int chunkInNAND, __u8 *data,
-+ yaffs_ExtendedTags *tags);
-+int nandemul2k_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
-+int nandemul2k_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
-+ yaffs_BlockState *state, __u32 *sequenceNumber);
-+int nandemul2k_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
-+ int blockInNAND);
-+int nandemul2k_InitialiseNAND(struct yaffs_DeviceStruct *dev);
-+int nandemul2k_GetBytesPerChunk(void);
-+int nandemul2k_GetChunksPerBlock(void);
-+int nandemul2k_GetNumberOfBlocks(void);
-+
-+#endif
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_nand.h linux-2.6.34/fs/yaffs2/yaffs_nand.h
---- linux-2.6.34.orig/fs/yaffs2/yaffs_nand.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffs_nand.h 2010-05-20 20:16:22.311614862 +0200
-@@ -0,0 +1,44 @@
-+/*
-+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
-+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
++ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
@@ -13640,39 +9274,33 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_nand.h linux-2.6.34/fs/yaffs2/yaffs_
+#define __YAFFS_NAND_H__
+#include "yaffs_guts.h"
+
++int yaffs_rd_chunk_tags_nand(struct yaffs_dev *dev, int nand_chunk,
++ u8 * buffer, struct yaffs_ext_tags *tags);
+
++int yaffs_wr_chunk_tags_nand(struct yaffs_dev *dev,
++ int nand_chunk,
++ const u8 * buffer, struct yaffs_ext_tags *tags);
+
-+int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+ __u8 *buffer,
-+ yaffs_ExtendedTags *tags);
-+
-+int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
-+ int chunkInNAND,
-+ const __u8 *buffer,
-+ yaffs_ExtendedTags *tags);
-+
-+int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo);
++int yaffs_mark_bad(struct yaffs_dev *dev, int block_no);
+
-+int yaffs_QueryInitialBlockState(yaffs_Device *dev,
-+ int blockNo,
-+ yaffs_BlockState *state,
-+ unsigned *sequenceNumber);
++int yaffs_query_init_block_state(struct yaffs_dev *dev,
++ int block_no,
++ enum yaffs_block_state *state,
++ unsigned *seq_number);
+
-+int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
-+ int blockInNAND);
++int yaffs_erase_block(struct yaffs_dev *dev, int flash_block);
+
-+int yaffs_InitialiseNAND(struct yaffs_DeviceStruct *dev);
++int yaffs_init_nand(struct yaffs_dev *dev);
+
+#endif
-+
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_packedtags1.c linux-2.6.34/fs/yaffs2/yaffs_packedtags1.c
---- linux-2.6.34.orig/fs/yaffs2/yaffs_packedtags1.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffs_packedtags1.c 2010-05-20 20:16:22.311614862 +0200
-@@ -0,0 +1,50 @@
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_packedtags1.c linux-2.6.36/fs/yaffs2/yaffs_packedtags1.c
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_packedtags1.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_packedtags1.c 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,53 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
++ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
@@ -13685,48 +9313,51 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_packedtags1.c linux-2.6.34/fs/yaffs2
+#include "yaffs_packedtags1.h"
+#include "yportenv.h"
+
-+void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t)
++void yaffs_pack_tags1(struct yaffs_packed_tags1 *pt,
++ const struct yaffs_ext_tags *t)
+{
-+ pt->chunkId = t->chunkId;
-+ pt->serialNumber = t->serialNumber;
-+ pt->byteCount = t->byteCount;
-+ pt->objectId = t->objectId;
++ pt->chunk_id = t->chunk_id;
++ pt->serial_number = t->serial_number;
++ pt->n_bytes = t->n_bytes;
++ pt->obj_id = t->obj_id;
+ pt->ecc = 0;
-+ pt->deleted = (t->chunkDeleted) ? 0 : 1;
-+ pt->unusedStuff = 0;
-+ pt->shouldBeFF = 0xFFFFFFFF;
++ pt->deleted = (t->is_deleted) ? 0 : 1;
++ pt->unused_stuff = 0;
++ pt->should_be_ff = 0xFFFFFFFF;
+
+}
+
-+void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt)
++void yaffs_unpack_tags1(struct yaffs_ext_tags *t,
++ const struct yaffs_packed_tags1 *pt)
+{
-+ static const __u8 allFF[] =
++ static const u8 all_ff[] =
+ { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-+0xff };
-+
-+ if (memcmp(allFF, pt, sizeof(yaffs_PackedTags1))) {
-+ t->blockBad = 0;
-+ if (pt->shouldBeFF != 0xFFFFFFFF)
-+ t->blockBad = 1;
-+ t->chunkUsed = 1;
-+ t->objectId = pt->objectId;
-+ t->chunkId = pt->chunkId;
-+ t->byteCount = pt->byteCount;
-+ t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-+ t->chunkDeleted = (pt->deleted) ? 0 : 1;
-+ t->serialNumber = pt->serialNumber;
++ 0xff
++ };
++
++ if (memcmp(all_ff, pt, sizeof(struct yaffs_packed_tags1))) {
++ t->block_bad = 0;
++ if (pt->should_be_ff != 0xFFFFFFFF)
++ t->block_bad = 1;
++ t->chunk_used = 1;
++ t->obj_id = pt->obj_id;
++ t->chunk_id = pt->chunk_id;
++ t->n_bytes = pt->n_bytes;
++ t->ecc_result = YAFFS_ECC_RESULT_NO_ERROR;
++ t->is_deleted = (pt->deleted) ? 0 : 1;
++ t->serial_number = pt->serial_number;
+ } else {
-+ memset(t, 0, sizeof(yaffs_ExtendedTags));
++ memset(t, 0, sizeof(struct yaffs_ext_tags));
+ }
+}
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_packedtags1.h linux-2.6.34/fs/yaffs2/yaffs_packedtags1.h
---- linux-2.6.34.orig/fs/yaffs2/yaffs_packedtags1.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffs_packedtags1.h 2010-05-20 20:16:22.311614862 +0200
-@@ -0,0 +1,37 @@
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_packedtags1.h linux-2.6.36/fs/yaffs2/yaffs_packedtags1.h
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_packedtags1.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_packedtags1.h 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,39 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
++ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
@@ -13745,29 +9376,31 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_packedtags1.h linux-2.6.34/fs/yaffs2
+
+#include "yaffs_guts.h"
+
-+typedef struct {
-+ unsigned chunkId:20;
-+ unsigned serialNumber:2;
-+ unsigned byteCount:10;
-+ unsigned objectId:18;
++struct yaffs_packed_tags1 {
++ unsigned chunk_id:20;
++ unsigned serial_number:2;
++ unsigned n_bytes:10;
++ unsigned obj_id:18;
+ unsigned ecc:12;
+ unsigned deleted:1;
-+ unsigned unusedStuff:1;
-+ unsigned shouldBeFF;
++ unsigned unused_stuff:1;
++ unsigned should_be_ff;
+
-+} yaffs_PackedTags1;
++};
+
-+void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt);
++void yaffs_pack_tags1(struct yaffs_packed_tags1 *pt,
++ const struct yaffs_ext_tags *t);
++void yaffs_unpack_tags1(struct yaffs_ext_tags *t,
++ const struct yaffs_packed_tags1 *pt);
+#endif
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_packedtags2.c linux-2.6.34/fs/yaffs2/yaffs_packedtags2.c
---- linux-2.6.34.orig/fs/yaffs2/yaffs_packedtags2.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffs_packedtags2.c 2010-05-20 20:16:22.311614862 +0200
-@@ -0,0 +1,206 @@
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_packedtags2.c linux-2.6.36/fs/yaffs2/yaffs_packedtags2.c
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_packedtags2.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_packedtags2.c 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,197 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
++ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
@@ -13779,6 +9412,7 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_packedtags2.c linux-2.6.34/fs/yaffs2
+
+#include "yaffs_packedtags2.h"
+#include "yportenv.h"
++#include "yaffs_trace.h"
+#include "yaffs_tagsvalidity.h"
+
+/* This code packs a set of extended tags into a binary structure for
@@ -13790,7 +9424,7 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_packedtags2.c linux-2.6.34/fs/yaffs2
+ * This is defined by having the EXTRA_HEADER_INFO_FLAG set.
+ */
+
-+/* Extra flags applied to chunkId */
++/* Extra flags applied to chunk_id */
+
+#define EXTRA_HEADER_INFO_FLAG 0x80000000
+#define EXTRA_SHRINK_FLAG 0x40000000
@@ -13803,181 +9437,171 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_packedtags2.c linux-2.6.34/fs/yaffs2
+#define EXTRA_OBJECT_TYPE_SHIFT (28)
+#define EXTRA_OBJECT_TYPE_MASK ((0x0F) << EXTRA_OBJECT_TYPE_SHIFT)
+
-+
-+static void yaffs_DumpPackedTags2TagsPart(const yaffs_PackedTags2TagsPart *ptt)
++static void yaffs_dump_packed_tags2_tags_only(const struct
++ yaffs_packed_tags2_tags_only *ptt)
+{
+ T(YAFFS_TRACE_MTD,
+ (TSTR("packed tags obj %d chunk %d byte %d seq %d" TENDSTR),
-+ ptt->objectId, ptt->chunkId, ptt->byteCount,
-+ ptt->sequenceNumber));
++ ptt->obj_id, ptt->chunk_id, ptt->n_bytes, ptt->seq_number));
+}
-+static void yaffs_DumpPackedTags2(const yaffs_PackedTags2 *pt)
++
++static void yaffs_dump_packed_tags2(const struct yaffs_packed_tags2 *pt)
+{
-+ yaffs_DumpPackedTags2TagsPart(&pt->t);
++ yaffs_dump_packed_tags2_tags_only(&pt->t);
+}
+
-+static void yaffs_DumpTags2(const yaffs_ExtendedTags *t)
++static void yaffs_dump_tags2(const struct yaffs_ext_tags *t)
+{
+ T(YAFFS_TRACE_MTD,
+ (TSTR
+ ("ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte %d del %d ser %d seq %d"
-+ TENDSTR), t->eccResult, t->blockBad, t->chunkUsed, t->objectId,
-+ t->chunkId, t->byteCount, t->chunkDeleted, t->serialNumber,
-+ t->sequenceNumber));
++ TENDSTR), t->ecc_result, t->block_bad, t->chunk_used, t->obj_id,
++ t->chunk_id, t->n_bytes, t->is_deleted, t->serial_number,
++ t->seq_number));
+
+}
+
-+void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *ptt,
-+ const yaffs_ExtendedTags *t)
++void yaffs_pack_tags2_tags_only(struct yaffs_packed_tags2_tags_only *ptt,
++ const struct yaffs_ext_tags *t)
+{
-+ ptt->chunkId = t->chunkId;
-+ ptt->sequenceNumber = t->sequenceNumber;
-+ ptt->byteCount = t->byteCount;
-+ ptt->objectId = t->objectId;
++ ptt->chunk_id = t->chunk_id;
++ ptt->seq_number = t->seq_number;
++ ptt->n_bytes = t->n_bytes;
++ ptt->obj_id = t->obj_id;
+
-+ if (t->chunkId == 0 && t->extraHeaderInfoAvailable) {
++ if (t->chunk_id == 0 && t->extra_available) {
+ /* Store the extra header info instead */
-+ /* We save the parent object in the chunkId */
-+ ptt->chunkId = EXTRA_HEADER_INFO_FLAG
-+ | t->extraParentObjectId;
-+ if (t->extraIsShrinkHeader)
-+ ptt->chunkId |= EXTRA_SHRINK_FLAG;
-+ if (t->extraShadows)
-+ ptt->chunkId |= EXTRA_SHADOWS_FLAG;
-+
-+ ptt->objectId &= ~EXTRA_OBJECT_TYPE_MASK;
-+ ptt->objectId |=
-+ (t->extraObjectType << EXTRA_OBJECT_TYPE_SHIFT);
-+
-+ if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK)
-+ ptt->byteCount = t->extraEquivalentObjectId;
-+ else if (t->extraObjectType == YAFFS_OBJECT_TYPE_FILE)
-+ ptt->byteCount = t->extraFileLength;
++ /* We save the parent object in the chunk_id */
++ ptt->chunk_id = EXTRA_HEADER_INFO_FLAG | t->extra_parent_id;
++ if (t->extra_is_shrink)
++ ptt->chunk_id |= EXTRA_SHRINK_FLAG;
++ if (t->extra_shadows)
++ ptt->chunk_id |= EXTRA_SHADOWS_FLAG;
++
++ ptt->obj_id &= ~EXTRA_OBJECT_TYPE_MASK;
++ ptt->obj_id |= (t->extra_obj_type << EXTRA_OBJECT_TYPE_SHIFT);
++
++ if (t->extra_obj_type == YAFFS_OBJECT_TYPE_HARDLINK)
++ ptt->n_bytes = t->extra_equiv_id;
++ else if (t->extra_obj_type == YAFFS_OBJECT_TYPE_FILE)
++ ptt->n_bytes = t->extra_length;
+ else
-+ ptt->byteCount = 0;
++ ptt->n_bytes = 0;
+ }
+
-+ yaffs_DumpPackedTags2TagsPart(ptt);
-+ yaffs_DumpTags2(t);
++ yaffs_dump_packed_tags2_tags_only(ptt);
++ yaffs_dump_tags2(t);
+}
+
-+
-+void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t)
++void yaffs_pack_tags2(struct yaffs_packed_tags2 *pt,
++ const struct yaffs_ext_tags *t, int tags_ecc)
+{
-+ yaffs_PackTags2TagsPart(&pt->t, t);
++ yaffs_pack_tags2_tags_only(&pt->t, t);
+
-+#ifndef YAFFS_IGNORE_TAGS_ECC
-+ {
-+ yaffs_ECCCalculateOther((unsigned char *)&pt->t,
-+ sizeof(yaffs_PackedTags2TagsPart),
-+ &pt->ecc);
-+ }
-+#endif
++ if (tags_ecc)
++ yaffs_ecc_calc_other((unsigned char *)&pt->t,
++ sizeof(struct
++ yaffs_packed_tags2_tags_only),
++ &pt->ecc);
+}
+
-+
-+void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t,
-+ yaffs_PackedTags2TagsPart *ptt)
++void yaffs_unpack_tags2_tags_only(struct yaffs_ext_tags *t,
++ struct yaffs_packed_tags2_tags_only *ptt)
+{
+
-+ memset(t, 0, sizeof(yaffs_ExtendedTags));
++ memset(t, 0, sizeof(struct yaffs_ext_tags));
+
-+ yaffs_InitialiseTags(t);
++ yaffs_init_tags(t);
+
-+ if (ptt->sequenceNumber != 0xFFFFFFFF) {
-+ t->blockBad = 0;
-+ t->chunkUsed = 1;
-+ t->objectId = ptt->objectId;
-+ t->chunkId = ptt->chunkId;
-+ t->byteCount = ptt->byteCount;
-+ t->chunkDeleted = 0;
-+ t->serialNumber = 0;
-+ t->sequenceNumber = ptt->sequenceNumber;
++ if (ptt->seq_number != 0xFFFFFFFF) {
++ t->block_bad = 0;
++ t->chunk_used = 1;
++ t->obj_id = ptt->obj_id;
++ t->chunk_id = ptt->chunk_id;
++ t->n_bytes = ptt->n_bytes;
++ t->is_deleted = 0;
++ t->serial_number = 0;
++ t->seq_number = ptt->seq_number;
+
+ /* Do extra header info stuff */
+
-+ if (ptt->chunkId & EXTRA_HEADER_INFO_FLAG) {
-+ t->chunkId = 0;
-+ t->byteCount = 0;
-+
-+ t->extraHeaderInfoAvailable = 1;
-+ t->extraParentObjectId =
-+ ptt->chunkId & (~(ALL_EXTRA_FLAGS));
-+ t->extraIsShrinkHeader =
-+ (ptt->chunkId & EXTRA_SHRINK_FLAG) ? 1 : 0;
-+ t->extraShadows =
-+ (ptt->chunkId & EXTRA_SHADOWS_FLAG) ? 1 : 0;
-+ t->extraObjectType =
-+ ptt->objectId >> EXTRA_OBJECT_TYPE_SHIFT;
-+ t->objectId &= ~EXTRA_OBJECT_TYPE_MASK;
-+
-+ if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK)
-+ t->extraEquivalentObjectId = ptt->byteCount;
++ if (ptt->chunk_id & EXTRA_HEADER_INFO_FLAG) {
++ t->chunk_id = 0;
++ t->n_bytes = 0;
++
++ t->extra_available = 1;
++ t->extra_parent_id =
++ ptt->chunk_id & (~(ALL_EXTRA_FLAGS));
++ t->extra_is_shrink =
++ (ptt->chunk_id & EXTRA_SHRINK_FLAG) ? 1 : 0;
++ t->extra_shadows =
++ (ptt->chunk_id & EXTRA_SHADOWS_FLAG) ? 1 : 0;
++ t->extra_obj_type =
++ ptt->obj_id >> EXTRA_OBJECT_TYPE_SHIFT;
++ t->obj_id &= ~EXTRA_OBJECT_TYPE_MASK;
++
++ if (t->extra_obj_type == YAFFS_OBJECT_TYPE_HARDLINK)
++ t->extra_equiv_id = ptt->n_bytes;
+ else
-+ t->extraFileLength = ptt->byteCount;
++ t->extra_length = ptt->n_bytes;
+ }
+ }
+
-+ yaffs_DumpPackedTags2TagsPart(ptt);
-+ yaffs_DumpTags2(t);
++ yaffs_dump_packed_tags2_tags_only(ptt);
++ yaffs_dump_tags2(t);
+
+}
+
-+
-+void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt)
++void yaffs_unpack_tags2(struct yaffs_ext_tags *t, struct yaffs_packed_tags2 *pt,
++ int tags_ecc)
+{
+
-+ yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_NO_ERROR;
++ enum yaffs_ecc_result ecc_result = YAFFS_ECC_RESULT_NO_ERROR;
+
-+ if (pt->t.sequenceNumber != 0xFFFFFFFF) {
-+ /* Page is in use */
-+#ifndef YAFFS_IGNORE_TAGS_ECC
-+ {
-+ yaffs_ECCOther ecc;
-+ int result;
-+ yaffs_ECCCalculateOther((unsigned char *)&pt->t,
-+ sizeof
-+ (yaffs_PackedTags2TagsPart),
-+ &ecc);
-+ result =
-+ yaffs_ECCCorrectOther((unsigned char *)&pt->t,
-+ sizeof
-+ (yaffs_PackedTags2TagsPart),
-+ &pt->ecc, &ecc);
-+ switch (result) {
-+ case 0:
-+ eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-+ break;
-+ case 1:
-+ eccResult = YAFFS_ECC_RESULT_FIXED;
-+ break;
-+ case -1:
-+ eccResult = YAFFS_ECC_RESULT_UNFIXED;
-+ break;
-+ default:
-+ eccResult = YAFFS_ECC_RESULT_UNKNOWN;
-+ }
++ if (pt->t.seq_number != 0xFFFFFFFF && tags_ecc) {
++ /* Chunk is in use and we need to do ECC */
++
++ struct yaffs_ecc_other ecc;
++ int result;
++ yaffs_ecc_calc_other((unsigned char *)&pt->t,
++ sizeof(struct
++ yaffs_packed_tags2_tags_only),
++ &ecc);
++ result =
++ yaffs_ecc_correct_other((unsigned char *)&pt->t,
++ sizeof(struct
++ yaffs_packed_tags2_tags_only),
++ &pt->ecc, &ecc);
++ switch (result) {
++ case 0:
++ ecc_result = YAFFS_ECC_RESULT_NO_ERROR;
++ break;
++ case 1:
++ ecc_result = YAFFS_ECC_RESULT_FIXED;
++ break;
++ case -1:
++ ecc_result = YAFFS_ECC_RESULT_UNFIXED;
++ break;
++ default:
++ ecc_result = YAFFS_ECC_RESULT_UNKNOWN;
+ }
-+#endif
+ }
+
-+ yaffs_UnpackTags2TagsPart(t, &pt->t);
-+
-+ t->eccResult = eccResult;
++ yaffs_unpack_tags2_tags_only(t, &pt->t);
+
-+ yaffs_DumpPackedTags2(pt);
-+ yaffs_DumpTags2(t);
++ t->ecc_result = ecc_result;
+
++ yaffs_dump_packed_tags2(pt);
++ yaffs_dump_tags2(t);
+}
-+
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_packedtags2.h linux-2.6.34/fs/yaffs2/yaffs_packedtags2.h
---- linux-2.6.34.orig/fs/yaffs2/yaffs_packedtags2.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffs_packedtags2.h 2010-05-20 20:16:22.311614862 +0200
-@@ -0,0 +1,43 @@
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_packedtags2.h linux-2.6.36/fs/yaffs2/yaffs_packedtags2.h
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_packedtags2.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_packedtags2.h 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,47 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
++ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
@@ -13997,228 +9621,38 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_packedtags2.h linux-2.6.34/fs/yaffs2
+#include "yaffs_guts.h"
+#include "yaffs_ecc.h"
+
-+typedef struct {
-+ unsigned sequenceNumber;
-+ unsigned objectId;
-+ unsigned chunkId;
-+ unsigned byteCount;
-+} yaffs_PackedTags2TagsPart;
++struct yaffs_packed_tags2_tags_only {
++ unsigned seq_number;
++ unsigned obj_id;
++ unsigned chunk_id;
++ unsigned n_bytes;
++};
+
-+typedef struct {
-+ yaffs_PackedTags2TagsPart t;
-+ yaffs_ECCOther ecc;
-+} yaffs_PackedTags2;
++struct yaffs_packed_tags2 {
++ struct yaffs_packed_tags2_tags_only t;
++ struct yaffs_ecc_other ecc;
++};
+
+/* Full packed tags with ECC, used for oob tags */
-+void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt);
++void yaffs_pack_tags2(struct yaffs_packed_tags2 *pt,
++ const struct yaffs_ext_tags *t, int tags_ecc);
++void yaffs_unpack_tags2(struct yaffs_ext_tags *t, struct yaffs_packed_tags2 *pt,
++ int tags_ecc);
+
+/* Only the tags part (no ECC for use with inband tags */
-+void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t, yaffs_PackedTags2TagsPart *pt);
-+#endif
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_qsort.c linux-2.6.34/fs/yaffs2/yaffs_qsort.c
---- linux-2.6.34.orig/fs/yaffs2/yaffs_qsort.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffs_qsort.c 2010-05-20 20:16:22.311614862 +0200
-@@ -0,0 +1,163 @@
-+/*
-+ * Copyright (c) 1992, 1993
-+ * The Regents of the University of California. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. Neither the name of the University nor the names of its contributors
-+ * may be used to endorse or promote products derived from this software
-+ * without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+#include "yportenv.h"
-+/* #include <linux/string.h> */
-+
-+/*
-+ * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
-+ */
-+#define swapcode(TYPE, parmi, parmj, n) do { \
-+ long i = (n) / sizeof (TYPE); \
-+ register TYPE *pi = (TYPE *) (parmi); \
-+ register TYPE *pj = (TYPE *) (parmj); \
-+ do { \
-+ register TYPE t = *pi; \
-+ *pi++ = *pj; \
-+ *pj++ = t; \
-+ } while (--i > 0); \
-+} while (0)
-+
-+#define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
-+ es % sizeof(long) ? 2 : es == sizeof(long) ? 0 : 1;
-+
-+static __inline void
-+swapfunc(char *a, char *b, int n, int swaptype)
-+{
-+ if (swaptype <= 1)
-+ swapcode(long, a, b, n);
-+ else
-+ swapcode(char, a, b, n);
-+}
-+
-+#define yswap(a, b) do { \
-+ if (swaptype == 0) { \
-+ long t = *(long *)(a); \
-+ *(long *)(a) = *(long *)(b); \
-+ *(long *)(b) = t; \
-+ } else \
-+ swapfunc(a, b, es, swaptype); \
-+} while (0)
-+
-+#define vecswap(a, b, n) if ((n) > 0) swapfunc(a, b, n, swaptype)
-+
-+static __inline char *
-+med3(char *a, char *b, char *c, int (*cmp)(const void *, const void *))
-+{
-+ return cmp(a, b) < 0 ?
-+ (cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a))
-+ : (cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c));
-+}
-+
-+#ifndef min
-+#define min(a, b) (((a) < (b)) ? (a) : (b))
++void yaffs_pack_tags2_tags_only(struct yaffs_packed_tags2_tags_only *pt,
++ const struct yaffs_ext_tags *t);
++void yaffs_unpack_tags2_tags_only(struct yaffs_ext_tags *t,
++ struct yaffs_packed_tags2_tags_only *pt);
+#endif
-+
-+void
-+yaffs_qsort(void *aa, size_t n, size_t es,
-+ int (*cmp)(const void *, const void *))
-+{
-+ char *pa, *pb, *pc, *pd, *pl, *pm, *pn;
-+ int d, r, swaptype, swap_cnt;
-+ register char *a = aa;
-+
-+loop: SWAPINIT(a, es);
-+ swap_cnt = 0;
-+ if (n < 7) {
-+ for (pm = (char *)a + es; pm < (char *) a + n * es; pm += es)
-+ for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
-+ pl -= es)
-+ yswap(pl, pl - es);
-+ return;
-+ }
-+ pm = (char *)a + (n / 2) * es;
-+ if (n > 7) {
-+ pl = (char *)a;
-+ pn = (char *)a + (n - 1) * es;
-+ if (n > 40) {
-+ d = (n / 8) * es;
-+ pl = med3(pl, pl + d, pl + 2 * d, cmp);
-+ pm = med3(pm - d, pm, pm + d, cmp);
-+ pn = med3(pn - 2 * d, pn - d, pn, cmp);
-+ }
-+ pm = med3(pl, pm, pn, cmp);
-+ }
-+ yswap(a, pm);
-+ pa = pb = (char *)a + es;
-+
-+ pc = pd = (char *)a + (n - 1) * es;
-+ for (;;) {
-+ while (pb <= pc && (r = cmp(pb, a)) <= 0) {
-+ if (r == 0) {
-+ swap_cnt = 1;
-+ yswap(pa, pb);
-+ pa += es;
-+ }
-+ pb += es;
-+ }
-+ while (pb <= pc && (r = cmp(pc, a)) >= 0) {
-+ if (r == 0) {
-+ swap_cnt = 1;
-+ yswap(pc, pd);
-+ pd -= es;
-+ }
-+ pc -= es;
-+ }
-+ if (pb > pc)
-+ break;
-+ yswap(pb, pc);
-+ swap_cnt = 1;
-+ pb += es;
-+ pc -= es;
-+ }
-+ if (swap_cnt == 0) { /* Switch to insertion sort */
-+ for (pm = (char *) a + es; pm < (char *) a + n * es; pm += es)
-+ for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
-+ pl -= es)
-+ yswap(pl, pl - es);
-+ return;
-+ }
-+
-+ pn = (char *)a + n * es;
-+ r = min(pa - (char *)a, pb - pa);
-+ vecswap(a, pb - r, r);
-+ r = min((long)(pd - pc), (long)(pn - pd - es));
-+ vecswap(pb, pn - r, r);
-+ r = pb - pa;
-+ if (r > es)
-+ yaffs_qsort(a, r / es, es, cmp);
-+ r = pd - pc;
-+ if (r > es) {
-+ /* Iterate rather than recurse to save stack space */
-+ a = pn - r;
-+ n = r / es;
-+ goto loop;
-+ }
-+/* yaffs_qsort(pn - r, r / es, es, cmp);*/
-+}
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_qsort.h linux-2.6.34/fs/yaffs2/yaffs_qsort.h
---- linux-2.6.34.orig/fs/yaffs2/yaffs_qsort.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffs_qsort.h 2010-05-20 20:16:22.311614862 +0200
-@@ -0,0 +1,23 @@
-+/*
-+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
-+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
-+ * for Toby Churchill Ltd and Brightstar Engineering
-+ *
-+ * Created by Charles Manning <charles@aleph1.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 2.1 as
-+ * published by the Free Software Foundation.
-+ *
-+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
-+ */
-+
-+
-+#ifndef __YAFFS_QSORT_H__
-+#define __YAFFS_QSORT_H__
-+
-+extern void yaffs_qsort(void *const base, size_t total_elems, size_t size,
-+ int (*cmp)(const void *, const void *));
-+
-+#endif
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_tagscompat.c linux-2.6.34/fs/yaffs2/yaffs_tagscompat.c
---- linux-2.6.34.orig/fs/yaffs2/yaffs_tagscompat.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffs_tagscompat.c 2010-05-20 20:16:22.311614862 +0200
-@@ -0,0 +1,541 @@
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_tagscompat.c linux-2.6.36/fs/yaffs2/yaffs_tagscompat.c
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_tagscompat.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_tagscompat.c 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,454 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
++ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
@@ -14232,19 +9666,11 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_tagscompat.c linux-2.6.34/fs/yaffs2/
+#include "yaffs_tagscompat.h"
+#include "yaffs_ecc.h"
+#include "yaffs_getblockinfo.h"
++#include "yaffs_trace.h"
+
-+static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND);
-+#ifdef NOTYET
-+static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND);
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+ const __u8 *data,
-+ const yaffs_Spare *spare);
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+ const yaffs_Spare *spare);
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND);
-+#endif
++static void yaffs_handle_rd_data_error(struct yaffs_dev *dev, int nand_chunk);
+
-+static const char yaffs_countBitsTable[256] = {
++static const char yaffs_count_bits_table[256] = {
+ 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4,
+ 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
+ 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
@@ -14263,26 +9689,26 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_tagscompat.c linux-2.6.34/fs/yaffs2/
+ 4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8
+};
+
-+int yaffs_CountBits(__u8 x)
++int yaffs_count_bits(u8 x)
+{
-+ int retVal;
-+ retVal = yaffs_countBitsTable[x];
-+ return retVal;
++ int ret_val;
++ ret_val = yaffs_count_bits_table[x];
++ return ret_val;
+}
+
+/********** Tags ECC calculations *********/
+
-+void yaffs_CalcECC(const __u8 *data, yaffs_Spare *spare)
++void yaffs_calc_ecc(const u8 * data, struct yaffs_spare *spare)
+{
-+ yaffs_ECCCalculate(data, spare->ecc1);
-+ yaffs_ECCCalculate(&data[256], spare->ecc2);
++ yaffs_ecc_cacl(data, spare->ecc1);
++ yaffs_ecc_cacl(&data[256], spare->ecc2);
+}
+
-+void yaffs_CalcTagsECC(yaffs_Tags *tags)
++void yaffs_calc_tags_ecc(struct yaffs_tags *tags)
+{
+ /* Calculate an ecc */
+
-+ unsigned char *b = ((yaffs_TagsUnion *) tags)->asBytes;
++ unsigned char *b = ((union yaffs_tags_union *)tags)->as_bytes;
+ unsigned i, j;
+ unsigned ecc = 0;
+ unsigned bit = 0;
@@ -14301,24 +9727,24 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_tagscompat.c linux-2.6.34/fs/yaffs2/
+
+}
+
-+int yaffs_CheckECCOnTags(yaffs_Tags *tags)
++int yaffs_check_tags_ecc(struct yaffs_tags *tags)
+{
+ unsigned ecc = tags->ecc;
+
-+ yaffs_CalcTagsECC(tags);
++ yaffs_calc_tags_ecc(tags);
+
+ ecc ^= tags->ecc;
+
+ if (ecc && ecc <= 64) {
+ /* TODO: Handle the failure better. Retire? */
-+ unsigned char *b = ((yaffs_TagsUnion *) tags)->asBytes;
++ unsigned char *b = ((union yaffs_tags_union *)tags)->as_bytes;
+
+ ecc--;
+
+ b[ecc / 8] ^= (1 << (ecc & 7));
+
+ /* Now recvalc the ecc */
-+ yaffs_CalcTagsECC(tags);
++ yaffs_calc_tags_ecc(tags);
+
+ return 1; /* recovered error */
+ } else if (ecc) {
@@ -14332,438 +9758,5127 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_tagscompat.c linux-2.6.34/fs/yaffs2/
+
+/********** Tags **********/
+
-+static void yaffs_LoadTagsIntoSpare(yaffs_Spare *sparePtr,
-+ yaffs_Tags *tagsPtr)
++static void yaffs_load_tags_to_spare(struct yaffs_spare *spare_ptr,
++ struct yaffs_tags *tags_ptr)
+{
-+ yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr;
++ union yaffs_tags_union *tu = (union yaffs_tags_union *)tags_ptr;
+
-+ yaffs_CalcTagsECC(tagsPtr);
++ yaffs_calc_tags_ecc(tags_ptr);
+
-+ sparePtr->tagByte0 = tu->asBytes[0];
-+ sparePtr->tagByte1 = tu->asBytes[1];
-+ sparePtr->tagByte2 = tu->asBytes[2];
-+ sparePtr->tagByte3 = tu->asBytes[3];
-+ sparePtr->tagByte4 = tu->asBytes[4];
-+ sparePtr->tagByte5 = tu->asBytes[5];
-+ sparePtr->tagByte6 = tu->asBytes[6];
-+ sparePtr->tagByte7 = tu->asBytes[7];
++ spare_ptr->tb0 = tu->as_bytes[0];
++ spare_ptr->tb1 = tu->as_bytes[1];
++ spare_ptr->tb2 = tu->as_bytes[2];
++ spare_ptr->tb3 = tu->as_bytes[3];
++ spare_ptr->tb4 = tu->as_bytes[4];
++ spare_ptr->tb5 = tu->as_bytes[5];
++ spare_ptr->tb6 = tu->as_bytes[6];
++ spare_ptr->tb7 = tu->as_bytes[7];
+}
+
-+static void yaffs_GetTagsFromSpare(yaffs_Device *dev, yaffs_Spare *sparePtr,
-+ yaffs_Tags *tagsPtr)
++static void yaffs_get_tags_from_spare(struct yaffs_dev *dev,
++ struct yaffs_spare *spare_ptr,
++ struct yaffs_tags *tags_ptr)
+{
-+ yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr;
++ union yaffs_tags_union *tu = (union yaffs_tags_union *)tags_ptr;
+ int result;
+
-+ tu->asBytes[0] = sparePtr->tagByte0;
-+ tu->asBytes[1] = sparePtr->tagByte1;
-+ tu->asBytes[2] = sparePtr->tagByte2;
-+ tu->asBytes[3] = sparePtr->tagByte3;
-+ tu->asBytes[4] = sparePtr->tagByte4;
-+ tu->asBytes[5] = sparePtr->tagByte5;
-+ tu->asBytes[6] = sparePtr->tagByte6;
-+ tu->asBytes[7] = sparePtr->tagByte7;
++ tu->as_bytes[0] = spare_ptr->tb0;
++ tu->as_bytes[1] = spare_ptr->tb1;
++ tu->as_bytes[2] = spare_ptr->tb2;
++ tu->as_bytes[3] = spare_ptr->tb3;
++ tu->as_bytes[4] = spare_ptr->tb4;
++ tu->as_bytes[5] = spare_ptr->tb5;
++ tu->as_bytes[6] = spare_ptr->tb6;
++ tu->as_bytes[7] = spare_ptr->tb7;
+
-+ result = yaffs_CheckECCOnTags(tagsPtr);
++ result = yaffs_check_tags_ecc(tags_ptr);
+ if (result > 0)
-+ dev->tagsEccFixed++;
++ dev->n_tags_ecc_fixed++;
+ else if (result < 0)
-+ dev->tagsEccUnfixed++;
++ dev->n_tags_ecc_unfixed++;
+}
+
-+static void yaffs_SpareInitialise(yaffs_Spare *spare)
++static void yaffs_spare_init(struct yaffs_spare *spare)
+{
-+ memset(spare, 0xFF, sizeof(yaffs_Spare));
++ memset(spare, 0xFF, sizeof(struct yaffs_spare));
+}
+
-+static int yaffs_WriteChunkToNAND(struct yaffs_DeviceStruct *dev,
-+ int chunkInNAND, const __u8 *data,
-+ yaffs_Spare *spare)
++static int yaffs_wr_nand(struct yaffs_dev *dev,
++ int nand_chunk, const u8 * data,
++ struct yaffs_spare *spare)
+{
-+ if (chunkInNAND < dev->startBlock * dev->nChunksPerBlock) {
++ if (nand_chunk < dev->param.start_block * dev->param.chunks_per_block) {
+ T(YAFFS_TRACE_ERROR,
+ (TSTR("**>> yaffs chunk %d is not valid" TENDSTR),
-+ chunkInNAND));
++ nand_chunk));
+ return YAFFS_FAIL;
+ }
+
-+ dev->nPageWrites++;
-+ return dev->writeChunkToNAND(dev, chunkInNAND, data, spare);
++ return dev->param.write_chunk_fn(dev, nand_chunk, data, spare);
+}
+
-+static int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev,
-+ int chunkInNAND,
-+ __u8 *data,
-+ yaffs_Spare *spare,
-+ yaffs_ECCResult *eccResult,
-+ int doErrorCorrection)
++static int yaffs_rd_chunk_nand(struct yaffs_dev *dev,
++ int nand_chunk,
++ u8 * data,
++ struct yaffs_spare *spare,
++ enum yaffs_ecc_result *ecc_result,
++ int correct_errors)
+{
-+ int retVal;
-+ yaffs_Spare localSpare;
-+
-+ dev->nPageReads++;
++ int ret_val;
++ struct yaffs_spare local_spare;
+
+ if (!spare && data) {
+ /* If we don't have a real spare, then we use a local one. */
+ /* Need this for the calculation of the ecc */
-+ spare = &localSpare;
++ spare = &local_spare;
+ }
+
-+ if (!dev->useNANDECC) {
-+ retVal = dev->readChunkFromNAND(dev, chunkInNAND, data, spare);
-+ if (data && doErrorCorrection) {
++ if (!dev->param.use_nand_ecc) {
++ ret_val =
++ dev->param.read_chunk_fn(dev, nand_chunk, data, spare);
++ if (data && correct_errors) {
+ /* Do ECC correction */
+ /* Todo handle any errors */
-+ int eccResult1, eccResult2;
-+ __u8 calcEcc[3];
-+
-+ yaffs_ECCCalculate(data, calcEcc);
-+ eccResult1 =
-+ yaffs_ECCCorrect(data, spare->ecc1, calcEcc);
-+ yaffs_ECCCalculate(&data[256], calcEcc);
-+ eccResult2 =
-+ yaffs_ECCCorrect(&data[256], spare->ecc2, calcEcc);
-+
-+ if (eccResult1 > 0) {
++ int ecc_result1, ecc_result2;
++ u8 calc_ecc[3];
++
++ yaffs_ecc_cacl(data, calc_ecc);
++ ecc_result1 =
++ yaffs_ecc_correct(data, spare->ecc1, calc_ecc);
++ yaffs_ecc_cacl(&data[256], calc_ecc);
++ ecc_result2 =
++ yaffs_ecc_correct(&data[256], spare->ecc2,
++ calc_ecc);
++
++ if (ecc_result1 > 0) {
+ T(YAFFS_TRACE_ERROR,
+ (TSTR
+ ("**>>yaffs ecc error fix performed on chunk %d:0"
-+ TENDSTR), chunkInNAND));
-+ dev->eccFixed++;
-+ } else if (eccResult1 < 0) {
++ TENDSTR), nand_chunk));
++ dev->n_ecc_fixed++;
++ } else if (ecc_result1 < 0) {
+ T(YAFFS_TRACE_ERROR,
+ (TSTR
+ ("**>>yaffs ecc error unfixed on chunk %d:0"
-+ TENDSTR), chunkInNAND));
-+ dev->eccUnfixed++;
++ TENDSTR), nand_chunk));
++ dev->n_ecc_unfixed++;
+ }
+
-+ if (eccResult2 > 0) {
++ if (ecc_result2 > 0) {
+ T(YAFFS_TRACE_ERROR,
+ (TSTR
+ ("**>>yaffs ecc error fix performed on chunk %d:1"
-+ TENDSTR), chunkInNAND));
-+ dev->eccFixed++;
-+ } else if (eccResult2 < 0) {
++ TENDSTR), nand_chunk));
++ dev->n_ecc_fixed++;
++ } else if (ecc_result2 < 0) {
+ T(YAFFS_TRACE_ERROR,
+ (TSTR
+ ("**>>yaffs ecc error unfixed on chunk %d:1"
-+ TENDSTR), chunkInNAND));
-+ dev->eccUnfixed++;
++ TENDSTR), nand_chunk));
++ dev->n_ecc_unfixed++;
+ }
+
-+ if (eccResult1 || eccResult2) {
++ if (ecc_result1 || ecc_result2) {
+ /* We had a data problem on this page */
-+ yaffs_HandleReadDataError(dev, chunkInNAND);
++ yaffs_handle_rd_data_error(dev, nand_chunk);
+ }
+
-+ if (eccResult1 < 0 || eccResult2 < 0)
-+ *eccResult = YAFFS_ECC_RESULT_UNFIXED;
-+ else if (eccResult1 > 0 || eccResult2 > 0)
-+ *eccResult = YAFFS_ECC_RESULT_FIXED;
++ if (ecc_result1 < 0 || ecc_result2 < 0)
++ *ecc_result = YAFFS_ECC_RESULT_UNFIXED;
++ else if (ecc_result1 > 0 || ecc_result2 > 0)
++ *ecc_result = YAFFS_ECC_RESULT_FIXED;
+ else
-+ *eccResult = YAFFS_ECC_RESULT_NO_ERROR;
++ *ecc_result = YAFFS_ECC_RESULT_NO_ERROR;
+ }
+ } else {
+ /* Must allocate enough memory for spare+2*sizeof(int) */
+ /* for ecc results from device. */
-+ struct yaffs_NANDSpare nspare;
++ struct yaffs_nand_spare nspare;
+
+ memset(&nspare, 0, sizeof(nspare));
+
-+ retVal = dev->readChunkFromNAND(dev, chunkInNAND, data,
-+ (yaffs_Spare *) &nspare);
-+ memcpy(spare, &nspare, sizeof(yaffs_Spare));
-+ if (data && doErrorCorrection) {
++ ret_val = dev->param.read_chunk_fn(dev, nand_chunk, data,
++ (struct yaffs_spare *)
++ &nspare);
++ memcpy(spare, &nspare, sizeof(struct yaffs_spare));
++ if (data && correct_errors) {
+ if (nspare.eccres1 > 0) {
+ T(YAFFS_TRACE_ERROR,
+ (TSTR
+ ("**>>mtd ecc error fix performed on chunk %d:0"
-+ TENDSTR), chunkInNAND));
++ TENDSTR), nand_chunk));
+ } else if (nspare.eccres1 < 0) {
+ T(YAFFS_TRACE_ERROR,
+ (TSTR
+ ("**>>mtd ecc error unfixed on chunk %d:0"
-+ TENDSTR), chunkInNAND));
++ TENDSTR), nand_chunk));
+ }
+
+ if (nspare.eccres2 > 0) {
+ T(YAFFS_TRACE_ERROR,
+ (TSTR
+ ("**>>mtd ecc error fix performed on chunk %d:1"
-+ TENDSTR), chunkInNAND));
++ TENDSTR), nand_chunk));
+ } else if (nspare.eccres2 < 0) {
+ T(YAFFS_TRACE_ERROR,
+ (TSTR
+ ("**>>mtd ecc error unfixed on chunk %d:1"
-+ TENDSTR), chunkInNAND));
++ TENDSTR), nand_chunk));
+ }
+
+ if (nspare.eccres1 || nspare.eccres2) {
+ /* We had a data problem on this page */
-+ yaffs_HandleReadDataError(dev, chunkInNAND);
++ yaffs_handle_rd_data_error(dev, nand_chunk);
+ }
+
+ if (nspare.eccres1 < 0 || nspare.eccres2 < 0)
-+ *eccResult = YAFFS_ECC_RESULT_UNFIXED;
++ *ecc_result = YAFFS_ECC_RESULT_UNFIXED;
+ else if (nspare.eccres1 > 0 || nspare.eccres2 > 0)
-+ *eccResult = YAFFS_ECC_RESULT_FIXED;
++ *ecc_result = YAFFS_ECC_RESULT_FIXED;
+ else
-+ *eccResult = YAFFS_ECC_RESULT_NO_ERROR;
++ *ecc_result = YAFFS_ECC_RESULT_NO_ERROR;
+
+ }
+ }
-+ return retVal;
++ return ret_val;
+}
+
-+#ifdef NOTYET
-+static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
-+ int chunkInNAND)
++/*
++ * Functions for robustisizing
++ */
++
++static void yaffs_handle_rd_data_error(struct yaffs_dev *dev, int nand_chunk)
+{
-+ static int init;
-+ static __u8 cmpbuf[YAFFS_BYTES_PER_CHUNK];
-+ static __u8 data[YAFFS_BYTES_PER_CHUNK];
-+ /* Might as well always allocate the larger size for */
-+ /* dev->useNANDECC == true; */
-+ static __u8 spare[sizeof(struct yaffs_NANDSpare)];
++ int flash_block = nand_chunk / dev->param.chunks_per_block;
++
++ /* Mark the block for retirement */
++ yaffs_get_block_info(dev,
++ flash_block + dev->block_offset)->needs_retiring =
++ 1;
++ T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
++ (TSTR("**>>Block %d marked for retirement" TENDSTR), flash_block));
++
++ /* TODO:
++ * Just do a garbage collection on the affected block
++ * then retire the block
++ * NB recursion
++ */
++}
++
++int yaffs_tags_compat_wr(struct yaffs_dev *dev,
++ int nand_chunk,
++ const u8 * data, const struct yaffs_ext_tags *ext_tags)
++{
++ struct yaffs_spare spare;
++ struct yaffs_tags tags;
++
++ yaffs_spare_init(&spare);
++
++ if (ext_tags->is_deleted)
++ spare.page_status = 0;
++ else {
++ tags.obj_id = ext_tags->obj_id;
++ tags.chunk_id = ext_tags->chunk_id;
++
++ tags.n_bytes_lsb = ext_tags->n_bytes & 0x3ff;
++
++ if (dev->data_bytes_per_chunk >= 1024)
++ tags.n_bytes_msb = (ext_tags->n_bytes >> 10) & 3;
++ else
++ tags.n_bytes_msb = 3;
+
-+ dev->readChunkFromNAND(dev, chunkInNAND, data, (yaffs_Spare *) spare);
++ tags.serial_number = ext_tags->serial_number;
++
++ if (!dev->param.use_nand_ecc && data)
++ yaffs_calc_ecc(data, &spare);
++
++ yaffs_load_tags_to_spare(&spare, &tags);
++
++ }
++
++ return yaffs_wr_nand(dev, nand_chunk, data, &spare);
++}
++
++int yaffs_tags_compat_rd(struct yaffs_dev *dev,
++ int nand_chunk,
++ u8 * data, struct yaffs_ext_tags *ext_tags)
++{
++
++ struct yaffs_spare spare;
++ struct yaffs_tags tags;
++ enum yaffs_ecc_result ecc_result = YAFFS_ECC_RESULT_UNKNOWN;
++
++ static struct yaffs_spare spare_ff;
++ static int init;
+
+ if (!init) {
-+ memset(cmpbuf, 0xff, YAFFS_BYTES_PER_CHUNK);
++ memset(&spare_ff, 0xFF, sizeof(spare_ff));
+ init = 1;
+ }
+
-+ if (memcmp(cmpbuf, data, YAFFS_BYTES_PER_CHUNK))
-+ return YAFFS_FAIL;
-+ if (memcmp(cmpbuf, spare, 16))
++ if (yaffs_rd_chunk_nand(dev, nand_chunk, data, &spare, &ecc_result, 1)) {
++ /* ext_tags may be NULL */
++ if (ext_tags) {
++
++ int deleted =
++ (yaffs_count_bits(spare.page_status) < 7) ? 1 : 0;
++
++ ext_tags->is_deleted = deleted;
++ ext_tags->ecc_result = ecc_result;
++ ext_tags->block_bad = 0; /* We're reading it */
++ /* therefore it is not a bad block */
++ ext_tags->chunk_used =
++ (memcmp(&spare_ff, &spare, sizeof(spare_ff)) !=
++ 0) ? 1 : 0;
++
++ if (ext_tags->chunk_used) {
++ yaffs_get_tags_from_spare(dev, &spare, &tags);
++
++ ext_tags->obj_id = tags.obj_id;
++ ext_tags->chunk_id = tags.chunk_id;
++ ext_tags->n_bytes = tags.n_bytes_lsb;
++
++ if (dev->data_bytes_per_chunk >= 1024)
++ ext_tags->n_bytes |=
++ (((unsigned)tags.
++ n_bytes_msb) << 10);
++
++ ext_tags->serial_number = tags.serial_number;
++ }
++ }
++
++ return YAFFS_OK;
++ } else {
+ return YAFFS_FAIL;
++ }
++}
++
++int yaffs_tags_compat_mark_bad(struct yaffs_dev *dev, int flash_block)
++{
++
++ struct yaffs_spare spare;
++
++ memset(&spare, 0xff, sizeof(struct yaffs_spare));
++
++ spare.block_status = 'Y';
++
++ yaffs_wr_nand(dev, flash_block * dev->param.chunks_per_block, NULL,
++ &spare);
++ yaffs_wr_nand(dev, flash_block * dev->param.chunks_per_block + 1,
++ NULL, &spare);
+
+ return YAFFS_OK;
+
+}
++
++int yaffs_tags_compat_query_block(struct yaffs_dev *dev,
++ int block_no,
++ enum yaffs_block_state *state,
++ u32 * seq_number)
++{
++
++ struct yaffs_spare spare0, spare1;
++ static struct yaffs_spare spare_ff;
++ static int init;
++ enum yaffs_ecc_result dummy;
++
++ if (!init) {
++ memset(&spare_ff, 0xFF, sizeof(spare_ff));
++ init = 1;
++ }
++
++ *seq_number = 0;
++
++ yaffs_rd_chunk_nand(dev, block_no * dev->param.chunks_per_block, NULL,
++ &spare0, &dummy, 1);
++ yaffs_rd_chunk_nand(dev, block_no * dev->param.chunks_per_block + 1,
++ NULL, &spare1, &dummy, 1);
++
++ if (yaffs_count_bits(spare0.block_status & spare1.block_status) < 7)
++ *state = YAFFS_BLOCK_STATE_DEAD;
++ else if (memcmp(&spare_ff, &spare0, sizeof(spare_ff)) == 0)
++ *state = YAFFS_BLOCK_STATE_EMPTY;
++ else
++ *state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
++
++ return YAFFS_OK;
++}
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_tagscompat.h linux-2.6.36/fs/yaffs2/yaffs_tagscompat.h
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_tagscompat.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_tagscompat.h 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,36 @@
++/*
++ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
++ *
++ * Copyright (C) 2002-2010 Aleph One Ltd.
++ * for Toby Churchill Ltd and Brightstar Engineering
++ *
++ * Created by Charles Manning <charles@aleph1.co.uk>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 2.1 as
++ * published by the Free Software Foundation.
++ *
++ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
++ */
++
++#ifndef __YAFFS_TAGSCOMPAT_H__
++#define __YAFFS_TAGSCOMPAT_H__
++
++#include "yaffs_guts.h"
++int yaffs_tags_compat_wr(struct yaffs_dev *dev,
++ int nand_chunk,
++ const u8 * data, const struct yaffs_ext_tags *tags);
++int yaffs_tags_compat_rd(struct yaffs_dev *dev,
++ int nand_chunk,
++ u8 * data, struct yaffs_ext_tags *tags);
++int yaffs_tags_compat_mark_bad(struct yaffs_dev *dev, int block_no);
++int yaffs_tags_compat_query_block(struct yaffs_dev *dev,
++ int block_no,
++ enum yaffs_block_state *state,
++ u32 * seq_number);
++
++void yaffs_calc_tags_ecc(struct yaffs_tags *tags);
++int yaffs_check_tags_ecc(struct yaffs_tags *tags);
++int yaffs_count_bits(u8 byte);
++
+#endif
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_tagsvalidity.c linux-2.6.36/fs/yaffs2/yaffs_tagsvalidity.c
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_tagsvalidity.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_tagsvalidity.c 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,27 @@
++/*
++ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
++ *
++ * Copyright (C) 2002-2010 Aleph One Ltd.
++ * for Toby Churchill Ltd and Brightstar Engineering
++ *
++ * Created by Charles Manning <charles@aleph1.co.uk>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include "yaffs_tagsvalidity.h"
+
++void yaffs_init_tags(struct yaffs_ext_tags *tags)
++{
++ memset(tags, 0, sizeof(struct yaffs_ext_tags));
++ tags->validity0 = 0xAAAAAAAA;
++ tags->validity1 = 0x55555555;
++}
++
++int yaffs_validate_tags(struct yaffs_ext_tags *tags)
++{
++ return (tags->validity0 == 0xAAAAAAAA && tags->validity1 == 0x55555555);
++
++}
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_tagsvalidity.h linux-2.6.36/fs/yaffs2/yaffs_tagsvalidity.h
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_tagsvalidity.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_tagsvalidity.h 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,23 @@
+/*
-+ * Functions for robustisizing
++ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
++ *
++ * Copyright (C) 2002-2010 Aleph One Ltd.
++ * for Toby Churchill Ltd and Brightstar Engineering
++ *
++ * Created by Charles Manning <charles@aleph1.co.uk>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 2.1 as
++ * published by the Free Software Foundation.
++ *
++ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
++ */
++
++#ifndef __YAFFS_TAGS_VALIDITY_H__
++#define __YAFFS_TAGS_VALIDITY_H__
++
++#include "yaffs_guts.h"
++
++void yaffs_init_tags(struct yaffs_ext_tags *tags);
++int yaffs_validate_tags(struct yaffs_ext_tags *tags);
++#endif
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_trace.h linux-2.6.36/fs/yaffs2/yaffs_trace.h
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_trace.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_trace.h 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,59 @@
++/*
++ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
++ *
++ * Copyright (C) 2002-2010 Aleph One Ltd.
++ * for Toby Churchill Ltd and Brightstar Engineering
++ *
++ * Created by Charles Manning <charles@aleph1.co.uk>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 2.1 as
++ * published by the Free Software Foundation.
++ *
++ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
++ */
++
++#ifndef __YTRACE_H__
++#define __YTRACE_H__
++
++extern unsigned int yaffs_trace_mask;
++extern unsigned int yaffs_wr_attempts;
++
++/*
++ * Tracing flags.
++ * The flags masked in YAFFS_TRACE_ALWAYS are always traced.
++ */
++
++#define YAFFS_TRACE_OS 0x00000002
++#define YAFFS_TRACE_ALLOCATE 0x00000004
++#define YAFFS_TRACE_SCAN 0x00000008
++#define YAFFS_TRACE_BAD_BLOCKS 0x00000010
++#define YAFFS_TRACE_ERASE 0x00000020
++#define YAFFS_TRACE_GC 0x00000040
++#define YAFFS_TRACE_WRITE 0x00000080
++#define YAFFS_TRACE_TRACING 0x00000100
++#define YAFFS_TRACE_DELETION 0x00000200
++#define YAFFS_TRACE_BUFFERS 0x00000400
++#define YAFFS_TRACE_NANDACCESS 0x00000800
++#define YAFFS_TRACE_GC_DETAIL 0x00001000
++#define YAFFS_TRACE_SCAN_DEBUG 0x00002000
++#define YAFFS_TRACE_MTD 0x00004000
++#define YAFFS_TRACE_CHECKPOINT 0x00008000
++
++#define YAFFS_TRACE_VERIFY 0x00010000
++#define YAFFS_TRACE_VERIFY_NAND 0x00020000
++#define YAFFS_TRACE_VERIFY_FULL 0x00040000
++#define YAFFS_TRACE_VERIFY_ALL 0x000F0000
++
++#define YAFFS_TRACE_SYNC 0x00100000
++#define YAFFS_TRACE_BACKGROUND 0x00200000
++#define YAFFS_TRACE_LOCK 0x00400000
++#define YAFFS_TRACE_MOUNT 0x00800000
++
++#define YAFFS_TRACE_ERROR 0x40000000
++#define YAFFS_TRACE_BUG 0x80000000
++#define YAFFS_TRACE_ALWAYS 0xF0000000
++
++#define T(mask, p) do { if ((mask) & (yaffs_trace_mask | YAFFS_TRACE_ALWAYS)) TOUT(p); } while (0)
++
++#endif
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_verify.c linux-2.6.36/fs/yaffs2/yaffs_verify.c
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_verify.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_verify.c 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,546 @@
++/*
++ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
++ *
++ * Copyright (C) 2002-2010 Aleph One Ltd.
++ * for Toby Churchill Ltd and Brightstar Engineering
++ *
++ * Created by Charles Manning <charles@aleph1.co.uk>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
+ */
+
-+static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND)
++#include "yaffs_verify.h"
++#include "yaffs_trace.h"
++#include "yaffs_bitmap.h"
++#include "yaffs_getblockinfo.h"
++#include "yaffs_nand.h"
++
++int yaffs_skip_verification(struct yaffs_dev *dev)
+{
-+ int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
++ dev = dev;
++ return !(yaffs_trace_mask &
++ (YAFFS_TRACE_VERIFY | YAFFS_TRACE_VERIFY_FULL));
++}
+
-+ /* Mark the block for retirement */
-+ yaffs_GetBlockInfo(dev, blockInNAND + dev->blockOffset)->needsRetiring = 1;
-+ T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
-+ (TSTR("**>>Block %d marked for retirement" TENDSTR), blockInNAND));
++static int yaffs_skip_full_verification(struct yaffs_dev *dev)
++{
++ dev = dev;
++ return !(yaffs_trace_mask & (YAFFS_TRACE_VERIFY_FULL));
++}
+
-+ /* TODO:
-+ * Just do a garbage collection on the affected block
-+ * then retire the block
-+ * NB recursion
++static int yaffs_skip_nand_verification(struct yaffs_dev *dev)
++{
++ dev = dev;
++ return !(yaffs_trace_mask & (YAFFS_TRACE_VERIFY_NAND));
++}
++
++static const char *block_state_name[] = {
++ "Unknown",
++ "Needs scanning",
++ "Scanning",
++ "Empty",
++ "Allocating",
++ "Full",
++ "Dirty",
++ "Checkpoint",
++ "Collecting",
++ "Dead"
++};
++
++void yaffs_verify_blk(struct yaffs_dev *dev, struct yaffs_block_info *bi, int n)
++{
++ int actually_used;
++ int in_use;
++
++ if (yaffs_skip_verification(dev))
++ return;
++
++ /* Report illegal runtime states */
++ if (bi->block_state >= YAFFS_NUMBER_OF_BLOCK_STATES)
++ T(YAFFS_TRACE_VERIFY,
++ (TSTR("Block %d has undefined state %d" TENDSTR), n,
++ bi->block_state));
++
++ switch (bi->block_state) {
++ case YAFFS_BLOCK_STATE_UNKNOWN:
++ case YAFFS_BLOCK_STATE_SCANNING:
++ case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
++ T(YAFFS_TRACE_VERIFY,
++ (TSTR("Block %d has bad run-state %s" TENDSTR), n,
++ block_state_name[bi->block_state]));
++ }
++
++ /* Check pages in use and soft deletions are legal */
++
++ actually_used = bi->pages_in_use - bi->soft_del_pages;
++
++ if (bi->pages_in_use < 0
++ || bi->pages_in_use > dev->param.chunks_per_block
++ || bi->soft_del_pages < 0
++ || bi->soft_del_pages > dev->param.chunks_per_block
++ || actually_used < 0 || actually_used > dev->param.chunks_per_block)
++ T(YAFFS_TRACE_VERIFY,
++ (TSTR
++ ("Block %d has illegal values pages_in_used %d soft_del_pages %d"
++ TENDSTR), n, bi->pages_in_use, bi->soft_del_pages));
++
++ /* Check chunk bitmap legal */
++ in_use = yaffs_count_chunk_bits(dev, n);
++ if (in_use != bi->pages_in_use)
++ T(YAFFS_TRACE_VERIFY,
++ (TSTR
++ ("Block %d has inconsistent values pages_in_use %d counted chunk bits %d"
++ TENDSTR), n, bi->pages_in_use, in_use));
++
++}
++
++void yaffs_verify_collected_blk(struct yaffs_dev *dev,
++ struct yaffs_block_info *bi, int n)
++{
++ yaffs_verify_blk(dev, bi, n);
++
++ /* After collection the block should be in the erased state */
++
++ if (bi->block_state != YAFFS_BLOCK_STATE_COLLECTING &&
++ bi->block_state != YAFFS_BLOCK_STATE_EMPTY) {
++ T(YAFFS_TRACE_ERROR,
++ (TSTR
++ ("Block %d is in state %d after gc, should be erased"
++ TENDSTR), n, bi->block_state));
++ }
++}
++
++void yaffs_verify_blocks(struct yaffs_dev *dev)
++{
++ int i;
++ int state_count[YAFFS_NUMBER_OF_BLOCK_STATES];
++ int illegal_states = 0;
++
++ if (yaffs_skip_verification(dev))
++ return;
++
++ memset(state_count, 0, sizeof(state_count));
++
++ for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
++ struct yaffs_block_info *bi = yaffs_get_block_info(dev, i);
++ yaffs_verify_blk(dev, bi, i);
++
++ if (bi->block_state < YAFFS_NUMBER_OF_BLOCK_STATES)
++ state_count[bi->block_state]++;
++ else
++ illegal_states++;
++ }
++
++ T(YAFFS_TRACE_VERIFY, (TSTR("" TENDSTR)));
++ T(YAFFS_TRACE_VERIFY, (TSTR("Block summary" TENDSTR)));
++
++ T(YAFFS_TRACE_VERIFY,
++ (TSTR("%d blocks have illegal states" TENDSTR), illegal_states));
++ if (state_count[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
++ T(YAFFS_TRACE_VERIFY,
++ (TSTR("Too many allocating blocks" TENDSTR)));
++
++ for (i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
++ T(YAFFS_TRACE_VERIFY,
++ (TSTR("%s %d blocks" TENDSTR),
++ block_state_name[i], state_count[i]));
++
++ if (dev->blocks_in_checkpt != state_count[YAFFS_BLOCK_STATE_CHECKPOINT])
++ T(YAFFS_TRACE_VERIFY,
++ (TSTR("Checkpoint block count wrong dev %d count %d" TENDSTR),
++ dev->blocks_in_checkpt,
++ state_count[YAFFS_BLOCK_STATE_CHECKPOINT]));
++
++ if (dev->n_erased_blocks != state_count[YAFFS_BLOCK_STATE_EMPTY])
++ T(YAFFS_TRACE_VERIFY,
++ (TSTR("Erased block count wrong dev %d count %d" TENDSTR),
++ dev->n_erased_blocks, state_count[YAFFS_BLOCK_STATE_EMPTY]));
++
++ if (state_count[YAFFS_BLOCK_STATE_COLLECTING] > 1)
++ T(YAFFS_TRACE_VERIFY,
++ (TSTR("Too many collecting blocks %d (max is 1)" TENDSTR),
++ state_count[YAFFS_BLOCK_STATE_COLLECTING]));
++
++ T(YAFFS_TRACE_VERIFY, (TSTR("" TENDSTR)));
++
++}
++
++/*
++ * Verify the object header. oh must be valid, but obj and tags may be NULL in which
++ * case those tests will not be performed.
++ */
++void yaffs_verify_oh(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh,
++ struct yaffs_ext_tags *tags, int parent_check)
++{
++ if (obj && yaffs_skip_verification(obj->my_dev))
++ return;
++
++ if (!(tags && obj && oh)) {
++ T(YAFFS_TRACE_VERIFY,
++ (TSTR("Verifying object header tags %p obj %p oh %p" TENDSTR),
++ tags, obj, oh));
++ return;
++ }
++
++ if (oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
++ oh->type > YAFFS_OBJECT_TYPE_MAX)
++ T(YAFFS_TRACE_VERIFY,
++ (TSTR("Obj %d header type is illegal value 0x%x" TENDSTR),
++ tags->obj_id, oh->type));
++
++ if (tags->obj_id != obj->obj_id)
++ T(YAFFS_TRACE_VERIFY,
++ (TSTR("Obj %d header mismatch obj_id %d" TENDSTR),
++ tags->obj_id, obj->obj_id));
++
++ /*
++ * Check that the object's parent ids match if parent_check requested.
++ *
++ * Tests do not apply to the root object.
+ */
++
++ if (parent_check && tags->obj_id > 1 && !obj->parent)
++ T(YAFFS_TRACE_VERIFY,
++ (TSTR
++ ("Obj %d header mismatch parent_id %d obj->parent is NULL"
++ TENDSTR), tags->obj_id, oh->parent_obj_id));
++
++ if (parent_check && obj->parent &&
++ oh->parent_obj_id != obj->parent->obj_id &&
++ (oh->parent_obj_id != YAFFS_OBJECTID_UNLINKED ||
++ obj->parent->obj_id != YAFFS_OBJECTID_DELETED))
++ T(YAFFS_TRACE_VERIFY,
++ (TSTR
++ ("Obj %d header mismatch parent_id %d parent_obj_id %d"
++ TENDSTR), tags->obj_id, oh->parent_obj_id,
++ obj->parent->obj_id));
++
++ if (tags->obj_id > 1 && oh->name[0] == 0) /* Null name */
++ T(YAFFS_TRACE_VERIFY,
++ (TSTR("Obj %d header name is NULL" TENDSTR), obj->obj_id));
++
++ if (tags->obj_id > 1 && ((u8) (oh->name[0])) == 0xff) /* Trashed name */
++ T(YAFFS_TRACE_VERIFY,
++ (TSTR("Obj %d header name is 0xFF" TENDSTR), obj->obj_id));
+}
+
-+#ifdef NOTYET
-+static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND)
++void yaffs_verify_file(struct yaffs_obj *obj)
+{
++ int required_depth;
++ int actual_depth;
++ u32 last_chunk;
++ u32 x;
++ u32 i;
++ struct yaffs_dev *dev;
++ struct yaffs_ext_tags tags;
++ struct yaffs_tnode *tn;
++ u32 obj_id;
++
++ if (!obj)
++ return;
++
++ if (yaffs_skip_verification(obj->my_dev))
++ return;
++
++ dev = obj->my_dev;
++ obj_id = obj->obj_id;
++
++ /* Check file size is consistent with tnode depth */
++ last_chunk =
++ obj->variant.file_variant.file_size / dev->data_bytes_per_chunk + 1;
++ x = last_chunk >> YAFFS_TNODES_LEVEL0_BITS;
++ required_depth = 0;
++ while (x > 0) {
++ x >>= YAFFS_TNODES_INTERNAL_BITS;
++ required_depth++;
++ }
++
++ actual_depth = obj->variant.file_variant.top_level;
++
++ /* Check that the chunks in the tnode tree are all correct.
++ * We do this by scanning through the tnode tree and
++ * checking the tags for every chunk match.
++ */
++
++ if (yaffs_skip_nand_verification(dev))
++ return;
++
++ for (i = 1; i <= last_chunk; i++) {
++ tn = yaffs_find_tnode_0(dev, &obj->variant.file_variant, i);
++
++ if (tn) {
++ u32 the_chunk = yaffs_get_group_base(dev, tn, i);
++ if (the_chunk > 0) {
++ /* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),obj_id,i,the_chunk)); */
++ yaffs_rd_chunk_tags_nand(dev, the_chunk, NULL,
++ &tags);
++ if (tags.obj_id != obj_id || tags.chunk_id != i) {
++ T(~0,
++ (TSTR
++ ("Object %d chunk_id %d NAND mismatch chunk %d tags (%d:%d)"
++ TENDSTR), obj_id, i, the_chunk,
++ tags.obj_id, tags.chunk_id));
++ }
++ }
++ }
++ }
+}
+
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+ const __u8 *data,
-+ const yaffs_Spare *spare)
++void yaffs_verify_link(struct yaffs_obj *obj)
+{
++ if (obj && yaffs_skip_verification(obj->my_dev))
++ return;
++
++ /* Verify sane equivalent object */
+}
+
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+ const yaffs_Spare *spare)
++void yaffs_verify_symlink(struct yaffs_obj *obj)
+{
++ if (obj && yaffs_skip_verification(obj->my_dev))
++ return;
++
++ /* Verify symlink string */
+}
+
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND)
++void yaffs_verify_special(struct yaffs_obj *obj)
+{
-+ int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
++ if (obj && yaffs_skip_verification(obj->my_dev))
++ return;
++}
+
-+ /* Mark the block for retirement */
-+ yaffs_GetBlockInfo(dev, blockInNAND)->needsRetiring = 1;
-+ /* Delete the chunk */
-+ yaffs_DeleteChunk(dev, chunkInNAND, 1, __LINE__);
-+}
-+
-+static int yaffs_VerifyCompare(const __u8 *d0, const __u8 *d1,
-+ const yaffs_Spare *s0, const yaffs_Spare *s1)
-+{
-+
-+ if (memcmp(d0, d1, YAFFS_BYTES_PER_CHUNK) != 0 ||
-+ s0->tagByte0 != s1->tagByte0 ||
-+ s0->tagByte1 != s1->tagByte1 ||
-+ s0->tagByte2 != s1->tagByte2 ||
-+ s0->tagByte3 != s1->tagByte3 ||
-+ s0->tagByte4 != s1->tagByte4 ||
-+ s0->tagByte5 != s1->tagByte5 ||
-+ s0->tagByte6 != s1->tagByte6 ||
-+ s0->tagByte7 != s1->tagByte7 ||
-+ s0->ecc1[0] != s1->ecc1[0] ||
-+ s0->ecc1[1] != s1->ecc1[1] ||
-+ s0->ecc1[2] != s1->ecc1[2] ||
-+ s0->ecc2[0] != s1->ecc2[0] ||
-+ s0->ecc2[1] != s1->ecc2[1] || s0->ecc2[2] != s1->ecc2[2]) {
-+ return 0;
++void yaffs_verify_obj(struct yaffs_obj *obj)
++{
++ struct yaffs_dev *dev;
++
++ u32 chunk_min;
++ u32 chunk_max;
++
++ u32 chunk_id_ok;
++ u32 chunk_in_range;
++ u32 chunk_wrongly_deleted;
++ u32 chunk_valid;
++
++ if (!obj)
++ return;
++
++ if (obj->being_created)
++ return;
++
++ dev = obj->my_dev;
++
++ if (yaffs_skip_verification(dev))
++ return;
++
++ /* Check sane object header chunk */
++
++ chunk_min = dev->internal_start_block * dev->param.chunks_per_block;
++ chunk_max =
++ (dev->internal_end_block + 1) * dev->param.chunks_per_block - 1;
++
++ chunk_in_range = (((unsigned)(obj->hdr_chunk)) >= chunk_min &&
++ ((unsigned)(obj->hdr_chunk)) <= chunk_max);
++ chunk_id_ok = chunk_in_range || (obj->hdr_chunk == 0);
++ chunk_valid = chunk_in_range &&
++ yaffs_check_chunk_bit(dev,
++ obj->hdr_chunk / dev->param.chunks_per_block,
++ obj->hdr_chunk % dev->param.chunks_per_block);
++ chunk_wrongly_deleted = chunk_in_range && !chunk_valid;
++
++ if (!obj->fake && (!chunk_id_ok || chunk_wrongly_deleted)) {
++ T(YAFFS_TRACE_VERIFY,
++ (TSTR("Obj %d has chunk_id %d %s %s" TENDSTR),
++ obj->obj_id, obj->hdr_chunk,
++ chunk_id_ok ? "" : ",out of range",
++ chunk_wrongly_deleted ? ",marked as deleted" : ""));
+ }
+
-+ return 1;
++ if (chunk_valid && !yaffs_skip_nand_verification(dev)) {
++ struct yaffs_ext_tags tags;
++ struct yaffs_obj_hdr *oh;
++ u8 *buffer = yaffs_get_temp_buffer(dev, __LINE__);
++
++ oh = (struct yaffs_obj_hdr *)buffer;
++
++ yaffs_rd_chunk_tags_nand(dev, obj->hdr_chunk, buffer, &tags);
++
++ yaffs_verify_oh(obj, oh, &tags, 1);
++
++ yaffs_release_temp_buffer(dev, buffer, __LINE__);
++ }
++
++ /* Verify it has a parent */
++ if (obj && !obj->fake && (!obj->parent || obj->parent->my_dev != dev)) {
++ T(YAFFS_TRACE_VERIFY,
++ (TSTR
++ ("Obj %d has parent pointer %p which does not look like an object"
++ TENDSTR), obj->obj_id, obj->parent));
++ }
++
++ /* Verify parent is a directory */
++ if (obj->parent
++ && obj->parent->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
++ T(YAFFS_TRACE_VERIFY,
++ (TSTR("Obj %d's parent is not a directory (type %d)" TENDSTR),
++ obj->obj_id, obj->parent->variant_type));
++ }
++
++ switch (obj->variant_type) {
++ case YAFFS_OBJECT_TYPE_FILE:
++ yaffs_verify_file(obj);
++ break;
++ case YAFFS_OBJECT_TYPE_SYMLINK:
++ yaffs_verify_symlink(obj);
++ break;
++ case YAFFS_OBJECT_TYPE_DIRECTORY:
++ yaffs_verify_dir(obj);
++ break;
++ case YAFFS_OBJECT_TYPE_HARDLINK:
++ yaffs_verify_link(obj);
++ break;
++ case YAFFS_OBJECT_TYPE_SPECIAL:
++ yaffs_verify_special(obj);
++ break;
++ case YAFFS_OBJECT_TYPE_UNKNOWN:
++ default:
++ T(YAFFS_TRACE_VERIFY,
++ (TSTR("Obj %d has illegaltype %d" TENDSTR),
++ obj->obj_id, obj->variant_type));
++ break;
++ }
+}
-+#endif /* NOTYET */
+
-+int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev,
-+ int chunkInNAND,
-+ const __u8 *data,
-+ const yaffs_ExtendedTags *eTags)
++void yaffs_verify_objects(struct yaffs_dev *dev)
+{
-+ yaffs_Spare spare;
-+ yaffs_Tags tags;
++ struct yaffs_obj *obj;
++ int i;
++ struct list_head *lh;
+
-+ yaffs_SpareInitialise(&spare);
++ if (yaffs_skip_verification(dev))
++ return;
+
-+ if (eTags->chunkDeleted)
-+ spare.pageStatus = 0;
-+ else {
-+ tags.objectId = eTags->objectId;
-+ tags.chunkId = eTags->chunkId;
++ /* Iterate through the objects in each hash entry */
++
++ for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
++ list_for_each(lh, &dev->obj_bucket[i].list) {
++ if (lh) {
++ obj =
++ list_entry(lh, struct yaffs_obj, hash_link);
++ yaffs_verify_obj(obj);
++ }
++ }
++ }
++}
++
++void yaffs_verify_obj_in_dir(struct yaffs_obj *obj)
++{
++ struct list_head *lh;
++ struct yaffs_obj *list_obj;
++
++ int count = 0;
++
++ if (!obj) {
++ T(YAFFS_TRACE_ALWAYS, (TSTR("No object to verify" TENDSTR)));
++ YBUG();
++ return;
++ }
++
++ if (yaffs_skip_verification(obj->my_dev))
++ return;
++
++ if (!obj->parent) {
++ T(YAFFS_TRACE_ALWAYS,
++ (TSTR("Object does not have parent" TENDSTR)));
++ YBUG();
++ return;
++ }
++
++ if (obj->parent->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
++ T(YAFFS_TRACE_ALWAYS,
++ (TSTR("Parent is not directory" TENDSTR)));
++ YBUG();
++ }
++
++ /* Iterate through the objects in each hash entry */
++
++ list_for_each(lh, &obj->parent->variant.dir_variant.children) {
++ if (lh) {
++ list_obj = list_entry(lh, struct yaffs_obj, siblings);
++ yaffs_verify_obj(list_obj);
++ if (obj == list_obj)
++ count++;
++ }
++ }
++
++ if (count != 1) {
++ T(YAFFS_TRACE_ALWAYS,
++ (TSTR("Object in directory %d times" TENDSTR), count));
++ YBUG();
++ }
++}
++
++void yaffs_verify_dir(struct yaffs_obj *directory)
++{
++ struct list_head *lh;
++ struct yaffs_obj *list_obj;
++
++ if (!directory) {
++ YBUG();
++ return;
++ }
++
++ if (yaffs_skip_full_verification(directory->my_dev))
++ return;
++
++ if (directory->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
++ T(YAFFS_TRACE_ALWAYS,
++ (TSTR("Directory has wrong type: %d" TENDSTR),
++ directory->variant_type));
++ YBUG();
++ }
++
++ /* Iterate through the objects in each hash entry */
++
++ list_for_each(lh, &directory->variant.dir_variant.children) {
++ if (lh) {
++ list_obj = list_entry(lh, struct yaffs_obj, siblings);
++ if (list_obj->parent != directory) {
++ T(YAFFS_TRACE_ALWAYS,
++ (TSTR
++ ("Object in directory list has wrong parent %p"
++ TENDSTR), list_obj->parent));
++ YBUG();
++ }
++ yaffs_verify_obj_in_dir(list_obj);
++ }
++ }
++}
++
++static int yaffs_free_verification_failures;
++
++void yaffs_verify_free_chunks(struct yaffs_dev *dev)
++{
++ int counted;
++ int difference;
++
++ if (yaffs_skip_verification(dev))
++ return;
++
++ counted = yaffs_count_free_chunks(dev);
++
++ difference = dev->n_free_chunks - counted;
++
++ if (difference) {
++ T(YAFFS_TRACE_ALWAYS,
++ (TSTR("Freechunks verification failure %d %d %d" TENDSTR),
++ dev->n_free_chunks, counted, difference));
++ yaffs_free_verification_failures++;
++ }
++}
++
++int yaffs_verify_file_sane(struct yaffs_obj *in)
++{
++ in = in;
++ return YAFFS_OK;
++}
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_verify.h linux-2.6.36/fs/yaffs2/yaffs_verify.h
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_verify.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_verify.h 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,43 @@
++/*
++ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
++ *
++ * Copyright (C) 2002-2010 Aleph One Ltd.
++ * for Toby Churchill Ltd and Brightstar Engineering
++ *
++ * Created by Charles Manning <charles@aleph1.co.uk>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 2.1 as
++ * published by the Free Software Foundation.
++ *
++ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
++ */
++
++#ifndef __YAFFS_VERIFY_H__
++#define __YAFFS_VERIFY_H__
++
++#include "yaffs_guts.h"
++
++void yaffs_verify_blk(struct yaffs_dev *dev, struct yaffs_block_info *bi,
++ int n);
++void yaffs_verify_collected_blk(struct yaffs_dev *dev,
++ struct yaffs_block_info *bi, int n);
++void yaffs_verify_blocks(struct yaffs_dev *dev);
++
++void yaffs_verify_oh(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh,
++ struct yaffs_ext_tags *tags, int parent_check);
++void yaffs_verify_file(struct yaffs_obj *obj);
++void yaffs_verify_link(struct yaffs_obj *obj);
++void yaffs_verify_symlink(struct yaffs_obj *obj);
++void yaffs_verify_special(struct yaffs_obj *obj);
++void yaffs_verify_obj(struct yaffs_obj *obj);
++void yaffs_verify_objects(struct yaffs_dev *dev);
++void yaffs_verify_obj_in_dir(struct yaffs_obj *obj);
++void yaffs_verify_dir(struct yaffs_obj *directory);
++void yaffs_verify_free_chunks(struct yaffs_dev *dev);
++
++int yaffs_verify_file_sane(struct yaffs_obj *obj);
++
++int yaffs_skip_verification(struct yaffs_dev *dev);
++
++#endif
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_vfs.c linux-2.6.36/fs/yaffs2/yaffs_vfs.c
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_vfs.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_vfs.c 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,3565 @@
++/*
++ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
++ *
++ * Copyright (C) 2002-2010 Aleph One Ltd.
++ * for Toby Churchill Ltd and Brightstar Engineering
++ *
++ * Created by Charles Manning <charles@aleph1.co.uk>
++ * Acknowledgements:
++ * Luc van OostenRyck for numerous patches.
++ * Nick Bane for numerous patches.
++ * Nick Bane for 2.5/2.6 integration.
++ * Andras Toth for mknod rdev issue.
++ * Michael Fischer for finding the problem with inode inconsistency.
++ * Some code bodily lifted from JFFS
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++/*
++ *
++ * This is the file system front-end to YAFFS that hooks it up to
++ * the VFS.
++ *
++ * Special notes:
++ * >> 2.4: sb->u.generic_sbp points to the struct yaffs_dev associated with
++ * this superblock
++ * >> 2.6: sb->s_fs_info points to the struct yaffs_dev associated with this
++ * superblock
++ * >> inode->u.generic_ip points to the associated struct yaffs_obj.
++ */
++
++/*
++ * There are two variants of the VFS glue code. This variant should compile
++ * for any version of Linux.
++ */
++#include <linux/version.h>
++
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10))
++#define YAFFS_COMPILE_BACKGROUND
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6, 23))
++#define YAFFS_COMPILE_FREEZER
++#endif
++#endif
++
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28))
++#define YAFFS_COMPILE_EXPORTFS
++#endif
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,35))
++#define YAFFS_USE_SETATTR_COPY
++#define YAFFS_USE_TRUNCATE_SETSIZE
++#endif
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,35))
++#define YAFFS_HAS_EVICT_INODE
++#endif
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
++#define YAFFS_NEW_FOLLOW_LINK 1
++#else
++#define YAFFS_NEW_FOLLOW_LINK 0
++#endif
++
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
++#include <linux/config.h>
++#endif
++
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/slab.h>
++#include <linux/init.h>
++#include <linux/fs.h>
++#include <linux/proc_fs.h>
++#include <linux/smp_lock.h>
++#include <linux/pagemap.h>
++#include <linux/mtd/mtd.h>
++#include <linux/interrupt.h>
++#include <linux/string.h>
++#include <linux/ctype.h>
++
++#if (YAFFS_NEW_FOLLOW_LINK == 1)
++#include <linux/namei.h>
++#endif
++
++#ifdef YAFFS_COMPILE_EXPORTFS
++#include <linux/exportfs.h>
++#endif
++
++#ifdef YAFFS_COMPILE_BACKGROUND
++#include <linux/kthread.h>
++#include <linux/delay.h>
++#endif
++#ifdef YAFFS_COMPILE_FREEZER
++#include <linux/freezer.h>
++#endif
++
++#include <asm/div64.h>
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
++
++#include <linux/statfs.h>
++
++#define UnlockPage(p) unlock_page(p)
++#define Page_Uptodate(page) test_bit(PG_uptodate, &(page)->flags)
++
++/* FIXME: use sb->s_id instead ? */
++#define yaffs_devname(sb, buf) bdevname(sb->s_bdev, buf)
++
++#else
+
-+ tags.byteCountLSB = eTags->byteCount & 0x3ff;
++#include <linux/locks.h>
++#define BDEVNAME_SIZE 0
++#define yaffs_devname(sb, buf) kdevname(sb->s_dev)
++
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0))
++/* added NCB 26/5/2006 for 2.4.25-vrs2-tcl1 kernel */
++#define __user
++#endif
++
++#endif
++
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26))
++#define YPROC_ROOT (&proc_root)
++#else
++#define YPROC_ROOT NULL
++#endif
++
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
++#define Y_INIT_TIMER(a) init_timer(a)
++#else
++#define Y_INIT_TIMER(a) init_timer_on_stack(a)
++#endif
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
++#define WRITE_SIZE_STR "writesize"
++#define WRITE_SIZE(mtd) ((mtd)->writesize)
++#else
++#define WRITE_SIZE_STR "oobblock"
++#define WRITE_SIZE(mtd) ((mtd)->oobblock)
++#endif
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 27))
++#define YAFFS_USE_WRITE_BEGIN_END 1
++#else
++#define YAFFS_USE_WRITE_BEGIN_END 0
++#endif
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28))
++static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size)
++{
++ uint64_t result = partition_size;
++ do_div(result, block_size);
++ return (uint32_t) result;
++}
++#else
++#define YCALCBLOCKS(s, b) ((s)/(b))
++#endif
++
++#include <linux/uaccess.h>
++#include <linux/mtd/mtd.h>
++
++#include "yportenv.h"
++#include "yaffs_trace.h"
++#include "yaffs_guts.h"
++#include "yaffs_attribs.h"
++
++#include "yaffs_linux.h"
++
++#include "yaffs_mtdif.h"
++#include "yaffs_mtdif1.h"
++#include "yaffs_mtdif2.h"
++
++unsigned int yaffs_trace_mask = YAFFS_TRACE_BAD_BLOCKS | YAFFS_TRACE_ALWAYS;
++unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS;
++unsigned int yaffs_auto_checkpoint = 1;
++unsigned int yaffs_gc_control = 1;
++unsigned int yaffs_bg_enable = 1;
++
++/* Module Parameters */
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
++module_param(yaffs_trace_mask, uint, 0644);
++module_param(yaffs_wr_attempts, uint, 0644);
++module_param(yaffs_auto_checkpoint, uint, 0644);
++module_param(yaffs_gc_control, uint, 0644);
++module_param(yaffs_bg_enable, uint, 0644);
++#else
++MODULE_PARM(yaffs_trace_mask, "i");
++MODULE_PARM(yaffs_wr_attempts, "i");
++MODULE_PARM(yaffs_auto_checkpoint, "i");
++MODULE_PARM(yaffs_gc_control, "i");
++#endif
++
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25))
++/* use iget and read_inode */
++#define Y_IGET(sb, inum) iget((sb), (inum))
++static void yaffs_read_inode(struct inode *inode);
++
++#else
++/* Call local equivalent */
++#define YAFFS_USE_OWN_IGET
++#define Y_IGET(sb, inum) yaffs_iget((sb), (inum))
++
++static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino);
++#endif
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
++#define yaffs_inode_to_obj_lv(iptr) ((iptr)->i_private)
++#else
++#define yaffs_inode_to_obj_lv(iptr) ((iptr)->u.generic_ip)
++#endif
++
++#define yaffs_inode_to_obj(iptr) ((struct yaffs_obj *)(yaffs_inode_to_obj_lv(iptr)))
++#define yaffs_dentry_to_obj(dptr) yaffs_inode_to_obj((dptr)->d_inode)
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
++#define yaffs_super_to_dev(sb) ((struct yaffs_dev *)sb->s_fs_info)
++#else
++#define yaffs_super_to_dev(sb) ((struct yaffs_dev *)sb->u.generic_sbp)
++#endif
++
++#define update_dir_time(dir) do {\
++ (dir)->i_ctime = (dir)->i_mtime = CURRENT_TIME; \
++ } while(0)
++
++static void yaffs_put_super(struct super_block *sb);
++
++static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
++ loff_t * pos);
++static ssize_t yaffs_hold_space(struct file *f);
++static void yaffs_release_space(struct file *f);
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
++static int yaffs_file_flush(struct file *file, fl_owner_t id);
++#else
++static int yaffs_file_flush(struct file *file);
++#endif
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34))
++static int yaffs_sync_object(struct file *file, int datasync);
++#else
++static int yaffs_sync_object(struct file *file, struct dentry *dentry,
++ int datasync);
++#endif
++
++static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir);
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
++static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
++ struct nameidata *n);
++static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
++ struct nameidata *n);
++#else
++static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode);
++static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry);
++#endif
++static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
++ struct dentry *dentry);
++static int yaffs_unlink(struct inode *dir, struct dentry *dentry);
++static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
++ const char *symname);
++static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode);
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
++static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
++ dev_t dev);
++#else
++static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
++ int dev);
++#endif
++static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
++ struct inode *new_dir, struct dentry *new_dentry);
++static int yaffs_setattr(struct dentry *dentry, struct iattr *attr);
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
++static int yaffs_sync_fs(struct super_block *sb, int wait);
++static void yaffs_write_super(struct super_block *sb);
++#else
++static int yaffs_sync_fs(struct super_block *sb);
++static int yaffs_write_super(struct super_block *sb);
++#endif
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
++static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf);
++#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
++static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf);
++#else
++static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
++#endif
++
++#ifdef YAFFS_HAS_PUT_INODE
++static void yaffs_put_inode(struct inode *inode);
++#endif
++
++#ifdef YAFFS_HAS_EVICT_INODE
++static void yaffs_evict_inode(struct inode *);
++#else
++static void yaffs_delete_inode(struct inode *);
++static void yaffs_clear_inode(struct inode *);
++#endif
++
++static int yaffs_readpage(struct file *file, struct page *page);
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
++static int yaffs_writepage(struct page *page, struct writeback_control *wbc);
++#else
++static int yaffs_writepage(struct page *page);
++#endif
++
++#ifdef CONFIG_YAFFS_XATTR
++int yaffs_setxattr(struct dentry *dentry, const char *name,
++ const void *value, size_t size, int flags);
++ssize_t yaffs_getxattr(struct dentry *dentry, const char *name, void *buff,
++ size_t size);
++int yaffs_removexattr(struct dentry *dentry, const char *name);
++ssize_t yaffs_listxattr(struct dentry *dentry, char *buff, size_t size);
++#endif
++
++#if (YAFFS_USE_WRITE_BEGIN_END != 0)
++static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
++ loff_t pos, unsigned len, unsigned flags,
++ struct page **pagep, void **fsdata);
++static int yaffs_write_end(struct file *filp, struct address_space *mapping,
++ loff_t pos, unsigned len, unsigned copied,
++ struct page *pg, void *fsdadata);
++#else
++static int yaffs_prepare_write(struct file *f, struct page *pg,
++ unsigned offset, unsigned to);
++static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
++ unsigned to);
++
++#endif
++
++static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
++ int buflen);
++#if (YAFFS_NEW_FOLLOW_LINK == 1)
++void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias);
++static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
++#else
++static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
++#endif
++
++static void yaffs_touch_super(struct yaffs_dev *dev);
++
++static loff_t yaffs_dir_llseek(struct file *file, loff_t offset, int origin);
++
++static int yaffs_vfs_setattr(struct inode *, struct iattr *);
++
++static struct address_space_operations yaffs_file_address_operations = {
++ .readpage = yaffs_readpage,
++ .writepage = yaffs_writepage,
++#if (YAFFS_USE_WRITE_BEGIN_END > 0)
++ .write_begin = yaffs_write_begin,
++ .write_end = yaffs_write_end,
++#else
++ .prepare_write = yaffs_prepare_write,
++ .commit_write = yaffs_commit_write,
++#endif
++};
+
-+ if (dev->nDataBytesPerChunk >= 1024)
-+ tags.byteCountMSB = (eTags->byteCount >> 10) & 3;
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22))
++static const struct file_operations yaffs_file_operations = {
++ .read = do_sync_read,
++ .write = do_sync_write,
++ .aio_read = generic_file_aio_read,
++ .aio_write = generic_file_aio_write,
++ .mmap = generic_file_mmap,
++ .flush = yaffs_file_flush,
++ .fsync = yaffs_sync_object,
++ .splice_read = generic_file_splice_read,
++ .splice_write = generic_file_splice_write,
++ .llseek = generic_file_llseek,
++};
++
++#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
++
++static const struct file_operations yaffs_file_operations = {
++ .read = do_sync_read,
++ .write = do_sync_write,
++ .aio_read = generic_file_aio_read,
++ .aio_write = generic_file_aio_write,
++ .mmap = generic_file_mmap,
++ .flush = yaffs_file_flush,
++ .fsync = yaffs_sync_object,
++ .sendfile = generic_file_sendfile,
++};
++
++#else
++
++static const struct file_operations yaffs_file_operations = {
++ .read = generic_file_read,
++ .write = generic_file_write,
++ .mmap = generic_file_mmap,
++ .flush = yaffs_file_flush,
++ .fsync = yaffs_sync_object,
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
++ .sendfile = generic_file_sendfile,
++#endif
++};
++#endif
++
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25))
++static void zero_user_segment(struct page *page, unsigned start, unsigned end)
++{
++ void *kaddr = kmap_atomic(page, KM_USER0);
++ memset(kaddr + start, 0, end - start);
++ kunmap_atomic(kaddr, KM_USER0);
++ flush_dcache_page(page);
++}
++#endif
++
++static const struct inode_operations yaffs_file_inode_operations = {
++ .setattr = yaffs_setattr,
++#ifdef CONFIG_YAFFS_XATTR
++ .setxattr = yaffs_setxattr,
++ .getxattr = yaffs_getxattr,
++ .listxattr = yaffs_listxattr,
++ .removexattr = yaffs_removexattr,
++#endif
++};
++
++static const struct inode_operations yaffs_symlink_inode_operations = {
++ .readlink = yaffs_readlink,
++ .follow_link = yaffs_follow_link,
++#if (YAFFS_NEW_FOLLOW_LINK == 1)
++ .put_link = yaffs_put_link,
++#endif
++ .setattr = yaffs_setattr,
++#ifdef CONFIG_YAFFS_XATTR
++ .setxattr = yaffs_setxattr,
++ .getxattr = yaffs_getxattr,
++ .listxattr = yaffs_listxattr,
++ .removexattr = yaffs_removexattr,
++#endif
++};
++
++static const struct inode_operations yaffs_dir_inode_operations = {
++ .create = yaffs_create,
++ .lookup = yaffs_lookup,
++ .link = yaffs_link,
++ .unlink = yaffs_unlink,
++ .symlink = yaffs_symlink,
++ .mkdir = yaffs_mkdir,
++ .rmdir = yaffs_unlink,
++ .mknod = yaffs_mknod,
++ .rename = yaffs_rename,
++ .setattr = yaffs_setattr,
++#ifdef CONFIG_YAFFS_XATTR
++ .setxattr = yaffs_setxattr,
++ .getxattr = yaffs_getxattr,
++ .listxattr = yaffs_listxattr,
++ .removexattr = yaffs_removexattr,
++#endif
++};
++
++static const struct file_operations yaffs_dir_operations = {
++ .read = generic_read_dir,
++ .readdir = yaffs_readdir,
++ .fsync = yaffs_sync_object,
++ .llseek = yaffs_dir_llseek,
++};
++
++static const struct super_operations yaffs_super_ops = {
++ .statfs = yaffs_statfs,
++
++#ifndef YAFFS_USE_OWN_IGET
++ .read_inode = yaffs_read_inode,
++#endif
++#ifdef YAFFS_HAS_PUT_INODE
++ .put_inode = yaffs_put_inode,
++#endif
++ .put_super = yaffs_put_super,
++#ifdef YAFFS_HAS_EVICT_INODE
++ .evict_inode = yaffs_evict_inode,
++#else
++ .delete_inode = yaffs_delete_inode,
++ .clear_inode = yaffs_clear_inode,
++#endif
++ .sync_fs = yaffs_sync_fs,
++ .write_super = yaffs_write_super,
++};
++
++static int yaffs_vfs_setattr(struct inode *inode, struct iattr *attr)
++{
++#ifdef YAFFS_USE_SETATTR_COPY
++ setattr_copy(inode, attr);
++ return 0;
++#else
++ return inode_setattr(inode, attr);
++#endif
++
++}
++
++static int yaffs_vfs_setsize(struct inode *inode, loff_t newsize)
++{
++#ifdef YAFFS_USE_TRUNCATE_SETSIZE
++ truncate_setsize(inode, newsize);
++ return 0;
++#else
++ truncate_inode_pages(&inode->i_data, newsize);
++ return 0;
++#endif
++
++}
++
++static unsigned yaffs_gc_control_callback(struct yaffs_dev *dev)
++{
++ return yaffs_gc_control;
++}
++
++static void yaffs_gross_lock(struct yaffs_dev *dev)
++{
++ T(YAFFS_TRACE_LOCK, (TSTR("yaffs locking %p\n"), current));
++ mutex_lock(&(yaffs_dev_to_lc(dev)->gross_lock));
++ T(YAFFS_TRACE_LOCK, (TSTR("yaffs locked %p\n"), current));
++}
++
++static void yaffs_gross_unlock(struct yaffs_dev *dev)
++{
++ T(YAFFS_TRACE_LOCK, (TSTR("yaffs unlocking %p\n"), current));
++ mutex_unlock(&(yaffs_dev_to_lc(dev)->gross_lock));
++}
++
++#ifdef YAFFS_COMPILE_EXPORTFS
++
++static struct inode *yaffs2_nfs_get_inode(struct super_block *sb, uint64_t ino,
++ uint32_t generation)
++{
++ return Y_IGET(sb, ino);
++}
++
++static struct dentry *yaffs2_fh_to_dentry(struct super_block *sb,
++ struct fid *fid, int fh_len,
++ int fh_type)
++{
++ return generic_fh_to_dentry(sb, fid, fh_len, fh_type,
++ yaffs2_nfs_get_inode);
++}
++
++static struct dentry *yaffs2_fh_to_parent(struct super_block *sb,
++ struct fid *fid, int fh_len,
++ int fh_type)
++{
++ return generic_fh_to_parent(sb, fid, fh_len, fh_type,
++ yaffs2_nfs_get_inode);
++}
++
++struct dentry *yaffs2_get_parent(struct dentry *dentry)
++{
++
++ struct super_block *sb = dentry->d_inode->i_sb;
++ struct dentry *parent = ERR_PTR(-ENOENT);
++ struct inode *inode;
++ unsigned long parent_ino;
++ struct yaffs_obj *d_obj;
++ struct yaffs_obj *parent_obj;
++
++ d_obj = yaffs_inode_to_obj(dentry->d_inode);
++
++ if (d_obj) {
++ parent_obj = d_obj->parent;
++ if (parent_obj) {
++ parent_ino = yaffs_get_obj_inode(parent_obj);
++ inode = Y_IGET(sb, parent_ino);
++
++ if (IS_ERR(inode)) {
++ parent = ERR_CAST(inode);
++ } else {
++ parent = d_obtain_alias(inode);
++ if (!IS_ERR(parent)) {
++ parent = ERR_PTR(-ENOMEM);
++ iput(inode);
++ }
++ }
++ }
++ }
++
++ return parent;
++}
++
++/* Just declare a zero structure as a NULL value implies
++ * using the default functions of exportfs.
++ */
++
++static struct export_operations yaffs_export_ops = {
++ .fh_to_dentry = yaffs2_fh_to_dentry,
++ .fh_to_parent = yaffs2_fh_to_parent,
++ .get_parent = yaffs2_get_parent,
++};
++
++#endif
++
++/*-----------------------------------------------------------------*/
++/* Directory search context allows us to unlock access to yaffs during
++ * filldir without causing problems with the directory being modified.
++ * This is similar to the tried and tested mechanism used in yaffs direct.
++ *
++ * A search context iterates along a doubly linked list of siblings in the
++ * directory. If the iterating object is deleted then this would corrupt
++ * the list iteration, likely causing a crash. The search context avoids
++ * this by using the remove_obj_fn to move the search context to the
++ * next object before the object is deleted.
++ *
++ * Many readdirs (and thus seach conexts) may be alive simulateously so
++ * each struct yaffs_dev has a list of these.
++ *
++ * A seach context lives for the duration of a readdir.
++ *
++ * All these functions must be called while yaffs is locked.
++ */
++
++struct yaffs_search_context {
++ struct yaffs_dev *dev;
++ struct yaffs_obj *dir_obj;
++ struct yaffs_obj *next_return;
++ struct list_head others;
++};
++
++/*
++ * yaffs_new_search() creates a new search context, initialises it and
++ * adds it to the device's search context list.
++ *
++ * Called at start of readdir.
++ */
++static struct yaffs_search_context *yaffs_new_search(struct yaffs_obj *dir)
++{
++ struct yaffs_dev *dev = dir->my_dev;
++ struct yaffs_search_context *sc =
++ YMALLOC(sizeof(struct yaffs_search_context));
++ if (sc) {
++ sc->dir_obj = dir;
++ sc->dev = dev;
++ if (list_empty(&sc->dir_obj->variant.dir_variant.children))
++ sc->next_return = NULL;
+ else
-+ tags.byteCountMSB = 3;
++ sc->next_return =
++ list_entry(dir->variant.dir_variant.children.next,
++ struct yaffs_obj, siblings);
++ INIT_LIST_HEAD(&sc->others);
++ list_add(&sc->others, &(yaffs_dev_to_lc(dev)->search_contexts));
++ }
++ return sc;
++}
+
++/*
++ * yaffs_search_end() disposes of a search context and cleans up.
++ */
++static void yaffs_search_end(struct yaffs_search_context *sc)
++{
++ if (sc) {
++ list_del(&sc->others);
++ YFREE(sc);
++ }
++}
+
-+ tags.serialNumber = eTags->serialNumber;
++/*
++ * yaffs_search_advance() moves a search context to the next object.
++ * Called when the search iterates or when an object removal causes
++ * the search context to be moved to the next object.
++ */
++static void yaffs_search_advance(struct yaffs_search_context *sc)
++{
++ if (!sc)
++ return;
+
-+ if (!dev->useNANDECC && data)
-+ yaffs_CalcECC(data, &spare);
++ if (sc->next_return == NULL ||
++ list_empty(&sc->dir_obj->variant.dir_variant.children))
++ sc->next_return = NULL;
++ else {
++ struct list_head *next = sc->next_return->siblings.next;
+
-+ yaffs_LoadTagsIntoSpare(&spare, &tags);
++ if (next == &sc->dir_obj->variant.dir_variant.children)
++ sc->next_return = NULL; /* end of list */
++ else
++ sc->next_return =
++ list_entry(next, struct yaffs_obj, siblings);
++ }
++}
+
++/*
++ * yaffs_remove_obj_callback() is called when an object is unlinked.
++ * We check open search contexts and advance any which are currently
++ * on the object being iterated.
++ */
++static void yaffs_remove_obj_callback(struct yaffs_obj *obj)
++{
++
++ struct list_head *i;
++ struct yaffs_search_context *sc;
++ struct list_head *search_contexts =
++ &(yaffs_dev_to_lc(obj->my_dev)->search_contexts);
++
++ /* Iterate through the directory search contexts.
++ * If any are currently on the object being removed, then advance
++ * the search context to the next object to prevent a hanging pointer.
++ */
++ list_for_each(i, search_contexts) {
++ if (i) {
++ sc = list_entry(i, struct yaffs_search_context, others);
++ if (sc->next_return == obj)
++ yaffs_search_advance(sc);
++ }
+ }
+
-+ return yaffs_WriteChunkToNAND(dev, chunkInNAND, data, &spare);
+}
+
-+int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev,
-+ int chunkInNAND,
-+ __u8 *data,
-+ yaffs_ExtendedTags *eTags)
++/*-----------------------------------------------------------------*/
++
++static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
++ int buflen)
+{
++ unsigned char *alias;
++ int ret;
+
-+ yaffs_Spare spare;
-+ yaffs_Tags tags;
-+ yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_UNKNOWN;
++ struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev;
+
-+ static yaffs_Spare spareFF;
-+ static int init;
++ yaffs_gross_lock(dev);
+
-+ if (!init) {
-+ memset(&spareFF, 0xFF, sizeof(spareFF));
-+ init = 1;
++ alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry));
++
++ yaffs_gross_unlock(dev);
++
++ if (!alias)
++ return -ENOMEM;
++
++ ret = vfs_readlink(dentry, buffer, buflen, alias);
++ kfree(alias);
++ return ret;
++}
++
++#if (YAFFS_NEW_FOLLOW_LINK == 1)
++static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
++{
++ void *ret;
++#else
++static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
++{
++ int ret
++#endif
++ unsigned char *alias;
++ int ret_int = 0;
++ struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev;
++
++ yaffs_gross_lock(dev);
++
++ alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry));
++ yaffs_gross_unlock(dev);
++
++ if (!alias) {
++ ret_int = -ENOMEM;
++ goto out;
+ }
++#if (YAFFS_NEW_FOLLOW_LINK == 1)
++ nd_set_link(nd, alias);
++ ret = alias;
++out:
++ if (ret_int)
++ ret = ERR_PTR(ret_int);
++ return ret;
++#else
++ ret = vfs_follow_link(nd, alias);
++ kfree(alias);
++out:
++ if (ret_int)
++ ret = ret_int;
++ return ret;
++#endif
++}
+
-+ if (yaffs_ReadChunkFromNAND
-+ (dev, chunkInNAND, data, &spare, &eccResult, 1)) {
-+ /* eTags may be NULL */
-+ if (eTags) {
++#if (YAFFS_NEW_FOLLOW_LINK == 1)
++void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias)
++{
++ kfree(alias);
++}
++#endif
+
-+ int deleted =
-+ (yaffs_CountBits(spare.pageStatus) < 7) ? 1 : 0;
++struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
++ struct yaffs_obj *obj);
+
-+ eTags->chunkDeleted = deleted;
-+ eTags->eccResult = eccResult;
-+ eTags->blockBad = 0; /* We're reading it */
-+ /* therefore it is not a bad block */
-+ eTags->chunkUsed =
-+ (memcmp(&spareFF, &spare, sizeof(spareFF)) !=
-+ 0) ? 1 : 0;
++/*
++ * Lookup is used to find objects in the fs
++ */
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
++
++static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
++ struct nameidata *n)
++#else
++static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
++#endif
++{
++ struct yaffs_obj *obj;
++ struct inode *inode = NULL; /* NCB 2.5/2.6 needs NULL here */
++
++ struct yaffs_dev *dev = yaffs_inode_to_obj(dir)->my_dev;
++
++ if (current != yaffs_dev_to_lc(dev)->readdir_process)
++ yaffs_gross_lock(dev);
++
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_lookup for %d:%s\n"),
++ yaffs_inode_to_obj(dir)->obj_id, dentry->d_name.name));
++
++ obj = yaffs_find_by_name(yaffs_inode_to_obj(dir), dentry->d_name.name);
++
++ obj = yaffs_get_equivalent_obj(obj); /* in case it was a hardlink */
++
++ /* Can't hold gross lock when calling yaffs_get_inode() */
++ if (current != yaffs_dev_to_lc(dev)->readdir_process)
++ yaffs_gross_unlock(dev);
++
++ if (obj) {
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_lookup found %d\n"), obj->obj_id));
++
++ inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
++
++ if (inode) {
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_loookup dentry \n")));
++/* #if 0 asserted by NCB for 2.5/6 compatability - falls through to
++ * d_add even if NULL inode */
++#if 0
++ /*dget(dentry); // try to solve directory bug */
++ d_add(dentry, inode);
++
++ /* return dentry; */
++ return NULL;
++#endif
++ }
++
++ } else {
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_lookup not found\n")));
++
++ }
++
++/* added NCB for 2.5/6 compatability - forces add even if inode is
++ * NULL which creates dentry hash */
++ d_add(dentry, inode);
++
++ return NULL;
++}
++
++#ifdef YAFFS_HAS_PUT_INODE
++
++/* For now put inode is just for debugging
++ * Put inode is called when the inode **structure** is put.
++ */
++static void yaffs_put_inode(struct inode *inode)
++{
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_put_inode: ino %d, count %d\n"), (int)inode->i_ino,
++ atomic_read(&inode->i_count)));
++
++}
++#endif
++
++static void yaffs_unstitch_obj(struct inode *inode, struct yaffs_obj *obj)
++{
++ /* Clear the association between the inode and
++ * the struct yaffs_obj.
++ */
++ obj->my_inode = NULL;
++ yaffs_inode_to_obj_lv(inode) = NULL;
++
++ /* If the object freeing was deferred, then the real
++ * free happens now.
++ * This should fix the inode inconsistency problem.
++ */
++ yaffs_handle_defered_free(obj);
++}
++
++#ifdef YAFFS_HAS_EVICT_INODE
++/* yaffs_evict_inode combines into one operation what was previously done in
++ * yaffs_clear_inode() and yaffs_delete_inode()
++ *
++ */
++static void yaffs_evict_inode(struct inode *inode)
++{
++ struct yaffs_obj *obj;
++ struct yaffs_dev *dev;
++ int deleteme = 0;
++
++ obj = yaffs_inode_to_obj(inode);
++
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_evict_inode: ino %d, count %d %s\n"), (int)inode->i_ino,
++ atomic_read(&inode->i_count),
++ obj ? "object exists" : "null object"));
++
++ if (!inode->i_nlink && !is_bad_inode(inode))
++ deleteme = 1;
++ truncate_inode_pages(&inode->i_data, 0);
++ end_writeback(inode);
++
++ if (deleteme && obj) {
++ dev = obj->my_dev;
++ yaffs_gross_lock(dev);
++ yaffs_del_obj(obj);
++ yaffs_gross_unlock(dev);
++ }
++ if (obj) {
++ dev = obj->my_dev;
++ yaffs_gross_lock(dev);
++ yaffs_unstitch_obj(inode, obj);
++ yaffs_gross_unlock(dev);
++ }
++
++}
++#else
++
++/* clear is called to tell the fs to release any per-inode data it holds.
++ * The object might still exist on disk and is just being thrown out of the cache
++ * or else the object has actually been deleted and we're being called via
++ * the chain
++ * yaffs_delete_inode() -> clear_inode()->yaffs_clear_inode()
++ */
++
++static void yaffs_clear_inode(struct inode *inode)
++{
++ struct yaffs_obj *obj;
++ struct yaffs_dev *dev;
++
++ obj = yaffs_inode_to_obj(inode);
++
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_clear_inode: ino %d, count %d %s\n"), (int)inode->i_ino,
++ atomic_read(&inode->i_count),
++ obj ? "object exists" : "null object"));
++
++ if (obj) {
++ dev = obj->my_dev;
++ yaffs_gross_lock(dev);
++ yaffs_unstitch_obj(inode, obj);
++ yaffs_gross_unlock(dev);
++ }
++
++}
++
++/* delete is called when the link count is zero and the inode
++ * is put (ie. nobody wants to know about it anymore, time to
++ * delete the file).
++ * NB Must call clear_inode()
++ */
++static void yaffs_delete_inode(struct inode *inode)
++{
++ struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
++ struct yaffs_dev *dev;
++
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_delete_inode: ino %d, count %d %s\n"), (int)inode->i_ino,
++ atomic_read(&inode->i_count),
++ obj ? "object exists" : "null object"));
++
++ if (obj) {
++ dev = obj->my_dev;
++ yaffs_gross_lock(dev);
++ yaffs_del_obj(obj);
++ yaffs_gross_unlock(dev);
++ }
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
++ truncate_inode_pages(&inode->i_data, 0);
++#endif
++ clear_inode(inode);
++}
++#endif
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
++static int yaffs_file_flush(struct file *file, fl_owner_t id)
++#else
++static int yaffs_file_flush(struct file *file)
++#endif
++{
++ struct yaffs_obj *obj = yaffs_dentry_to_obj(file->f_dentry);
++
++ struct yaffs_dev *dev = obj->my_dev;
++
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_file_flush object %d (%s)\n"), obj->obj_id,
++ obj->dirty ? "dirty" : "clean"));
++
++ yaffs_gross_lock(dev);
++
++ yaffs_flush_file(obj, 1, 0);
++
++ yaffs_gross_unlock(dev);
++
++ return 0;
++}
++
++static int yaffs_readpage_nolock(struct file *f, struct page *pg)
++{
++ /* Lifted from jffs2 */
++
++ struct yaffs_obj *obj;
++ unsigned char *pg_buf;
++ int ret;
++
++ struct yaffs_dev *dev;
++
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_readpage_nolock at %08x, size %08x\n"),
++ (unsigned)(pg->index << PAGE_CACHE_SHIFT),
++ (unsigned)PAGE_CACHE_SIZE));
++
++ obj = yaffs_dentry_to_obj(f->f_dentry);
++
++ dev = obj->my_dev;
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
++ BUG_ON(!PageLocked(pg));
++#else
++ if (!PageLocked(pg))
++ PAGE_BUG(pg);
++#endif
++
++ pg_buf = kmap(pg);
++ /* FIXME: Can kmap fail? */
++
++ yaffs_gross_lock(dev);
++
++ ret = yaffs_file_rd(obj, pg_buf,
++ pg->index << PAGE_CACHE_SHIFT, PAGE_CACHE_SIZE);
++
++ yaffs_gross_unlock(dev);
++
++ if (ret >= 0)
++ ret = 0;
++
++ if (ret) {
++ ClearPageUptodate(pg);
++ SetPageError(pg);
++ } else {
++ SetPageUptodate(pg);
++ ClearPageError(pg);
++ }
++
++ flush_dcache_page(pg);
++ kunmap(pg);
++
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_readpage_nolock done\n")));
++ return ret;
++}
++
++static int yaffs_readpage_unlock(struct file *f, struct page *pg)
++{
++ int ret = yaffs_readpage_nolock(f, pg);
++ UnlockPage(pg);
++ return ret;
++}
++
++static int yaffs_readpage(struct file *f, struct page *pg)
++{
++ int ret;
++
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_readpage\n")));
++ ret = yaffs_readpage_unlock(f, pg);
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_readpage done\n")));
++ return ret;
++}
++
++/* writepage inspired by/stolen from smbfs */
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
++static int yaffs_writepage(struct page *page, struct writeback_control *wbc)
++#else
++static int yaffs_writepage(struct page *page)
++#endif
++{
++ struct yaffs_dev *dev;
++ struct address_space *mapping = page->mapping;
++ struct inode *inode;
++ unsigned long end_index;
++ char *buffer;
++ struct yaffs_obj *obj;
++ int n_written = 0;
++ unsigned n_bytes;
++ loff_t i_size;
++
++ if (!mapping)
++ BUG();
++ inode = mapping->host;
++ if (!inode)
++ BUG();
++ i_size = i_size_read(inode);
++
++ end_index = i_size >> PAGE_CACHE_SHIFT;
++
++ if (page->index < end_index)
++ n_bytes = PAGE_CACHE_SIZE;
++ else {
++ n_bytes = i_size & (PAGE_CACHE_SIZE - 1);
++
++ if (page->index > end_index || !n_bytes) {
++ T(YAFFS_TRACE_OS,
++ (TSTR
++ ("yaffs_writepage at %08x, inode size = %08x!!!\n"),
++ (unsigned)(page->index << PAGE_CACHE_SHIFT),
++ (unsigned)inode->i_size));
++ T(YAFFS_TRACE_OS,
++ (TSTR(" -> don't care!!\n")));
++
++ zero_user_segment(page, 0, PAGE_CACHE_SIZE);
++ set_page_writeback(page);
++ unlock_page(page);
++ end_page_writeback(page);
++ return 0;
++ }
++ }
++
++ if (n_bytes != PAGE_CACHE_SIZE)
++ zero_user_segment(page, n_bytes, PAGE_CACHE_SIZE);
++
++ get_page(page);
++
++ buffer = kmap(page);
++
++ obj = yaffs_inode_to_obj(inode);
++ dev = obj->my_dev;
++ yaffs_gross_lock(dev);
++
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_writepage at %08x, size %08x\n"),
++ (unsigned)(page->index << PAGE_CACHE_SHIFT), n_bytes));
++ T(YAFFS_TRACE_OS,
++ (TSTR("writepag0: obj = %05x, ino = %05x\n"),
++ (int)obj->variant.file_variant.file_size, (int)inode->i_size));
++
++ n_written = yaffs_wr_file(obj, buffer,
++ page->index << PAGE_CACHE_SHIFT, n_bytes, 0);
++
++ yaffs_touch_super(dev);
++
++ T(YAFFS_TRACE_OS,
++ (TSTR("writepag1: obj = %05x, ino = %05x\n"),
++ (int)obj->variant.file_variant.file_size, (int)inode->i_size));
++
++ yaffs_gross_unlock(dev);
++
++ kunmap(page);
++ set_page_writeback(page);
++ unlock_page(page);
++ end_page_writeback(page);
++ put_page(page);
++
++ return (n_written == n_bytes) ? 0 : -ENOSPC;
++}
++
++#if (YAFFS_USE_WRITE_BEGIN_END > 0)
++static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
++ loff_t pos, unsigned len, unsigned flags,
++ struct page **pagep, void **fsdata)
++{
++ struct page *pg = NULL;
++ pgoff_t index = pos >> PAGE_CACHE_SHIFT;
++
++ int ret = 0;
++ int space_held = 0;
++
++ /* Get a page */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++ pg = grab_cache_page_write_begin(mapping, index, flags);
++#else
++ pg = __grab_cache_page(mapping, index);
++#endif
++
++ *pagep = pg;
++ if (!pg) {
++ ret = -ENOMEM;
++ goto out;
++ }
++ T(YAFFS_TRACE_OS,
++ (TSTR("start yaffs_write_begin index %d(%x) uptodate %d\n"),
++ (int)index, (int)index, Page_Uptodate(pg) ? 1 : 0));
++
++ /* Get fs space */
++ space_held = yaffs_hold_space(filp);
++
++ if (!space_held) {
++ ret = -ENOSPC;
++ goto out;
++ }
++
++ /* Update page if required */
++
++ if (!Page_Uptodate(pg))
++ ret = yaffs_readpage_nolock(filp, pg);
++
++ if (ret)
++ goto out;
++
++ /* Happy path return */
++ T(YAFFS_TRACE_OS, (TSTR("end yaffs_write_begin - ok\n")));
++
++ return 0;
++
++out:
++ T(YAFFS_TRACE_OS,
++ (TSTR("end yaffs_write_begin fail returning %d\n"), ret));
++ if (space_held)
++ yaffs_release_space(filp);
++ if (pg) {
++ unlock_page(pg);
++ page_cache_release(pg);
++ }
++ return ret;
++}
++
++#else
++
++static int yaffs_prepare_write(struct file *f, struct page *pg,
++ unsigned offset, unsigned to)
++{
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_prepair_write\n")));
++
++ if (!Page_Uptodate(pg))
++ return yaffs_readpage_nolock(f, pg);
++ return 0;
++}
++#endif
++
++#if (YAFFS_USE_WRITE_BEGIN_END > 0)
++static int yaffs_write_end(struct file *filp, struct address_space *mapping,
++ loff_t pos, unsigned len, unsigned copied,
++ struct page *pg, void *fsdadata)
++{
++ int ret = 0;
++ void *addr, *kva;
++ uint32_t offset_into_page = pos & (PAGE_CACHE_SIZE - 1);
++
++ kva = kmap(pg);
++ addr = kva + offset_into_page;
++
++ T(YAFFS_TRACE_OS,
++ ("yaffs_write_end addr %p pos %x n_bytes %d\n",
++ addr, (unsigned)pos, copied));
+
-+ if (eTags->chunkUsed) {
-+ yaffs_GetTagsFromSpare(dev, &spare, &tags);
++ ret = yaffs_file_write(filp, addr, copied, &pos);
+
-+ eTags->objectId = tags.objectId;
-+ eTags->chunkId = tags.chunkId;
-+ eTags->byteCount = tags.byteCountLSB;
++ if (ret != copied) {
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_write_end not same size ret %d copied %d\n"),
++ ret, copied));
++ SetPageError(pg);
++ } else {
++ /* Nothing */
++ }
++
++ kunmap(pg);
+
-+ if (dev->nDataBytesPerChunk >= 1024)
-+ eTags->byteCount |= (((unsigned) tags.byteCountMSB) << 10);
++ yaffs_release_space(filp);
++ unlock_page(pg);
++ page_cache_release(pg);
++ return ret;
++}
++#else
+
-+ eTags->serialNumber = tags.serialNumber;
++static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
++ unsigned to)
++{
++ void *addr, *kva;
++
++ loff_t pos = (((loff_t) pg->index) << PAGE_CACHE_SHIFT) + offset;
++ int n_bytes = to - offset;
++ int n_written;
++
++ unsigned spos = pos;
++ unsigned saddr;
++
++ kva = kmap(pg);
++ addr = kva + offset;
++
++ saddr = (unsigned)addr;
++
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_commit_write addr %x pos %x n_bytes %d\n"),
++ saddr, spos, n_bytes));
++
++ n_written = yaffs_file_write(f, addr, n_bytes, &pos);
++
++ if (n_written != n_bytes) {
++ T(YAFFS_TRACE_OS,
++ (TSTR
++ ("yaffs_commit_write not same size n_written %d n_bytes %d\n"),
++ n_written, n_bytes));
++ SetPageError(pg);
++ } else {
++ /* Nothing */
++ }
++
++ kunmap(pg);
++
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_commit_write returning %d\n"),
++ n_written == n_bytes ? 0 : n_written));
++
++ return n_written == n_bytes ? 0 : n_written;
++}
++#endif
++
++static void yaffs_fill_inode_from_obj(struct inode *inode,
++ struct yaffs_obj *obj)
++{
++ if (inode && obj) {
++
++ /* Check mode against the variant type and attempt to repair if broken. */
++ u32 mode = obj->yst_mode;
++ switch (obj->variant_type) {
++ case YAFFS_OBJECT_TYPE_FILE:
++ if (!S_ISREG(mode)) {
++ obj->yst_mode &= ~S_IFMT;
++ obj->yst_mode |= S_IFREG;
+ }
++
++ break;
++ case YAFFS_OBJECT_TYPE_SYMLINK:
++ if (!S_ISLNK(mode)) {
++ obj->yst_mode &= ~S_IFMT;
++ obj->yst_mode |= S_IFLNK;
++ }
++
++ break;
++ case YAFFS_OBJECT_TYPE_DIRECTORY:
++ if (!S_ISDIR(mode)) {
++ obj->yst_mode &= ~S_IFMT;
++ obj->yst_mode |= S_IFDIR;
++ }
++
++ break;
++ case YAFFS_OBJECT_TYPE_UNKNOWN:
++ case YAFFS_OBJECT_TYPE_HARDLINK:
++ case YAFFS_OBJECT_TYPE_SPECIAL:
++ default:
++ /* TODO? */
++ break;
+ }
+
-+ return YAFFS_OK;
++ inode->i_flags |= S_NOATIME;
++
++ inode->i_ino = obj->obj_id;
++ inode->i_mode = obj->yst_mode;
++ inode->i_uid = obj->yst_uid;
++ inode->i_gid = obj->yst_gid;
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
++ inode->i_blksize = inode->i_sb->s_blocksize;
++#endif
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
++
++ inode->i_rdev = old_decode_dev(obj->yst_rdev);
++ inode->i_atime.tv_sec = (time_t) (obj->yst_atime);
++ inode->i_atime.tv_nsec = 0;
++ inode->i_mtime.tv_sec = (time_t) obj->yst_mtime;
++ inode->i_mtime.tv_nsec = 0;
++ inode->i_ctime.tv_sec = (time_t) obj->yst_ctime;
++ inode->i_ctime.tv_nsec = 0;
++#else
++ inode->i_rdev = obj->yst_rdev;
++ inode->i_atime = obj->yst_atime;
++ inode->i_mtime = obj->yst_mtime;
++ inode->i_ctime = obj->yst_ctime;
++#endif
++ inode->i_size = yaffs_get_obj_length(obj);
++ inode->i_blocks = (inode->i_size + 511) >> 9;
++
++ inode->i_nlink = yaffs_get_obj_link_count(obj);
++
++ T(YAFFS_TRACE_OS,
++ (TSTR
++ ("yaffs_fill_inode mode %x uid %d gid %d size %d count %d\n"),
++ inode->i_mode, inode->i_uid, inode->i_gid,
++ (int)inode->i_size, atomic_read(&inode->i_count)));
++
++ switch (obj->yst_mode & S_IFMT) {
++ default: /* fifo, device or socket */
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
++ init_special_inode(inode, obj->yst_mode,
++ old_decode_dev(obj->yst_rdev));
++#else
++ init_special_inode(inode, obj->yst_mode,
++ (dev_t) (obj->yst_rdev));
++#endif
++ break;
++ case S_IFREG: /* file */
++ inode->i_op = &yaffs_file_inode_operations;
++ inode->i_fop = &yaffs_file_operations;
++ inode->i_mapping->a_ops =
++ &yaffs_file_address_operations;
++ break;
++ case S_IFDIR: /* directory */
++ inode->i_op = &yaffs_dir_inode_operations;
++ inode->i_fop = &yaffs_dir_operations;
++ break;
++ case S_IFLNK: /* symlink */
++ inode->i_op = &yaffs_symlink_inode_operations;
++ break;
++ }
++
++ yaffs_inode_to_obj_lv(inode) = obj;
++
++ obj->my_inode = inode;
++
+ } else {
-+ return YAFFS_FAIL;
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_fill_inode invalid parameters\n")));
+ }
++
+}
+
-+int yaffs_TagsCompatabilityMarkNANDBlockBad(struct yaffs_DeviceStruct *dev,
-+ int blockInNAND)
++struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
++ struct yaffs_obj *obj)
+{
++ struct inode *inode;
++
++ if (!sb) {
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_get_inode for NULL super_block!!\n")));
++ return NULL;
++
++ }
+
-+ yaffs_Spare spare;
++ if (!obj) {
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_get_inode for NULL object!!\n")));
++ return NULL;
+
-+ memset(&spare, 0xff, sizeof(yaffs_Spare));
++ }
+
-+ spare.blockStatus = 'Y';
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_get_inode for object %d\n"), obj->obj_id));
+
-+ yaffs_WriteChunkToNAND(dev, blockInNAND * dev->nChunksPerBlock, NULL,
-+ &spare);
-+ yaffs_WriteChunkToNAND(dev, blockInNAND * dev->nChunksPerBlock + 1,
-+ NULL, &spare);
++ inode = Y_IGET(sb, obj->obj_id);
++ if (IS_ERR(inode))
++ return NULL;
+
-+ return YAFFS_OK;
++ /* NB Side effect: iget calls back to yaffs_read_inode(). */
++ /* iget also increments the inode's i_count */
++ /* NB You can't be holding gross_lock or deadlock will happen! */
+
++ return inode;
+}
+
-+int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev,
-+ int blockNo,
-+ yaffs_BlockState *state,
-+ __u32 *sequenceNumber)
++static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
++ loff_t * pos)
+{
++ struct yaffs_obj *obj;
++ int n_written, ipos;
++ struct inode *inode;
++ struct yaffs_dev *dev;
+
-+ yaffs_Spare spare0, spare1;
-+ static yaffs_Spare spareFF;
-+ static int init;
-+ yaffs_ECCResult dummy;
++ obj = yaffs_dentry_to_obj(f->f_dentry);
++
++ dev = obj->my_dev;
++
++ yaffs_gross_lock(dev);
++
++ inode = f->f_dentry->d_inode;
++
++ if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND)
++ ipos = inode->i_size;
++ else
++ ipos = *pos;
++
++ if (!obj)
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_file_write: hey obj is null!\n")));
++ else
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_file_write about to write writing %u(%x) bytes"
++ "to object %d at %d(%x)\n"),
++ (unsigned)n, (unsigned)n, obj->obj_id, ipos, ipos));
++
++ n_written = yaffs_wr_file(obj, buf, ipos, n, 0);
++
++ yaffs_touch_super(dev);
++
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_file_write: %d(%x) bytes written\n"),
++ (unsigned)n, (unsigned)n));
++
++ if (n_written > 0) {
++ ipos += n_written;
++ *pos = ipos;
++ if (ipos > inode->i_size) {
++ inode->i_size = ipos;
++ inode->i_blocks = (ipos + 511) >> 9;
++
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_file_write size updated to %d bytes, "
++ "%d blocks\n"), ipos, (int)(inode->i_blocks)));
++ }
+
-+ if (!init) {
-+ memset(&spareFF, 0xFF, sizeof(spareFF));
-+ init = 1;
+ }
++ yaffs_gross_unlock(dev);
++ return (n_written == 0) && (n > 0) ? -ENOSPC : n_written;
++}
++
++/* Space holding and freeing is done to ensure we have space available for write_begin/end */
++/* For now we just assume few parallel writes and check against a small number. */
++/* Todo: need to do this with a counter to handle parallel reads better */
+
-+ *sequenceNumber = 0;
++static ssize_t yaffs_hold_space(struct file *f)
++{
++ struct yaffs_obj *obj;
++ struct yaffs_dev *dev;
+
-+ yaffs_ReadChunkFromNAND(dev, blockNo * dev->nChunksPerBlock, NULL,
-+ &spare0, &dummy, 1);
-+ yaffs_ReadChunkFromNAND(dev, blockNo * dev->nChunksPerBlock + 1, NULL,
-+ &spare1, &dummy, 1);
++ int n_free_chunks;
+
-+ if (yaffs_CountBits(spare0.blockStatus & spare1.blockStatus) < 7)
-+ *state = YAFFS_BLOCK_STATE_DEAD;
-+ else if (memcmp(&spareFF, &spare0, sizeof(spareFF)) == 0)
-+ *state = YAFFS_BLOCK_STATE_EMPTY;
++ obj = yaffs_dentry_to_obj(f->f_dentry);
++
++ dev = obj->my_dev;
++
++ yaffs_gross_lock(dev);
++
++ n_free_chunks = yaffs_get_n_free_chunks(dev);
++
++ yaffs_gross_unlock(dev);
++
++ return (n_free_chunks > 20) ? 1 : 0;
++}
++
++static void yaffs_release_space(struct file *f)
++{
++ struct yaffs_obj *obj;
++ struct yaffs_dev *dev;
++
++ obj = yaffs_dentry_to_obj(f->f_dentry);
++
++ dev = obj->my_dev;
++
++ yaffs_gross_lock(dev);
++
++ yaffs_gross_unlock(dev);
++}
++
++static loff_t yaffs_dir_llseek(struct file *file, loff_t offset, int origin)
++{
++ long long retval;
++
++ lock_kernel();
++
++ switch (origin) {
++ case 2:
++ offset += i_size_read(file->f_path.dentry->d_inode);
++ break;
++ case 1:
++ offset += file->f_pos;
++ }
++ retval = -EINVAL;
++
++ if (offset >= 0) {
++ if (offset != file->f_pos)
++ file->f_pos = offset;
++
++ retval = offset;
++ }
++ unlock_kernel();
++ return retval;
++}
++
++static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
++{
++ struct yaffs_obj *obj;
++ struct yaffs_dev *dev;
++ struct yaffs_search_context *sc;
++ struct inode *inode = f->f_dentry->d_inode;
++ unsigned long offset, curoffs;
++ struct yaffs_obj *l;
++ int ret_val = 0;
++
++ char name[YAFFS_MAX_NAME_LENGTH + 1];
++
++ obj = yaffs_dentry_to_obj(f->f_dentry);
++ dev = obj->my_dev;
++
++ yaffs_gross_lock(dev);
++
++ yaffs_dev_to_lc(dev)->readdir_process = current;
++
++ offset = f->f_pos;
++
++ sc = yaffs_new_search(obj);
++ if (!sc) {
++ ret_val = -ENOMEM;
++ goto out;
++ }
++
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_readdir: starting at %d\n"), (int)offset));
++
++ if (offset == 0) {
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_readdir: entry . ino %d \n"),
++ (int)inode->i_ino));
++ yaffs_gross_unlock(dev);
++ if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR) < 0) {
++ yaffs_gross_lock(dev);
++ goto out;
++ }
++ yaffs_gross_lock(dev);
++ offset++;
++ f->f_pos++;
++ }
++ if (offset == 1) {
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_readdir: entry .. ino %d \n"),
++ (int)f->f_dentry->d_parent->d_inode->i_ino));
++ yaffs_gross_unlock(dev);
++ if (filldir(dirent, "..", 2, offset,
++ f->f_dentry->d_parent->d_inode->i_ino,
++ DT_DIR) < 0) {
++ yaffs_gross_lock(dev);
++ goto out;
++ }
++ yaffs_gross_lock(dev);
++ offset++;
++ f->f_pos++;
++ }
++
++ curoffs = 1;
++
++ /* If the directory has changed since the open or last call to
++ readdir, rewind to after the 2 canned entries. */
++ if (f->f_version != inode->i_version) {
++ offset = 2;
++ f->f_pos = offset;
++ f->f_version = inode->i_version;
++ }
++
++ while (sc->next_return) {
++ curoffs++;
++ l = sc->next_return;
++ if (curoffs >= offset) {
++ int this_inode = yaffs_get_obj_inode(l);
++ int this_type = yaffs_get_obj_type(l);
++
++ yaffs_get_obj_name(l, name, YAFFS_MAX_NAME_LENGTH + 1);
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_readdir: %s inode %d\n"),
++ name, yaffs_get_obj_inode(l)));
++
++ yaffs_gross_unlock(dev);
++
++ if (filldir(dirent,
++ name,
++ strlen(name),
++ offset, this_inode, this_type) < 0) {
++ yaffs_gross_lock(dev);
++ goto out;
++ }
++
++ yaffs_gross_lock(dev);
++
++ offset++;
++ f->f_pos++;
++ }
++ yaffs_search_advance(sc);
++ }
++
++out:
++ yaffs_search_end(sc);
++ yaffs_dev_to_lc(dev)->readdir_process = NULL;
++ yaffs_gross_unlock(dev);
++
++ return ret_val;
++}
++
++/*
++ * File creation. Allocate an inode, and we're done..
++ */
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
++#define YCRED(x) x
++#else
++#define YCRED(x) (x->cred)
++#endif
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
++static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
++ dev_t rdev)
++#else
++static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
++ int rdev)
++#endif
++{
++ struct inode *inode;
++
++ struct yaffs_obj *obj = NULL;
++ struct yaffs_dev *dev;
++
++ struct yaffs_obj *parent = yaffs_inode_to_obj(dir);
++
++ int error = -ENOSPC;
++ uid_t uid = YCRED(current)->fsuid;
++ gid_t gid =
++ (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
++
++ if ((dir->i_mode & S_ISGID) && S_ISDIR(mode))
++ mode |= S_ISGID;
++
++ if (parent) {
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_mknod: parent object %d type %d\n"),
++ parent->obj_id, parent->variant_type));
++ } else {
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_mknod: could not get parent object\n")));
++ return -EPERM;
++ }
++
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making oject for %s, "
++ "mode %x dev %x\n"),
++ dentry->d_name.name, mode, rdev));
++
++ dev = parent->my_dev;
++
++ yaffs_gross_lock(dev);
++
++ switch (mode & S_IFMT) {
++ default:
++ /* Special (socket, fifo, device...) */
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making special\n")));
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
++ obj =
++ yaffs_create_special(parent, dentry->d_name.name, mode, uid,
++ gid, old_encode_dev(rdev));
++#else
++ obj =
++ yaffs_create_special(parent, dentry->d_name.name, mode, uid,
++ gid, rdev);
++#endif
++ break;
++ case S_IFREG: /* file */
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making file\n")));
++ obj = yaffs_create_file(parent, dentry->d_name.name, mode, uid,
++ gid);
++ break;
++ case S_IFDIR: /* directory */
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making directory\n")));
++ obj = yaffs_create_dir(parent, dentry->d_name.name, mode,
++ uid, gid);
++ break;
++ case S_IFLNK: /* symlink */
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making symlink\n")));
++ obj = NULL; /* Do we ever get here? */
++ break;
++ }
++
++ /* Can not call yaffs_get_inode() with gross lock held */
++ yaffs_gross_unlock(dev);
++
++ if (obj) {
++ inode = yaffs_get_inode(dir->i_sb, mode, rdev, obj);
++ d_instantiate(dentry, inode);
++ update_dir_time(dir);
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_mknod created object %d count = %d\n"),
++ obj->obj_id, atomic_read(&inode->i_count)));
++ error = 0;
++ yaffs_fill_inode_from_obj(dir, parent);
++ } else {
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod failed making object\n")));
++ error = -ENOMEM;
++ }
++
++ return error;
++}
++
++static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
++{
++ int ret_val;
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_mkdir\n")));
++ ret_val = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0);
++ return ret_val;
++}
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
++static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
++ struct nameidata *n)
++#else
++static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode)
++#endif
++{
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_create\n")));
++ return yaffs_mknod(dir, dentry, mode | S_IFREG, 0);
++}
++
++static int yaffs_unlink(struct inode *dir, struct dentry *dentry)
++{
++ int ret_val;
++
++ struct yaffs_dev *dev;
++ struct yaffs_obj *obj;
++
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_unlink %d:%s\n"),
++ (int)(dir->i_ino), dentry->d_name.name));
++ obj = yaffs_inode_to_obj(dir);
++ dev = obj->my_dev;
++
++ yaffs_gross_lock(dev);
++
++ ret_val = yaffs_unlinker(obj, dentry->d_name.name);
++
++ if (ret_val == YAFFS_OK) {
++ dentry->d_inode->i_nlink--;
++ dir->i_version++;
++ yaffs_gross_unlock(dev);
++ mark_inode_dirty(dentry->d_inode);
++ update_dir_time(dir);
++ return 0;
++ }
++ yaffs_gross_unlock(dev);
++ return -ENOTEMPTY;
++}
++
++/*
++ * Create a link...
++ */
++static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
++ struct dentry *dentry)
++{
++ struct inode *inode = old_dentry->d_inode;
++ struct yaffs_obj *obj = NULL;
++ struct yaffs_obj *link = NULL;
++ struct yaffs_dev *dev;
++
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_link\n")));
++
++ obj = yaffs_inode_to_obj(inode);
++ dev = obj->my_dev;
++
++ yaffs_gross_lock(dev);
++
++ if (!S_ISDIR(inode->i_mode)) /* Don't link directories */
++ link =
++ yaffs_link_obj(yaffs_inode_to_obj(dir), dentry->d_name.name,
++ obj);
++
++ if (link) {
++ old_dentry->d_inode->i_nlink = yaffs_get_obj_link_count(obj);
++ d_instantiate(dentry, old_dentry->d_inode);
++ atomic_inc(&old_dentry->d_inode->i_count);
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_link link count %d i_count %d\n"),
++ old_dentry->d_inode->i_nlink,
++ atomic_read(&old_dentry->d_inode->i_count)));
++ }
++
++ yaffs_gross_unlock(dev);
++
++ if (link) {
++ update_dir_time(dir);
++ return 0;
++ }
++
++ return -EPERM;
++}
++
++static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
++ const char *symname)
++{
++ struct yaffs_obj *obj;
++ struct yaffs_dev *dev;
++ uid_t uid = YCRED(current)->fsuid;
++ gid_t gid =
++ (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
++
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_symlink\n")));
++
++ dev = yaffs_inode_to_obj(dir)->my_dev;
++ yaffs_gross_lock(dev);
++ obj = yaffs_create_symlink(yaffs_inode_to_obj(dir), dentry->d_name.name,
++ S_IFLNK | S_IRWXUGO, uid, gid, symname);
++ yaffs_gross_unlock(dev);
++
++ if (obj) {
++ struct inode *inode;
++
++ inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
++ d_instantiate(dentry, inode);
++ update_dir_time(dir);
++ T(YAFFS_TRACE_OS, (TSTR("symlink created OK\n")));
++ return 0;
++ } else {
++ T(YAFFS_TRACE_OS, (TSTR("symlink not created\n")));
++ }
++
++ return -ENOMEM;
++}
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34))
++static int yaffs_sync_object(struct file *file, int datasync)
++#else
++static int yaffs_sync_object(struct file *file, struct dentry *dentry,
++ int datasync)
++#endif
++{
++
++ struct yaffs_obj *obj;
++ struct yaffs_dev *dev;
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34))
++ struct dentry *dentry = file->f_path.dentry;
++#endif
++
++ obj = yaffs_dentry_to_obj(dentry);
++
++ dev = obj->my_dev;
++
++ T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC, (TSTR("yaffs_sync_object\n")));
++ yaffs_gross_lock(dev);
++ yaffs_flush_file(obj, 1, datasync);
++ yaffs_gross_unlock(dev);
++ return 0;
++}
++
++/*
++ * The VFS layer already does all the dentry stuff for rename.
++ *
++ * NB: POSIX says you can rename an object over an old object of the same name
++ */
++static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
++ struct inode *new_dir, struct dentry *new_dentry)
++{
++ struct yaffs_dev *dev;
++ int ret_val = YAFFS_FAIL;
++ struct yaffs_obj *target;
++
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_rename\n")));
++ dev = yaffs_inode_to_obj(old_dir)->my_dev;
++
++ yaffs_gross_lock(dev);
++
++ /* Check if the target is an existing directory that is not empty. */
++ target = yaffs_find_by_name(yaffs_inode_to_obj(new_dir),
++ new_dentry->d_name.name);
++
++ if (target && target->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY &&
++ !list_empty(&target->variant.dir_variant.children)) {
++
++ T(YAFFS_TRACE_OS, (TSTR("target is non-empty dir\n")));
++
++ ret_val = YAFFS_FAIL;
++ } else {
++ /* Now does unlinking internally using shadowing mechanism */
++ T(YAFFS_TRACE_OS, (TSTR("calling yaffs_rename_obj\n")));
++
++ ret_val = yaffs_rename_obj(yaffs_inode_to_obj(old_dir),
++ old_dentry->d_name.name,
++ yaffs_inode_to_obj(new_dir),
++ new_dentry->d_name.name);
++ }
++ yaffs_gross_unlock(dev);
++
++ if (ret_val == YAFFS_OK) {
++ if (target) {
++ new_dentry->d_inode->i_nlink--;
++ mark_inode_dirty(new_dentry->d_inode);
++ }
++
++ update_dir_time(old_dir);
++ if (old_dir != new_dir)
++ update_dir_time(new_dir);
++ return 0;
++ } else {
++ return -ENOTEMPTY;
++ }
++}
++
++static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
++{
++ struct inode *inode = dentry->d_inode;
++ int error = 0;
++ struct yaffs_dev *dev;
++
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_setattr of object %d\n"),
++ yaffs_inode_to_obj(inode)->obj_id));
++
++ /* Fail if a requested resize >= 2GB */
++ if (attr->ia_valid & ATTR_SIZE && (attr->ia_size >> 31))
++ error = -EINVAL;
++
++ if (error == 0)
++ error = inode_change_ok(inode, attr);
++ if (error == 0) {
++ int result;
++ if (!error) {
++ error = yaffs_vfs_setattr(inode, attr);
++ T(YAFFS_TRACE_OS, (TSTR("inode_setattr called\n")));
++ if (attr->ia_valid & ATTR_SIZE) {
++ yaffs_vfs_setsize(inode, attr->ia_size);
++ inode->i_blocks = (inode->i_size + 511) >> 9;
++ }
++ }
++ dev = yaffs_inode_to_obj(inode)->my_dev;
++ if (attr->ia_valid & ATTR_SIZE) {
++ T(YAFFS_TRACE_OS, (TSTR("resize to %d(%x)\n"),
++ (int)(attr->ia_size),
++ (int)(attr->ia_size)));
++ }
++ yaffs_gross_lock(dev);
++ result = yaffs_set_attribs(yaffs_inode_to_obj(inode), attr);
++ if (result == YAFFS_OK) {
++ error = 0;
++ } else {
++ error = -EPERM;
++ }
++ yaffs_gross_unlock(dev);
++
++ }
++
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_setattr done returning %d\n"), error));
++
++ return error;
++}
++
++#ifdef CONFIG_YAFFS_XATTR
++int yaffs_setxattr(struct dentry *dentry, const char *name,
++ const void *value, size_t size, int flags)
++{
++ struct inode *inode = dentry->d_inode;
++ int error = 0;
++ struct yaffs_dev *dev;
++ struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
++
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_setxattr of object %d\n"), obj->obj_id));
++
++ if (error == 0) {
++ int result;
++ dev = obj->my_dev;
++ yaffs_gross_lock(dev);
++ result = yaffs_set_xattrib(obj, name, value, size, flags);
++ if (result == YAFFS_OK)
++ error = 0;
++ else if (result < 0)
++ error = result;
++ yaffs_gross_unlock(dev);
++
++ }
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_setxattr done returning %d\n"), error));
++
++ return error;
++}
++
++ssize_t yaffs_getxattr(struct dentry * dentry, const char *name, void *buff,
++ size_t size)
++{
++ struct inode *inode = dentry->d_inode;
++ int error = 0;
++ struct yaffs_dev *dev;
++ struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
++
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_getxattr \"%s\" from object %d\n"), name, obj->obj_id));
++
++ if (error == 0) {
++ dev = obj->my_dev;
++ yaffs_gross_lock(dev);
++ error = yaffs_get_xattrib(obj, name, buff, size);
++ yaffs_gross_unlock(dev);
++
++ }
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_getxattr done returning %d\n"), error));
++
++ return error;
++}
++
++int yaffs_removexattr(struct dentry *dentry, const char *name)
++{
++ struct inode *inode = dentry->d_inode;
++ int error = 0;
++ struct yaffs_dev *dev;
++ struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
++
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_removexattr of object %d\n"), obj->obj_id));
++
++ if (error == 0) {
++ int result;
++ dev = obj->my_dev;
++ yaffs_gross_lock(dev);
++ result = yaffs_remove_xattrib(obj, name);
++ if (result == YAFFS_OK)
++ error = 0;
++ else if (result < 0)
++ error = result;
++ yaffs_gross_unlock(dev);
++
++ }
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_removexattr done returning %d\n"), error));
++
++ return error;
++}
++
++ssize_t yaffs_listxattr(struct dentry * dentry, char *buff, size_t size)
++{
++ struct inode *inode = dentry->d_inode;
++ int error = 0;
++ struct yaffs_dev *dev;
++ struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
++
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_listxattr of object %d\n"), obj->obj_id));
++
++ if (error == 0) {
++ dev = obj->my_dev;
++ yaffs_gross_lock(dev);
++ error = yaffs_list_xattrib(obj, buff, size);
++ yaffs_gross_unlock(dev);
++
++ }
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_listxattr done returning %d\n"), error));
++
++ return error;
++}
++
++#endif
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
++static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf)
++{
++ struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev;
++ struct super_block *sb = dentry->d_sb;
++#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
++static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf)
++{
++ struct yaffs_dev *dev = yaffs_super_to_dev(sb);
++#else
++static int yaffs_statfs(struct super_block *sb, struct statfs *buf)
++{
++ struct yaffs_dev *dev = yaffs_super_to_dev(sb);
++#endif
++
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_statfs\n")));
++
++ yaffs_gross_lock(dev);
++
++ buf->f_type = YAFFS_MAGIC;
++ buf->f_bsize = sb->s_blocksize;
++ buf->f_namelen = 255;
++
++ if (dev->data_bytes_per_chunk & (dev->data_bytes_per_chunk - 1)) {
++ /* Do this if chunk size is not a power of 2 */
++
++ uint64_t bytes_in_dev;
++ uint64_t bytes_free;
++
++ bytes_in_dev =
++ ((uint64_t)
++ ((dev->param.end_block - dev->param.start_block +
++ 1))) * ((uint64_t) (dev->param.chunks_per_block *
++ dev->data_bytes_per_chunk));
++
++ do_div(bytes_in_dev, sb->s_blocksize); /* bytes_in_dev becomes the number of blocks */
++ buf->f_blocks = bytes_in_dev;
++
++ bytes_free = ((uint64_t) (yaffs_get_n_free_chunks(dev))) *
++ ((uint64_t) (dev->data_bytes_per_chunk));
++
++ do_div(bytes_free, sb->s_blocksize);
++
++ buf->f_bfree = bytes_free;
++
++ } else if (sb->s_blocksize > dev->data_bytes_per_chunk) {
++
++ buf->f_blocks =
++ (dev->param.end_block - dev->param.start_block + 1) *
++ dev->param.chunks_per_block /
++ (sb->s_blocksize / dev->data_bytes_per_chunk);
++ buf->f_bfree =
++ yaffs_get_n_free_chunks(dev) /
++ (sb->s_blocksize / dev->data_bytes_per_chunk);
++ } else {
++ buf->f_blocks =
++ (dev->param.end_block - dev->param.start_block + 1) *
++ dev->param.chunks_per_block *
++ (dev->data_bytes_per_chunk / sb->s_blocksize);
++
++ buf->f_bfree =
++ yaffs_get_n_free_chunks(dev) *
++ (dev->data_bytes_per_chunk / sb->s_blocksize);
++ }
++
++ buf->f_files = 0;
++ buf->f_ffree = 0;
++ buf->f_bavail = buf->f_bfree;
++
++ yaffs_gross_unlock(dev);
++ return 0;
++}
++
++static void yaffs_flush_inodes(struct super_block *sb)
++{
++ struct inode *iptr;
++ struct yaffs_obj *obj;
++
++ list_for_each_entry(iptr, &sb->s_inodes, i_sb_list) {
++ obj = yaffs_inode_to_obj(iptr);
++ if (obj) {
++ T(YAFFS_TRACE_OS, (TSTR("flushing obj %d\n"),
++ obj->obj_id));
++ yaffs_flush_file(obj, 1, 0);
++ }
++ }
++}
++
++static void yaffs_flush_super(struct super_block *sb, int do_checkpoint)
++{
++ struct yaffs_dev *dev = yaffs_super_to_dev(sb);
++ if (!dev)
++ return;
++
++ yaffs_flush_inodes(sb);
++ yaffs_update_dirty_dirs(dev);
++ yaffs_flush_whole_cache(dev);
++ if (do_checkpoint)
++ yaffs_checkpoint_save(dev);
++}
++
++static unsigned yaffs_bg_gc_urgency(struct yaffs_dev *dev)
++{
++ unsigned erased_chunks =
++ dev->n_erased_blocks * dev->param.chunks_per_block;
++ struct yaffs_linux_context *context = yaffs_dev_to_lc(dev);
++ unsigned scattered = 0; /* Free chunks not in an erased block */
++
++ if (erased_chunks < dev->n_free_chunks)
++ scattered = (dev->n_free_chunks - erased_chunks);
++
++ if (!context->bg_running)
++ return 0;
++ else if (scattered < (dev->param.chunks_per_block * 2))
++ return 0;
++ else if (erased_chunks > dev->n_free_chunks / 2)
++ return 0;
++ else if (erased_chunks > dev->n_free_chunks / 4)
++ return 1;
+ else
-+ *state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
++ return 2;
++}
++
++static int yaffs_do_sync_fs(struct super_block *sb, int request_checkpoint)
++{
++
++ struct yaffs_dev *dev = yaffs_super_to_dev(sb);
++ unsigned int oneshot_checkpoint = (yaffs_auto_checkpoint & 4);
++ unsigned gc_urgent = yaffs_bg_gc_urgency(dev);
++ int do_checkpoint;
++
++ T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND,
++ (TSTR("yaffs_do_sync_fs: gc-urgency %d %s %s%s\n"),
++ gc_urgent,
++ sb->s_dirt ? "dirty" : "clean",
++ request_checkpoint ? "checkpoint requested" : "no checkpoint",
++ oneshot_checkpoint ? " one-shot" : ""));
++
++ yaffs_gross_lock(dev);
++ do_checkpoint = ((request_checkpoint && !gc_urgent) ||
++ oneshot_checkpoint) && !dev->is_checkpointed;
++
++ if (sb->s_dirt || do_checkpoint) {
++ yaffs_flush_super(sb, !dev->is_checkpointed && do_checkpoint);
++ sb->s_dirt = 0;
++ if (oneshot_checkpoint)
++ yaffs_auto_checkpoint &= ~4;
++ }
++ yaffs_gross_unlock(dev);
++
++ return 0;
++}
++
++/*
++ * yaffs background thread functions .
++ * yaffs_bg_thread_fn() the thread function
++ * yaffs_bg_start() launches the background thread.
++ * yaffs_bg_stop() cleans up the background thread.
++ *
++ * NB:
++ * The thread should only run after the yaffs is initialised
++ * The thread should be stopped before yaffs is unmounted.
++ * The thread should not do any writing while the fs is in read only.
++ */
++
++#ifdef YAFFS_COMPILE_BACKGROUND
++
++void yaffs_background_waker(unsigned long data)
++{
++ wake_up_process((struct task_struct *)data);
++}
++
++static int yaffs_bg_thread_fn(void *data)
++{
++ struct yaffs_dev *dev = (struct yaffs_dev *)data;
++ struct yaffs_linux_context *context = yaffs_dev_to_lc(dev);
++ unsigned long now = jiffies;
++ unsigned long next_dir_update = now;
++ unsigned long next_gc = now;
++ unsigned long expires;
++ unsigned int urgency;
++
++ int gc_result;
++ struct timer_list timer;
++
++ T(YAFFS_TRACE_BACKGROUND,
++ (TSTR("yaffs_background starting for dev %p\n"), (void *)dev));
++
++#ifdef YAFFS_COMPILE_FREEZER
++ set_freezable();
++#endif
++ while (context->bg_running) {
++ T(YAFFS_TRACE_BACKGROUND, (TSTR("yaffs_background\n")));
++
++ if (kthread_should_stop())
++ break;
++
++#ifdef YAFFS_COMPILE_FREEZER
++ if (try_to_freeze())
++ continue;
++#endif
++ yaffs_gross_lock(dev);
++
++ now = jiffies;
++
++ if (time_after(now, next_dir_update) && yaffs_bg_enable) {
++ yaffs_update_dirty_dirs(dev);
++ next_dir_update = now + HZ;
++ }
++
++ if (time_after(now, next_gc) && yaffs_bg_enable) {
++ if (!dev->is_checkpointed) {
++ urgency = yaffs_bg_gc_urgency(dev);
++ gc_result = yaffs_bg_gc(dev, urgency);
++ if (urgency > 1)
++ next_gc = now + HZ / 20 + 1;
++ else if (urgency > 0)
++ next_gc = now + HZ / 10 + 1;
++ else
++ next_gc = now + HZ * 2;
++ } else {
++ /*
++ * gc not running so set to next_dir_update
++ * to cut down on wake ups
++ */
++ next_gc = next_dir_update;
++ }
++ }
++ yaffs_gross_unlock(dev);
++#if 1
++ expires = next_dir_update;
++ if (time_before(next_gc, expires))
++ expires = next_gc;
++ if (time_before(expires, now))
++ expires = now + HZ;
++
++ Y_INIT_TIMER(&timer);
++ timer.expires = expires + 1;
++ timer.data = (unsigned long)current;
++ timer.function = yaffs_background_waker;
++
++ set_current_state(TASK_INTERRUPTIBLE);
++ add_timer(&timer);
++ schedule();
++ del_timer_sync(&timer);
++#else
++ msleep(10);
++#endif
++ }
++
++ return 0;
++}
++
++static int yaffs_bg_start(struct yaffs_dev *dev)
++{
++ int retval = 0;
++ struct yaffs_linux_context *context = yaffs_dev_to_lc(dev);
++
++ if (dev->read_only)
++ return -1;
++
++ context->bg_running = 1;
++
++ context->bg_thread = kthread_run(yaffs_bg_thread_fn,
++ (void *)dev, "yaffs-bg-%d",
++ context->mount_id);
++
++ if (IS_ERR(context->bg_thread)) {
++ retval = PTR_ERR(context->bg_thread);
++ context->bg_thread = NULL;
++ context->bg_running = 0;
++ }
++ return retval;
++}
++
++static void yaffs_bg_stop(struct yaffs_dev *dev)
++{
++ struct yaffs_linux_context *ctxt = yaffs_dev_to_lc(dev);
++
++ ctxt->bg_running = 0;
++
++ if (ctxt->bg_thread) {
++ kthread_stop(ctxt->bg_thread);
++ ctxt->bg_thread = NULL;
++ }
++}
++#else
++static int yaffs_bg_thread_fn(void *data)
++{
++ return 0;
++}
++
++static int yaffs_bg_start(struct yaffs_dev *dev)
++{
++ return 0;
++}
++
++static void yaffs_bg_stop(struct yaffs_dev *dev)
++{
++}
++#endif
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
++static void yaffs_write_super(struct super_block *sb)
++#else
++static int yaffs_write_super(struct super_block *sb)
++#endif
++{
++ unsigned request_checkpoint = (yaffs_auto_checkpoint >= 2);
++
++ T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND,
++ (TSTR("yaffs_write_super%s\n"),
++ request_checkpoint ? " checkpt" : ""));
++
++ yaffs_do_sync_fs(sb, request_checkpoint);
++
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
++ return 0;
++#endif
++}
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
++static int yaffs_sync_fs(struct super_block *sb, int wait)
++#else
++static int yaffs_sync_fs(struct super_block *sb)
++#endif
++{
++ unsigned request_checkpoint = (yaffs_auto_checkpoint >= 1);
++
++ T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC,
++ (TSTR("yaffs_sync_fs%s\n"), request_checkpoint ? " checkpt" : ""));
++
++ yaffs_do_sync_fs(sb, request_checkpoint);
++
++ return 0;
++}
++
++#ifdef YAFFS_USE_OWN_IGET
++
++static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino)
++{
++ struct inode *inode;
++ struct yaffs_obj *obj;
++ struct yaffs_dev *dev = yaffs_super_to_dev(sb);
++
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_iget for %lu\n"), ino));
++
++ inode = iget_locked(sb, ino);
++ if (!inode)
++ return ERR_PTR(-ENOMEM);
++ if (!(inode->i_state & I_NEW))
++ return inode;
++
++ /* NB This is called as a side effect of other functions, but
++ * we had to release the lock to prevent deadlocks, so
++ * need to lock again.
++ */
++
++ yaffs_gross_lock(dev);
++
++ obj = yaffs_find_by_number(dev, inode->i_ino);
++
++ yaffs_fill_inode_from_obj(inode, obj);
++
++ yaffs_gross_unlock(dev);
++
++ unlock_new_inode(inode);
++ return inode;
++}
++
++#else
++
++static void yaffs_read_inode(struct inode *inode)
++{
++ /* NB This is called as a side effect of other functions, but
++ * we had to release the lock to prevent deadlocks, so
++ * need to lock again.
++ */
++
++ struct yaffs_obj *obj;
++ struct yaffs_dev *dev = yaffs_super_to_dev(inode->i_sb);
++
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_read_inode for %d\n"), (int)inode->i_ino));
++
++ if (current != yaffs_dev_to_lc(dev)->readdir_process)
++ yaffs_gross_lock(dev);
++
++ obj = yaffs_find_by_number(dev, inode->i_ino);
++
++ yaffs_fill_inode_from_obj(inode, obj);
++
++ if (current != yaffs_dev_to_lc(dev)->readdir_process)
++ yaffs_gross_unlock(dev);
++}
++
++#endif
++
++static LIST_HEAD(yaffs_context_list);
++struct mutex yaffs_context_lock;
++
++static void yaffs_put_super(struct super_block *sb)
++{
++ struct yaffs_dev *dev = yaffs_super_to_dev(sb);
++
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_put_super\n")));
++
++ T(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND,
++ (TSTR("Shutting down yaffs background thread\n")));
++ yaffs_bg_stop(dev);
++ T(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND,
++ (TSTR("yaffs background thread shut down\n")));
++
++ yaffs_gross_lock(dev);
++
++ yaffs_flush_super(sb, 1);
++
++ if (yaffs_dev_to_lc(dev)->put_super_fn)
++ yaffs_dev_to_lc(dev)->put_super_fn(sb);
++
++ yaffs_deinitialise(dev);
++
++ yaffs_gross_unlock(dev);
++
++ mutex_lock(&yaffs_context_lock);
++ list_del_init(&(yaffs_dev_to_lc(dev)->context_list));
++ mutex_unlock(&yaffs_context_lock);
++
++ if (yaffs_dev_to_lc(dev)->spare_buffer) {
++ YFREE(yaffs_dev_to_lc(dev)->spare_buffer);
++ yaffs_dev_to_lc(dev)->spare_buffer = NULL;
++ }
++
++ kfree(dev);
++}
++
++static void yaffs_mtd_put_super(struct super_block *sb)
++{
++ struct mtd_info *mtd = yaffs_dev_to_mtd(yaffs_super_to_dev(sb));
++
++ if (mtd->sync)
++ mtd->sync(mtd);
++
++ put_mtd_device(mtd);
++}
++
++static void yaffs_touch_super(struct yaffs_dev *dev)
++{
++ struct super_block *sb = yaffs_dev_to_lc(dev)->super;
++
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_touch_super() sb = %p\n"), sb));
++ if (sb)
++ sb->s_dirt = 1;
++}
++
++struct yaffs_options {
++ int inband_tags;
++ int skip_checkpoint_read;
++ int skip_checkpoint_write;
++ int no_cache;
++ int tags_ecc_on;
++ int tags_ecc_overridden;
++ int lazy_loading_enabled;
++ int lazy_loading_overridden;
++ int empty_lost_and_found;
++ int empty_lost_and_found_overridden;
++};
++
++#define MAX_OPT_LEN 30
++static int yaffs_parse_options(struct yaffs_options *options,
++ const char *options_str)
++{
++ char cur_opt[MAX_OPT_LEN + 1];
++ int p;
++ int error = 0;
++
++ /* Parse through the options which is a comma seperated list */
++
++ while (options_str && *options_str && !error) {
++ memset(cur_opt, 0, MAX_OPT_LEN + 1);
++ p = 0;
++
++ while (*options_str == ',')
++ options_str++;
++
++ while (*options_str && *options_str != ',') {
++ if (p < MAX_OPT_LEN) {
++ cur_opt[p] = *options_str;
++ p++;
++ }
++ options_str++;
++ }
++
++ if (!strcmp(cur_opt, "inband-tags")) {
++ options->inband_tags = 1;
++ } else if (!strcmp(cur_opt, "tags-ecc-off")) {
++ options->tags_ecc_on = 0;
++ options->tags_ecc_overridden = 1;
++ } else if (!strcmp(cur_opt, "tags-ecc-on")) {
++ options->tags_ecc_on = 1;
++ options->tags_ecc_overridden = 1;
++ } else if (!strcmp(cur_opt, "lazy-loading-off")) {
++ options->lazy_loading_enabled = 0;
++ options->lazy_loading_overridden = 1;
++ } else if (!strcmp(cur_opt, "lazy-loading-on")) {
++ options->lazy_loading_enabled = 1;
++ options->lazy_loading_overridden = 1;
++ } else if (!strcmp(cur_opt, "empty-lost-and-found-off")) {
++ options->empty_lost_and_found = 0;
++ options->empty_lost_and_found_overridden = 1;
++ } else if (!strcmp(cur_opt, "empty-lost-and-found-on")) {
++ options->empty_lost_and_found = 1;
++ options->empty_lost_and_found_overridden = 1;
++ } else if (!strcmp(cur_opt, "no-cache")) {
++ options->no_cache = 1;
++ } else if (!strcmp(cur_opt, "no-checkpoint-read")) {
++ options->skip_checkpoint_read = 1;
++ } else if (!strcmp(cur_opt, "no-checkpoint-write")) {
++ options->skip_checkpoint_write = 1;
++ } else if (!strcmp(cur_opt, "no-checkpoint")) {
++ options->skip_checkpoint_read = 1;
++ options->skip_checkpoint_write = 1;
++ } else {
++ printk(KERN_INFO "yaffs: Bad mount option \"%s\"\n",
++ cur_opt);
++ error = 1;
++ }
++ }
++
++ return error;
++}
++
++static struct super_block *yaffs_internal_read_super(int yaffs_version,
++ struct super_block *sb,
++ void *data, int silent)
++{
++ int n_blocks;
++ struct inode *inode = NULL;
++ struct dentry *root;
++ struct yaffs_dev *dev = 0;
++ char devname_buf[BDEVNAME_SIZE + 1];
++ struct mtd_info *mtd;
++ int err;
++ char *data_str = (char *)data;
++ struct yaffs_linux_context *context = NULL;
++ struct yaffs_param *param;
++
++ int read_only = 0;
++
++ struct yaffs_options options;
++
++ unsigned mount_id;
++ int found;
++ struct yaffs_linux_context *context_iterator;
++ struct list_head *l;
++
++ sb->s_magic = YAFFS_MAGIC;
++ sb->s_op = &yaffs_super_ops;
++ sb->s_flags |= MS_NOATIME;
++
++ read_only = ((sb->s_flags & MS_RDONLY) != 0);
++
++#ifdef YAFFS_COMPILE_EXPORTFS
++ sb->s_export_op = &yaffs_export_ops;
++#endif
++
++ if (!sb)
++ printk(KERN_INFO "yaffs: sb is NULL\n");
++ else if (!sb->s_dev)
++ printk(KERN_INFO "yaffs: sb->s_dev is NULL\n");
++ else if (!yaffs_devname(sb, devname_buf))
++ printk(KERN_INFO "yaffs: devname is NULL\n");
++ else
++ printk(KERN_INFO "yaffs: dev is %d name is \"%s\" %s\n",
++ sb->s_dev,
++ yaffs_devname(sb, devname_buf), read_only ? "ro" : "rw");
++
++ if (!data_str)
++ data_str = "";
++
++ printk(KERN_INFO "yaffs: passed flags \"%s\"\n", data_str);
++
++ memset(&options, 0, sizeof(options));
++
++ if (yaffs_parse_options(&options, data_str)) {
++ /* Option parsing failed */
++ return NULL;
++ }
++
++ sb->s_blocksize = PAGE_CACHE_SIZE;
++ sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
++
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_read_super: Using yaffs%d\n"), yaffs_version));
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_read_super: block size %d\n"), (int)(sb->s_blocksize)));
++
++ T(YAFFS_TRACE_ALWAYS,
++ (TSTR("yaffs: Attempting MTD mount of %u.%u,\"%s\"\n"),
++ MAJOR(sb->s_dev), MINOR(sb->s_dev), yaffs_devname(sb, devname_buf)));
++
++ /* Check it's an mtd device..... */
++ if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR)
++ return NULL; /* This isn't an mtd device */
++
++ /* Get the device */
++ mtd = get_mtd_device(NULL, MINOR(sb->s_dev));
++ if (!mtd) {
++ T(YAFFS_TRACE_ALWAYS,
++ (TSTR("yaffs: MTD device #%u doesn't appear to exist\n"),
++ MINOR(sb->s_dev)));
++ return NULL;
++ }
++ /* Check it's NAND */
++ if (mtd->type != MTD_NANDFLASH) {
++ T(YAFFS_TRACE_ALWAYS,
++ (TSTR("yaffs: MTD device is not NAND it's type %d\n"),
++ mtd->type));
++ return NULL;
++ }
++
++ T(YAFFS_TRACE_OS, (TSTR(" erase %p\n"), mtd->erase));
++ T(YAFFS_TRACE_OS, (TSTR(" read %p\n"), mtd->read));
++ T(YAFFS_TRACE_OS, (TSTR(" write %p\n"), mtd->write));
++ T(YAFFS_TRACE_OS, (TSTR(" readoob %p\n"), mtd->read_oob));
++ T(YAFFS_TRACE_OS, (TSTR(" writeoob %p\n"), mtd->write_oob));
++ T(YAFFS_TRACE_OS, (TSTR(" block_isbad %p\n"), mtd->block_isbad));
++ T(YAFFS_TRACE_OS, (TSTR(" block_markbad %p\n"), mtd->block_markbad));
++ T(YAFFS_TRACE_OS, (TSTR(" %s %d\n"), WRITE_SIZE_STR, WRITE_SIZE(mtd)));
++ T(YAFFS_TRACE_OS, (TSTR(" oobsize %d\n"), mtd->oobsize));
++ T(YAFFS_TRACE_OS, (TSTR(" erasesize %d\n"), mtd->erasesize));
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
++ T(YAFFS_TRACE_OS, (TSTR(" size %u\n"), mtd->size));
++#else
++ T(YAFFS_TRACE_OS, (TSTR(" size %lld\n"), mtd->size));
++#endif
++
++#ifdef CONFIG_YAFFS_AUTO_YAFFS2
++
++ if (yaffs_version == 1 && WRITE_SIZE(mtd) >= 2048) {
++ T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: auto selecting yaffs2\n")));
++ yaffs_version = 2;
++ }
++
++ /* Added NCB 26/5/2006 for completeness */
++ if (yaffs_version == 2 && !options.inband_tags
++ && WRITE_SIZE(mtd) == 512) {
++ T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: auto selecting yaffs1\n")));
++ yaffs_version = 1;
++ }
++#endif
++
++ if (yaffs_version == 2) {
++ /* Check for version 2 style functions */
++ if (!mtd->erase ||
++ !mtd->block_isbad ||
++ !mtd->block_markbad || !mtd->read || !mtd->write ||
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
++ !mtd->read_oob || !mtd->write_oob) {
++#else
++ !mtd->write_ecc ||
++ !mtd->read_ecc || !mtd->read_oob || !mtd->write_oob) {
++#endif
++ T(YAFFS_TRACE_ALWAYS,
++ (TSTR("yaffs: MTD device does not support required "
++ "functions\n")));
++ return NULL;
++ }
++
++ if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
++ mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) &&
++ !options.inband_tags) {
++ T(YAFFS_TRACE_ALWAYS,
++ (TSTR("yaffs: MTD device does not have the "
++ "right page sizes\n")));
++ return NULL;
++ }
++ } else {
++ /* Check for V1 style functions */
++ if (!mtd->erase || !mtd->read || !mtd->write ||
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
++ !mtd->read_oob || !mtd->write_oob) {
++#else
++ !mtd->write_ecc ||
++ !mtd->read_ecc || !mtd->read_oob || !mtd->write_oob) {
++#endif
++ T(YAFFS_TRACE_ALWAYS,
++ (TSTR("yaffs: MTD device does not support required "
++ "functions\n")));
++ return NULL;
++ }
++
++ if (WRITE_SIZE(mtd) < YAFFS_BYTES_PER_CHUNK ||
++ mtd->oobsize != YAFFS_BYTES_PER_SPARE) {
++ T(YAFFS_TRACE_ALWAYS,
++ (TSTR("yaffs: MTD device does not support have the "
++ "right page sizes\n")));
++ return NULL;
++ }
++ }
++
++ /* OK, so if we got here, we have an MTD that's NAND and looks
++ * like it has the right capabilities
++ * Set the struct yaffs_dev up for mtd
++ */
++
++ if (!read_only && !(mtd->flags & MTD_WRITEABLE)) {
++ read_only = 1;
++ printk(KERN_INFO
++ "yaffs: mtd is read only, setting superblock read only");
++ sb->s_flags |= MS_RDONLY;
++ }
++
++ dev = kmalloc(sizeof(struct yaffs_dev), GFP_KERNEL);
++ context = kmalloc(sizeof(struct yaffs_linux_context), GFP_KERNEL);
++
++ if (!dev || !context) {
++ if (dev)
++ kfree(dev);
++ if (context)
++ kfree(context);
++ dev = NULL;
++ context = NULL;
++ }
++
++ if (!dev) {
++ /* Deep shit could not allocate device structure */
++ T(YAFFS_TRACE_ALWAYS,
++ (TSTR("yaffs_read_super: Failed trying to allocate "
++ "struct yaffs_dev. \n")));
++ return NULL;
++ }
++ memset(dev, 0, sizeof(struct yaffs_dev));
++ param = &(dev->param);
++
++ memset(context, 0, sizeof(struct yaffs_linux_context));
++ dev->os_context = context;
++ INIT_LIST_HEAD(&(context->context_list));
++ context->dev = dev;
++ context->super = sb;
++
++ dev->read_only = read_only;
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
++ sb->s_fs_info = dev;
++#else
++ sb->u.generic_sbp = dev;
++#endif
++
++ dev->driver_context = mtd;
++ param->name = mtd->name;
++
++ /* Set up the memory size parameters.... */
++
++ n_blocks =
++ YCALCBLOCKS(mtd->size,
++ (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK));
++
++ param->start_block = 0;
++ param->end_block = n_blocks - 1;
++ param->chunks_per_block = YAFFS_CHUNKS_PER_BLOCK;
++ param->total_bytes_per_chunk = YAFFS_BYTES_PER_CHUNK;
++ param->n_reserved_blocks = 5;
++ param->n_caches = (options.no_cache) ? 0 : 10;
++ param->inband_tags = options.inband_tags;
++
++#ifdef CONFIG_YAFFS_DISABLE_LAZY_LOAD
++ param->disable_lazy_load = 1;
++#endif
++#ifdef CONFIG_YAFFS_XATTR
++ param->enable_xattr = 1;
++#endif
++ if (options.lazy_loading_overridden)
++ param->disable_lazy_load = !options.lazy_loading_enabled;
++
++#ifdef CONFIG_YAFFS_DISABLE_TAGS_ECC
++ param->no_tags_ecc = 1;
++#endif
++
++#ifdef CONFIG_YAFFS_DISABLE_BACKGROUND
++#else
++ param->defered_dir_update = 1;
++#endif
++
++ if (options.tags_ecc_overridden)
++ param->no_tags_ecc = !options.tags_ecc_on;
++
++#ifdef CONFIG_YAFFS_EMPTY_LOST_AND_FOUND
++ param->empty_lost_n_found = 1;
++#endif
++
++#ifdef CONFIG_YAFFS_DISABLE_BLOCK_REFRESHING
++ param->refresh_period = 0;
++#else
++ param->refresh_period = 500;
++#endif
++
++#ifdef CONFIG_YAFFS__ALWAYS_CHECK_CHUNK_ERASED
++ param->always_check_erased = 1;
++#endif
++
++ if (options.empty_lost_and_found_overridden)
++ param->empty_lost_n_found = options.empty_lost_and_found;
++
++ /* ... and the functions. */
++ if (yaffs_version == 2) {
++ param->write_chunk_tags_fn = nandmtd2_write_chunk_tags;
++ param->read_chunk_tags_fn = nandmtd2_read_chunk_tags;
++ param->bad_block_fn = nandmtd2_mark_block_bad;
++ param->query_block_fn = nandmtd2_query_block;
++ yaffs_dev_to_lc(dev)->spare_buffer = YMALLOC(mtd->oobsize);
++ param->is_yaffs2 = 1;
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
++ param->total_bytes_per_chunk = mtd->writesize;
++ param->chunks_per_block = mtd->erasesize / mtd->writesize;
++#else
++ param->total_bytes_per_chunk = mtd->oobblock;
++ param->chunks_per_block = mtd->erasesize / mtd->oobblock;
++#endif
++ n_blocks = YCALCBLOCKS(mtd->size, mtd->erasesize);
++
++ param->start_block = 0;
++ param->end_block = n_blocks - 1;
++ } else {
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
++ /* use the MTD interface in yaffs_mtdif1.c */
++ param->write_chunk_tags_fn = nandmtd1_write_chunk_tags;
++ param->read_chunk_tags_fn = nandmtd1_read_chunk_tags;
++ param->bad_block_fn = nandmtd1_mark_block_bad;
++ param->query_block_fn = nandmtd1_query_block;
++#else
++ param->write_chunk_fn = nandmtd_write_chunk;
++ param->read_chunk_fn = nandmtd_read_chunk;
++#endif
++ param->is_yaffs2 = 0;
++ }
++ /* ... and common functions */
++ param->erase_fn = nandmtd_erase_block;
++ param->initialise_flash_fn = nandmtd_initialise;
++
++ yaffs_dev_to_lc(dev)->put_super_fn = yaffs_mtd_put_super;
++
++ param->sb_dirty_fn = yaffs_touch_super;
++ param->gc_control = yaffs_gc_control_callback;
++
++ yaffs_dev_to_lc(dev)->super = sb;
++
++#ifndef CONFIG_YAFFS_DOES_ECC
++ param->use_nand_ecc = 1;
++#endif
++
++#ifdef CONFIG_YAFFS_DISABLE_WIDE_TNODES
++ param->wide_tnodes_disabled = 1;
++#endif
++
++ param->skip_checkpt_rd = options.skip_checkpoint_read;
++ param->skip_checkpt_wr = options.skip_checkpoint_write;
++
++ mutex_lock(&yaffs_context_lock);
++ /* Get a mount id */
++ found = 0;
++ for (mount_id = 0; !found; mount_id++) {
++ found = 1;
++ list_for_each(l, &yaffs_context_list) {
++ context_iterator =
++ list_entry(l, struct yaffs_linux_context,
++ context_list);
++ if (context_iterator->mount_id == mount_id)
++ found = 0;
++ }
++ }
++ context->mount_id = mount_id;
++
++ list_add_tail(&(yaffs_dev_to_lc(dev)->context_list),
++ &yaffs_context_list);
++ mutex_unlock(&yaffs_context_lock);
++
++ /* Directory search handling... */
++ INIT_LIST_HEAD(&(yaffs_dev_to_lc(dev)->search_contexts));
++ param->remove_obj_fn = yaffs_remove_obj_callback;
++
++ mutex_init(&(yaffs_dev_to_lc(dev)->gross_lock));
++
++ yaffs_gross_lock(dev);
++
++ err = yaffs_guts_initialise(dev);
++
++ T(YAFFS_TRACE_OS,
++ (TSTR("yaffs_read_super: guts initialised %s\n"),
++ (err == YAFFS_OK) ? "OK" : "FAILED"));
++
++ if (err == YAFFS_OK)
++ yaffs_bg_start(dev);
++
++ if (!context->bg_thread)
++ param->defered_dir_update = 0;
++
++ /* Release lock before yaffs_get_inode() */
++ yaffs_gross_unlock(dev);
++
++ /* Create root inode */
++ if (err == YAFFS_OK)
++ inode = yaffs_get_inode(sb, S_IFDIR | 0755, 0, yaffs_root(dev));
++
++ if (!inode)
++ return NULL;
++
++ inode->i_op = &yaffs_dir_inode_operations;
++ inode->i_fop = &yaffs_dir_operations;
++
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_read_super: got root inode\n")));
++
++ root = d_alloc_root(inode);
++
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_read_super: d_alloc_root done\n")));
++
++ if (!root) {
++ iput(inode);
++ return NULL;
++ }
++ sb->s_root = root;
++ sb->s_dirt = !dev->is_checkpointed;
++ T(YAFFS_TRACE_ALWAYS,
++ (TSTR("yaffs_read_super: is_checkpointed %d\n"),
++ dev->is_checkpointed));
++
++ T(YAFFS_TRACE_OS, (TSTR("yaffs_read_super: done\n")));
++ return sb;
++}
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
++static int yaffs_internal_read_super_mtd(struct super_block *sb, void *data,
++ int silent)
++{
++ return yaffs_internal_read_super(1, sb, data, silent) ? 0 : -EINVAL;
++}
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
++static int yaffs_read_super(struct file_system_type *fs,
++ int flags, const char *dev_name,
++ void *data, struct vfsmount *mnt)
++{
++
++ return get_sb_bdev(fs, flags, dev_name, data,
++ yaffs_internal_read_super_mtd, mnt);
++}
++#else
++static struct super_block *yaffs_read_super(struct file_system_type *fs,
++ int flags, const char *dev_name,
++ void *data)
++{
++
++ return get_sb_bdev(fs, flags, dev_name, data,
++ yaffs_internal_read_super_mtd);
++}
++#endif
++
++static struct file_system_type yaffs_fs_type = {
++ .owner = THIS_MODULE,
++ .name = "yaffs",
++ .get_sb = yaffs_read_super,
++ .kill_sb = kill_block_super,
++ .fs_flags = FS_REQUIRES_DEV,
++};
++#else
++static struct super_block *yaffs_read_super(struct super_block *sb, void *data,
++ int silent)
++{
++ return yaffs_internal_read_super(1, sb, data, silent);
++}
++
++static DECLARE_FSTYPE(yaffs_fs_type, "yaffs", yaffs_read_super,
++ FS_REQUIRES_DEV);
++#endif
++
++#ifdef CONFIG_YAFFS_YAFFS2
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
++static int yaffs2_internal_read_super_mtd(struct super_block *sb, void *data,
++ int silent)
++{
++ return yaffs_internal_read_super(2, sb, data, silent) ? 0 : -EINVAL;
++}
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
++static int yaffs2_read_super(struct file_system_type *fs,
++ int flags, const char *dev_name, void *data,
++ struct vfsmount *mnt)
++{
++ return get_sb_bdev(fs, flags, dev_name, data,
++ yaffs2_internal_read_super_mtd, mnt);
++}
++#else
++static struct super_block *yaffs2_read_super(struct file_system_type *fs,
++ int flags, const char *dev_name,
++ void *data)
++{
++
++ return get_sb_bdev(fs, flags, dev_name, data,
++ yaffs2_internal_read_super_mtd);
++}
++#endif
++
++static struct file_system_type yaffs2_fs_type = {
++ .owner = THIS_MODULE,
++ .name = "yaffs2",
++ .get_sb = yaffs2_read_super,
++ .kill_sb = kill_block_super,
++ .fs_flags = FS_REQUIRES_DEV,
++};
++#else
++static struct super_block *yaffs2_read_super(struct super_block *sb,
++ void *data, int silent)
++{
++ return yaffs_internal_read_super(2, sb, data, silent);
++}
++
++static DECLARE_FSTYPE(yaffs2_fs_type, "yaffs2", yaffs2_read_super,
++ FS_REQUIRES_DEV);
++#endif
++
++#endif /* CONFIG_YAFFS_YAFFS2 */
++
++static struct proc_dir_entry *my_proc_entry;
++static struct proc_dir_entry *debug_proc_entry;
++
++static char *yaffs_dump_dev_part0(char *buf, struct yaffs_dev *dev)
++{
++ buf +=
++ sprintf(buf, "start_block.......... %d\n", dev->param.start_block);
++ buf += sprintf(buf, "end_block............ %d\n", dev->param.end_block);
++ buf +=
++ sprintf(buf, "total_bytes_per_chunk %d\n",
++ dev->param.total_bytes_per_chunk);
++ buf +=
++ sprintf(buf, "use_nand_ecc......... %d\n", dev->param.use_nand_ecc);
++ buf +=
++ sprintf(buf, "no_tags_ecc.......... %d\n", dev->param.no_tags_ecc);
++ buf += sprintf(buf, "is_yaffs2............ %d\n", dev->param.is_yaffs2);
++ buf +=
++ sprintf(buf, "inband_tags.......... %d\n", dev->param.inband_tags);
++ buf +=
++ sprintf(buf, "empty_lost_n_found... %d\n",
++ dev->param.empty_lost_n_found);
++ buf +=
++ sprintf(buf, "disable_lazy_load.... %d\n",
++ dev->param.disable_lazy_load);
++ buf +=
++ sprintf(buf, "refresh_period....... %d\n",
++ dev->param.refresh_period);
++ buf += sprintf(buf, "n_caches............. %d\n", dev->param.n_caches);
++ buf +=
++ sprintf(buf, "n_reserved_blocks.... %d\n",
++ dev->param.n_reserved_blocks);
++ buf +=
++ sprintf(buf, "always_check_erased.. %d\n",
++ dev->param.always_check_erased);
++
++ buf += sprintf(buf, "\n");
++
++ return buf;
++}
++
++static char *yaffs_dump_dev_part1(char *buf, struct yaffs_dev *dev)
++{
++ buf +=
++ sprintf(buf, "data_bytes_per_chunk. %d\n",
++ dev->data_bytes_per_chunk);
++ buf += sprintf(buf, "chunk_grp_bits....... %d\n", dev->chunk_grp_bits);
++ buf += sprintf(buf, "chunk_grp_size....... %d\n", dev->chunk_grp_size);
++ buf += sprintf(buf, "n_erased_blocks...... %d\n", dev->n_erased_blocks);
++ buf +=
++ sprintf(buf, "blocks_in_checkpt.... %d\n", dev->blocks_in_checkpt);
++ buf += sprintf(buf, "\n");
++ buf += sprintf(buf, "n_tnodes............. %d\n", dev->n_tnodes);
++ buf += sprintf(buf, "n_obj................ %d\n", dev->n_obj);
++ buf += sprintf(buf, "n_free_chunks........ %d\n", dev->n_free_chunks);
++ buf += sprintf(buf, "\n");
++ buf += sprintf(buf, "n_page_writes........ %u\n", dev->n_page_writes);
++ buf += sprintf(buf, "n_page_reads......... %u\n", dev->n_page_reads);
++ buf += sprintf(buf, "n_erasures........... %u\n", dev->n_erasures);
++ buf += sprintf(buf, "n_gc_copies.......... %u\n", dev->n_gc_copies);
++ buf += sprintf(buf, "all_gcs.............. %u\n", dev->all_gcs);
++ buf +=
++ sprintf(buf, "passive_gc_count..... %u\n", dev->passive_gc_count);
++ buf +=
++ sprintf(buf, "oldest_dirty_gc_count %u\n",
++ dev->oldest_dirty_gc_count);
++ buf += sprintf(buf, "n_gc_blocks.......... %u\n", dev->n_gc_blocks);
++ buf += sprintf(buf, "bg_gcs............... %u\n", dev->bg_gcs);
++ buf +=
++ sprintf(buf, "n_retired_writes..... %u\n", dev->n_retired_writes);
++ buf +=
++ sprintf(buf, "n_retired_blocks..... %u\n", dev->n_retired_blocks);
++ buf += sprintf(buf, "n_ecc_fixed.......... %u\n", dev->n_ecc_fixed);
++ buf += sprintf(buf, "n_ecc_unfixed........ %u\n", dev->n_ecc_unfixed);
++ buf +=
++ sprintf(buf, "n_tags_ecc_fixed..... %u\n", dev->n_tags_ecc_fixed);
++ buf +=
++ sprintf(buf, "n_tags_ecc_unfixed... %u\n", dev->n_tags_ecc_unfixed);
++ buf += sprintf(buf, "cache_hits........... %u\n", dev->cache_hits);
++ buf += sprintf(buf, "n_deleted_files...... %u\n", dev->n_deleted_files);
++ buf +=
++ sprintf(buf, "n_unlinked_files..... %u\n", dev->n_unlinked_files);
++ buf += sprintf(buf, "refresh_count........ %u\n", dev->refresh_count);
++ buf += sprintf(buf, "n_bg_deletions....... %u\n", dev->n_bg_deletions);
++
++ return buf;
++}
++
++static int yaffs_proc_read(char *page,
++ char **start,
++ off_t offset, int count, int *eof, void *data)
++{
++ struct list_head *item;
++ char *buf = page;
++ int step = offset;
++ int n = 0;
++
++ /* Get proc_file_read() to step 'offset' by one on each sucessive call.
++ * We use 'offset' (*ppos) to indicate where we are in dev_list.
++ * This also assumes the user has posted a read buffer large
++ * enough to hold the complete output; but that's life in /proc.
++ */
++
++ *(int *)start = 1;
++
++ /* Print header first */
++ if (step == 0)
++ buf +=
++ sprintf(buf,
++ "Multi-version YAFFS built:" __DATE__ " " __TIME__
++ "\n");
++ else if (step == 1)
++ buf += sprintf(buf, "\n");
++ else {
++ step -= 2;
++
++ mutex_lock(&yaffs_context_lock);
++
++ /* Locate and print the Nth entry. Order N-squared but N is small. */
++ list_for_each(item, &yaffs_context_list) {
++ struct yaffs_linux_context *dc =
++ list_entry(item, struct yaffs_linux_context,
++ context_list);
++ struct yaffs_dev *dev = dc->dev;
++
++ if (n < (step & ~1)) {
++ n += 2;
++ continue;
++ }
++ if ((step & 1) == 0) {
++ buf +=
++ sprintf(buf, "\nDevice %d \"%s\"\n", n,
++ dev->param.name);
++ buf = yaffs_dump_dev_part0(buf, dev);
++ } else {
++ buf = yaffs_dump_dev_part1(buf, dev);
++ }
++
++ break;
++ }
++ mutex_unlock(&yaffs_context_lock);
++ }
++
++ return buf - page < count ? buf - page : count;
++}
++
++static int yaffs_stats_proc_read(char *page,
++ char **start,
++ off_t offset, int count, int *eof, void *data)
++{
++ struct list_head *item;
++ char *buf = page;
++ int n = 0;
++
++ mutex_lock(&yaffs_context_lock);
++
++ /* Locate and print the Nth entry. Order N-squared but N is small. */
++ list_for_each(item, &yaffs_context_list) {
++ struct yaffs_linux_context *dc =
++ list_entry(item, struct yaffs_linux_context, context_list);
++ struct yaffs_dev *dev = dc->dev;
++
++ int erased_chunks;
++
++ erased_chunks =
++ dev->n_erased_blocks * dev->param.chunks_per_block;
++
++ buf += sprintf(buf, "%d, %d, %d, %u, %u, %u, %u\n",
++ n, dev->n_free_chunks, erased_chunks,
++ dev->bg_gcs, dev->oldest_dirty_gc_count,
++ dev->n_obj, dev->n_tnodes);
++ }
++ mutex_unlock(&yaffs_context_lock);
++
++ return buf - page < count ? buf - page : count;
++}
++
++/**
++ * Set the verbosity of the warnings and error messages.
++ *
++ * Note that the names can only be a..z or _ with the current code.
++ */
++
++static struct {
++ char *mask_name;
++ unsigned mask_bitfield;
++} mask_flags[] = {
++ {"allocate", YAFFS_TRACE_ALLOCATE},
++ {"always", YAFFS_TRACE_ALWAYS},
++ {"background", YAFFS_TRACE_BACKGROUND},
++ {"bad_blocks", YAFFS_TRACE_BAD_BLOCKS},
++ {"buffers", YAFFS_TRACE_BUFFERS},
++ {"bug", YAFFS_TRACE_BUG},
++ {"checkpt", YAFFS_TRACE_CHECKPOINT},
++ {"deletion", YAFFS_TRACE_DELETION},
++ {"erase", YAFFS_TRACE_ERASE},
++ {"error", YAFFS_TRACE_ERROR},
++ {"gc_detail", YAFFS_TRACE_GC_DETAIL},
++ {"gc", YAFFS_TRACE_GC},
++ {"lock", YAFFS_TRACE_LOCK},
++ {"mtd", YAFFS_TRACE_MTD},
++ {"nandaccess", YAFFS_TRACE_NANDACCESS},
++ {"os", YAFFS_TRACE_OS},
++ {"scan_debug", YAFFS_TRACE_SCAN_DEBUG},
++ {"scan", YAFFS_TRACE_SCAN},
++ {"mount", YAFFS_TRACE_MOUNT},
++ {"tracing", YAFFS_TRACE_TRACING},
++ {"sync", YAFFS_TRACE_SYNC},
++ {"write", YAFFS_TRACE_WRITE},
++ {"verify", YAFFS_TRACE_VERIFY},
++ {"verify_nand", YAFFS_TRACE_VERIFY_NAND},
++ {"verify_full", YAFFS_TRACE_VERIFY_FULL},
++ {"verify_all", YAFFS_TRACE_VERIFY_ALL},
++ {"all", 0xffffffff},
++ {"none", 0},
++ {NULL, 0},
++};
++
++#define MAX_MASK_NAME_LENGTH 40
++static int yaffs_proc_write_trace_options(struct file *file, const char *buf,
++ unsigned long count, void *data)
++{
++ unsigned rg = 0, mask_bitfield;
++ char *end;
++ char *mask_name;
++ const char *x;
++ char substring[MAX_MASK_NAME_LENGTH + 1];
++ int i;
++ int done = 0;
++ int add, len = 0;
++ int pos = 0;
++
++ rg = yaffs_trace_mask;
++
++ while (!done && (pos < count)) {
++ done = 1;
++ while ((pos < count) && isspace(buf[pos]))
++ pos++;
++
++ switch (buf[pos]) {
++ case '+':
++ case '-':
++ case '=':
++ add = buf[pos];
++ pos++;
++ break;
++
++ default:
++ add = ' ';
++ break;
++ }
++ mask_name = NULL;
++
++ mask_bitfield = simple_strtoul(buf + pos, &end, 0);
++
++ if (end > buf + pos) {
++ mask_name = "numeral";
++ len = end - (buf + pos);
++ pos += len;
++ done = 0;
++ } else {
++ for (x = buf + pos, i = 0;
++ (*x == '_' || (*x >= 'a' && *x <= 'z')) &&
++ i < MAX_MASK_NAME_LENGTH; x++, i++, pos++)
++ substring[i] = *x;
++ substring[i] = '\0';
++
++ for (i = 0; mask_flags[i].mask_name != NULL; i++) {
++ if (strcmp(substring, mask_flags[i].mask_name)
++ == 0) {
++ mask_name = mask_flags[i].mask_name;
++ mask_bitfield =
++ mask_flags[i].mask_bitfield;
++ done = 0;
++ break;
++ }
++ }
++ }
++
++ if (mask_name != NULL) {
++ done = 0;
++ switch (add) {
++ case '-':
++ rg &= ~mask_bitfield;
++ break;
++ case '+':
++ rg |= mask_bitfield;
++ break;
++ case '=':
++ rg = mask_bitfield;
++ break;
++ default:
++ rg |= mask_bitfield;
++ break;
++ }
++ }
++ }
++
++ yaffs_trace_mask = rg | YAFFS_TRACE_ALWAYS;
++
++ printk(KERN_DEBUG "new trace = 0x%08X\n", yaffs_trace_mask);
++
++ if (rg & YAFFS_TRACE_ALWAYS) {
++ for (i = 0; mask_flags[i].mask_name != NULL; i++) {
++ char flag;
++ flag = ((rg & mask_flags[i].mask_bitfield) ==
++ mask_flags[i].mask_bitfield) ? '+' : '-';
++ printk(KERN_DEBUG "%c%s\n", flag,
++ mask_flags[i].mask_name);
++ }
++ }
++
++ return count;
++}
++
++static int yaffs_proc_write(struct file *file, const char *buf,
++ unsigned long count, void *data)
++{
++ return yaffs_proc_write_trace_options(file, buf, count, data);
++}
++
++/* Stuff to handle installation of file systems */
++struct file_system_to_install {
++ struct file_system_type *fst;
++ int installed;
++};
++
++static struct file_system_to_install fs_to_install[] = {
++ {&yaffs_fs_type, 0},
++ {&yaffs2_fs_type, 0},
++ {NULL, 0}
++};
++
++static int __init init_yaffs_fs(void)
++{
++ int error = 0;
++ struct file_system_to_install *fsinst;
++
++ T(YAFFS_TRACE_ALWAYS,
++ (TSTR("yaffs built " __DATE__ " " __TIME__ " Installing. \n")));
++
++#ifdef CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED
++ T(YAFFS_TRACE_ALWAYS,
++ (TSTR
++ (" \n\n\n\nYAFFS-WARNING CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED selected.\n\n\n\n")));
++#endif
++
++ mutex_init(&yaffs_context_lock);
++
++ /* Install the proc_fs entries */
++ my_proc_entry = create_proc_entry("yaffs",
++ S_IRUGO | S_IFREG, YPROC_ROOT);
++
++ if (my_proc_entry) {
++ my_proc_entry->write_proc = yaffs_proc_write;
++ my_proc_entry->read_proc = yaffs_proc_read;
++ my_proc_entry->data = NULL;
++ } else {
++ return -ENOMEM;
++ }
++
++ debug_proc_entry = create_proc_entry("yaffs_stats",
++ S_IRUGO | S_IFREG, YPROC_ROOT);
++
++ if (debug_proc_entry) {
++ debug_proc_entry->write_proc = NULL;
++ debug_proc_entry->read_proc = yaffs_stats_proc_read;
++ debug_proc_entry->data = NULL;
++ } else {
++ return -ENOMEM;
++ }
++
++ /* Now add the file system entries */
++
++ fsinst = fs_to_install;
++
++ while (fsinst->fst && !error) {
++ error = register_filesystem(fsinst->fst);
++ if (!error)
++ fsinst->installed = 1;
++ fsinst++;
++ }
++
++ /* Any errors? uninstall */
++ if (error) {
++ fsinst = fs_to_install;
++
++ while (fsinst->fst) {
++ if (fsinst->installed) {
++ unregister_filesystem(fsinst->fst);
++ fsinst->installed = 0;
++ }
++ fsinst++;
++ }
++ }
++
++ return error;
++}
++
++static void __exit exit_yaffs_fs(void)
++{
++
++ struct file_system_to_install *fsinst;
++
++ T(YAFFS_TRACE_ALWAYS,
++ (TSTR("yaffs built " __DATE__ " " __TIME__ " removing. \n")));
++
++ remove_proc_entry("yaffs", YPROC_ROOT);
++ remove_proc_entry("yaffs_stats", YPROC_ROOT);
++
++ fsinst = fs_to_install;
++
++ while (fsinst->fst) {
++ if (fsinst->installed) {
++ unregister_filesystem(fsinst->fst);
++ fsinst->installed = 0;
++ }
++ fsinst++;
++ }
++}
++
++module_init(init_yaffs_fs)
++ module_exit(exit_yaffs_fs)
++
++ MODULE_DESCRIPTION("YAFFS2 - a NAND specific flash file system");
++MODULE_AUTHOR("Charles Manning, Aleph One Ltd., 2002-2010");
++MODULE_LICENSE("GPL");
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_yaffs1.c linux-2.6.36/fs/yaffs2/yaffs_yaffs1.c
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_yaffs1.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_yaffs1.c 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,437 @@
++/*
++ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
++ *
++ * Copyright (C) 2002-2010 Aleph One Ltd.
++ * for Toby Churchill Ltd and Brightstar Engineering
++ *
++ * Created by Charles Manning <charles@aleph1.co.uk>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include "yaffs_yaffs1.h"
++#include "yportenv.h"
++#include "yaffs_trace.h"
++#include "yaffs_bitmap.h"
++#include "yaffs_getblockinfo.h"
++#include "yaffs_nand.h"
++#include "yaffs_attribs.h"
++
++int yaffs1_scan(struct yaffs_dev *dev)
++{
++ struct yaffs_ext_tags tags;
++ int blk;
++ int result;
++
++ int chunk;
++ int c;
++ int deleted;
++ enum yaffs_block_state state;
++ struct yaffs_obj *hard_list = NULL;
++ struct yaffs_block_info *bi;
++ u32 seq_number;
++ struct yaffs_obj_hdr *oh;
++ struct yaffs_obj *in;
++ struct yaffs_obj *parent;
++
++ int alloc_failed = 0;
++
++ struct yaffs_shadow_fixer *shadow_fixers = NULL;
++
++ u8 *chunk_data;
++
++ T(YAFFS_TRACE_SCAN,
++ (TSTR("yaffs1_scan starts intstartblk %d intendblk %d..." TENDSTR),
++ dev->internal_start_block, dev->internal_end_block));
++
++ chunk_data = yaffs_get_temp_buffer(dev, __LINE__);
++
++ dev->seq_number = YAFFS_LOWEST_SEQUENCE_NUMBER;
++
++ /* Scan all the blocks to determine their state */
++ bi = dev->block_info;
++ for (blk = dev->internal_start_block; blk <= dev->internal_end_block;
++ blk++) {
++ yaffs_clear_chunk_bits(dev, blk);
++ bi->pages_in_use = 0;
++ bi->soft_del_pages = 0;
++
++ yaffs_query_init_block_state(dev, blk, &state, &seq_number);
++
++ bi->block_state = state;
++ bi->seq_number = seq_number;
++
++ if (bi->seq_number == YAFFS_SEQUENCE_BAD_BLOCK)
++ bi->block_state = state = YAFFS_BLOCK_STATE_DEAD;
++
++ T(YAFFS_TRACE_SCAN_DEBUG,
++ (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
++ state, seq_number));
++
++ if (state == YAFFS_BLOCK_STATE_DEAD) {
++ T(YAFFS_TRACE_BAD_BLOCKS,
++ (TSTR("block %d is bad" TENDSTR), blk));
++ } else if (state == YAFFS_BLOCK_STATE_EMPTY) {
++ T(YAFFS_TRACE_SCAN_DEBUG,
++ (TSTR("Block empty " TENDSTR)));
++ dev->n_erased_blocks++;
++ dev->n_free_chunks += dev->param.chunks_per_block;
++ }
++ bi++;
++ }
++
++ /* For each block.... */
++ for (blk = dev->internal_start_block;
++ !alloc_failed && blk <= dev->internal_end_block; blk++) {
++
++ YYIELD();
++
++ bi = yaffs_get_block_info(dev, blk);
++ state = bi->block_state;
++
++ deleted = 0;
++
++ /* For each chunk in each block that needs scanning.... */
++ for (c = 0; !alloc_failed && c < dev->param.chunks_per_block &&
++ state == YAFFS_BLOCK_STATE_NEEDS_SCANNING; c++) {
++ /* Read the tags and decide what to do */
++ chunk = blk * dev->param.chunks_per_block + c;
++
++ result = yaffs_rd_chunk_tags_nand(dev, chunk, NULL,
++ &tags);
++
++ /* Let's have a good look at this chunk... */
++
++ if (tags.ecc_result == YAFFS_ECC_RESULT_UNFIXED
++ || tags.is_deleted) {
++ /* YAFFS1 only...
++ * A deleted chunk
++ */
++ deleted++;
++ dev->n_free_chunks++;
++ /*T((" %d %d deleted\n",blk,c)); */
++ } else if (!tags.chunk_used) {
++ /* An unassigned chunk in the block
++ * This means that either the block is empty or
++ * this is the one being allocated from
++ */
++
++ if (c == 0) {
++ /* We're looking at the first chunk in the block so the block is unused */
++ state = YAFFS_BLOCK_STATE_EMPTY;
++ dev->n_erased_blocks++;
++ } else {
++ /* this is the block being allocated from */
++ T(YAFFS_TRACE_SCAN,
++ (TSTR
++ (" Allocating from %d %d" TENDSTR),
++ blk, c));
++ state = YAFFS_BLOCK_STATE_ALLOCATING;
++ dev->alloc_block = blk;
++ dev->alloc_page = c;
++ dev->alloc_block_finder = blk;
++ /* Set block finder here to encourage the allocator to go forth from here. */
++
++ }
++
++ dev->n_free_chunks +=
++ (dev->param.chunks_per_block - c);
++ } else if (tags.chunk_id > 0) {
++ /* chunk_id > 0 so it is a data chunk... */
++ unsigned int endpos;
++
++ yaffs_set_chunk_bit(dev, blk, c);
++ bi->pages_in_use++;
++
++ in = yaffs_find_or_create_by_number(dev,
++ tags.obj_id,
++ YAFFS_OBJECT_TYPE_FILE);
++ /* PutChunkIntoFile checks for a clash (two data chunks with
++ * the same chunk_id).
++ */
++
++ if (!in)
++ alloc_failed = 1;
++
++ if (in) {
++ if (!yaffs_put_chunk_in_file
++ (in, tags.chunk_id, chunk, 1))
++ alloc_failed = 1;
++ }
++
++ endpos =
++ (tags.chunk_id -
++ 1) * dev->data_bytes_per_chunk +
++ tags.n_bytes;
++ if (in
++ && in->variant_type ==
++ YAFFS_OBJECT_TYPE_FILE
++ && in->variant.file_variant.scanned_size <
++ endpos) {
++ in->variant.file_variant.scanned_size =
++ endpos;
++ if (!dev->param.use_header_file_size) {
++ in->variant.
++ file_variant.file_size =
++ in->variant.
++ file_variant.scanned_size;
++ }
++
++ }
++ /* T((" %d %d data %d %d\n",blk,c,tags.obj_id,tags.chunk_id)); */
++ } else {
++ /* chunk_id == 0, so it is an ObjectHeader.
++ * Thus, we read in the object header and make the object
++ */
++ yaffs_set_chunk_bit(dev, blk, c);
++ bi->pages_in_use++;
++
++ result = yaffs_rd_chunk_tags_nand(dev, chunk,
++ chunk_data,
++ NULL);
++
++ oh = (struct yaffs_obj_hdr *)chunk_data;
++
++ in = yaffs_find_by_number(dev, tags.obj_id);
++ if (in && in->variant_type != oh->type) {
++ /* This should not happen, but somehow
++ * Wev'e ended up with an obj_id that has been reused but not yet
++ * deleted, and worse still it has changed type. Delete the old object.
++ */
++
++ yaffs_del_obj(in);
++
++ in = 0;
++ }
++
++ in = yaffs_find_or_create_by_number(dev,
++ tags.obj_id,
++ oh->type);
++
++ if (!in)
++ alloc_failed = 1;
++
++ if (in && oh->shadows_obj > 0) {
++
++ struct yaffs_shadow_fixer *fixer;
++ fixer =
++ YMALLOC(sizeof
++ (struct
++ yaffs_shadow_fixer));
++ if (fixer) {
++ fixer->next = shadow_fixers;
++ shadow_fixers = fixer;
++ fixer->obj_id = tags.obj_id;
++ fixer->shadowed_id =
++ oh->shadows_obj;
++ T(YAFFS_TRACE_SCAN,
++ (TSTR
++ (" Shadow fixer: %d shadows %d"
++ TENDSTR), fixer->obj_id,
++ fixer->shadowed_id));
++
++ }
++
++ }
++
++ if (in && in->valid) {
++ /* We have already filled this one. We have a duplicate and need to resolve it. */
++
++ unsigned existing_serial = in->serial;
++ unsigned new_serial =
++ tags.serial_number;
++
++ if (((existing_serial + 1) & 3) ==
++ new_serial) {
++ /* Use new one - destroy the exisiting one */
++ yaffs_chunk_del(dev,
++ in->hdr_chunk,
++ 1, __LINE__);
++ in->valid = 0;
++ } else {
++ /* Use existing - destroy this one. */
++ yaffs_chunk_del(dev, chunk, 1,
++ __LINE__);
++ }
++ }
++
++ if (in && !in->valid &&
++ (tags.obj_id == YAFFS_OBJECTID_ROOT ||
++ tags.obj_id ==
++ YAFFS_OBJECTID_LOSTNFOUND)) {
++ /* We only load some info, don't fiddle with directory structure */
++ in->valid = 1;
++ in->variant_type = oh->type;
++
++ in->yst_mode = oh->yst_mode;
++ yaffs_load_attribs(in, oh);
++ in->hdr_chunk = chunk;
++ in->serial = tags.serial_number;
++
++ } else if (in && !in->valid) {
++ /* we need to load this info */
++
++ in->valid = 1;
++ in->variant_type = oh->type;
++
++ in->yst_mode = oh->yst_mode;
++ yaffs_load_attribs(in, oh);
++ in->hdr_chunk = chunk;
++ in->serial = tags.serial_number;
++
++ yaffs_set_obj_name_from_oh(in, oh);
++ in->dirty = 0;
++
++ /* directory stuff...
++ * hook up to parent
++ */
++
++ parent =
++ yaffs_find_or_create_by_number
++ (dev, oh->parent_obj_id,
++ YAFFS_OBJECT_TYPE_DIRECTORY);
++ if (!parent)
++ alloc_failed = 1;
++ if (parent && parent->variant_type ==
++ YAFFS_OBJECT_TYPE_UNKNOWN) {
++ /* Set up as a directory */
++ parent->variant_type =
++ YAFFS_OBJECT_TYPE_DIRECTORY;
++ INIT_LIST_HEAD(&parent->
++ variant.dir_variant.children);
++ } else if (!parent
++ || parent->variant_type !=
++ YAFFS_OBJECT_TYPE_DIRECTORY) {
++ /* Hoosterman, another problem....
++ * We're trying to use a non-directory as a directory
++ */
++
++ T(YAFFS_TRACE_ERROR,
++ (TSTR
++ ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
++ TENDSTR)));
++ parent = dev->lost_n_found;
++ }
++
++ yaffs_add_obj_to_dir(parent, in);
++
++ if (0 && (parent == dev->del_dir ||
++ parent ==
++ dev->unlinked_dir)) {
++ in->deleted = 1; /* If it is unlinked at start up then it wants deleting */
++ dev->n_deleted_files++;
++ }
++ /* Note re hardlinks.
++ * Since we might scan a hardlink before its equivalent object is scanned
++ * we put them all in a list.
++ * After scanning is complete, we should have all the objects, so we run through this
++ * list and fix up all the chains.
++ */
++
++ switch (in->variant_type) {
++ case YAFFS_OBJECT_TYPE_UNKNOWN:
++ /* Todo got a problem */
++ break;
++ case YAFFS_OBJECT_TYPE_FILE:
++ if (dev->param.
++ use_header_file_size)
++
++ in->variant.
++ file_variant.file_size
++ = oh->file_size;
++
++ break;
++ case YAFFS_OBJECT_TYPE_HARDLINK:
++ in->variant.
++ hardlink_variant.equiv_id =
++ oh->equiv_id;
++ in->hard_links.next =
++ (struct list_head *)
++ hard_list;
++ hard_list = in;
++ break;
++ case YAFFS_OBJECT_TYPE_DIRECTORY:
++ /* Do nothing */
++ break;
++ case YAFFS_OBJECT_TYPE_SPECIAL:
++ /* Do nothing */
++ break;
++ case YAFFS_OBJECT_TYPE_SYMLINK:
++ in->variant.symlink_variant.
++ alias =
++ yaffs_clone_str(oh->alias);
++ if (!in->variant.
++ symlink_variant.alias)
++ alloc_failed = 1;
++ break;
++ }
++
++ }
++ }
++ }
++
++ if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
++ /* If we got this far while scanning, then the block is fully allocated. */
++ state = YAFFS_BLOCK_STATE_FULL;
++ }
++
++ if (state == YAFFS_BLOCK_STATE_ALLOCATING) {
++ /* If the block was partially allocated then treat it as fully allocated. */
++ state = YAFFS_BLOCK_STATE_FULL;
++ dev->alloc_block = -1;
++ }
++
++ bi->block_state = state;
++
++ /* Now let's see if it was dirty */
++ if (bi->pages_in_use == 0 &&
++ !bi->has_shrink_hdr &&
++ bi->block_state == YAFFS_BLOCK_STATE_FULL) {
++ yaffs_block_became_dirty(dev, blk);
++ }
++
++ }
++
++ /* Ok, we've done all the scanning.
++ * Fix up the hard link chains.
++ * We should now have scanned all the objects, now it's time to add these
++ * hardlinks.
++ */
++
++ yaffs_link_fixup(dev, hard_list);
++
++ /* Fix up any shadowed objects */
++ {
++ struct yaffs_shadow_fixer *fixer;
++ struct yaffs_obj *obj;
++
++ while (shadow_fixers) {
++ fixer = shadow_fixers;
++ shadow_fixers = fixer->next;
++ /* Complete the rename transaction by deleting the shadowed object
++ * then setting the object header to unshadowed.
++ */
++ obj = yaffs_find_by_number(dev, fixer->shadowed_id);
++ if (obj)
++ yaffs_del_obj(obj);
++
++ obj = yaffs_find_by_number(dev, fixer->obj_id);
++
++ if (obj)
++ yaffs_update_oh(obj, NULL, 1, 0, 0, NULL);
++
++ YFREE(fixer);
++ }
++ }
++
++ yaffs_release_temp_buffer(dev, chunk_data, __LINE__);
++
++ if (alloc_failed)
++ return YAFFS_FAIL;
++
++ T(YAFFS_TRACE_SCAN, (TSTR("yaffs1_scan ends" TENDSTR)));
+
+ return YAFFS_OK;
+}
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_tagscompat.h linux-2.6.34/fs/yaffs2/yaffs_tagscompat.h
---- linux-2.6.34.orig/fs/yaffs2/yaffs_tagscompat.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffs_tagscompat.h 2010-05-20 20:16:22.311614862 +0200
-@@ -0,0 +1,39 @@
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_yaffs1.h linux-2.6.36/fs/yaffs2/yaffs_yaffs1.h
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_yaffs1.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_yaffs1.h 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,22 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
++ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
@@ -14775,38 +14890,21 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_tagscompat.h linux-2.6.34/fs/yaffs2/
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
-+#ifndef __YAFFS_TAGSCOMPAT_H__
-+#define __YAFFS_TAGSCOMPAT_H__
++#ifndef __YAFFS_YAFFS1_H__
++#define __YAFFS_YAFFS1_H__
+
+#include "yaffs_guts.h"
-+int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev,
-+ int chunkInNAND,
-+ const __u8 *data,
-+ const yaffs_ExtendedTags *tags);
-+int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev,
-+ int chunkInNAND,
-+ __u8 *data,
-+ yaffs_ExtendedTags *tags);
-+int yaffs_TagsCompatabilityMarkNANDBlockBad(struct yaffs_DeviceStruct *dev,
-+ int blockNo);
-+int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev,
-+ int blockNo,
-+ yaffs_BlockState *state,
-+ __u32 *sequenceNumber);
-+
-+void yaffs_CalcTagsECC(yaffs_Tags *tags);
-+int yaffs_CheckECCOnTags(yaffs_Tags *tags);
-+int yaffs_CountBits(__u8 byte);
-+
-+#endif
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_tagsvalidity.c linux-2.6.34/fs/yaffs2/yaffs_tagsvalidity.c
---- linux-2.6.34.orig/fs/yaffs2/yaffs_tagsvalidity.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffs_tagsvalidity.c 2010-05-20 20:16:22.311614862 +0200
-@@ -0,0 +1,28 @@
++int yaffs1_scan(struct yaffs_dev *dev);
++
++#endif
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_yaffs2.c linux-2.6.36/fs/yaffs2/yaffs_yaffs2.c
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_yaffs2.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_yaffs2.c 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,1620 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
++ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
@@ -14816,29 +14914,1621 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_tagsvalidity.c linux-2.6.34/fs/yaffs
+ * published by the Free Software Foundation.
+ */
+
-+#include "yaffs_tagsvalidity.h"
++#include "yaffs_guts.h"
++#include "yaffs_trace.h"
++#include "yaffs_yaffs2.h"
++#include "yaffs_checkptrw.h"
++#include "yaffs_bitmap.h"
++#include "yaffs_nand.h"
++#include "yaffs_getblockinfo.h"
++#include "yaffs_verify.h"
++#include "yaffs_attribs.h"
++
++/*
++ * Checkpoints are really no benefit on very small partitions.
++ *
++ * To save space on small partitions don't bother with checkpoints unless
++ * the partition is at least this big.
++ */
++#define YAFFS_CHECKPOINT_MIN_BLOCKS 60
++
++#define YAFFS_SMALL_HOLE_THRESHOLD 4
++
++/*
++ * Oldest Dirty Sequence Number handling.
++ */
++
++/* yaffs_calc_oldest_dirty_seq()
++ * yaffs2_find_oldest_dirty_seq()
++ * Calculate the oldest dirty sequence number if we don't know it.
++ */
++void yaffs_calc_oldest_dirty_seq(struct yaffs_dev *dev)
++{
++ int i;
++ unsigned seq;
++ unsigned block_no = 0;
++ struct yaffs_block_info *b;
++
++ if (!dev->param.is_yaffs2)
++ return;
++
++ /* Find the oldest dirty sequence number. */
++ seq = dev->seq_number + 1;
++ b = dev->block_info;
++ for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
++ if (b->block_state == YAFFS_BLOCK_STATE_FULL &&
++ (b->pages_in_use - b->soft_del_pages) <
++ dev->param.chunks_per_block && b->seq_number < seq) {
++ seq = b->seq_number;
++ block_no = i;
++ }
++ b++;
++ }
++
++ if (block_no) {
++ dev->oldest_dirty_seq = seq;
++ dev->oldest_dirty_block = block_no;
++ }
++
++}
++
++void yaffs2_find_oldest_dirty_seq(struct yaffs_dev *dev)
++{
++ if (!dev->param.is_yaffs2)
++ return;
++
++ if (!dev->oldest_dirty_seq)
++ yaffs_calc_oldest_dirty_seq(dev);
++}
++
++/*
++ * yaffs_clear_oldest_dirty_seq()
++ * Called when a block is erased or marked bad. (ie. when its seq_number
++ * becomes invalid). If the value matches the oldest then we clear
++ * dev->oldest_dirty_seq to force its recomputation.
++ */
++void yaffs2_clear_oldest_dirty_seq(struct yaffs_dev *dev,
++ struct yaffs_block_info *bi)
++{
++
++ if (!dev->param.is_yaffs2)
++ return;
++
++ if (!bi || bi->seq_number == dev->oldest_dirty_seq) {
++ dev->oldest_dirty_seq = 0;
++ dev->oldest_dirty_block = 0;
++ }
++}
++
++/*
++ * yaffs2_update_oldest_dirty_seq()
++ * Update the oldest dirty sequence number whenever we dirty a block.
++ * Only do this if the oldest_dirty_seq is actually being tracked.
++ */
++void yaffs2_update_oldest_dirty_seq(struct yaffs_dev *dev, unsigned block_no,
++ struct yaffs_block_info *bi)
++{
++ if (!dev->param.is_yaffs2)
++ return;
++
++ if (dev->oldest_dirty_seq) {
++ if (dev->oldest_dirty_seq > bi->seq_number) {
++ dev->oldest_dirty_seq = bi->seq_number;
++ dev->oldest_dirty_block = block_no;
++ }
++ }
++}
++
++int yaffs_block_ok_for_gc(struct yaffs_dev *dev, struct yaffs_block_info *bi)
++{
++
++ if (!dev->param.is_yaffs2)
++ return 1; /* disqualification only applies to yaffs2. */
++
++ if (!bi->has_shrink_hdr)
++ return 1; /* can gc */
++
++ yaffs2_find_oldest_dirty_seq(dev);
++
++ /* Can't do gc of this block if there are any blocks older than this one that have
++ * discarded pages.
++ */
++ return (bi->seq_number <= dev->oldest_dirty_seq);
++}
++
++/*
++ * yaffs2_find_refresh_block()
++ * periodically finds the oldest full block by sequence number for refreshing.
++ * Only for yaffs2.
++ */
++u32 yaffs2_find_refresh_block(struct yaffs_dev * dev)
++{
++ u32 b;
++
++ u32 oldest = 0;
++ u32 oldest_seq = 0;
++
++ struct yaffs_block_info *bi;
++
++ if (!dev->param.is_yaffs2)
++ return oldest;
++
++ /*
++ * If refresh period < 10 then refreshing is disabled.
++ */
++ if (dev->param.refresh_period < 10)
++ return oldest;
++
++ /*
++ * Fix broken values.
++ */
++ if (dev->refresh_skip > dev->param.refresh_period)
++ dev->refresh_skip = dev->param.refresh_period;
++
++ if (dev->refresh_skip > 0)
++ return oldest;
++
++ /*
++ * Refresh skip is now zero.
++ * We'll do a refresh this time around....
++ * Update the refresh skip and find the oldest block.
++ */
++ dev->refresh_skip = dev->param.refresh_period;
++ dev->refresh_count++;
++ bi = dev->block_info;
++ for (b = dev->internal_start_block; b <= dev->internal_end_block; b++) {
++
++ if (bi->block_state == YAFFS_BLOCK_STATE_FULL) {
++
++ if (oldest < 1 || bi->seq_number < oldest_seq) {
++ oldest = b;
++ oldest_seq = bi->seq_number;
++ }
++ }
++ bi++;
++ }
++
++ if (oldest > 0) {
++ T(YAFFS_TRACE_GC,
++ (TSTR
++ ("GC refresh count %d selected block %d with seq_number %d"
++ TENDSTR), dev->refresh_count, oldest, oldest_seq));
++ }
++
++ return oldest;
++}
++
++int yaffs2_checkpt_required(struct yaffs_dev *dev)
++{
++ int nblocks;
++
++ if (!dev->param.is_yaffs2)
++ return 0;
++
++ nblocks = dev->internal_end_block - dev->internal_start_block + 1;
++
++ return !dev->param.skip_checkpt_wr &&
++ !dev->read_only && (nblocks >= YAFFS_CHECKPOINT_MIN_BLOCKS);
++}
++
++int yaffs_calc_checkpt_blocks_required(struct yaffs_dev *dev)
++{
++ int retval;
++
++ if (!dev->param.is_yaffs2)
++ return 0;
++
++ if (!dev->checkpoint_blocks_required && yaffs2_checkpt_required(dev)) {
++ /* Not a valid value so recalculate */
++ int n_bytes = 0;
++ int n_blocks;
++ int dev_blocks =
++ (dev->param.end_block - dev->param.start_block + 1);
++
++ n_bytes += sizeof(struct yaffs_checkpt_validity);
++ n_bytes += sizeof(struct yaffs_checkpt_dev);
++ n_bytes += dev_blocks * sizeof(struct yaffs_block_info);
++ n_bytes += dev_blocks * dev->chunk_bit_stride;
++ n_bytes +=
++ (sizeof(struct yaffs_checkpt_obj) +
++ sizeof(u32)) * (dev->n_obj);
++ n_bytes += (dev->tnode_size + sizeof(u32)) * (dev->n_tnodes);
++ n_bytes += sizeof(struct yaffs_checkpt_validity);
++ n_bytes += sizeof(u32); /* checksum */
++
++ /* Round up and add 2 blocks to allow for some bad blocks, so add 3 */
++
++ n_blocks =
++ (n_bytes /
++ (dev->data_bytes_per_chunk *
++ dev->param.chunks_per_block)) + 3;
++
++ dev->checkpoint_blocks_required = n_blocks;
++ }
++
++ retval = dev->checkpoint_blocks_required - dev->blocks_in_checkpt;
++ if (retval < 0)
++ retval = 0;
++ return retval;
++}
++
++/*--------------------- Checkpointing --------------------*/
++
++static int yaffs2_wr_checkpt_validity_marker(struct yaffs_dev *dev, int head)
++{
++ struct yaffs_checkpt_validity cp;
++
++ memset(&cp, 0, sizeof(cp));
++
++ cp.struct_type = sizeof(cp);
++ cp.magic = YAFFS_MAGIC;
++ cp.version = YAFFS_CHECKPOINT_VERSION;
++ cp.head = (head) ? 1 : 0;
++
++ return (yaffs2_checkpt_wr(dev, &cp, sizeof(cp)) == sizeof(cp)) ? 1 : 0;
++}
++
++static int yaffs2_rd_checkpt_validity_marker(struct yaffs_dev *dev, int head)
++{
++ struct yaffs_checkpt_validity cp;
++ int ok;
++
++ ok = (yaffs2_checkpt_rd(dev, &cp, sizeof(cp)) == sizeof(cp));
++
++ if (ok)
++ ok = (cp.struct_type == sizeof(cp)) &&
++ (cp.magic == YAFFS_MAGIC) &&
++ (cp.version == YAFFS_CHECKPOINT_VERSION) &&
++ (cp.head == ((head) ? 1 : 0));
++ return ok ? 1 : 0;
++}
++
++static void yaffs2_dev_to_checkpt_dev(struct yaffs_checkpt_dev *cp,
++ struct yaffs_dev *dev)
++{
++ cp->n_erased_blocks = dev->n_erased_blocks;
++ cp->alloc_block = dev->alloc_block;
++ cp->alloc_page = dev->alloc_page;
++ cp->n_free_chunks = dev->n_free_chunks;
++
++ cp->n_deleted_files = dev->n_deleted_files;
++ cp->n_unlinked_files = dev->n_unlinked_files;
++ cp->n_bg_deletions = dev->n_bg_deletions;
++ cp->seq_number = dev->seq_number;
++
++}
++
++static void yaffs_checkpt_dev_to_dev(struct yaffs_dev *dev,
++ struct yaffs_checkpt_dev *cp)
++{
++ dev->n_erased_blocks = cp->n_erased_blocks;
++ dev->alloc_block = cp->alloc_block;
++ dev->alloc_page = cp->alloc_page;
++ dev->n_free_chunks = cp->n_free_chunks;
++
++ dev->n_deleted_files = cp->n_deleted_files;
++ dev->n_unlinked_files = cp->n_unlinked_files;
++ dev->n_bg_deletions = cp->n_bg_deletions;
++ dev->seq_number = cp->seq_number;
++}
++
++static int yaffs2_wr_checkpt_dev(struct yaffs_dev *dev)
++{
++ struct yaffs_checkpt_dev cp;
++ u32 n_bytes;
++ u32 n_blocks =
++ (dev->internal_end_block - dev->internal_start_block + 1);
++
++ int ok;
++
++ /* Write device runtime values */
++ yaffs2_dev_to_checkpt_dev(&cp, dev);
++ cp.struct_type = sizeof(cp);
++
++ ok = (yaffs2_checkpt_wr(dev, &cp, sizeof(cp)) == sizeof(cp));
++
++ /* Write block info */
++ if (ok) {
++ n_bytes = n_blocks * sizeof(struct yaffs_block_info);
++ ok = (yaffs2_checkpt_wr(dev, dev->block_info, n_bytes) ==
++ n_bytes);
++ }
++
++ /* Write chunk bits */
++ if (ok) {
++ n_bytes = n_blocks * dev->chunk_bit_stride;
++ ok = (yaffs2_checkpt_wr(dev, dev->chunk_bits, n_bytes) ==
++ n_bytes);
++ }
++ return ok ? 1 : 0;
++
++}
++
++static int yaffs2_rd_checkpt_dev(struct yaffs_dev *dev)
++{
++ struct yaffs_checkpt_dev cp;
++ u32 n_bytes;
++ u32 n_blocks =
++ (dev->internal_end_block - dev->internal_start_block + 1);
++
++ int ok;
++
++ ok = (yaffs2_checkpt_rd(dev, &cp, sizeof(cp)) == sizeof(cp));
++ if (!ok)
++ return 0;
++
++ if (cp.struct_type != sizeof(cp))
++ return 0;
++
++ yaffs_checkpt_dev_to_dev(dev, &cp);
++
++ n_bytes = n_blocks * sizeof(struct yaffs_block_info);
++
++ ok = (yaffs2_checkpt_rd(dev, dev->block_info, n_bytes) == n_bytes);
++
++ if (!ok)
++ return 0;
++ n_bytes = n_blocks * dev->chunk_bit_stride;
++
++ ok = (yaffs2_checkpt_rd(dev, dev->chunk_bits, n_bytes) == n_bytes);
++
++ return ok ? 1 : 0;
++}
++
++static void yaffs2_obj_checkpt_obj(struct yaffs_checkpt_obj *cp,
++ struct yaffs_obj *obj)
++{
++
++ cp->obj_id = obj->obj_id;
++ cp->parent_id = (obj->parent) ? obj->parent->obj_id : 0;
++ cp->hdr_chunk = obj->hdr_chunk;
++ cp->variant_type = obj->variant_type;
++ cp->deleted = obj->deleted;
++ cp->soft_del = obj->soft_del;
++ cp->unlinked = obj->unlinked;
++ cp->fake = obj->fake;
++ cp->rename_allowed = obj->rename_allowed;
++ cp->unlink_allowed = obj->unlink_allowed;
++ cp->serial = obj->serial;
++ cp->n_data_chunks = obj->n_data_chunks;
++
++ if (obj->variant_type == YAFFS_OBJECT_TYPE_FILE)
++ cp->size_or_equiv_obj = obj->variant.file_variant.file_size;
++ else if (obj->variant_type == YAFFS_OBJECT_TYPE_HARDLINK)
++ cp->size_or_equiv_obj = obj->variant.hardlink_variant.equiv_id;
++}
++
++static int taffs2_checkpt_obj_to_obj(struct yaffs_obj *obj,
++ struct yaffs_checkpt_obj *cp)
++{
++
++ struct yaffs_obj *parent;
++
++ if (obj->variant_type != cp->variant_type) {
++ T(YAFFS_TRACE_ERROR, (TSTR("Checkpoint read object %d type %d "
++ TCONT
++ ("chunk %d does not match existing object type %d")
++ TENDSTR), cp->obj_id,
++ cp->variant_type, cp->hdr_chunk,
++ obj->variant_type));
++ return 0;
++ }
++
++ obj->obj_id = cp->obj_id;
++
++ if (cp->parent_id)
++ parent = yaffs_find_or_create_by_number(obj->my_dev,
++ cp->parent_id,
++ YAFFS_OBJECT_TYPE_DIRECTORY);
++ else
++ parent = NULL;
++
++ if (parent) {
++ if (parent->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
++ T(YAFFS_TRACE_ALWAYS,
++ (TSTR
++ ("Checkpoint read object %d parent %d type %d"
++ TCONT(" chunk %d Parent type, %d, not directory")
++ TENDSTR), cp->obj_id, cp->parent_id,
++ cp->variant_type, cp->hdr_chunk,
++ parent->variant_type));
++ return 0;
++ }
++ yaffs_add_obj_to_dir(parent, obj);
++ }
++
++ obj->hdr_chunk = cp->hdr_chunk;
++ obj->variant_type = cp->variant_type;
++ obj->deleted = cp->deleted;
++ obj->soft_del = cp->soft_del;
++ obj->unlinked = cp->unlinked;
++ obj->fake = cp->fake;
++ obj->rename_allowed = cp->rename_allowed;
++ obj->unlink_allowed = cp->unlink_allowed;
++ obj->serial = cp->serial;
++ obj->n_data_chunks = cp->n_data_chunks;
++
++ if (obj->variant_type == YAFFS_OBJECT_TYPE_FILE)
++ obj->variant.file_variant.file_size = cp->size_or_equiv_obj;
++ else if (obj->variant_type == YAFFS_OBJECT_TYPE_HARDLINK)
++ obj->variant.hardlink_variant.equiv_id = cp->size_or_equiv_obj;
++
++ if (obj->hdr_chunk > 0)
++ obj->lazy_loaded = 1;
++ return 1;
++}
++
++static int yaffs2_checkpt_tnode_worker(struct yaffs_obj *in,
++ struct yaffs_tnode *tn, u32 level,
++ int chunk_offset)
++{
++ int i;
++ struct yaffs_dev *dev = in->my_dev;
++ int ok = 1;
++
++ if (tn) {
++ if (level > 0) {
++
++ for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
++ if (tn->internal[i]) {
++ ok = yaffs2_checkpt_tnode_worker(in,
++ tn->
++ internal
++ [i],
++ level -
++ 1,
++ (chunk_offset
++ <<
++ YAFFS_TNODES_INTERNAL_BITS)
++ + i);
++ }
++ }
++ } else if (level == 0) {
++ u32 base_offset =
++ chunk_offset << YAFFS_TNODES_LEVEL0_BITS;
++ ok = (yaffs2_checkpt_wr
++ (dev, &base_offset,
++ sizeof(base_offset)) == sizeof(base_offset));
++ if (ok)
++ ok = (yaffs2_checkpt_wr
++ (dev, tn,
++ dev->tnode_size) == dev->tnode_size);
++ }
++ }
++
++ return ok;
++
++}
++
++static int yaffs2_wr_checkpt_tnodes(struct yaffs_obj *obj)
++{
++ u32 end_marker = ~0;
++ int ok = 1;
++
++ if (obj->variant_type == YAFFS_OBJECT_TYPE_FILE) {
++ ok = yaffs2_checkpt_tnode_worker(obj,
++ obj->variant.file_variant.top,
++ obj->variant.file_variant.
++ top_level, 0);
++ if (ok)
++ ok = (yaffs2_checkpt_wr
++ (obj->my_dev, &end_marker,
++ sizeof(end_marker)) == sizeof(end_marker));
++ }
++
++ return ok ? 1 : 0;
++}
++
++static int yaffs2_rd_checkpt_tnodes(struct yaffs_obj *obj)
++{
++ u32 base_chunk;
++ int ok = 1;
++ struct yaffs_dev *dev = obj->my_dev;
++ struct yaffs_file_var *file_stuct_ptr = &obj->variant.file_variant;
++ struct yaffs_tnode *tn;
++ int nread = 0;
++
++ ok = (yaffs2_checkpt_rd(dev, &base_chunk, sizeof(base_chunk)) ==
++ sizeof(base_chunk));
++
++ while (ok && (~base_chunk)) {
++ nread++;
++ /* Read level 0 tnode */
++
++ tn = yaffs_get_tnode(dev);
++ if (tn) {
++ ok = (yaffs2_checkpt_rd(dev, tn, dev->tnode_size) ==
++ dev->tnode_size);
++ } else {
++ ok = 0;
++ }
++
++ if (tn && ok)
++ ok = yaffs_add_find_tnode_0(dev,
++ file_stuct_ptr,
++ base_chunk, tn) ? 1 : 0;
++
++ if (ok)
++ ok = (yaffs2_checkpt_rd
++ (dev, &base_chunk,
++ sizeof(base_chunk)) == sizeof(base_chunk));
++
++ }
++
++ T(YAFFS_TRACE_CHECKPOINT,
++ (TSTR("Checkpoint read tnodes %d records, last %d. ok %d" TENDSTR),
++ nread, base_chunk, ok));
++
++ return ok ? 1 : 0;
++}
++
++static int yaffs2_wr_checkpt_objs(struct yaffs_dev *dev)
++{
++ struct yaffs_obj *obj;
++ struct yaffs_checkpt_obj cp;
++ int i;
++ int ok = 1;
++ struct list_head *lh;
++
++ /* Iterate through the objects in each hash entry,
++ * dumping them to the checkpointing stream.
++ */
++
++ for (i = 0; ok && i < YAFFS_NOBJECT_BUCKETS; i++) {
++ list_for_each(lh, &dev->obj_bucket[i].list) {
++ if (lh) {
++ obj =
++ list_entry(lh, struct yaffs_obj, hash_link);
++ if (!obj->defered_free) {
++ yaffs2_obj_checkpt_obj(&cp, obj);
++ cp.struct_type = sizeof(cp);
++
++ T(YAFFS_TRACE_CHECKPOINT,
++ (TSTR
++ ("Checkpoint write object %d parent %d type %d chunk %d obj addr %p"
++ TENDSTR), cp.obj_id, cp.parent_id,
++ cp.variant_type, cp.hdr_chunk, obj));
++
++ ok = (yaffs2_checkpt_wr
++ (dev, &cp,
++ sizeof(cp)) == sizeof(cp));
++
++ if (ok
++ && obj->variant_type ==
++ YAFFS_OBJECT_TYPE_FILE)
++ ok = yaffs2_wr_checkpt_tnodes
++ (obj);
++ }
++ }
++ }
++ }
++
++ /* Dump end of list */
++ memset(&cp, 0xFF, sizeof(struct yaffs_checkpt_obj));
++ cp.struct_type = sizeof(cp);
++
++ if (ok)
++ ok = (yaffs2_checkpt_wr(dev, &cp, sizeof(cp)) == sizeof(cp));
++
++ return ok ? 1 : 0;
++}
++
++static int yaffs2_rd_checkpt_objs(struct yaffs_dev *dev)
++{
++ struct yaffs_obj *obj;
++ struct yaffs_checkpt_obj cp;
++ int ok = 1;
++ int done = 0;
++ struct yaffs_obj *hard_list = NULL;
++
++ while (ok && !done) {
++ ok = (yaffs2_checkpt_rd(dev, &cp, sizeof(cp)) == sizeof(cp));
++ if (cp.struct_type != sizeof(cp)) {
++ T(YAFFS_TRACE_CHECKPOINT,
++ (TSTR("struct size %d instead of %d ok %d" TENDSTR),
++ cp.struct_type, (int)sizeof(cp), ok));
++ ok = 0;
++ }
++
++ T(YAFFS_TRACE_CHECKPOINT,
++ (TSTR
++ ("Checkpoint read object %d parent %d type %d chunk %d "
++ TENDSTR), cp.obj_id, cp.parent_id, cp.variant_type,
++ cp.hdr_chunk));
++
++ if (ok && cp.obj_id == ~0) {
++ done = 1;
++ } else if (ok) {
++ obj =
++ yaffs_find_or_create_by_number(dev, cp.obj_id,
++ cp.variant_type);
++ if (obj) {
++ ok = taffs2_checkpt_obj_to_obj(obj, &cp);
++ if (!ok)
++ break;
++ if (obj->variant_type == YAFFS_OBJECT_TYPE_FILE) {
++ ok = yaffs2_rd_checkpt_tnodes(obj);
++ } else if (obj->variant_type ==
++ YAFFS_OBJECT_TYPE_HARDLINK) {
++ obj->hard_links.next =
++ (struct list_head *)hard_list;
++ hard_list = obj;
++ }
++ } else {
++ ok = 0;
++ }
++ }
++ }
++
++ if (ok)
++ yaffs_link_fixup(dev, hard_list);
++
++ return ok ? 1 : 0;
++}
++
++static int yaffs2_wr_checkpt_sum(struct yaffs_dev *dev)
++{
++ u32 checkpt_sum;
++ int ok;
++
++ yaffs2_get_checkpt_sum(dev, &checkpt_sum);
++
++ ok = (yaffs2_checkpt_wr(dev, &checkpt_sum, sizeof(checkpt_sum)) ==
++ sizeof(checkpt_sum));
++
++ if (!ok)
++ return 0;
++
++ return 1;
++}
++
++static int yaffs2_rd_checkpt_sum(struct yaffs_dev *dev)
++{
++ u32 checkpt_sum0;
++ u32 checkpt_sum1;
++ int ok;
++
++ yaffs2_get_checkpt_sum(dev, &checkpt_sum0);
++
++ ok = (yaffs2_checkpt_rd(dev, &checkpt_sum1, sizeof(checkpt_sum1)) ==
++ sizeof(checkpt_sum1));
++
++ if (!ok)
++ return 0;
++
++ if (checkpt_sum0 != checkpt_sum1)
++ return 0;
++
++ return 1;
++}
++
++static int yaffs2_wr_checkpt_data(struct yaffs_dev *dev)
++{
++ int ok = 1;
++
++ if (!yaffs2_checkpt_required(dev)) {
++ T(YAFFS_TRACE_CHECKPOINT,
++ (TSTR("skipping checkpoint write" TENDSTR)));
++ ok = 0;
++ }
++
++ if (ok)
++ ok = yaffs2_checkpt_open(dev, 1);
++
++ if (ok) {
++ T(YAFFS_TRACE_CHECKPOINT,
++ (TSTR("write checkpoint validity" TENDSTR)));
++ ok = yaffs2_wr_checkpt_validity_marker(dev, 1);
++ }
++ if (ok) {
++ T(YAFFS_TRACE_CHECKPOINT,
++ (TSTR("write checkpoint device" TENDSTR)));
++ ok = yaffs2_wr_checkpt_dev(dev);
++ }
++ if (ok) {
++ T(YAFFS_TRACE_CHECKPOINT,
++ (TSTR("write checkpoint objects" TENDSTR)));
++ ok = yaffs2_wr_checkpt_objs(dev);
++ }
++ if (ok) {
++ T(YAFFS_TRACE_CHECKPOINT,
++ (TSTR("write checkpoint validity" TENDSTR)));
++ ok = yaffs2_wr_checkpt_validity_marker(dev, 0);
++ }
++
++ if (ok)
++ ok = yaffs2_wr_checkpt_sum(dev);
++
++ if (!yaffs_checkpt_close(dev))
++ ok = 0;
++
++ if (ok)
++ dev->is_checkpointed = 1;
++ else
++ dev->is_checkpointed = 0;
++
++ return dev->is_checkpointed;
++}
++
++static int yaffs2_rd_checkpt_data(struct yaffs_dev *dev)
++{
++ int ok = 1;
++
++ if (!dev->param.is_yaffs2)
++ ok = 0;
++
++ if (ok && dev->param.skip_checkpt_rd) {
++ T(YAFFS_TRACE_CHECKPOINT,
++ (TSTR("skipping checkpoint read" TENDSTR)));
++ ok = 0;
++ }
++
++ if (ok)
++ ok = yaffs2_checkpt_open(dev, 0); /* open for read */
++
++ if (ok) {
++ T(YAFFS_TRACE_CHECKPOINT,
++ (TSTR("read checkpoint validity" TENDSTR)));
++ ok = yaffs2_rd_checkpt_validity_marker(dev, 1);
++ }
++ if (ok) {
++ T(YAFFS_TRACE_CHECKPOINT,
++ (TSTR("read checkpoint device" TENDSTR)));
++ ok = yaffs2_rd_checkpt_dev(dev);
++ }
++ if (ok) {
++ T(YAFFS_TRACE_CHECKPOINT,
++ (TSTR("read checkpoint objects" TENDSTR)));
++ ok = yaffs2_rd_checkpt_objs(dev);
++ }
++ if (ok) {
++ T(YAFFS_TRACE_CHECKPOINT,
++ (TSTR("read checkpoint validity" TENDSTR)));
++ ok = yaffs2_rd_checkpt_validity_marker(dev, 0);
++ }
++
++ if (ok) {
++ ok = yaffs2_rd_checkpt_sum(dev);
++ T(YAFFS_TRACE_CHECKPOINT,
++ (TSTR("read checkpoint checksum %d" TENDSTR), ok));
++ }
+
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags)
++ if (!yaffs_checkpt_close(dev))
++ ok = 0;
++
++ if (ok)
++ dev->is_checkpointed = 1;
++ else
++ dev->is_checkpointed = 0;
++
++ return ok ? 1 : 0;
++
++}
++
++void yaffs2_checkpt_invalidate(struct yaffs_dev *dev)
+{
-+ memset(tags, 0, sizeof(yaffs_ExtendedTags));
-+ tags->validMarker0 = 0xAAAAAAAA;
-+ tags->validMarker1 = 0x55555555;
++ if (dev->is_checkpointed || dev->blocks_in_checkpt > 0) {
++ dev->is_checkpointed = 0;
++ yaffs2_checkpt_invalidate_stream(dev);
++ }
++ if (dev->param.sb_dirty_fn)
++ dev->param.sb_dirty_fn(dev);
++}
++
++int yaffs_checkpoint_save(struct yaffs_dev *dev)
++{
++
++ T(YAFFS_TRACE_CHECKPOINT,
++ (TSTR("save entry: is_checkpointed %d" TENDSTR),
++ dev->is_checkpointed));
++
++ yaffs_verify_objects(dev);
++ yaffs_verify_blocks(dev);
++ yaffs_verify_free_chunks(dev);
++
++ if (!dev->is_checkpointed) {
++ yaffs2_checkpt_invalidate(dev);
++ yaffs2_wr_checkpt_data(dev);
++ }
++
++ T(YAFFS_TRACE_CHECKPOINT | YAFFS_TRACE_MOUNT,
++ (TSTR("save exit: is_checkpointed %d" TENDSTR),
++ dev->is_checkpointed));
++
++ return dev->is_checkpointed;
+}
+
-+int yaffs_ValidateTags(yaffs_ExtendedTags *tags)
++int yaffs2_checkpt_restore(struct yaffs_dev *dev)
+{
-+ return (tags->validMarker0 == 0xAAAAAAAA &&
-+ tags->validMarker1 == 0x55555555);
++ int retval;
++ T(YAFFS_TRACE_CHECKPOINT,
++ (TSTR("restore entry: is_checkpointed %d" TENDSTR),
++ dev->is_checkpointed));
++
++ retval = yaffs2_rd_checkpt_data(dev);
++
++ if (dev->is_checkpointed) {
++ yaffs_verify_objects(dev);
++ yaffs_verify_blocks(dev);
++ yaffs_verify_free_chunks(dev);
++ }
++
++ T(YAFFS_TRACE_CHECKPOINT,
++ (TSTR("restore exit: is_checkpointed %d" TENDSTR),
++ dev->is_checkpointed));
+
++ return retval;
+}
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_tagsvalidity.h linux-2.6.34/fs/yaffs2/yaffs_tagsvalidity.h
---- linux-2.6.34.orig/fs/yaffs2/yaffs_tagsvalidity.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yaffs_tagsvalidity.h 2010-05-20 20:16:22.311614862 +0200
-@@ -0,0 +1,24 @@
++
++int yaffs2_handle_hole(struct yaffs_obj *obj, loff_t new_size)
++{
++ /* if new_size > old_file_size.
++ * We're going to be writing a hole.
++ * If the hole is small then write zeros otherwise write a start of hole marker.
++ */
++
++ loff_t old_file_size;
++ int increase;
++ int small_hole;
++ int result = YAFFS_OK;
++ struct yaffs_dev *dev = NULL;
++
++ u8 *local_buffer = NULL;
++
++ int small_increase_ok = 0;
++
++ if (!obj)
++ return YAFFS_FAIL;
++
++ if (obj->variant_type != YAFFS_OBJECT_TYPE_FILE)
++ return YAFFS_FAIL;
++
++ dev = obj->my_dev;
++
++ /* Bail out if not yaffs2 mode */
++ if (!dev->param.is_yaffs2)
++ return YAFFS_OK;
++
++ old_file_size = obj->variant.file_variant.file_size;
++
++ if (new_size <= old_file_size)
++ return YAFFS_OK;
++
++ increase = new_size - old_file_size;
++
++ if (increase < YAFFS_SMALL_HOLE_THRESHOLD * dev->data_bytes_per_chunk &&
++ yaffs_check_alloc_available(dev, YAFFS_SMALL_HOLE_THRESHOLD + 1))
++ small_hole = 1;
++ else
++ small_hole = 0;
++
++ if (small_hole)
++ local_buffer = yaffs_get_temp_buffer(dev, __LINE__);
++
++ if (local_buffer) {
++ /* fill hole with zero bytes */
++ int pos = old_file_size;
++ int this_write;
++ int written;
++ memset(local_buffer, 0, dev->data_bytes_per_chunk);
++ small_increase_ok = 1;
++
++ while (increase > 0 && small_increase_ok) {
++ this_write = increase;
++ if (this_write > dev->data_bytes_per_chunk)
++ this_write = dev->data_bytes_per_chunk;
++ written =
++ yaffs_do_file_wr(obj, local_buffer, pos, this_write,
++ 0);
++ if (written == this_write) {
++ pos += this_write;
++ increase -= this_write;
++ } else {
++ small_increase_ok = 0;
++ }
++ }
++
++ yaffs_release_temp_buffer(dev, local_buffer, __LINE__);
++
++ /* If we were out of space then reverse any chunks we've added */
++ if (!small_increase_ok)
++ yaffs_resize_file_down(obj, old_file_size);
++ }
++
++ if (!small_increase_ok &&
++ obj->parent &&
++ obj->parent->obj_id != YAFFS_OBJECTID_UNLINKED &&
++ obj->parent->obj_id != YAFFS_OBJECTID_DELETED) {
++ /* Write a hole start header with the old file size */
++ yaffs_update_oh(obj, NULL, 0, 1, 0, NULL);
++ }
++
++ return result;
++
++}
++
++struct yaffs_block_index {
++ int seq;
++ int block;
++};
++
++static int yaffs2_ybicmp(const void *a, const void *b)
++{
++ int aseq = ((struct yaffs_block_index *)a)->seq;
++ int bseq = ((struct yaffs_block_index *)b)->seq;
++ int ablock = ((struct yaffs_block_index *)a)->block;
++ int bblock = ((struct yaffs_block_index *)b)->block;
++ if (aseq == bseq)
++ return ablock - bblock;
++ else
++ return aseq - bseq;
++}
++
++int yaffs2_scan_backwards(struct yaffs_dev *dev)
++{
++ struct yaffs_ext_tags tags;
++ int blk;
++ int block_iter;
++ int start_iter;
++ int end_iter;
++ int n_to_scan = 0;
++
++ int chunk;
++ int result;
++ int c;
++ int deleted;
++ enum yaffs_block_state state;
++ struct yaffs_obj *hard_list = NULL;
++ struct yaffs_block_info *bi;
++ u32 seq_number;
++ struct yaffs_obj_hdr *oh;
++ struct yaffs_obj *in;
++ struct yaffs_obj *parent;
++ int n_blocks = dev->internal_end_block - dev->internal_start_block + 1;
++ int is_unlinked;
++ u8 *chunk_data;
++
++ int file_size;
++ int is_shrink;
++ int found_chunks;
++ int equiv_id;
++ int alloc_failed = 0;
++
++ struct yaffs_block_index *block_index = NULL;
++ int alt_block_index = 0;
++
++ T(YAFFS_TRACE_SCAN,
++ (TSTR
++ ("yaffs2_scan_backwards starts intstartblk %d intendblk %d..."
++ TENDSTR), dev->internal_start_block, dev->internal_end_block));
++
++ dev->seq_number = YAFFS_LOWEST_SEQUENCE_NUMBER;
++
++ block_index = YMALLOC(n_blocks * sizeof(struct yaffs_block_index));
++
++ if (!block_index) {
++ block_index =
++ YMALLOC_ALT(n_blocks * sizeof(struct yaffs_block_index));
++ alt_block_index = 1;
++ }
++
++ if (!block_index) {
++ T(YAFFS_TRACE_SCAN,
++ (TSTR
++ ("yaffs2_scan_backwards() could not allocate block index!"
++ TENDSTR)));
++ return YAFFS_FAIL;
++ }
++
++ dev->blocks_in_checkpt = 0;
++
++ chunk_data = yaffs_get_temp_buffer(dev, __LINE__);
++
++ /* Scan all the blocks to determine their state */
++ bi = dev->block_info;
++ for (blk = dev->internal_start_block; blk <= dev->internal_end_block;
++ blk++) {
++ yaffs_clear_chunk_bits(dev, blk);
++ bi->pages_in_use = 0;
++ bi->soft_del_pages = 0;
++
++ yaffs_query_init_block_state(dev, blk, &state, &seq_number);
++
++ bi->block_state = state;
++ bi->seq_number = seq_number;
++
++ if (bi->seq_number == YAFFS_SEQUENCE_CHECKPOINT_DATA)
++ bi->block_state = state = YAFFS_BLOCK_STATE_CHECKPOINT;
++ if (bi->seq_number == YAFFS_SEQUENCE_BAD_BLOCK)
++ bi->block_state = state = YAFFS_BLOCK_STATE_DEAD;
++
++ T(YAFFS_TRACE_SCAN_DEBUG,
++ (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
++ state, seq_number));
++
++ if (state == YAFFS_BLOCK_STATE_CHECKPOINT) {
++ dev->blocks_in_checkpt++;
++
++ } else if (state == YAFFS_BLOCK_STATE_DEAD) {
++ T(YAFFS_TRACE_BAD_BLOCKS,
++ (TSTR("block %d is bad" TENDSTR), blk));
++ } else if (state == YAFFS_BLOCK_STATE_EMPTY) {
++ T(YAFFS_TRACE_SCAN_DEBUG,
++ (TSTR("Block empty " TENDSTR)));
++ dev->n_erased_blocks++;
++ dev->n_free_chunks += dev->param.chunks_per_block;
++ } else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
++
++ /* Determine the highest sequence number */
++ if (seq_number >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
++ seq_number < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
++
++ block_index[n_to_scan].seq = seq_number;
++ block_index[n_to_scan].block = blk;
++
++ n_to_scan++;
++
++ if (seq_number >= dev->seq_number)
++ dev->seq_number = seq_number;
++ } else {
++ /* TODO: Nasty sequence number! */
++ T(YAFFS_TRACE_SCAN,
++ (TSTR
++ ("Block scanning block %d has bad sequence number %d"
++ TENDSTR), blk, seq_number));
++
++ }
++ }
++ bi++;
++ }
++
++ T(YAFFS_TRACE_SCAN,
++ (TSTR("%d blocks to be sorted..." TENDSTR), n_to_scan));
++
++ YYIELD();
++
++ /* Sort the blocks by sequence number */
++ yaffs_sort(block_index, n_to_scan, sizeof(struct yaffs_block_index),
++ yaffs2_ybicmp);
++
++ YYIELD();
++
++ T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR)));
++
++ /* Now scan the blocks looking at the data. */
++ start_iter = 0;
++ end_iter = n_to_scan - 1;
++ T(YAFFS_TRACE_SCAN_DEBUG,
++ (TSTR("%d blocks to be scanned" TENDSTR), n_to_scan));
++
++ /* For each block.... backwards */
++ for (block_iter = end_iter; !alloc_failed && block_iter >= start_iter;
++ block_iter--) {
++ /* Cooperative multitasking! This loop can run for so
++ long that watchdog timers expire. */
++ YYIELD();
++
++ /* get the block to scan in the correct order */
++ blk = block_index[block_iter].block;
++
++ bi = yaffs_get_block_info(dev, blk);
++
++ state = bi->block_state;
++
++ deleted = 0;
++
++ /* For each chunk in each block that needs scanning.... */
++ found_chunks = 0;
++ for (c = dev->param.chunks_per_block - 1;
++ !alloc_failed && c >= 0 &&
++ (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
++ state == YAFFS_BLOCK_STATE_ALLOCATING); c--) {
++ /* Scan backwards...
++ * Read the tags and decide what to do
++ */
++
++ chunk = blk * dev->param.chunks_per_block + c;
++
++ result = yaffs_rd_chunk_tags_nand(dev, chunk, NULL,
++ &tags);
++
++ /* Let's have a good look at this chunk... */
++
++ if (!tags.chunk_used) {
++ /* An unassigned chunk in the block.
++ * If there are used chunks after this one, then
++ * it is a chunk that was skipped due to failing the erased
++ * check. Just skip it so that it can be deleted.
++ * But, more typically, We get here when this is an unallocated
++ * chunk and his means that either the block is empty or
++ * this is the one being allocated from
++ */
++
++ if (found_chunks) {
++ /* This is a chunk that was skipped due to failing the erased check */
++ } else if (c == 0) {
++ /* We're looking at the first chunk in the block so the block is unused */
++ state = YAFFS_BLOCK_STATE_EMPTY;
++ dev->n_erased_blocks++;
++ } else {
++ if (state ==
++ YAFFS_BLOCK_STATE_NEEDS_SCANNING
++ || state ==
++ YAFFS_BLOCK_STATE_ALLOCATING) {
++ if (dev->seq_number ==
++ bi->seq_number) {
++ /* this is the block being allocated from */
++
++ T(YAFFS_TRACE_SCAN,
++ (TSTR
++ (" Allocating from %d %d"
++ TENDSTR), blk, c));
++
++ state =
++ YAFFS_BLOCK_STATE_ALLOCATING;
++ dev->alloc_block = blk;
++ dev->alloc_page = c;
++ dev->
++ alloc_block_finder =
++ blk;
++ } else {
++ /* This is a partially written block that is not
++ * the current allocation block.
++ */
++
++ T(YAFFS_TRACE_SCAN,
++ (TSTR
++ ("Partially written block %d detected"
++ TENDSTR), blk));
++ }
++ }
++ }
++
++ dev->n_free_chunks++;
++
++ } else if (tags.ecc_result == YAFFS_ECC_RESULT_UNFIXED) {
++ T(YAFFS_TRACE_SCAN,
++ (TSTR
++ (" Unfixed ECC in chunk(%d:%d), chunk ignored"
++ TENDSTR), blk, c));
++
++ dev->n_free_chunks++;
++
++ } else if (tags.obj_id > YAFFS_MAX_OBJECT_ID ||
++ tags.chunk_id > YAFFS_MAX_CHUNK_ID ||
++ (tags.chunk_id > 0
++ && tags.n_bytes > dev->data_bytes_per_chunk)
++ || tags.seq_number != bi->seq_number) {
++ T(YAFFS_TRACE_SCAN,
++ (TSTR
++ ("Chunk (%d:%d) with bad tags:obj = %d, chunk_id = %d, n_bytes = %d, ignored"
++ TENDSTR), blk, c, tags.obj_id,
++ tags.chunk_id, tags.n_bytes));
++
++ dev->n_free_chunks++;
++
++ } else if (tags.chunk_id > 0) {
++ /* chunk_id > 0 so it is a data chunk... */
++ unsigned int endpos;
++ u32 chunk_base =
++ (tags.chunk_id -
++ 1) * dev->data_bytes_per_chunk;
++
++ found_chunks = 1;
++
++ yaffs_set_chunk_bit(dev, blk, c);
++ bi->pages_in_use++;
++
++ in = yaffs_find_or_create_by_number(dev,
++ tags.obj_id,
++ YAFFS_OBJECT_TYPE_FILE);
++ if (!in) {
++ /* Out of memory */
++ alloc_failed = 1;
++ }
++
++ if (in &&
++ in->variant_type == YAFFS_OBJECT_TYPE_FILE
++ && chunk_base <
++ in->variant.file_variant.shrink_size) {
++ /* This has not been invalidated by a resize */
++ if (!yaffs_put_chunk_in_file
++ (in, tags.chunk_id, chunk, -1)) {
++ alloc_failed = 1;
++ }
++
++ /* File size is calculated by looking at the data chunks if we have not
++ * seen an object header yet. Stop this practice once we find an object header.
++ */
++ endpos = chunk_base + tags.n_bytes;
++
++ if (!in->valid && /* have not got an object header yet */
++ in->variant.file_variant.
++ scanned_size < endpos) {
++ in->variant.file_variant.
++ scanned_size = endpos;
++ in->variant.file_variant.
++ file_size = endpos;
++ }
++
++ } else if (in) {
++ /* This chunk has been invalidated by a resize, or a past file deletion
++ * so delete the chunk*/
++ yaffs_chunk_del(dev, chunk, 1,
++ __LINE__);
++
++ }
++ } else {
++ /* chunk_id == 0, so it is an ObjectHeader.
++ * Thus, we read in the object header and make the object
++ */
++ found_chunks = 1;
++
++ yaffs_set_chunk_bit(dev, blk, c);
++ bi->pages_in_use++;
++
++ oh = NULL;
++ in = NULL;
++
++ if (tags.extra_available) {
++ in = yaffs_find_or_create_by_number(dev,
++ tags.
++ obj_id,
++ tags.
++ extra_obj_type);
++ if (!in)
++ alloc_failed = 1;
++ }
++
++ if (!in ||
++ (!in->valid && dev->param.disable_lazy_load)
++ || tags.extra_shadows || (!in->valid
++ && (tags.obj_id ==
++ YAFFS_OBJECTID_ROOT
++ || tags.
++ obj_id ==
++ YAFFS_OBJECTID_LOSTNFOUND)))
++ {
++
++ /* If we don't have valid info then we need to read the chunk
++ * TODO In future we can probably defer reading the chunk and
++ * living with invalid data until needed.
++ */
++
++ result = yaffs_rd_chunk_tags_nand(dev,
++ chunk,
++ chunk_data,
++ NULL);
++
++ oh = (struct yaffs_obj_hdr *)chunk_data;
++
++ if (dev->param.inband_tags) {
++ /* Fix up the header if they got corrupted by inband tags */
++ oh->shadows_obj =
++ oh->inband_shadowed_obj_id;
++ oh->is_shrink =
++ oh->inband_is_shrink;
++ }
++
++ if (!in) {
++ in = yaffs_find_or_create_by_number(dev, tags.obj_id, oh->type);
++ if (!in)
++ alloc_failed = 1;
++ }
++
++ }
++
++ if (!in) {
++ /* TODO Hoosterman we have a problem! */
++ T(YAFFS_TRACE_ERROR,
++ (TSTR
++ ("yaffs tragedy: Could not make object for object %d at chunk %d during scan"
++ TENDSTR), tags.obj_id, chunk));
++ continue;
++ }
++
++ if (in->valid) {
++ /* We have already filled this one.
++ * We have a duplicate that will be discarded, but
++ * we first have to suck out resize info if it is a file.
++ */
++
++ if ((in->variant_type ==
++ YAFFS_OBJECT_TYPE_FILE) && ((oh
++ &&
++ oh->
++ type
++ ==
++ YAFFS_OBJECT_TYPE_FILE)
++ ||
++ (tags.
++ extra_available
++ &&
++ tags.
++ extra_obj_type
++ ==
++ YAFFS_OBJECT_TYPE_FILE)))
++ {
++ u32 this_size =
++ (oh) ? oh->
++ file_size :
++ tags.extra_length;
++ u32 parent_obj_id =
++ (oh) ? oh->parent_obj_id :
++ tags.extra_parent_id;
++
++ is_shrink =
++ (oh) ? oh->
++ is_shrink :
++ tags.extra_is_shrink;
++
++ /* If it is deleted (unlinked at start also means deleted)
++ * we treat the file size as being zeroed at this point.
++ */
++ if (parent_obj_id ==
++ YAFFS_OBJECTID_DELETED
++ || parent_obj_id ==
++ YAFFS_OBJECTID_UNLINKED) {
++ this_size = 0;
++ is_shrink = 1;
++ }
++
++ if (is_shrink
++ && in->variant.file_variant.
++ shrink_size > this_size)
++ in->variant.
++ file_variant.
++ shrink_size =
++ this_size;
++
++ if (is_shrink)
++ bi->has_shrink_hdr = 1;
++
++ }
++ /* Use existing - destroy this one. */
++ yaffs_chunk_del(dev, chunk, 1,
++ __LINE__);
++
++ }
++
++ if (!in->valid && in->variant_type !=
++ (oh ? oh->type : tags.extra_obj_type))
++ T(YAFFS_TRACE_ERROR,
++ (TSTR
++ ("yaffs tragedy: Bad object type, "
++ TCONT
++ ("%d != %d, for object %d at chunk ")
++ TCONT("%d during scan")
++ TENDSTR), oh ?
++ oh->type : tags.extra_obj_type,
++ in->variant_type, tags.obj_id,
++ chunk));
++
++ if (!in->valid &&
++ (tags.obj_id == YAFFS_OBJECTID_ROOT ||
++ tags.obj_id ==
++ YAFFS_OBJECTID_LOSTNFOUND)) {
++ /* We only load some info, don't fiddle with directory structure */
++ in->valid = 1;
++
++ if (oh) {
++
++ in->yst_mode = oh->yst_mode;
++ yaffs_load_attribs(in, oh);
++ in->lazy_loaded = 0;
++ } else {
++ in->lazy_loaded = 1;
++ }
++ in->hdr_chunk = chunk;
++
++ } else if (!in->valid) {
++ /* we need to load this info */
++
++ in->valid = 1;
++ in->hdr_chunk = chunk;
++
++ if (oh) {
++ in->variant_type = oh->type;
++
++ in->yst_mode = oh->yst_mode;
++ yaffs_load_attribs(in, oh);
++
++ if (oh->shadows_obj > 0)
++ yaffs_handle_shadowed_obj
++ (dev,
++ oh->shadows_obj,
++ 1);
++
++ yaffs_set_obj_name_from_oh(in,
++ oh);
++ parent =
++ yaffs_find_or_create_by_number
++ (dev, oh->parent_obj_id,
++ YAFFS_OBJECT_TYPE_DIRECTORY);
++
++ file_size = oh->file_size;
++ is_shrink = oh->is_shrink;
++ equiv_id = oh->equiv_id;
++
++ } else {
++ in->variant_type =
++ tags.extra_obj_type;
++ parent =
++ yaffs_find_or_create_by_number
++ (dev, tags.extra_parent_id,
++ YAFFS_OBJECT_TYPE_DIRECTORY);
++ file_size = tags.extra_length;
++ is_shrink =
++ tags.extra_is_shrink;
++ equiv_id = tags.extra_equiv_id;
++ in->lazy_loaded = 1;
++
++ }
++ in->dirty = 0;
++
++ if (!parent)
++ alloc_failed = 1;
++
++ /* directory stuff...
++ * hook up to parent
++ */
++
++ if (parent && parent->variant_type ==
++ YAFFS_OBJECT_TYPE_UNKNOWN) {
++ /* Set up as a directory */
++ parent->variant_type =
++ YAFFS_OBJECT_TYPE_DIRECTORY;
++ INIT_LIST_HEAD(&parent->
++ variant.dir_variant.children);
++ } else if (!parent
++ || parent->variant_type !=
++ YAFFS_OBJECT_TYPE_DIRECTORY) {
++ /* Hoosterman, another problem....
++ * We're trying to use a non-directory as a directory
++ */
++
++ T(YAFFS_TRACE_ERROR,
++ (TSTR
++ ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
++ TENDSTR)));
++ parent = dev->lost_n_found;
++ }
++
++ yaffs_add_obj_to_dir(parent, in);
++
++ is_unlinked = (parent == dev->del_dir)
++ || (parent == dev->unlinked_dir);
++
++ if (is_shrink) {
++ /* Mark the block as having a shrink header */
++ bi->has_shrink_hdr = 1;
++ }
++
++ /* Note re hardlinks.
++ * Since we might scan a hardlink before its equivalent object is scanned
++ * we put them all in a list.
++ * After scanning is complete, we should have all the objects, so we run
++ * through this list and fix up all the chains.
++ */
++
++ switch (in->variant_type) {
++ case YAFFS_OBJECT_TYPE_UNKNOWN:
++ /* Todo got a problem */
++ break;
++ case YAFFS_OBJECT_TYPE_FILE:
++
++ if (in->variant.
++ file_variant.scanned_size <
++ file_size) {
++ /* This covers the case where the file size is greater
++ * than where the data is
++ * This will happen if the file is resized to be larger
++ * than its current data extents.
++ */
++ in->variant.
++ file_variant.
++ file_size =
++ file_size;
++ in->variant.
++ file_variant.
++ scanned_size =
++ file_size;
++ }
++
++ if (in->variant.file_variant.
++ shrink_size > file_size)
++ in->variant.
++ file_variant.
++ shrink_size =
++ file_size;
++
++ break;
++ case YAFFS_OBJECT_TYPE_HARDLINK:
++ if (!is_unlinked) {
++ in->variant.
++ hardlink_variant.
++ equiv_id = equiv_id;
++ in->hard_links.next =
++ (struct list_head *)
++ hard_list;
++ hard_list = in;
++ }
++ break;
++ case YAFFS_OBJECT_TYPE_DIRECTORY:
++ /* Do nothing */
++ break;
++ case YAFFS_OBJECT_TYPE_SPECIAL:
++ /* Do nothing */
++ break;
++ case YAFFS_OBJECT_TYPE_SYMLINK:
++ if (oh) {
++ in->variant.
++ symlink_variant.
++ alias =
++ yaffs_clone_str(oh->
++ alias);
++ if (!in->variant.
++ symlink_variant.
++ alias)
++ alloc_failed =
++ 1;
++ }
++ break;
++ }
++
++ }
++
++ }
++
++ } /* End of scanning for each chunk */
++
++ if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
++ /* If we got this far while scanning, then the block is fully allocated. */
++ state = YAFFS_BLOCK_STATE_FULL;
++ }
++
++ bi->block_state = state;
++
++ /* Now let's see if it was dirty */
++ if (bi->pages_in_use == 0 &&
++ !bi->has_shrink_hdr &&
++ bi->block_state == YAFFS_BLOCK_STATE_FULL) {
++ yaffs_block_became_dirty(dev, blk);
++ }
++
++ }
++
++ yaffs_skip_rest_of_block(dev);
++
++ if (alt_block_index)
++ YFREE_ALT(block_index);
++ else
++ YFREE(block_index);
++
++ /* Ok, we've done all the scanning.
++ * Fix up the hard link chains.
++ * We should now have scanned all the objects, now it's time to add these
++ * hardlinks.
++ */
++ yaffs_link_fixup(dev, hard_list);
++
++ yaffs_release_temp_buffer(dev, chunk_data, __LINE__);
++
++ if (alloc_failed)
++ return YAFFS_FAIL;
++
++ T(YAFFS_TRACE_SCAN, (TSTR("yaffs2_scan_backwards ends" TENDSTR)));
++
++ return YAFFS_OK;
++}
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_yaffs2.h linux-2.6.36/fs/yaffs2/yaffs_yaffs2.h
+--- linux-2.6.36.orig/fs/yaffs2/yaffs_yaffs2.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_yaffs2.h 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,39 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
++ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
@@ -14850,23 +16540,38 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yaffs_tagsvalidity.h linux-2.6.34/fs/yaffs
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
-+
-+#ifndef __YAFFS_TAGS_VALIDITY_H__
-+#define __YAFFS_TAGS_VALIDITY_H__
++#ifndef __YAFFS_YAFFS2_H__
++#define __YAFFS_YAFFS2_H__
+
+#include "yaffs_guts.h"
+
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags);
-+int yaffs_ValidateTags(yaffs_ExtendedTags *tags);
++void yaffs_calc_oldest_dirty_seq(struct yaffs_dev *dev);
++void yaffs2_find_oldest_dirty_seq(struct yaffs_dev *dev);
++void yaffs2_clear_oldest_dirty_seq(struct yaffs_dev *dev,
++ struct yaffs_block_info *bi);
++void yaffs2_update_oldest_dirty_seq(struct yaffs_dev *dev, unsigned block_no,
++ struct yaffs_block_info *bi);
++int yaffs_block_ok_for_gc(struct yaffs_dev *dev, struct yaffs_block_info *bi);
++u32 yaffs2_find_refresh_block(struct yaffs_dev *dev);
++int yaffs2_checkpt_required(struct yaffs_dev *dev);
++int yaffs_calc_checkpt_blocks_required(struct yaffs_dev *dev);
++
++void yaffs2_checkpt_invalidate(struct yaffs_dev *dev);
++int yaffs2_checkpt_save(struct yaffs_dev *dev);
++int yaffs2_checkpt_restore(struct yaffs_dev *dev);
++
++int yaffs2_handle_hole(struct yaffs_obj *obj, loff_t new_size);
++int yaffs2_scan_backwards(struct yaffs_dev *dev);
++
+#endif
-diff -Nur linux-2.6.34.orig/fs/yaffs2/yportenv.h linux-2.6.34/fs/yaffs2/yportenv.h
---- linux-2.6.34.orig/fs/yaffs2/yportenv.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/fs/yaffs2/yportenv.h 2010-05-20 20:16:22.311614862 +0200
-@@ -0,0 +1,203 @@
+diff -Nur linux-2.6.36.orig/fs/yaffs2/yportenv.h linux-2.6.36/fs/yaffs2/yportenv.h
+--- linux-2.6.36.orig/fs/yaffs2/yportenv.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yportenv.h 2010-11-18 18:15:51.000000000 +0100
+@@ -0,0 +1,339 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
++ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
@@ -14878,7 +16583,6 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yportenv.h linux-2.6.34/fs/yaffs2/yportenv
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
-+
+#ifndef __YPORTENV_H__
+#define __YPORTENV_H__
+
@@ -14906,12 +16610,19 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yportenv.h linux-2.6.34/fs/yaffs2/yportenv
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
+#include <linux/config.h>
+#endif
++#include <linux/version.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/sched.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
++#include <linux/xattr.h>
++#include <linux/list.h>
++#include <linux/types.h>
++#include <linux/fs.h>
++#include <linux/stat.h>
++#include <linux/sort.h>
+
+#define YCHAR char
+#define YUCHAR unsigned char
@@ -14920,11 +16631,12 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yportenv.h linux-2.6.34/fs/yaffs2/yportenv
+#define yaffs_strcpy(a, b) strcpy(a, b)
+#define yaffs_strncpy(a, b, c) strncpy(a, b, c)
+#define yaffs_strncmp(a, b, c) strncmp(a, b, c)
-+#define yaffs_strlen(s) strlen(s)
++#define yaffs_strnlen(s,m) strnlen(s,m)
+#define yaffs_sprintf sprintf
+#define yaffs_toupper(a) toupper(a)
++#define yaffs_sort(base, n, sz, cmp_fn) sort(base, n, sz, cmp_fn, NULL)
+
-+#define Y_INLINE inline
++#define Y_INLINE __inline__
+
+#define YAFFS_LOSTNFOUND_NAME "lost+found"
+#define YAFFS_LOSTNFOUND_PREFIX "obj"
@@ -14936,11 +16648,11 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yportenv.h linux-2.6.34/fs/yaffs2/yportenv
+#define YFREE_ALT(x) vfree(x)
+#define YMALLOC_DMA(x) YMALLOC(x)
+
-+/* KR - added for use in scan so processes aren't blocked indefinitely. */
+#define YYIELD() schedule()
++#define Y_DUMP_STACK() dump_stack()
+
-+#define YAFFS_ROOT_MODE 0666
-+#define YAFFS_LOSTNFOUND_MODE 0666
++#define YAFFS_ROOT_MODE 0755
++#define YAFFS_LOSTNFOUND_MODE 0700
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+#define Y_CURRENT_TIME CURRENT_TIME.tv_sec
@@ -14950,19 +16662,14 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yportenv.h linux-2.6.34/fs/yaffs2/yportenv
+#define Y_TIME_CONVERT(x) (x)
+#endif
+
-+#define yaffs_SumCompare(x, y) ((x) == (y))
++#define yaffs_sum_cmp(x, y) ((x) == (y))
+#define yaffs_strcmp(a, b) strcmp(a, b)
+
+#define TENDSTR "\n"
-+#define TSTR(x) KERN_WARNING x
++#define TSTR(x) KERN_DEBUG x
+#define TCONT(x) x
+#define TOUT(p) printk p
+
-+#define yaffs_trace(mask, fmt, args...) \
-+ do { if ((mask) & (yaffs_traceMask|YAFFS_TRACE_ERROR)) \
-+ printk(KERN_WARNING "yaffs: " fmt, ## args); \
-+ } while (0)
-+
+#define compile_time_assertion(assertion) \
+ ({ int x = __builtin_choose_expr(assertion, 0, (void)0); (void) x; })
+
@@ -14981,8 +16688,6 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yportenv.h linux-2.6.34/fs/yaffs2/yportenv
+#include "stdio.h"
+#include "string.h"
+
-+#include "devextras.h"
-+
+#define YMALLOC(x) malloc(x)
+#define YFREE(x) free(x)
+#define YMALLOC_ALT(x) malloc(x)
@@ -14994,7 +16699,7 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yportenv.h linux-2.6.34/fs/yaffs2/yportenv
+#define yaffs_strcat(a, b) strcat(a, b)
+#define yaffs_strcpy(a, b) strcpy(a, b)
+#define yaffs_strncpy(a, b, c) strncpy(a, b, c)
-+#define yaffs_strlen(s) strlen(s)
++#define yaffs_strnlen(s,m) strnlen(s,m)
+#define yaffs_sprintf sprintf
+#define yaffs_toupper(a) toupper(a)
+
@@ -15011,10 +16716,10 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yportenv.h linux-2.6.34/fs/yaffs2/yportenv
+#define YAFFS_LOSTNFOUND_PREFIX "obj"
+/* #define YPRINTF(x) printf x */
+
-+#define YAFFS_ROOT_MODE 0666
-+#define YAFFS_LOSTNFOUND_MODE 0666
++#define YAFFS_ROOT_MODE 0755
++#define YAFFS_LOSTNFOUND_MODE 0700
+
-+#define yaffs_SumCompare(x, y) ((x) == (y))
++#define yaffs_sum_cmp(x, y) ((x) == (y))
+#define yaffs_strcmp(a, b) strcmp(a, b)
+
+#else
@@ -15023,46 +16728,182 @@ diff -Nur linux-2.6.34.orig/fs/yaffs2/yportenv.h linux-2.6.34/fs/yaffs2/yportenv
+
+#endif
+
-+/* see yaffs_fs.c */
-+extern unsigned int yaffs_traceMask;
-+extern unsigned int yaffs_wr_attempts;
++#if defined(CONFIG_YAFFS_DIRECT) || defined(CONFIG_YAFFS_WINCE)
+
-+/*
-+ * Tracing flags.
-+ * The flags masked in YAFFS_TRACE_ALWAYS are always traced.
-+ */
++#ifdef CONFIG_YAFFSFS_PROVIDE_VALUES
+
-+#define YAFFS_TRACE_OS 0x00000002
-+#define YAFFS_TRACE_ALLOCATE 0x00000004
-+#define YAFFS_TRACE_SCAN 0x00000008
-+#define YAFFS_TRACE_BAD_BLOCKS 0x00000010
-+#define YAFFS_TRACE_ERASE 0x00000020
-+#define YAFFS_TRACE_GC 0x00000040
-+#define YAFFS_TRACE_WRITE 0x00000080
-+#define YAFFS_TRACE_TRACING 0x00000100
-+#define YAFFS_TRACE_DELETION 0x00000200
-+#define YAFFS_TRACE_BUFFERS 0x00000400
-+#define YAFFS_TRACE_NANDACCESS 0x00000800
-+#define YAFFS_TRACE_GC_DETAIL 0x00001000
-+#define YAFFS_TRACE_SCAN_DEBUG 0x00002000
-+#define YAFFS_TRACE_MTD 0x00004000
-+#define YAFFS_TRACE_CHECKPOINT 0x00008000
++#ifndef O_RDONLY
++#define O_RDONLY 00
++#endif
+
-+#define YAFFS_TRACE_VERIFY 0x00010000
-+#define YAFFS_TRACE_VERIFY_NAND 0x00020000
-+#define YAFFS_TRACE_VERIFY_FULL 0x00040000
-+#define YAFFS_TRACE_VERIFY_ALL 0x000F0000
++#ifndef O_WRONLY
++#define O_WRONLY 01
++#endif
+
++#ifndef O_RDWR
++#define O_RDWR 02
++#endif
+
-+#define YAFFS_TRACE_ERROR 0x40000000
-+#define YAFFS_TRACE_BUG 0x80000000
-+#define YAFFS_TRACE_ALWAYS 0xF0000000
++#ifndef O_CREAT
++#define O_CREAT 0100
++#endif
++
++#ifndef O_EXCL
++#define O_EXCL 0200
++#endif
++
++#ifndef O_TRUNC
++#define O_TRUNC 01000
++#endif
++
++#ifndef O_APPEND
++#define O_APPEND 02000
++#endif
++
++#ifndef SEEK_SET
++#define SEEK_SET 0
++#endif
++
++#ifndef SEEK_CUR
++#define SEEK_CUR 1
++#endif
++
++#ifndef SEEK_END
++#define SEEK_END 2
++#endif
++
++#ifndef EBUSY
++#define EBUSY 16
++#endif
+
++#ifndef ENODEV
++#define ENODEV 19
++#endif
++
++#ifndef EINVAL
++#define EINVAL 22
++#endif
++
++#ifndef ENFILE
++#define ENFILE 23
++#endif
++
++#ifndef EBADF
++#define EBADF 9
++#endif
++
++#ifndef EACCES
++#define EACCES 13
++#endif
+
-+#define T(mask, p) do { if ((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p); } while (0)
++#ifndef EXDEV
++#define EXDEV 18
++#endif
++
++#ifndef ENOENT
++#define ENOENT 2
++#endif
++
++#ifndef ENOSPC
++#define ENOSPC 28
++#endif
++
++#ifndef ERANGE
++#define ERANGE 34
++#endif
++
++#ifndef ENODATA
++#define ENODATA 61
++#endif
++
++#ifndef ENOTEMPTY
++#define ENOTEMPTY 39
++#endif
++
++#ifndef ENAMETOOLONG
++#define ENAMETOOLONG 36
++#endif
++
++#ifndef ENOMEM
++#define ENOMEM 12
++#endif
++
++#ifndef EEXIST
++#define EEXIST 17
++#endif
++
++#ifndef ENOTDIR
++#define ENOTDIR 20
++#endif
++
++#ifndef EISDIR
++#define EISDIR 21
++#endif
++
++// Mode flags
++
++#ifndef S_IFMT
++#define S_IFMT 0170000
++#endif
++
++#ifndef S_IFLNK
++#define S_IFLNK 0120000
++#endif
++
++#ifndef S_IFDIR
++#define S_IFDIR 0040000
++#endif
++
++#ifndef S_IFREG
++#define S_IFREG 0100000
++#endif
++
++#ifndef S_IREAD
++#define S_IREAD 0000400
++#endif
++
++#ifndef S_IWRITE
++#define S_IWRITE 0000200
++#endif
++
++#ifndef S_IEXEC
++#define S_IEXEC 0000100
++#endif
++
++#ifndef XATTR_CREATE
++#define XATTR_CREATE 1
++#endif
++
++#ifndef XATTR_REPLACE
++#define XATTR_REPLACE 2
++#endif
++
++#ifndef R_OK
++#define R_OK 4
++#define W_OK 2
++#define X_OK 1
++#define F_OK 0
++#endif
++
++#else
++#include <errno.h>
++#include <sys/stat.h>
++#include <fcntl.h>
++#endif
++
++#endif
++
++#ifndef Y_DUMP_STACK
++#define Y_DUMP_STACK() do { } while (0)
++#endif
+
+#ifndef YBUG
-+#define YBUG() do {T(YAFFS_TRACE_BUG, (TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR), __LINE__)); } while (0)
++#define YBUG() do {\
++ T(YAFFS_TRACE_BUG,\
++ (TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR),\
++ __LINE__));\
++ Y_DUMP_STACK();\
++} while (0)
+#endif
+
+#endif
diff --git a/target/rb4xx/kernel.config b/target/rb4xx/kernel.config
index 7604854c6..4284af347 100644
--- a/target/rb4xx/kernel.config
+++ b/target/rb4xx/kernel.config
@@ -1,14 +1,14 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.35.7
-# Thu Oct 14 20:34:11 2010
+# Linux kernel version: 2.6.36
+# Thu Nov 18 21:36:13 2010
#
CONFIG_MIPS=y
#
# Machine selection
#
-# CONFIG_MACH_ALCHEMY is not set
+# CONFIG_MIPS_ALCHEMY is not set
# CONFIG_AR7 is not set
CONFIG_ATHEROS_AR71XX=y
# CONFIG_BCM47XX is not set
@@ -16,6 +16,7 @@ CONFIG_ATHEROS_AR71XX=y
# CONFIG_MIPS_COBALT is not set
# CONFIG_MACH_DECSTATION is not set
# CONFIG_MACH_JAZZ is not set
+# CONFIG_MACH_JZ4740 is not set
# CONFIG_LASAT is not set
# CONFIG_MACH_LOONGSON is not set
# CONFIG_MIPS_MALTA is not set
@@ -91,6 +92,7 @@ CONFIG_AR71XX_DEV_LEDS_GPIO=y
# CONFIG_AR71XX_DEV_PB9X_PCI is not set
CONFIG_AR71XX_DEV_USB=y
# CONFIG_AR71XX_NVRAM is not set
+CONFIG_CAVIUM_OCTEON_HELPER=y
CONFIG_LOONGSON_UART_BASE=y
# CONFIG_LOONGSON_MC146818 is not set
CONFIG_RWSEM_GENERIC_SPINLOCK=y
@@ -101,7 +103,6 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_TIME=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
@@ -116,7 +117,6 @@ CONFIG_MIPS_MACHINE=y
# CONFIG_NO_IOPORT is not set
CONFIG_GENERIC_GPIO=y
CONFIG_CPU_BIG_ENDIAN=y
-# CONFIG_CPU_LITTLE_ENDIAN is not set
CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
CONFIG_IRQ_CPU=y
CONFIG_MIPS_L1_CACHE_SHIFT=5
@@ -124,29 +124,8 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
#
# CPU selection
#
-# CONFIG_CPU_LOONGSON2E is not set
-# CONFIG_CPU_LOONGSON2F is not set
CONFIG_CPU_MIPS32_R1=y
# CONFIG_CPU_MIPS32_R2 is not set
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_VR41XX is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R5500 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-# CONFIG_CPU_CAVIUM_OCTEON is not set
CONFIG_SYS_HAS_CPU_MIPS32_R1=y
CONFIG_SYS_HAS_CPU_MIPS32_R2=y
CONFIG_CPU_MIPS32=y
@@ -159,16 +138,11 @@ CONFIG_HARDWARE_WATCHPOINTS=y
# Kernel type
#
CONFIG_32BIT=y
-# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_8KB is not set
# CONFIG_PAGE_SIZE_16KB is not set
-# CONFIG_PAGE_SIZE_32KB is not set
# CONFIG_PAGE_SIZE_64KB is not set
CONFIG_CPU_HAS_PREFETCH=y
CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_MT_SMP is not set
-# CONFIG_MIPS_MT_SMTC is not set
# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
CONFIG_CPU_HAS_SYNC=y
CONFIG_GENERIC_HARDIRQS=y
@@ -178,8 +152,6 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
CONFIG_ARCH_POPULATES_NODE_MAP=y
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_PAGEFLAGS_EXTENDED=y
@@ -232,7 +204,6 @@ CONFIG_SYSVIPC_SYSCTL=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
# CONFIG_TINY_RCU is not set
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=32
@@ -277,11 +248,13 @@ CONFIG_SLAB=y
# CONFIG_SLOB is not set
# CONFIG_PROFILING is not set
CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
#
# GCOV-based kernel profiling
#
-# CONFIG_SLOW_WORK is not set
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
@@ -303,8 +276,6 @@ CONFIG_BLOCK=y
CONFIG_IOSCHED_NOOP=y
# CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_IOSCHED_CFQ is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
CONFIG_DEFAULT_NOOP=y
CONFIG_DEFAULT_IOSCHED="noop"
# CONFIG_INLINE_SPIN_TRYLOCK is not set
@@ -399,6 +370,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_TCP_MD5SIG is not set
# CONFIG_IPV6 is not set
# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
# CONFIG_NETFILTER is not set
# CONFIG_IP_DCCP is not set
# CONFIG_IP_SCTP is not set
@@ -535,7 +507,6 @@ CONFIG_MTD_NAND=y
# CONFIG_MTD_SM_COMMON is not set
# CONFIG_MTD_NAND_MUSEUM_IDS is not set
# CONFIG_MTD_NAND_DENALI is not set
-CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018
CONFIG_MTD_NAND_IDS=y
# CONFIG_MTD_NAND_RICOH is not set
# CONFIG_MTD_NAND_DISKONCHIP is not set
@@ -601,6 +572,7 @@ CONFIG_SCSI_MOD=y
#
# CONFIG_FIREWIRE is not set
# CONFIG_IEEE1394 is not set
+# CONFIG_FIREWIRE_NOSY is not set
# CONFIG_I2O is not set
CONFIG_NETDEVICES=y
# CONFIG_DUMMY is not set
@@ -673,7 +645,6 @@ CONFIG_NET_PCI=y
# CONFIG_SMSC9420 is not set
# CONFIG_SUNDANCE is not set
# CONFIG_TLAN is not set
-# CONFIG_KS8842 is not set
# CONFIG_KS8851_MLL is not set
# CONFIG_VIA_RHINE is not set
# CONFIG_SC92031 is not set
@@ -716,6 +687,10 @@ CONFIG_WLAN=y
# Enable WiMAX (Networking options) to see the WiMAX drivers
#
# CONFIG_WAN is not set
+
+#
+# CAIF transport drivers
+#
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
# CONFIG_PPP is not set
@@ -760,6 +735,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
#
# Non-8250 serial port support
#
+# CONFIG_SERIAL_MFD_HSU is not set
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_JSM is not set
@@ -843,16 +819,7 @@ CONFIG_SSB_POSSIBLE=y
# Sonics Silicon Backplane
#
# CONFIG_SSB is not set
-CONFIG_MFD_SUPPORT=y
-# CONFIG_MFD_CORE is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_MFD_TMIO is not set
-# CONFIG_ABX500_CORE is not set
-# CONFIG_MFD_TIMBERDALE is not set
-# CONFIG_LPC_SCH is not set
-# CONFIG_MFD_RDC321X is not set
-# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_SUPPORT is not set
# CONFIG_REGULATOR is not set
# CONFIG_MEDIA_SUPPORT is not set
@@ -871,26 +838,7 @@ CONFIG_MFD_SUPPORT=y
#
# CONFIG_DISPLAY_SUPPORT is not set
# CONFIG_SOUND is not set
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-# CONFIG_USB is not set
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-
-#
-# Enable Host or Gadget support to see Inventra options
-#
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# OTG and related infrastructure
-#
+# CONFIG_USB_SUPPORT is not set
# CONFIG_UWB is not set
# CONFIG_MMC is not set
# CONFIG_MEMSTICK is not set
@@ -917,11 +865,9 @@ CONFIG_RTC_LIB=y
# CONFIG_OCFS2_FS is not set
# CONFIG_BTRFS_FS is not set
# CONFIG_NILFS2_FS is not set
-# CONFIG_AUFS_FS is not set
CONFIG_FILE_LOCKING=y
# CONFIG_FSNOTIFY is not set
# CONFIG_DNOTIFY is not set
-# CONFIG_INOTIFY is not set
# CONFIG_INOTIFY_USER is not set
# CONFIG_QUOTA is not set
# CONFIG_AUTOFS_FS is not set
@@ -972,10 +918,12 @@ CONFIG_YAFFS_YAFFS1=y
# CONFIG_YAFFS_DOES_ECC is not set
CONFIG_YAFFS_YAFFS2=y
CONFIG_YAFFS_AUTO_YAFFS2=y
-# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
-# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
+# CONFIG_YAFFS_DISABLE_TAGS_ECC is not set
# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
-CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
+# CONFIG_YAFFS_EMPTY_LOST_AND_FOUND is not set
+# CONFIG_YAFFS_DISABLE_BLOCK_REFRESHING is not set
+# CONFIG_YAFFS_DISABLE_BACKGROUND is not set
+CONFIG_YAFFS_XATTR=y
# CONFIG_JFFS2_FS is not set
# CONFIG_LOGFS is not set
# CONFIG_CRAMFS is not set
@@ -1014,12 +962,13 @@ CONFIG_PRINTK_TIME=y
# CONFIG_ENABLE_WARN_DEPRECATED is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_FRAME_WARN=0
-CONFIG_MAGIC_SYSRQ=y
+# CONFIG_MAGIC_SYSRQ is not set
# CONFIG_STRIP_ASM_SYMS is not set
# CONFIG_UNUSED_SYMBOLS is not set
# CONFIG_DEBUG_FS is not set
# CONFIG_HEADERS_CHECK is not set
# CONFIG_DEBUG_KERNEL is not set
+# CONFIG_HARDLOCKUP_DETECTOR is not set
# CONFIG_DEBUG_MEMORY_INIT is not set
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
# CONFIG_SYSCTL_SYSCALL_CHECK is not set
@@ -1044,9 +993,6 @@ CONFIG_CMDLINE="console=ttyS0,115200"
# CONFIG_KEYS is not set
# CONFIG_SECURITY is not set
# CONFIG_SECURITYFS is not set
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
CONFIG_DEFAULT_SECURITY_DAC=y
CONFIG_DEFAULT_SECURITY=""
CONFIG_CRYPTO=y
@@ -1159,3 +1105,4 @@ CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
CONFIG_NLATTR=y
+CONFIG_GENERIC_ATOMIC64=y
diff --git a/target/rb4xx/patches/ar71xx.patch b/target/rb4xx/patches/ar71xx.patch
index 697379d36..f53e86f81 100644
--- a/target/rb4xx/patches/ar71xx.patch
+++ b/target/rb4xx/patches/ar71xx.patch
@@ -1,6 +1,400 @@
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/ar71xx.c linux-2.6.35.7/arch/mips/ar71xx/ar71xx.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/ar71xx.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/ar71xx.c 2010-10-14 20:27:55.855601218 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/Kconfig linux-2.6.36/arch/mips/Kconfig
+--- linux-2.6.36.orig/arch/mips/Kconfig 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/arch/mips/Kconfig 2010-11-18 21:16:05.000000000 +0100
+@@ -60,6 +60,23 @@
+ Support for the Texas Instruments AR7 System-on-a-Chip
+ family: TNETD7100, 7200 and 7300.
+
++config ATHEROS_AR71XX
++ bool "Atheros AR71xx based boards"
++ select CEVT_R4K
++ select CSRC_R4K
++ select DMA_NONCOHERENT
++ select HW_HAS_PCI
++ select IRQ_CPU
++ select ARCH_REQUIRE_GPIOLIB
++ select SYS_HAS_CPU_MIPS32_R1
++ select SYS_HAS_CPU_MIPS32_R2
++ select SYS_SUPPORTS_32BIT_KERNEL
++ select SYS_SUPPORTS_BIG_ENDIAN
++ select SYS_HAS_EARLY_PRINTK
++ select MIPS_MACHINE
++ help
++ Support for Atheros AR71xx based boards.
++
+ config BCM47XX
+ bool "Broadcom BCM47XX based boards"
+ select CEVT_R4K
+@@ -709,6 +726,7 @@
+ endchoice
+
+ source "arch/mips/alchemy/Kconfig"
++source "arch/mips/ar71xx/Kconfig"
+ source "arch/mips/bcm63xx/Kconfig"
+ source "arch/mips/jazz/Kconfig"
+ source "arch/mips/jz4740/Kconfig"
+@@ -872,9 +890,15 @@
+ config MIPS_DISABLE_OBSOLETE_IDE
+ bool
+
++config MYLOADER
++ bool
++
+ config SYNC_R4K
+ bool
+
++config MIPS_MACHINE
++ def_bool n
++
+ config NO_IOPORT
+ def_bool n
+
+diff -Nur linux-2.6.36.orig/arch/mips/Makefile linux-2.6.36/arch/mips/Makefile
+--- linux-2.6.36.orig/arch/mips/Makefile 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/arch/mips/Makefile 2010-11-18 21:16:07.000000000 +0100
+@@ -160,6 +160,13 @@
+ cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += -Wa,-march=octeon
+ endif
+
++#
++# Atheros AR71xx
++#
++core-$(CONFIG_ATHEROS_AR71XX) += arch/mips/ar71xx/
++cflags-$(CONFIG_ATHEROS_AR71XX) += -I$(srctree)/arch/mips/include/asm/mach-ar71xx
++load-$(CONFIG_ATHEROS_AR71XX) += 0xffffffff80060000
++
+ cflags-$(CONFIG_CPU_R4000_WORKAROUNDS) += $(call cc-option,-mfix-r4000,)
+ cflags-$(CONFIG_CPU_R4400_WORKAROUNDS) += $(call cc-option,-mfix-r4400,)
+ cflags-$(CONFIG_CPU_DADDI_WORKAROUNDS) += $(call cc-option,-mno-daddi,)
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/Kconfig linux-2.6.36/arch/mips/ar71xx/Kconfig
+--- linux-2.6.36.orig/arch/mips/ar71xx/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/Kconfig 2010-11-18 21:16:05.000000000 +0100
+@@ -0,0 +1,264 @@
++if ATHEROS_AR71XX
++
++menu "Atheros AR71xx machine selection"
++
++config AR71XX_MACH_AP81
++ bool "Atheros AP81 board support"
++ select AR71XX_DEV_M25P80
++ select AR71XX_DEV_AR913X_WMAC
++ select AR71XX_DEV_GPIO_BUTTONS
++ select AR71XX_DEV_LEDS_GPIO
++ select AR71XX_DEV_USB
++ default n
++
++config AR71XX_MACH_AP83
++ bool "Atheros AP83 board support"
++ select AR71XX_DEV_AR913X_WMAC
++ select AR71XX_DEV_GPIO_BUTTONS
++ select AR71XX_DEV_LEDS_GPIO
++ select AR71XX_DEV_USB
++ default n
++
++config AR71XX_MACH_DIR_600_A1
++ bool "D-Link DIR-600 rev. A1 support"
++ select AR71XX_DEV_AP91_ETH
++ select AR71XX_DEV_AP91_PCI if PCI
++ select AR71XX_DEV_M25P80
++ select AR71XX_DEV_GPIO_BUTTONS
++ select AR71XX_DEV_LEDS_GPIO
++ select AR71XX_NVRAM
++ default n
++
++config AR71XX_MACH_DIR_615_C1
++ bool "D-Link DIR-615 rev. C1 support"
++ select AR71XX_DEV_M25P80
++ select AR71XX_DEV_AR913X_WMAC
++ select AR71XX_DEV_GPIO_BUTTONS
++ select AR71XX_DEV_LEDS_GPIO
++ select AR71XX_NVRAM
++ default n
++
++config AR71XX_MACH_DIR_825_B1
++ bool "D-Link DIR-825 rev. B1 board support"
++ select AR71XX_DEV_M25P80
++ select AR71XX_DEV_AP94_PCI if PCI
++ select AR71XX_DEV_GPIO_BUTTONS
++ select AR71XX_DEV_LEDS_GPIO
++ select AR71XX_DEV_USB
++ default n
++
++config AR71XX_MACH_PB42
++ bool "Atheros PB42 board support"
++ select AR71XX_DEV_M25P80
++ select AR71XX_DEV_GPIO_BUTTONS
++ select AR71XX_DEV_PB42_PCI if PCI
++ default n
++
++config AR71XX_MACH_PB44
++ bool "Atheros PB44 board support"
++ select AR71XX_DEV_GPIO_BUTTONS
++ select AR71XX_DEV_PB42_PCI if PCI
++ select AR71XX_DEV_LEDS_GPIO
++ select AR71XX_DEV_USB
++ default n
++
++config AR71XX_MACH_PB92
++ bool "Atheros PB92 board support"
++ select AR71XX_DEV_GPIO_BUTTONS
++ select AR71XX_DEV_PB9X_PCI if PCI
++ select AR71XX_DEV_LEDS_GPIO
++ select AR71XX_DEV_USB
++ default n
++
++config AR71XX_MACH_AW_NR580
++ bool "AzureWave AW-NR580 board support"
++ select AR71XX_DEV_M25P80
++ select AR71XX_DEV_GPIO_BUTTONS
++ select AR71XX_DEV_PB42_PCI if PCI
++ select AR71XX_DEV_LEDS_GPIO
++ default n
++
++config AR71XX_MACH_WZR_HP_G300NH
++ bool "Buffalo WZR-HP-G300NH board support"
++ select AR71XX_DEV_AR913X_WMAC
++ select AR71XX_DEV_GPIO_BUTTONS
++ select AR71XX_DEV_LEDS_GPIO
++ select AR71XX_DEV_USB
++ default y
++
++config AR71XX_MACH_WP543
++ bool "Compex WP543/WPJ543 board support"
++ select MYLOADER
++ select AR71XX_DEV_M25P80
++ select AR71XX_DEV_GPIO_BUTTONS
++ select AR71XX_DEV_PB42_PCI if PCI
++ select AR71XX_DEV_LEDS_GPIO
++ select AR71XX_DEV_USB
++ default n
++
++config AR71XX_MACH_WRT160NL
++ bool "Linksys WRT160NL board support"
++ select AR71XX_DEV_M25P80
++ select AR71XX_DEV_AR913X_WMAC
++ select AR71XX_DEV_GPIO_BUTTONS
++ select AR71XX_DEV_LEDS_GPIO
++ select AR71XX_DEV_USB
++ select AR71XX_NVRAM
++ default n
++
++config AR71XX_MACH_WRT400N
++ bool "Linksys WRT400N board support"
++ select AR71XX_DEV_AP94_PCI if PCI
++ select AR71XX_DEV_M25P80
++ select AR71XX_DEV_GPIO_BUTTONS
++ select AR71XX_DEV_LEDS_GPIO
++ default n
++
++config AR71XX_MACH_RB4XX
++ bool "MikroTik RouterBOARD 4xx series support"
++ select AR71XX_DEV_GPIO_BUTTONS
++ select AR71XX_DEV_LEDS_GPIO
++ select AR71XX_DEV_USB
++ default n
++
++config AR71XX_MACH_RB750
++ bool "MikroTik RouterBOARD 750 support"
++ select AR71XX_DEV_AP91_ETH
++ default n
++
++config AR71XX_MACH_WNDR3700
++ bool "NETGEAR WNDR3700 board support"
++ select AR71XX_DEV_M25P80
++ select AR71XX_DEV_AP94_PCI if PCI
++ select AR71XX_DEV_GPIO_BUTTONS
++ select AR71XX_DEV_LEDS_GPIO
++ select AR71XX_DEV_USB
++ default n
++
++config AR71XX_MACH_WNR2000
++ bool "NETGEAR WNR2000 board support"
++ select AR71XX_DEV_M25P80
++ select AR71XX_DEV_AR913X_WMAC
++ select AR71XX_DEV_GPIO_BUTTONS
++ select AR71XX_DEV_LEDS_GPIO
++ default n
++
++config AR71XX_MACH_MZK_W04NU
++ bool "Planex MZK-W04NU board support"
++ select AR71XX_DEV_M25P80
++ select AR71XX_DEV_AR913X_WMAC
++ select AR71XX_DEV_GPIO_BUTTONS
++ select AR71XX_DEV_LEDS_GPIO
++ select AR71XX_DEV_USB
++ default n
++
++config AR71XX_MACH_MZK_W300NH
++ bool "Planex MZK-W300NH board support"
++ select AR71XX_DEV_M25P80
++ select AR71XX_DEV_AR913X_WMAC
++ select AR71XX_DEV_GPIO_BUTTONS
++ select AR71XX_DEV_LEDS_GPIO
++ default n
++
++config AR71XX_MACH_NBG460N
++ bool "Zyxel NBG460N/550N/550NH board support"
++ select AR71XX_DEV_M25P80
++ select AR71XX_DEV_AR913X_WMAC
++ select AR71XX_DEV_GPIO_BUTTONS
++ select AR71XX_DEV_LEDS_GPIO
++ default n
++
++config AR71XX_MACH_TL_WR741ND
++ bool "TP-LINK TL-WR741ND support"
++ select AR71XX_DEV_M25P80
++ select AR71XX_DEV_AP91_ETH
++ select AR71XX_DEV_AP91_PCI if PCI
++ select AR71XX_DEV_GPIO_BUTTONS
++ select AR71XX_DEV_LEDS_GPIO
++ default n
++
++config AR71XX_MACH_TL_WR841N_V1
++ bool "TP-LINK TL-WR841N v1 support"
++ select AR71XX_DEV_M25P80
++ select AR71XX_DEV_PB42_PCI if PCI
++ select AR71XX_DEV_DSA
++ select AR71XX_DEV_GPIO_BUTTONS
++ select AR71XX_DEV_LEDS_GPIO
++ default n
++
++config AR71XX_MACH_TL_WR941ND
++ bool "TP-LINK TL-WR941ND support"
++ select AR71XX_DEV_M25P80
++ select AR71XX_DEV_AR913X_WMAC
++ select AR71XX_DEV_DSA
++ select AR71XX_DEV_GPIO_BUTTONS
++ select AR71XX_DEV_LEDS_GPIO
++ default n
++
++config AR71XX_MACH_TL_WR1043ND
++ bool "TP-LINK TL-WR1043ND support"
++ select AR71XX_DEV_M25P80
++ select AR71XX_DEV_AR913X_WMAC
++ select AR71XX_DEV_GPIO_BUTTONS
++ select AR71XX_DEV_LEDS_GPIO
++ select AR71XX_DEV_USB
++ default n
++
++config AR71XX_MACH_TEW_632BRP
++ bool "TRENDnet TEW-632BRP support"
++ select AR71XX_DEV_M25P80
++ select AR71XX_DEV_AR913X_WMAC
++ select AR71XX_DEV_GPIO_BUTTONS
++ select AR71XX_DEV_LEDS_GPIO
++ select AR71XX_NVRAM
++ default n
++
++config AR71XX_MACH_UBNT
++ bool "Ubiquiti AR71xx based boards support"
++ select AR71XX_DEV_M25P80
++ select AR71XX_DEV_AP91_PCI if PCI
++ select AR71XX_DEV_GPIO_BUTTONS
++ select AR71XX_DEV_LEDS_GPIO
++ select AR71XX_DEV_PB42_PCI if PCI
++ select AR71XX_DEV_USB
++ default n
++
++endmenu
++
++config AR71XX_DEV_M25P80
++ def_bool n
++
++config AR71XX_DEV_AP91_PCI
++ def_bool n
++
++config AR71XX_DEV_AP91_ETH
++ def_bool n
++
++config AR71XX_DEV_AP94_PCI
++ def_bool n
++
++config AR71XX_DEV_AR913X_WMAC
++ def_bool n
++
++config AR71XX_DEV_DSA
++ def_bool n
++
++config AR71XX_DEV_GPIO_BUTTONS
++ def_bool n
++
++config AR71XX_DEV_LEDS_GPIO
++ def_bool n
++
++config AR71XX_DEV_PB42_PCI
++ def_bool n
++
++config AR71XX_DEV_PB9X_PCI
++ def_bool n
++
++config AR71XX_DEV_USB
++ def_bool n
++
++config AR71XX_NVRAM
++ def_bool n
++
++endif
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/Makefile linux-2.6.36/arch/mips/ar71xx/Makefile
+--- linux-2.6.36.orig/arch/mips/ar71xx/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/Makefile 2010-11-18 21:16:05.000000000 +0100
+@@ -0,0 +1,54 @@
++#
++# Makefile for the Atheros AR71xx SoC specific parts of the kernel
++#
++# Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
++# Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
++#
++# This program is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 as published
++# by the Free Software Foundation.
++
++obj-y := prom.o irq.o setup.o devices.o gpio.o ar71xx.o
++
++obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
++obj-$(CONFIG_PCI) += pci.o
++
++obj-$(CONFIG_AR71XX_DEV_AP91_ETH) += dev-ap91-eth.o
++obj-$(CONFIG_AR71XX_DEV_AP91_PCI) += dev-ap91-pci.o
++obj-$(CONFIG_AR71XX_DEV_AP94_PCI) += dev-ap94-pci.o
++obj-$(CONFIG_AR71XX_DEV_AR913X_WMAC) += dev-ar913x-wmac.o
++obj-$(CONFIG_AR71XX_DEV_DSA) += dev-dsa.o
++obj-$(CONFIG_AR71XX_DEV_GPIO_BUTTONS) += dev-gpio-buttons.o
++obj-$(CONFIG_AR71XX_DEV_LEDS_GPIO) += dev-leds-gpio.o
++obj-$(CONFIG_AR71XX_DEV_M25P80) += dev-m25p80.o
++obj-$(CONFIG_AR71XX_DEV_PB42_PCI) += dev-pb42-pci.o
++obj-$(CONFIG_AR71XX_DEV_PB9X_PCI) += dev-pb9x-pci.o
++obj-$(CONFIG_AR71XX_DEV_USB) += dev-usb.o
++
++obj-$(CONFIG_AR71XX_NVRAM) += nvram.o
++
++obj-$(CONFIG_AR71XX_MACH_AP81) += mach-ap81.o
++obj-$(CONFIG_AR71XX_MACH_AP83) += mach-ap83.o
++obj-$(CONFIG_AR71XX_MACH_AW_NR580) += mach-aw-nr580.o
++obj-$(CONFIG_AR71XX_MACH_DIR_600_A1) += mach-dir-600-a1.o
++obj-$(CONFIG_AR71XX_MACH_DIR_615_C1) += mach-dir-615-c1.o
++obj-$(CONFIG_AR71XX_MACH_DIR_825_B1) += mach-dir-825-b1.o
++obj-$(CONFIG_AR71XX_MACH_MZK_W04NU) += mach-mzk-w04nu.o
++obj-$(CONFIG_AR71XX_MACH_MZK_W300NH) += mach-mzk-w300nh.o
++obj-$(CONFIG_AR71XX_MACH_NBG460N) += mach-nbg460n.o
++obj-$(CONFIG_AR71XX_MACH_PB42) += mach-pb42.o
++obj-$(CONFIG_AR71XX_MACH_PB44) += mach-pb44.o
++obj-$(CONFIG_AR71XX_MACH_PB92) += mach-pb92.o
++obj-$(CONFIG_AR71XX_MACH_RB4XX) += mach-rb4xx.o
++obj-$(CONFIG_AR71XX_MACH_RB750) += mach-rb750.o
++obj-$(CONFIG_AR71XX_MACH_TEW_632BRP) += mach-tew-632brp.o
++obj-$(CONFIG_AR71XX_MACH_TL_WR741ND) += mach-tl-wr741nd.o
++obj-$(CONFIG_AR71XX_MACH_TL_WR841N_V1) += mach-tl-wr841n.o
++obj-$(CONFIG_AR71XX_MACH_TL_WR941ND) += mach-tl-wr941nd.o
++obj-$(CONFIG_AR71XX_MACH_TL_WR1043ND) += mach-tl-wr1043nd.o
++obj-$(CONFIG_AR71XX_MACH_UBNT) += mach-ubnt.o
++obj-$(CONFIG_AR71XX_MACH_WNDR3700) += mach-wndr3700.o
++obj-$(CONFIG_AR71XX_MACH_WNR2000) += mach-wnr2000.o
++obj-$(CONFIG_AR71XX_MACH_WP543) += mach-wp543.o
++obj-$(CONFIG_AR71XX_MACH_WRT160NL) += mach-wrt160nl.o
++obj-$(CONFIG_AR71XX_MACH_WRT400N) += mach-wrt400n.o
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/ar71xx.c linux-2.6.36/arch/mips/ar71xx/ar71xx.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/ar71xx.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/ar71xx.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,177 @@
+/*
+ * AR71xx SoC routines
@@ -179,9 +573,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/ar71xx.c linux-2.6.35.7/arch/mips
+ mutex_unlock(&ar71xx_flash_mutex);
+}
+EXPORT_SYMBOL_GPL(ar71xx_flash_release);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap91-eth.c linux-2.6.35.7/arch/mips/ar71xx/dev-ap91-eth.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap91-eth.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/dev-ap91-eth.c 2010-10-14 20:27:55.876851074 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/dev-ap91-eth.c linux-2.6.36/arch/mips/ar71xx/dev-ap91-eth.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/dev-ap91-eth.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/dev-ap91-eth.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,70 @@
+/*
+ * Atheros AP91 reference board ethernet initialization
@@ -253,9 +647,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap91-eth.c linux-2.6.35.7/arc
+
+ ar71xx_add_device_dsa(1, &ap91_dsa_data);
+}
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap91-eth.h linux-2.6.35.7/arch/mips/ar71xx/dev-ap91-eth.h
---- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap91-eth.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/dev-ap91-eth.h 2010-10-14 20:27:55.918101097 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/dev-ap91-eth.h linux-2.6.36/arch/mips/ar71xx/dev-ap91-eth.h
+--- linux-2.6.36.orig/arch/mips/ar71xx/dev-ap91-eth.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/dev-ap91-eth.h 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,23 @@
+/*
+ * Atheros AP91 reference board ethernet initialization
@@ -280,9 +674,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap91-eth.h linux-2.6.35.7/arc
+
+#endif /* _AR71XX_DEV_AP91_ETH_H */
+
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap91-pci.c linux-2.6.35.7/arch/mips/ar71xx/dev-ap91-pci.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap91-pci.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/dev-ap91-pci.c 2010-10-14 20:27:55.964356595 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/dev-ap91-pci.c linux-2.6.36/arch/mips/ar71xx/dev-ap91-pci.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/dev-ap91-pci.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/dev-ap91-pci.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,114 @@
+/*
+ * Atheros AP91 reference board PCI initialization
@@ -398,9 +792,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap91-pci.c linux-2.6.35.7/arc
+
+ ap91_pci_fixup_enabled = 1;
+}
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap91-pci.h linux-2.6.35.7/arch/mips/ar71xx/dev-ap91-pci.h
---- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap91-pci.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/dev-ap91-pci.h 2010-10-14 20:27:56.005601094 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/dev-ap91-pci.h linux-2.6.36/arch/mips/ar71xx/dev-ap91-pci.h
+--- linux-2.6.36.orig/arch/mips/ar71xx/dev-ap91-pci.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/dev-ap91-pci.h 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,21 @@
+/*
+ * Atheros AP91 reference board PCI initialization
@@ -423,9 +817,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap91-pci.h linux-2.6.35.7/arc
+
+#endif /* _AR71XX_DEV_AP91_PCI_H */
+
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap94-pci.c linux-2.6.35.7/arch/mips/ar71xx/dev-ap94-pci.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap94-pci.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/dev-ap94-pci.c 2010-10-14 20:27:56.056135764 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/dev-ap94-pci.c linux-2.6.36/arch/mips/ar71xx/dev-ap94-pci.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/dev-ap94-pci.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/dev-ap94-pci.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,159 @@
+/*
+ * Atheros AP94 reference board PCI initialization
@@ -586,9 +980,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap94-pci.c linux-2.6.35.7/arc
+
+ ap94_pci_fixup_enabled = 1;
+}
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap94-pci.h linux-2.6.35.7/arch/mips/ar71xx/dev-ap94-pci.h
---- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap94-pci.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/dev-ap94-pci.h 2010-10-14 20:27:56.105939718 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/dev-ap94-pci.h linux-2.6.36/arch/mips/ar71xx/dev-ap94-pci.h
+--- linux-2.6.36.orig/arch/mips/ar71xx/dev-ap94-pci.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/dev-ap94-pci.h 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,28 @@
+/*
+ * Atheros AP94 reference board PCI initialization
@@ -618,9 +1012,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap94-pci.h linux-2.6.35.7/arc
+
+#endif /* _AR71XX_DEV_AP94_PCI_H */
+
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ar913x-wmac.c linux-2.6.35.7/arch/mips/ar71xx/dev-ar913x-wmac.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ar913x-wmac.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/dev-ar913x-wmac.c 2010-10-14 20:27:56.154378236 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/dev-ar913x-wmac.c linux-2.6.36/arch/mips/ar71xx/dev-ar913x-wmac.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/dev-ar913x-wmac.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/dev-ar913x-wmac.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,68 @@
+/*
+ * Atheros AR913x SoC built-in WMAC device support
@@ -690,9 +1084,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ar913x-wmac.c linux-2.6.35.7/
+
+ platform_device_register(&ar913x_wmac_device);
+}
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ar913x-wmac.h linux-2.6.35.7/arch/mips/ar71xx/dev-ar913x-wmac.h
---- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ar913x-wmac.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/dev-ar913x-wmac.h 2010-10-14 20:27:56.205590855 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/dev-ar913x-wmac.h linux-2.6.36/arch/mips/ar71xx/dev-ar913x-wmac.h
+--- linux-2.6.36.orig/arch/mips/ar71xx/dev-ar913x-wmac.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/dev-ar913x-wmac.h 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,19 @@
+/*
+ * Atheros AR913x SoC built-in WMAC device support
@@ -713,9 +1107,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ar913x-wmac.h linux-2.6.35.7/
+void ar913x_add_device_wmac(u8 *cal_data, u8 *mac_addr) __init;
+
+#endif /* _AR71XX_DEV_AR913X_WMAC_H */
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-dsa.c linux-2.6.35.7/arch/mips/ar71xx/dev-dsa.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-dsa.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/dev-dsa.c 2010-10-14 20:27:56.255387205 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/dev-dsa.c linux-2.6.36/arch/mips/ar71xx/dev-dsa.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/dev-dsa.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/dev-dsa.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,50 @@
+/*
+ * Atheros AR71xx DSA switch device support
@@ -767,9 +1161,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-dsa.c linux-2.6.35.7/arch/mip
+
+ platform_device_register(&ar71xx_dsa_switch_device);
+}
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-dsa.h linux-2.6.35.7/arch/mips/ar71xx/dev-dsa.h
---- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-dsa.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/dev-dsa.h 2010-10-14 20:27:56.305200658 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/dev-dsa.h linux-2.6.36/arch/mips/ar71xx/dev-dsa.h
+--- linux-2.6.36.orig/arch/mips/ar71xx/dev-dsa.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/dev-dsa.h 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,20 @@
+/*
+ * Atheros AR71xx DSA switch device support
@@ -791,9 +1185,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-dsa.h linux-2.6.35.7/arch/mip
+ struct dsa_platform_data *d) __init;
+
+#endif /* _AR71XX_DEV_DSA_H */
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-gpio-buttons.c linux-2.6.35.7/arch/mips/ar71xx/dev-gpio-buttons.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-gpio-buttons.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/dev-gpio-buttons.c 2010-10-14 20:27:56.355043092 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/dev-gpio-buttons.c linux-2.6.36/arch/mips/ar71xx/dev-gpio-buttons.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/dev-gpio-buttons.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/dev-gpio-buttons.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,58 @@
+/*
+ * Atheros AR71xx GPIO button support
@@ -853,9 +1247,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-gpio-buttons.c linux-2.6.35.7
+err_free_buttons:
+ kfree(p);
+}
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-gpio-buttons.h linux-2.6.35.7/arch/mips/ar71xx/dev-gpio-buttons.h
---- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-gpio-buttons.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/dev-gpio-buttons.h 2010-10-14 20:27:56.404843567 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/dev-gpio-buttons.h linux-2.6.36/arch/mips/ar71xx/dev-gpio-buttons.h
+--- linux-2.6.36.orig/arch/mips/ar71xx/dev-gpio-buttons.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/dev-gpio-buttons.h 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,25 @@
+/*
+ * Atheros AR71xx GPIO button support
@@ -882,9 +1276,487 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-gpio-buttons.h linux-2.6.35.7
+ struct gpio_button *buttons) __init;
+
+#endif /* _AR71XX_DEV_GPIO_BUTTONS_H */
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/devices.c linux-2.6.35.7/arch/mips/ar71xx/devices.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/devices.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/devices.c 2010-10-14 20:27:56.454649960 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/dev-leds-gpio.c linux-2.6.36/arch/mips/ar71xx/dev-leds-gpio.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/dev-leds-gpio.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/dev-leds-gpio.c 2010-11-18 21:16:05.000000000 +0100
+@@ -0,0 +1,57 @@
++/*
++ * Atheros AR71xx GPIO LED device support
++ *
++ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
++ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
++ *
++ * Parts of this file are based on Atheros' 2.6.15 BSP
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published
++ * by the Free Software Foundation.
++ */
++
++#include <linux/init.h>
++#include <linux/platform_device.h>
++#include <linux/slab.h>
++
++#include "dev-leds-gpio.h"
++
++void __init ar71xx_add_device_leds_gpio(int id, unsigned num_leds,
++ struct gpio_led *leds)
++{
++ struct platform_device *pdev;
++ struct gpio_led_platform_data pdata;
++ struct gpio_led *p;
++ int err;
++
++ p = kmalloc(num_leds * sizeof(*p), GFP_KERNEL);
++ if (!p)
++ return;
++
++ memcpy(p, leds, num_leds * sizeof(*p));
++
++ pdev = platform_device_alloc("leds-gpio", id);
++ if (!pdev)
++ goto err_free_leds;
++
++ memset(&pdata, 0, sizeof(pdata));
++ pdata.num_leds = num_leds;
++ pdata.leds = p;
++
++ err = platform_device_add_data(pdev, &pdata, sizeof(pdata));
++ if (err)
++ goto err_put_pdev;
++
++ err = platform_device_add(pdev);
++ if (err)
++ goto err_put_pdev;
++
++ return;
++
++err_put_pdev:
++ platform_device_put(pdev);
++
++err_free_leds:
++ kfree(p);
++}
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/dev-leds-gpio.h linux-2.6.36/arch/mips/ar71xx/dev-leds-gpio.h
+--- linux-2.6.36.orig/arch/mips/ar71xx/dev-leds-gpio.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/dev-leds-gpio.h 2010-11-18 21:16:05.000000000 +0100
+@@ -0,0 +1,21 @@
++/*
++ * Atheros AR71xx GPIO LED device support
++ *
++ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
++ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published
++ * by the Free Software Foundation.
++ */
++
++#ifndef _AR71XX_DEV_LEDS_GPIO_H
++#define _AR71XX_DEV_LEDS_GPIO_H
++
++#include <linux/leds.h>
++
++void ar71xx_add_device_leds_gpio(int id,
++ unsigned num_leds,
++ struct gpio_led *leds) __init;
++
++#endif /* _AR71XX_DEV_LEDS_GPIO_H */
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/dev-m25p80.c linux-2.6.36/arch/mips/ar71xx/dev-m25p80.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/dev-m25p80.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/dev-m25p80.c 2010-11-18 21:16:05.000000000 +0100
+@@ -0,0 +1,30 @@
++/*
++ * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published
++ * by the Free Software Foundation.
++ */
++
++#include <linux/init.h>
++#include <linux/spi/spi.h>
++#include <linux/spi/flash.h>
++
++#include "devices.h"
++#include "dev-m25p80.h"
++
++static struct spi_board_info ar71xx_spi_info[] = {
++ {
++ .bus_num = 0,
++ .chip_select = 0,
++ .max_speed_hz = 25000000,
++ .modalias = "m25p80",
++ }
++};
++
++void __init ar71xx_add_device_m25p80(struct flash_platform_data *pdata)
++{
++ ar71xx_spi_info[0].platform_data = pdata;
++ ar71xx_add_device_spi(NULL, ar71xx_spi_info,
++ ARRAY_SIZE(ar71xx_spi_info));
++}
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/dev-m25p80.h linux-2.6.36/arch/mips/ar71xx/dev-m25p80.h
+--- linux-2.6.36.orig/arch/mips/ar71xx/dev-m25p80.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/dev-m25p80.h 2010-11-18 21:16:05.000000000 +0100
+@@ -0,0 +1,16 @@
++/*
++ * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published
++ * by the Free Software Foundation.
++ */
++
++#ifndef _AR71XX_DEV_M25P80_H
++#define _AR71XX_DEV_M25P80_H
++
++#include <linux/spi/flash.h>
++
++void ar71xx_add_device_m25p80(struct flash_platform_data *pdata) __init;
++
++#endif /* _AR71XX_DEV_M25P80_H */
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/dev-pb42-pci.c linux-2.6.36/arch/mips/ar71xx/dev-pb42-pci.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/dev-pb42-pci.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/dev-pb42-pci.c 2010-11-18 21:16:05.000000000 +0100
+@@ -0,0 +1,40 @@
++/*
++ * Atheros PB42 reference board PCI initialization
++ *
++ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
++ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
++ *
++ * Parts of this file are based on Atheros' 2.6.15 BSP
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published
++ * by the Free Software Foundation.
++ */
++
++#include <linux/pci.h>
++
++#include <asm/mach-ar71xx/ar71xx.h>
++#include <asm/mach-ar71xx/pci.h>
++
++#include "dev-pb42-pci.h"
++
++static struct ar71xx_pci_irq pb42_pci_irqs[] __initdata = {
++ {
++ .slot = 0,
++ .pin = 1,
++ .irq = AR71XX_PCI_IRQ_DEV0,
++ }, {
++ .slot = 1,
++ .pin = 1,
++ .irq = AR71XX_PCI_IRQ_DEV1,
++ }, {
++ .slot = 2,
++ .pin = 1,
++ .irq = AR71XX_PCI_IRQ_DEV2,
++ }
++};
++
++void __init pb42_pci_init(void)
++{
++ ar71xx_pci_init(ARRAY_SIZE(pb42_pci_irqs), pb42_pci_irqs);
++}
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/dev-pb42-pci.h linux-2.6.36/arch/mips/ar71xx/dev-pb42-pci.h
+--- linux-2.6.36.orig/arch/mips/ar71xx/dev-pb42-pci.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/dev-pb42-pci.h 2010-11-18 21:16:05.000000000 +0100
+@@ -0,0 +1,21 @@
++/*
++ * Atheros PB42 reference board PCI initialization
++ *
++ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
++ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published
++ * by the Free Software Foundation.
++ */
++
++#ifndef _AR71XX_DEV_PB42_PCI_H
++#define _AR71XX_DEV_PB42_PCI_H
++
++#if defined(CONFIG_AR71XX_DEV_PB42_PCI)
++void pb42_pci_init(void) __init;
++#else
++static inline void pb42_pci_init(void) { }
++#endif
++
++#endif /* _AR71XX_DEV_PB42_PCI_H */
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/dev-pb9x-pci.c linux-2.6.36/arch/mips/ar71xx/dev-pb9x-pci.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/dev-pb9x-pci.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/dev-pb9x-pci.c 2010-11-18 21:16:05.000000000 +0100
+@@ -0,0 +1,33 @@
++/*
++ * Atheros PB9x reference board PCI initialization
++ *
++ * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
++ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
++ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
++ *
++ * Parts of this file are based on Atheros' 2.6.15 BSP
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published
++ * by the Free Software Foundation.
++ */
++
++#include <linux/pci.h>
++
++#include <asm/mach-ar71xx/ar71xx.h>
++#include <asm/mach-ar71xx/pci.h>
++
++#include "dev-pb9x-pci.h"
++
++static struct ar71xx_pci_irq pb9x_pci_irqs[] __initdata = {
++ {
++ .slot = 0,
++ .pin = 1,
++ .irq = AR71XX_PCI_IRQ_DEV0,
++ }
++};
++
++void __init pb9x_pci_init(void)
++{
++ ar71xx_pci_init(ARRAY_SIZE(pb9x_pci_irqs), pb9x_pci_irqs);
++}
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/dev-pb9x-pci.h linux-2.6.36/arch/mips/ar71xx/dev-pb9x-pci.h
+--- linux-2.6.36.orig/arch/mips/ar71xx/dev-pb9x-pci.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/dev-pb9x-pci.h 2010-11-18 21:16:05.000000000 +0100
+@@ -0,0 +1,22 @@
++/*
++ * Atheros PB9x reference board PCI initialization
++ *
++ * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
++ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
++ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published
++ * by the Free Software Foundation.
++ */
++
++#ifndef _AR71XX_DEV_PB9X_PCI_H
++#define _AR71XX_DEV_PB9X_PCI_H
++
++#if defined(CONFIG_AR71XX_DEV_PB9X_PCI)
++void pb9x_pci_init(void) __init;
++#else
++static inline void pb9x_pci_init(void) { }
++#endif
++
++#endif /* _AR71XX_DEV_PB9X_PCI_H */
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/dev-usb.c linux-2.6.36/arch/mips/ar71xx/dev-usb.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/dev-usb.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/dev-usb.c 2010-11-18 21:16:05.000000000 +0100
+@@ -0,0 +1,181 @@
++/*
++ * Atheros AR71xx USB host device support
++ *
++ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
++ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
++ *
++ * Parts of this file are based on Atheros' 2.6.15 BSP
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published
++ * by the Free Software Foundation.
++ */
++
++#include <linux/kernel.h>
++#include <linux/init.h>
++#include <linux/delay.h>
++#include <linux/dma-mapping.h>
++#include <linux/platform_device.h>
++
++#include <asm/mach-ar71xx/ar71xx.h>
++#include <asm/mach-ar71xx/platform.h>
++
++#include "dev-usb.h"
++
++/*
++ * OHCI (USB full speed host controller)
++ */
++static struct resource ar71xx_ohci_resources[] = {
++ [0] = {
++ .start = AR71XX_OHCI_BASE,
++ .end = AR71XX_OHCI_BASE + AR71XX_OHCI_SIZE - 1,
++ .flags = IORESOURCE_MEM,
++ },
++ [1] = {
++ .start = AR71XX_MISC_IRQ_OHCI,
++ .end = AR71XX_MISC_IRQ_OHCI,
++ .flags = IORESOURCE_IRQ,
++ },
++};
++
++static struct resource ar7240_ohci_resources[] = {
++ [0] = {
++ .start = AR7240_OHCI_BASE,
++ .end = AR7240_OHCI_BASE + AR7240_OHCI_SIZE - 1,
++ .flags = IORESOURCE_MEM,
++ },
++ [1] = {
++ .start = AR71XX_CPU_IRQ_USB,
++ .end = AR71XX_CPU_IRQ_USB,
++ .flags = IORESOURCE_IRQ,
++ },
++};
++
++static u64 ar71xx_ohci_dmamask = DMA_BIT_MASK(32);
++static struct platform_device ar71xx_ohci_device = {
++ .name = "ar71xx-ohci",
++ .id = -1,
++ .resource = ar71xx_ohci_resources,
++ .num_resources = ARRAY_SIZE(ar71xx_ohci_resources),
++ .dev = {
++ .dma_mask = &ar71xx_ohci_dmamask,
++ .coherent_dma_mask = DMA_BIT_MASK(32),
++ },
++};
++
++/*
++ * EHCI (USB full speed host controller)
++ */
++static struct resource ar71xx_ehci_resources[] = {
++ [0] = {
++ .start = AR71XX_EHCI_BASE,
++ .end = AR71XX_EHCI_BASE + AR71XX_EHCI_SIZE - 1,
++ .flags = IORESOURCE_MEM,
++ },
++ [1] = {
++ .start = AR71XX_CPU_IRQ_USB,
++ .end = AR71XX_CPU_IRQ_USB,
++ .flags = IORESOURCE_IRQ,
++ },
++};
++
++static u64 ar71xx_ehci_dmamask = DMA_BIT_MASK(32);
++static struct ar71xx_ehci_platform_data ar71xx_ehci_data;
++
++static struct platform_device ar71xx_ehci_device = {
++ .name = "ar71xx-ehci",
++ .id = -1,
++ .resource = ar71xx_ehci_resources,
++ .num_resources = ARRAY_SIZE(ar71xx_ehci_resources),
++ .dev = {
++ .dma_mask = &ar71xx_ehci_dmamask,
++ .coherent_dma_mask = DMA_BIT_MASK(32),
++ .platform_data = &ar71xx_ehci_data,
++ },
++};
++
++#define AR71XX_USB_RESET_MASK \
++ (RESET_MODULE_USB_HOST | RESET_MODULE_USB_PHY \
++ | RESET_MODULE_USB_OHCI_DLL)
++
++#define AR7240_USB_RESET_MASK \
++ (RESET_MODULE_USB_HOST | RESET_MODULE_USB_OHCI_DLL_7240)
++
++static void __init ar71xx_usb_setup(void)
++{
++ ar71xx_device_stop(AR71XX_USB_RESET_MASK);
++ mdelay(1000);
++ ar71xx_device_start(AR71XX_USB_RESET_MASK);
++
++ /* Turning on the Buff and Desc swap bits */
++ ar71xx_usb_ctrl_wr(USB_CTRL_REG_CONFIG, 0xf0000);
++
++ /* WAR for HW bug. Here it adjusts the duration between two SOFS */
++ ar71xx_usb_ctrl_wr(USB_CTRL_REG_FLADJ, 0x20c00);
++
++ mdelay(900);
++
++ platform_device_register(&ar71xx_ohci_device);
++ platform_device_register(&ar71xx_ehci_device);
++}
++
++static void __init ar7240_usb_setup(void)
++{
++ ar71xx_device_stop(AR7240_USB_RESET_MASK);
++ mdelay(1000);
++ ar71xx_device_start(AR7240_USB_RESET_MASK);
++
++ /* WAR for HW bug. Here it adjusts the duration between two SOFS */
++ ar71xx_usb_ctrl_wr(USB_CTRL_REG_FLADJ, 0x3);
++
++ if (ar71xx_soc == AR71XX_SOC_AR7241 || ar71xx_soc == AR71XX_SOC_AR7242) {
++ ar71xx_ehci_data.is_ar91xx = 1;
++ ar71xx_ehci_device.resource = ar7240_ohci_resources;
++ ar71xx_ehci_device.num_resources = ARRAY_SIZE(ar7240_ohci_resources);
++ platform_device_register(&ar71xx_ehci_device);
++ } else {
++ ar71xx_ohci_device.resource = ar7240_ohci_resources;
++ ar71xx_ohci_device.num_resources = ARRAY_SIZE(ar7240_ohci_resources);
++ platform_device_register(&ar71xx_ohci_device);
++ }
++}
++
++static void __init ar91xx_usb_setup(void)
++{
++ ar71xx_device_stop(RESET_MODULE_USBSUS_OVERRIDE);
++ mdelay(10);
++
++ ar71xx_device_start(RESET_MODULE_USB_HOST);
++ mdelay(10);
++
++ ar71xx_device_start(RESET_MODULE_USB_PHY);
++ mdelay(10);
++
++ ar71xx_ehci_data.is_ar91xx = 1;
++ platform_device_register(&ar71xx_ehci_device);
++}
++
++void __init ar71xx_add_device_usb(void)
++{
++ switch (ar71xx_soc) {
++ case AR71XX_SOC_AR7240:
++ case AR71XX_SOC_AR7241:
++ case AR71XX_SOC_AR7242:
++ ar7240_usb_setup();
++ break;
++
++ case AR71XX_SOC_AR7130:
++ case AR71XX_SOC_AR7141:
++ case AR71XX_SOC_AR7161:
++ ar71xx_usb_setup();
++ break;
++
++ case AR71XX_SOC_AR9130:
++ case AR71XX_SOC_AR9132:
++ ar91xx_usb_setup();
++ break;
++
++ default:
++ BUG();
++ }
++}
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/dev-usb.h linux-2.6.36/arch/mips/ar71xx/dev-usb.h
+--- linux-2.6.36.orig/arch/mips/ar71xx/dev-usb.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/dev-usb.h 2010-11-18 21:16:05.000000000 +0100
+@@ -0,0 +1,17 @@
++/*
++ * Atheros AR71xx USB host device support
++ *
++ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
++ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published
++ * by the Free Software Foundation.
++ */
++
++#ifndef _AR71XX_DEV_USB_H
++#define _AR71XX_DEV_USB_H
++
++void ar71xx_add_device_usb(void) __init;
++
++#endif /* _AR71XX_DEV_USB_H */
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/devices.c linux-2.6.36/arch/mips/ar71xx/devices.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/devices.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/devices.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,575 @@
+/*
+ * Atheros AR71xx SoC platform devices
@@ -1461,9 +2333,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/devices.c linux-2.6.35.7/arch/mip
+ return 1;
+}
+__setup("kmac=", ar71xx_kmac_setup);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/devices.h linux-2.6.35.7/arch/mips/ar71xx/devices.h
---- linux-2.6.35.7.orig/arch/mips/ar71xx/devices.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/devices.h 2010-10-14 20:27:56.504463432 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/devices.h linux-2.6.36/arch/mips/ar71xx/devices.h
+--- linux-2.6.36.orig/arch/mips/ar71xx/devices.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/devices.h 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,48 @@
+/*
+ * Atheros AR71xx SoC device definitions
@@ -1513,487 +2385,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/devices.h linux-2.6.35.7/arch/mip
+void ar71xx_add_device_wdt(void) __init;
+
+#endif /* __AR71XX_DEVICES_H */
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-leds-gpio.c linux-2.6.35.7/arch/mips/ar71xx/dev-leds-gpio.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-leds-gpio.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/dev-leds-gpio.c 2010-10-14 20:27:56.545601257 +0200
-@@ -0,0 +1,57 @@
-+/*
-+ * Atheros AR71xx GPIO LED device support
-+ *
-+ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
-+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * Parts of this file are based on Atheros' 2.6.15 BSP
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ */
-+
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/slab.h>
-+
-+#include "dev-leds-gpio.h"
-+
-+void __init ar71xx_add_device_leds_gpio(int id, unsigned num_leds,
-+ struct gpio_led *leds)
-+{
-+ struct platform_device *pdev;
-+ struct gpio_led_platform_data pdata;
-+ struct gpio_led *p;
-+ int err;
-+
-+ p = kmalloc(num_leds * sizeof(*p), GFP_KERNEL);
-+ if (!p)
-+ return;
-+
-+ memcpy(p, leds, num_leds * sizeof(*p));
-+
-+ pdev = platform_device_alloc("leds-gpio", id);
-+ if (!pdev)
-+ goto err_free_leds;
-+
-+ memset(&pdata, 0, sizeof(pdata));
-+ pdata.num_leds = num_leds;
-+ pdata.leds = p;
-+
-+ err = platform_device_add_data(pdev, &pdata, sizeof(pdata));
-+ if (err)
-+ goto err_put_pdev;
-+
-+ err = platform_device_add(pdev);
-+ if (err)
-+ goto err_put_pdev;
-+
-+ return;
-+
-+err_put_pdev:
-+ platform_device_put(pdev);
-+
-+err_free_leds:
-+ kfree(p);
-+}
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-leds-gpio.h linux-2.6.35.7/arch/mips/ar71xx/dev-leds-gpio.h
---- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-leds-gpio.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/dev-leds-gpio.h 2010-10-14 20:27:56.595814317 +0200
-@@ -0,0 +1,21 @@
-+/*
-+ * Atheros AR71xx GPIO LED device support
-+ *
-+ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
-+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ */
-+
-+#ifndef _AR71XX_DEV_LEDS_GPIO_H
-+#define _AR71XX_DEV_LEDS_GPIO_H
-+
-+#include <linux/leds.h>
-+
-+void ar71xx_add_device_leds_gpio(int id,
-+ unsigned num_leds,
-+ struct gpio_led *leds) __init;
-+
-+#endif /* _AR71XX_DEV_LEDS_GPIO_H */
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-m25p80.c linux-2.6.35.7/arch/mips/ar71xx/dev-m25p80.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-m25p80.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/dev-m25p80.c 2010-10-14 20:27:56.645623230 +0200
-@@ -0,0 +1,30 @@
-+/*
-+ * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ */
-+
-+#include <linux/init.h>
-+#include <linux/spi/spi.h>
-+#include <linux/spi/flash.h>
-+
-+#include "devices.h"
-+#include "dev-m25p80.h"
-+
-+static struct spi_board_info ar71xx_spi_info[] = {
-+ {
-+ .bus_num = 0,
-+ .chip_select = 0,
-+ .max_speed_hz = 25000000,
-+ .modalias = "m25p80",
-+ }
-+};
-+
-+void __init ar71xx_add_device_m25p80(struct flash_platform_data *pdata)
-+{
-+ ar71xx_spi_info[0].platform_data = pdata;
-+ ar71xx_add_device_spi(NULL, ar71xx_spi_info,
-+ ARRAY_SIZE(ar71xx_spi_info));
-+}
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-m25p80.h linux-2.6.35.7/arch/mips/ar71xx/dev-m25p80.h
---- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-m25p80.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/dev-m25p80.h 2010-10-14 20:27:56.695412366 +0200
-@@ -0,0 +1,16 @@
-+/*
-+ * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ */
-+
-+#ifndef _AR71XX_DEV_M25P80_H
-+#define _AR71XX_DEV_M25P80_H
-+
-+#include <linux/spi/flash.h>
-+
-+void ar71xx_add_device_m25p80(struct flash_platform_data *pdata) __init;
-+
-+#endif /* _AR71XX_DEV_M25P80_H */
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-pb42-pci.c linux-2.6.35.7/arch/mips/ar71xx/dev-pb42-pci.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-pb42-pci.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/dev-pb42-pci.c 2010-10-14 20:27:56.745266514 +0200
-@@ -0,0 +1,40 @@
-+/*
-+ * Atheros PB42 reference board PCI initialization
-+ *
-+ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
-+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * Parts of this file are based on Atheros' 2.6.15 BSP
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ */
-+
-+#include <linux/pci.h>
-+
-+#include <asm/mach-ar71xx/ar71xx.h>
-+#include <asm/mach-ar71xx/pci.h>
-+
-+#include "dev-pb42-pci.h"
-+
-+static struct ar71xx_pci_irq pb42_pci_irqs[] __initdata = {
-+ {
-+ .slot = 0,
-+ .pin = 1,
-+ .irq = AR71XX_PCI_IRQ_DEV0,
-+ }, {
-+ .slot = 1,
-+ .pin = 1,
-+ .irq = AR71XX_PCI_IRQ_DEV1,
-+ }, {
-+ .slot = 2,
-+ .pin = 1,
-+ .irq = AR71XX_PCI_IRQ_DEV2,
-+ }
-+};
-+
-+void __init pb42_pci_init(void)
-+{
-+ ar71xx_pci_init(ARRAY_SIZE(pb42_pci_irqs), pb42_pci_irqs);
-+}
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-pb42-pci.h linux-2.6.35.7/arch/mips/ar71xx/dev-pb42-pci.h
---- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-pb42-pci.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/dev-pb42-pci.h 2010-10-14 20:27:56.795082429 +0200
-@@ -0,0 +1,21 @@
-+/*
-+ * Atheros PB42 reference board PCI initialization
-+ *
-+ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
-+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ */
-+
-+#ifndef _AR71XX_DEV_PB42_PCI_H
-+#define _AR71XX_DEV_PB42_PCI_H
-+
-+#if defined(CONFIG_AR71XX_DEV_PB42_PCI)
-+void pb42_pci_init(void) __init;
-+#else
-+static inline void pb42_pci_init(void) { }
-+#endif
-+
-+#endif /* _AR71XX_DEV_PB42_PCI_H */
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-pb9x-pci.c linux-2.6.35.7/arch/mips/ar71xx/dev-pb9x-pci.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-pb9x-pci.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/dev-pb9x-pci.c 2010-10-14 20:27:56.844918541 +0200
-@@ -0,0 +1,33 @@
-+/*
-+ * Atheros PB9x reference board PCI initialization
-+ *
-+ * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
-+ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
-+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * Parts of this file are based on Atheros' 2.6.15 BSP
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ */
-+
-+#include <linux/pci.h>
-+
-+#include <asm/mach-ar71xx/ar71xx.h>
-+#include <asm/mach-ar71xx/pci.h>
-+
-+#include "dev-pb9x-pci.h"
-+
-+static struct ar71xx_pci_irq pb9x_pci_irqs[] __initdata = {
-+ {
-+ .slot = 0,
-+ .pin = 1,
-+ .irq = AR71XX_PCI_IRQ_DEV0,
-+ }
-+};
-+
-+void __init pb9x_pci_init(void)
-+{
-+ ar71xx_pci_init(ARRAY_SIZE(pb9x_pci_irqs), pb9x_pci_irqs);
-+}
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-pb9x-pci.h linux-2.6.35.7/arch/mips/ar71xx/dev-pb9x-pci.h
---- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-pb9x-pci.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/dev-pb9x-pci.h 2010-10-14 20:27:56.894720777 +0200
-@@ -0,0 +1,22 @@
-+/*
-+ * Atheros PB9x reference board PCI initialization
-+ *
-+ * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
-+ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
-+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ */
-+
-+#ifndef _AR71XX_DEV_PB9X_PCI_H
-+#define _AR71XX_DEV_PB9X_PCI_H
-+
-+#if defined(CONFIG_AR71XX_DEV_PB9X_PCI)
-+void pb9x_pci_init(void) __init;
-+#else
-+static inline void pb9x_pci_init(void) { }
-+#endif
-+
-+#endif /* _AR71XX_DEV_PB9X_PCI_H */
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-usb.c linux-2.6.35.7/arch/mips/ar71xx/dev-usb.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-usb.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/dev-usb.c 2010-10-14 20:27:56.944533864 +0200
-@@ -0,0 +1,181 @@
-+/*
-+ * Atheros AR71xx USB host device support
-+ *
-+ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
-+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * Parts of this file are based on Atheros' 2.6.15 BSP
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/platform_device.h>
-+
-+#include <asm/mach-ar71xx/ar71xx.h>
-+#include <asm/mach-ar71xx/platform.h>
-+
-+#include "dev-usb.h"
-+
-+/*
-+ * OHCI (USB full speed host controller)
-+ */
-+static struct resource ar71xx_ohci_resources[] = {
-+ [0] = {
-+ .start = AR71XX_OHCI_BASE,
-+ .end = AR71XX_OHCI_BASE + AR71XX_OHCI_SIZE - 1,
-+ .flags = IORESOURCE_MEM,
-+ },
-+ [1] = {
-+ .start = AR71XX_MISC_IRQ_OHCI,
-+ .end = AR71XX_MISC_IRQ_OHCI,
-+ .flags = IORESOURCE_IRQ,
-+ },
-+};
-+
-+static struct resource ar7240_ohci_resources[] = {
-+ [0] = {
-+ .start = AR7240_OHCI_BASE,
-+ .end = AR7240_OHCI_BASE + AR7240_OHCI_SIZE - 1,
-+ .flags = IORESOURCE_MEM,
-+ },
-+ [1] = {
-+ .start = AR71XX_CPU_IRQ_USB,
-+ .end = AR71XX_CPU_IRQ_USB,
-+ .flags = IORESOURCE_IRQ,
-+ },
-+};
-+
-+static u64 ar71xx_ohci_dmamask = DMA_BIT_MASK(32);
-+static struct platform_device ar71xx_ohci_device = {
-+ .name = "ar71xx-ohci",
-+ .id = -1,
-+ .resource = ar71xx_ohci_resources,
-+ .num_resources = ARRAY_SIZE(ar71xx_ohci_resources),
-+ .dev = {
-+ .dma_mask = &ar71xx_ohci_dmamask,
-+ .coherent_dma_mask = DMA_BIT_MASK(32),
-+ },
-+};
-+
-+/*
-+ * EHCI (USB full speed host controller)
-+ */
-+static struct resource ar71xx_ehci_resources[] = {
-+ [0] = {
-+ .start = AR71XX_EHCI_BASE,
-+ .end = AR71XX_EHCI_BASE + AR71XX_EHCI_SIZE - 1,
-+ .flags = IORESOURCE_MEM,
-+ },
-+ [1] = {
-+ .start = AR71XX_CPU_IRQ_USB,
-+ .end = AR71XX_CPU_IRQ_USB,
-+ .flags = IORESOURCE_IRQ,
-+ },
-+};
-+
-+static u64 ar71xx_ehci_dmamask = DMA_BIT_MASK(32);
-+static struct ar71xx_ehci_platform_data ar71xx_ehci_data;
-+
-+static struct platform_device ar71xx_ehci_device = {
-+ .name = "ar71xx-ehci",
-+ .id = -1,
-+ .resource = ar71xx_ehci_resources,
-+ .num_resources = ARRAY_SIZE(ar71xx_ehci_resources),
-+ .dev = {
-+ .dma_mask = &ar71xx_ehci_dmamask,
-+ .coherent_dma_mask = DMA_BIT_MASK(32),
-+ .platform_data = &ar71xx_ehci_data,
-+ },
-+};
-+
-+#define AR71XX_USB_RESET_MASK \
-+ (RESET_MODULE_USB_HOST | RESET_MODULE_USB_PHY \
-+ | RESET_MODULE_USB_OHCI_DLL)
-+
-+#define AR7240_USB_RESET_MASK \
-+ (RESET_MODULE_USB_HOST | RESET_MODULE_USB_OHCI_DLL_7240)
-+
-+static void __init ar71xx_usb_setup(void)
-+{
-+ ar71xx_device_stop(AR71XX_USB_RESET_MASK);
-+ mdelay(1000);
-+ ar71xx_device_start(AR71XX_USB_RESET_MASK);
-+
-+ /* Turning on the Buff and Desc swap bits */
-+ ar71xx_usb_ctrl_wr(USB_CTRL_REG_CONFIG, 0xf0000);
-+
-+ /* WAR for HW bug. Here it adjusts the duration between two SOFS */
-+ ar71xx_usb_ctrl_wr(USB_CTRL_REG_FLADJ, 0x20c00);
-+
-+ mdelay(900);
-+
-+ platform_device_register(&ar71xx_ohci_device);
-+ platform_device_register(&ar71xx_ehci_device);
-+}
-+
-+static void __init ar7240_usb_setup(void)
-+{
-+ ar71xx_device_stop(AR7240_USB_RESET_MASK);
-+ mdelay(1000);
-+ ar71xx_device_start(AR7240_USB_RESET_MASK);
-+
-+ /* WAR for HW bug. Here it adjusts the duration between two SOFS */
-+ ar71xx_usb_ctrl_wr(USB_CTRL_REG_FLADJ, 0x3);
-+
-+ if (ar71xx_soc == AR71XX_SOC_AR7241 || ar71xx_soc == AR71XX_SOC_AR7242) {
-+ ar71xx_ehci_data.is_ar91xx = 1;
-+ ar71xx_ehci_device.resource = ar7240_ohci_resources;
-+ ar71xx_ehci_device.num_resources = ARRAY_SIZE(ar7240_ohci_resources);
-+ platform_device_register(&ar71xx_ehci_device);
-+ } else {
-+ ar71xx_ohci_device.resource = ar7240_ohci_resources;
-+ ar71xx_ohci_device.num_resources = ARRAY_SIZE(ar7240_ohci_resources);
-+ platform_device_register(&ar71xx_ohci_device);
-+ }
-+}
-+
-+static void __init ar91xx_usb_setup(void)
-+{
-+ ar71xx_device_stop(RESET_MODULE_USBSUS_OVERRIDE);
-+ mdelay(10);
-+
-+ ar71xx_device_start(RESET_MODULE_USB_HOST);
-+ mdelay(10);
-+
-+ ar71xx_device_start(RESET_MODULE_USB_PHY);
-+ mdelay(10);
-+
-+ ar71xx_ehci_data.is_ar91xx = 1;
-+ platform_device_register(&ar71xx_ehci_device);
-+}
-+
-+void __init ar71xx_add_device_usb(void)
-+{
-+ switch (ar71xx_soc) {
-+ case AR71XX_SOC_AR7240:
-+ case AR71XX_SOC_AR7241:
-+ case AR71XX_SOC_AR7242:
-+ ar7240_usb_setup();
-+ break;
-+
-+ case AR71XX_SOC_AR7130:
-+ case AR71XX_SOC_AR7141:
-+ case AR71XX_SOC_AR7161:
-+ ar71xx_usb_setup();
-+ break;
-+
-+ case AR71XX_SOC_AR9130:
-+ case AR71XX_SOC_AR9132:
-+ ar91xx_usb_setup();
-+ break;
-+
-+ default:
-+ BUG();
-+ }
-+}
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-usb.h linux-2.6.35.7/arch/mips/ar71xx/dev-usb.h
---- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-usb.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/dev-usb.h 2010-10-14 20:27:56.994353425 +0200
-@@ -0,0 +1,17 @@
-+/*
-+ * Atheros AR71xx USB host device support
-+ *
-+ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
-+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ */
-+
-+#ifndef _AR71XX_DEV_USB_H
-+#define _AR71XX_DEV_USB_H
-+
-+void ar71xx_add_device_usb(void) __init;
-+
-+#endif /* _AR71XX_DEV_USB_H */
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/early_printk.c linux-2.6.35.7/arch/mips/ar71xx/early_printk.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/early_printk.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/early_printk.c 2010-10-14 20:27:57.044356938 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/early_printk.c linux-2.6.36/arch/mips/ar71xx/early_printk.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/early_printk.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/early_printk.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,30 @@
+/*
+ * Atheros AR71xx SoC early printk support
@@ -2025,9 +2419,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/early_printk.c linux-2.6.35.7/arc
+ while (((UART_READ(UART_LSR)) & UART_LSR_THRE) == 0);
+}
+
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/gpio.c linux-2.6.35.7/arch/mips/ar71xx/gpio.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/gpio.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/gpio.c 2010-10-14 20:27:57.084356695 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/gpio.c linux-2.6.36/arch/mips/ar71xx/gpio.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/gpio.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/gpio.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,182 @@
+/*
+ * Atheros AR71xx SoC GPIO API support
@@ -2211,9 +2605,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/gpio.c linux-2.6.35.7/arch/mips/a
+ if (err)
+ panic("cannot add AR71xx GPIO chip, error=%d", err);
+}
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/irq.c linux-2.6.35.7/arch/mips/ar71xx/irq.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/irq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/irq.c 2010-10-14 20:27:57.135484452 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/irq.c linux-2.6.36/arch/mips/ar71xx/irq.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/irq.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/irq.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,295 @@
+/*
+ * Atheros AR71xx SoC specific interrupt handling
@@ -2510,277 +2904,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/irq.c linux-2.6.35.7/arch/mips/ar
+
+ ar71xx_gpio_irq_init();
+}
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/Kconfig linux-2.6.35.7/arch/mips/ar71xx/Kconfig
---- linux-2.6.35.7.orig/arch/mips/ar71xx/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/Kconfig 2010-10-14 20:27:57.185337757 +0200
-@@ -0,0 +1,264 @@
-+if ATHEROS_AR71XX
-+
-+menu "Atheros AR71xx machine selection"
-+
-+config AR71XX_MACH_AP81
-+ bool "Atheros AP81 board support"
-+ select AR71XX_DEV_M25P80
-+ select AR71XX_DEV_AR913X_WMAC
-+ select AR71XX_DEV_GPIO_BUTTONS
-+ select AR71XX_DEV_LEDS_GPIO
-+ select AR71XX_DEV_USB
-+ default n
-+
-+config AR71XX_MACH_AP83
-+ bool "Atheros AP83 board support"
-+ select AR71XX_DEV_AR913X_WMAC
-+ select AR71XX_DEV_GPIO_BUTTONS
-+ select AR71XX_DEV_LEDS_GPIO
-+ select AR71XX_DEV_USB
-+ default n
-+
-+config AR71XX_MACH_DIR_600_A1
-+ bool "D-Link DIR-600 rev. A1 support"
-+ select AR71XX_DEV_AP91_ETH
-+ select AR71XX_DEV_AP91_PCI if PCI
-+ select AR71XX_DEV_M25P80
-+ select AR71XX_DEV_GPIO_BUTTONS
-+ select AR71XX_DEV_LEDS_GPIO
-+ select AR71XX_NVRAM
-+ default n
-+
-+config AR71XX_MACH_DIR_615_C1
-+ bool "D-Link DIR-615 rev. C1 support"
-+ select AR71XX_DEV_M25P80
-+ select AR71XX_DEV_AR913X_WMAC
-+ select AR71XX_DEV_GPIO_BUTTONS
-+ select AR71XX_DEV_LEDS_GPIO
-+ select AR71XX_NVRAM
-+ default n
-+
-+config AR71XX_MACH_DIR_825_B1
-+ bool "D-Link DIR-825 rev. B1 board support"
-+ select AR71XX_DEV_M25P80
-+ select AR71XX_DEV_AP94_PCI if PCI
-+ select AR71XX_DEV_GPIO_BUTTONS
-+ select AR71XX_DEV_LEDS_GPIO
-+ select AR71XX_DEV_USB
-+ default n
-+
-+config AR71XX_MACH_PB42
-+ bool "Atheros PB42 board support"
-+ select AR71XX_DEV_M25P80
-+ select AR71XX_DEV_GPIO_BUTTONS
-+ select AR71XX_DEV_PB42_PCI if PCI
-+ default n
-+
-+config AR71XX_MACH_PB44
-+ bool "Atheros PB44 board support"
-+ select AR71XX_DEV_GPIO_BUTTONS
-+ select AR71XX_DEV_PB42_PCI if PCI
-+ select AR71XX_DEV_LEDS_GPIO
-+ select AR71XX_DEV_USB
-+ default n
-+
-+config AR71XX_MACH_PB92
-+ bool "Atheros PB92 board support"
-+ select AR71XX_DEV_GPIO_BUTTONS
-+ select AR71XX_DEV_PB9X_PCI if PCI
-+ select AR71XX_DEV_LEDS_GPIO
-+ select AR71XX_DEV_USB
-+ default n
-+
-+config AR71XX_MACH_AW_NR580
-+ bool "AzureWave AW-NR580 board support"
-+ select AR71XX_DEV_M25P80
-+ select AR71XX_DEV_GPIO_BUTTONS
-+ select AR71XX_DEV_PB42_PCI if PCI
-+ select AR71XX_DEV_LEDS_GPIO
-+ default n
-+
-+config AR71XX_MACH_WZR_HP_G300NH
-+ bool "Buffalo WZR-HP-G300NH board support"
-+ select AR71XX_DEV_AR913X_WMAC
-+ select AR71XX_DEV_GPIO_BUTTONS
-+ select AR71XX_DEV_LEDS_GPIO
-+ select AR71XX_DEV_USB
-+ default y
-+
-+config AR71XX_MACH_WP543
-+ bool "Compex WP543/WPJ543 board support"
-+ select MYLOADER
-+ select AR71XX_DEV_M25P80
-+ select AR71XX_DEV_GPIO_BUTTONS
-+ select AR71XX_DEV_PB42_PCI if PCI
-+ select AR71XX_DEV_LEDS_GPIO
-+ select AR71XX_DEV_USB
-+ default n
-+
-+config AR71XX_MACH_WRT160NL
-+ bool "Linksys WRT160NL board support"
-+ select AR71XX_DEV_M25P80
-+ select AR71XX_DEV_AR913X_WMAC
-+ select AR71XX_DEV_GPIO_BUTTONS
-+ select AR71XX_DEV_LEDS_GPIO
-+ select AR71XX_DEV_USB
-+ select AR71XX_NVRAM
-+ default n
-+
-+config AR71XX_MACH_WRT400N
-+ bool "Linksys WRT400N board support"
-+ select AR71XX_DEV_AP94_PCI if PCI
-+ select AR71XX_DEV_M25P80
-+ select AR71XX_DEV_GPIO_BUTTONS
-+ select AR71XX_DEV_LEDS_GPIO
-+ default n
-+
-+config AR71XX_MACH_RB4XX
-+ bool "MikroTik RouterBOARD 4xx series support"
-+ select AR71XX_DEV_GPIO_BUTTONS
-+ select AR71XX_DEV_LEDS_GPIO
-+ select AR71XX_DEV_USB
-+ default n
-+
-+config AR71XX_MACH_RB750
-+ bool "MikroTik RouterBOARD 750 support"
-+ select AR71XX_DEV_AP91_ETH
-+ default n
-+
-+config AR71XX_MACH_WNDR3700
-+ bool "NETGEAR WNDR3700 board support"
-+ select AR71XX_DEV_M25P80
-+ select AR71XX_DEV_AP94_PCI if PCI
-+ select AR71XX_DEV_GPIO_BUTTONS
-+ select AR71XX_DEV_LEDS_GPIO
-+ select AR71XX_DEV_USB
-+ default n
-+
-+config AR71XX_MACH_WNR2000
-+ bool "NETGEAR WNR2000 board support"
-+ select AR71XX_DEV_M25P80
-+ select AR71XX_DEV_AR913X_WMAC
-+ select AR71XX_DEV_GPIO_BUTTONS
-+ select AR71XX_DEV_LEDS_GPIO
-+ default n
-+
-+config AR71XX_MACH_MZK_W04NU
-+ bool "Planex MZK-W04NU board support"
-+ select AR71XX_DEV_M25P80
-+ select AR71XX_DEV_AR913X_WMAC
-+ select AR71XX_DEV_GPIO_BUTTONS
-+ select AR71XX_DEV_LEDS_GPIO
-+ select AR71XX_DEV_USB
-+ default n
-+
-+config AR71XX_MACH_MZK_W300NH
-+ bool "Planex MZK-W300NH board support"
-+ select AR71XX_DEV_M25P80
-+ select AR71XX_DEV_AR913X_WMAC
-+ select AR71XX_DEV_GPIO_BUTTONS
-+ select AR71XX_DEV_LEDS_GPIO
-+ default n
-+
-+config AR71XX_MACH_NBG460N
-+ bool "Zyxel NBG460N/550N/550NH board support"
-+ select AR71XX_DEV_M25P80
-+ select AR71XX_DEV_AR913X_WMAC
-+ select AR71XX_DEV_GPIO_BUTTONS
-+ select AR71XX_DEV_LEDS_GPIO
-+ default n
-+
-+config AR71XX_MACH_TL_WR741ND
-+ bool "TP-LINK TL-WR741ND support"
-+ select AR71XX_DEV_M25P80
-+ select AR71XX_DEV_AP91_ETH
-+ select AR71XX_DEV_AP91_PCI if PCI
-+ select AR71XX_DEV_GPIO_BUTTONS
-+ select AR71XX_DEV_LEDS_GPIO
-+ default n
-+
-+config AR71XX_MACH_TL_WR841N_V1
-+ bool "TP-LINK TL-WR841N v1 support"
-+ select AR71XX_DEV_M25P80
-+ select AR71XX_DEV_PB42_PCI if PCI
-+ select AR71XX_DEV_DSA
-+ select AR71XX_DEV_GPIO_BUTTONS
-+ select AR71XX_DEV_LEDS_GPIO
-+ default n
-+
-+config AR71XX_MACH_TL_WR941ND
-+ bool "TP-LINK TL-WR941ND support"
-+ select AR71XX_DEV_M25P80
-+ select AR71XX_DEV_AR913X_WMAC
-+ select AR71XX_DEV_DSA
-+ select AR71XX_DEV_GPIO_BUTTONS
-+ select AR71XX_DEV_LEDS_GPIO
-+ default n
-+
-+config AR71XX_MACH_TL_WR1043ND
-+ bool "TP-LINK TL-WR1043ND support"
-+ select AR71XX_DEV_M25P80
-+ select AR71XX_DEV_AR913X_WMAC
-+ select AR71XX_DEV_GPIO_BUTTONS
-+ select AR71XX_DEV_LEDS_GPIO
-+ select AR71XX_DEV_USB
-+ default n
-+
-+config AR71XX_MACH_TEW_632BRP
-+ bool "TRENDnet TEW-632BRP support"
-+ select AR71XX_DEV_M25P80
-+ select AR71XX_DEV_AR913X_WMAC
-+ select AR71XX_DEV_GPIO_BUTTONS
-+ select AR71XX_DEV_LEDS_GPIO
-+ select AR71XX_NVRAM
-+ default n
-+
-+config AR71XX_MACH_UBNT
-+ bool "Ubiquiti AR71xx based boards support"
-+ select AR71XX_DEV_M25P80
-+ select AR71XX_DEV_AP91_PCI if PCI
-+ select AR71XX_DEV_GPIO_BUTTONS
-+ select AR71XX_DEV_LEDS_GPIO
-+ select AR71XX_DEV_PB42_PCI if PCI
-+ select AR71XX_DEV_USB
-+ default n
-+
-+endmenu
-+
-+config AR71XX_DEV_M25P80
-+ def_bool n
-+
-+config AR71XX_DEV_AP91_PCI
-+ def_bool n
-+
-+config AR71XX_DEV_AP91_ETH
-+ def_bool n
-+
-+config AR71XX_DEV_AP94_PCI
-+ def_bool n
-+
-+config AR71XX_DEV_AR913X_WMAC
-+ def_bool n
-+
-+config AR71XX_DEV_DSA
-+ def_bool n
-+
-+config AR71XX_DEV_GPIO_BUTTONS
-+ def_bool n
-+
-+config AR71XX_DEV_LEDS_GPIO
-+ def_bool n
-+
-+config AR71XX_DEV_PB42_PCI
-+ def_bool n
-+
-+config AR71XX_DEV_PB9X_PCI
-+ def_bool n
-+
-+config AR71XX_DEV_USB
-+ def_bool n
-+
-+config AR71XX_NVRAM
-+ def_bool n
-+
-+endif
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-ap81.c linux-2.6.35.7/arch/mips/ar71xx/mach-ap81.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-ap81.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/mach-ap81.c 2010-10-14 20:27:57.235141599 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/mach-ap81.c linux-2.6.36/arch/mips/ar71xx/mach-ap81.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/mach-ap81.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/mach-ap81.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,140 @@
+/*
+ * Atheros AP81 board support
@@ -2922,9 +3048,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-ap81.c linux-2.6.35.7/arch/m
+}
+
+MIPS_MACHINE(AR71XX_MACH_AP81, "AP81", "Atheros AP81", ap81_setup);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-ap83.c linux-2.6.35.7/arch/mips/ar71xx/mach-ap83.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-ap83.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/mach-ap83.c 2010-10-14 20:27:57.284350521 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/mach-ap83.c linux-2.6.36/arch/mips/ar71xx/mach-ap83.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/mach-ap83.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/mach-ap83.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,266 @@
+/*
+ * Atheros AP83 board support
@@ -3192,9 +3318,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-ap83.c linux-2.6.35.7/arch/m
+}
+
+MIPS_MACHINE(AR71XX_MACH_AP83, "AP83", "Atheros AP83", ap83_setup);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-aw-nr580.c linux-2.6.35.7/arch/mips/ar71xx/mach-aw-nr580.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-aw-nr580.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/mach-aw-nr580.c 2010-10-14 20:27:57.334787684 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/mach-aw-nr580.c linux-2.6.36/arch/mips/ar71xx/mach-aw-nr580.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/mach-aw-nr580.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/mach-aw-nr580.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,101 @@
+/*
+ * AzureWave AW-NR580 board support
@@ -3297,9 +3423,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-aw-nr580.c linux-2.6.35.7/ar
+
+MIPS_MACHINE(AR71XX_MACH_AW_NR580, "AW-NR580", "AzureWave AW-NR580",
+ aw_nr580_setup);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-dir-600-a1.c linux-2.6.35.7/arch/mips/ar71xx/mach-dir-600-a1.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-dir-600-a1.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/mach-dir-600-a1.c 2010-10-14 20:27:57.384602615 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/mach-dir-600-a1.c linux-2.6.36/arch/mips/ar71xx/mach-dir-600-a1.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/mach-dir-600-a1.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/mach-dir-600-a1.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,138 @@
+/*
+ * D-Link DIR-600 rev. A1 board support
@@ -3439,9 +3565,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-dir-600-a1.c linux-2.6.35.7/
+
+MIPS_MACHINE(AR71XX_MACH_DIR_600_A1, "DIR-600-A1", "D-Link DIR-600 rev. A1",
+ dir_600_a1_setup);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-dir-615-c1.c linux-2.6.35.7/arch/mips/ar71xx/mach-dir-615-c1.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-dir-615-c1.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/mach-dir-615-c1.c 2010-10-14 20:27:57.434406850 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/mach-dir-615-c1.c linux-2.6.36/arch/mips/ar71xx/mach-dir-615-c1.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/mach-dir-615-c1.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/mach-dir-615-c1.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,173 @@
+/*
+ * D-Link DIR-615 rev C1 board support
@@ -3616,9 +3742,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-dir-615-c1.c linux-2.6.35.7/
+
+MIPS_MACHINE(AR71XX_MACH_DIR_615_C1, "DIR-615-C1", "D-Link DIR-615 rev. C1",
+ dir_615c1_setup);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-dir-825-b1.c linux-2.6.35.7/arch/mips/ar71xx/mach-dir-825-b1.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-dir-825-b1.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/mach-dir-825-b1.c 2010-10-14 20:27:57.478101111 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/mach-dir-825-b1.c linux-2.6.36/arch/mips/ar71xx/mach-dir-825-b1.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/mach-dir-825-b1.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/mach-dir-825-b1.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,192 @@
+/*
+ * D-Link DIR-825 rev. B1 board support
@@ -3812,9 +3938,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-dir-825-b1.c linux-2.6.35.7/
+
+MIPS_MACHINE(AR71XX_MACH_DIR_825_B1, "DIR-825-B1", "D-Link DIR-825 rev. B1",
+ dir825b1_setup);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-mzk-w04nu.c linux-2.6.35.7/arch/mips/ar71xx/mach-mzk-w04nu.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-mzk-w04nu.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/mach-mzk-w04nu.c 2010-10-14 20:27:57.518101300 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/mach-mzk-w04nu.c linux-2.6.36/arch/mips/ar71xx/mach-mzk-w04nu.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/mach-mzk-w04nu.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/mach-mzk-w04nu.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,165 @@
+/*
+ * Planex MZK-W04NU board support
@@ -3981,9 +4107,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-mzk-w04nu.c linux-2.6.35.7/a
+
+MIPS_MACHINE(AR71XX_MACH_MZK_W04NU, "MZK-W04NU", "Planex MZK-W04NU",
+ mzk_w04nu_setup);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-mzk-w300nh.c linux-2.6.35.7/arch/mips/ar71xx/mach-mzk-w300nh.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-mzk-w300nh.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/mach-mzk-w300nh.c 2010-10-14 20:27:57.565601159 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/mach-mzk-w300nh.c linux-2.6.36/arch/mips/ar71xx/mach-mzk-w300nh.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/mach-mzk-w300nh.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/mach-mzk-w300nh.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,158 @@
+/*
+ * Planex MZK-W300NH board support
@@ -4143,9 +4269,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-mzk-w300nh.c linux-2.6.35.7/
+
+MIPS_MACHINE(AR71XX_MACH_MZK_W300NH, "MZK-W300NH", "Planex MZK-W300NH",
+ mzk_w300nh_setup);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-nbg460n.c linux-2.6.35.7/arch/mips/ar71xx/mach-nbg460n.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-nbg460n.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/mach-nbg460n.c 2010-10-14 20:27:57.617104398 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/mach-nbg460n.c linux-2.6.36/arch/mips/ar71xx/mach-nbg460n.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/mach-nbg460n.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/mach-nbg460n.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,222 @@
+/*
+ * Zyxel NBG 460N/550N/550NH board support
@@ -4369,9 +4495,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-nbg460n.c linux-2.6.35.7/arc
+}
+
+MIPS_MACHINE(AR71XX_MACH_NBG460N, "NBG460N", "Zyxel NBG460N/550N/550NH", nbg460n_setup);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-pb42.c linux-2.6.35.7/arch/mips/ar71xx/mach-pb42.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-pb42.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/mach-pb42.c 2010-10-14 20:27:57.665601166 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/mach-pb42.c linux-2.6.36/arch/mips/ar71xx/mach-pb42.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/mach-pb42.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/mach-pb42.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,71 @@
+/*
+ * Atheros PB42 board support
@@ -4444,9 +4570,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-pb42.c linux-2.6.35.7/arch/m
+}
+
+MIPS_MACHINE(AR71XX_MACH_PB42, "PB42", "Atheros PB42", pb42_init);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-pb44.c linux-2.6.35.7/arch/mips/ar71xx/mach-pb44.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-pb44.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/mach-pb44.c 2010-10-14 20:27:57.725015448 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/mach-pb44.c linux-2.6.36/arch/mips/ar71xx/mach-pb44.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/mach-pb44.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/mach-pb44.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,207 @@
+/*
+ * Atheros PB44 board support
@@ -4655,9 +4781,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-pb44.c linux-2.6.35.7/arch/m
+}
+
+MIPS_MACHINE(AR71XX_MACH_PB44, "PB44", "Atheros PB44", pb44_init);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-pb92.c linux-2.6.35.7/arch/mips/ar71xx/mach-pb92.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-pb92.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/mach-pb92.c 2010-10-14 20:27:57.774807434 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/mach-pb92.c linux-2.6.36/arch/mips/ar71xx/mach-pb92.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/mach-pb92.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/mach-pb92.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,109 @@
+/*
+ * Atheros PB92 board support
@@ -4768,9 +4894,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-pb92.c linux-2.6.35.7/arch/m
+}
+
+MIPS_MACHINE(AR71XX_MACH_PB92, "PB92", "Atheros PB92", pb92_init);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-rb4xx.c linux-2.6.35.7/arch/mips/ar71xx/mach-rb4xx.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-rb4xx.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/mach-rb4xx.c 2010-10-14 20:27:57.824611115 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/mach-rb4xx.c linux-2.6.36/arch/mips/ar71xx/mach-rb4xx.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/mach-rb4xx.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/mach-rb4xx.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,290 @@
+/*
+ * MikroTik RouterBOARD 4xx series support
@@ -5062,9 +5188,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-rb4xx.c linux-2.6.35.7/arch/
+
+MIPS_MACHINE(AR71XX_MACH_RB_493, "493", "MikroTik RouterBOARD 493/AH",
+ rb493_setup);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-rb750.c linux-2.6.35.7/arch/mips/ar71xx/mach-rb750.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-rb750.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/mach-rb750.c 2010-10-14 20:27:57.874416755 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/mach-rb750.c linux-2.6.36/arch/mips/ar71xx/mach-rb750.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/mach-rb750.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/mach-rb750.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,133 @@
+/*
+ * MikroTik RouterBOARD 750 support
@@ -5199,9 +5325,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-rb750.c linux-2.6.35.7/arch/
+
+MIPS_MACHINE(AR71XX_MACH_RB_750, "750i", "MikroTik RouterBOARD 750",
+ rb750_setup);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-tew-632brp.c linux-2.6.35.7/arch/mips/ar71xx/mach-tew-632brp.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-tew-632brp.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/mach-tew-632brp.c 2010-10-14 20:27:57.916006386 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/mach-tew-632brp.c linux-2.6.36/arch/mips/ar71xx/mach-tew-632brp.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/mach-tew-632brp.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/mach-tew-632brp.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,149 @@
+/*
+ * TrendNET TEW-632BRP board support
@@ -5352,9 +5478,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-tew-632brp.c linux-2.6.35.7/
+
+MIPS_MACHINE(AR71XX_MACH_TEW_632BRP, "TEW-632BRP", "TRENDnet TEW-632BRP",
+ tew_632brp_setup);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-tl-wr1043nd.c linux-2.6.35.7/arch/mips/ar71xx/mach-tl-wr1043nd.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-tl-wr1043nd.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/mach-tl-wr1043nd.c 2010-10-14 20:27:57.964353043 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/mach-tl-wr1043nd.c linux-2.6.36/arch/mips/ar71xx/mach-tl-wr1043nd.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/mach-tl-wr1043nd.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/mach-tl-wr1043nd.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,156 @@
+/*
+ * TP-LINK TL-WR1043ND board support
@@ -5512,9 +5638,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-tl-wr1043nd.c linux-2.6.35.7
+
+MIPS_MACHINE(AR71XX_MACH_TL_WR1043ND, "TL-WR1043ND", "TP-LINK TL-WR1043ND",
+ tl_wr1043nd_setup);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-tl-wr741nd.c linux-2.6.35.7/arch/mips/ar71xx/mach-tl-wr741nd.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-tl-wr741nd.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/mach-tl-wr741nd.c 2010-10-14 20:27:58.005601016 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/mach-tl-wr741nd.c linux-2.6.36/arch/mips/ar71xx/mach-tl-wr741nd.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/mach-tl-wr741nd.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/mach-tl-wr741nd.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,115 @@
+/*
+ * TP-LINK TL-WR741ND board support
@@ -5631,9 +5757,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-tl-wr741nd.c linux-2.6.35.7/
+}
+MIPS_MACHINE(AR71XX_MACH_TL_WR741ND, "TL-WR741ND", "TP-LINK TL-WR741ND",
+ tl_wr741nd_setup);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-tl-wr841n.c linux-2.6.35.7/arch/mips/ar71xx/mach-tl-wr841n.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-tl-wr841n.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/mach-tl-wr841n.c 2010-10-14 20:27:58.057141646 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/mach-tl-wr841n.c linux-2.6.36/arch/mips/ar71xx/mach-tl-wr841n.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/mach-tl-wr841n.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/mach-tl-wr841n.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,143 @@
+/*
+ * TP-LINK TL-WR841N board support
@@ -5778,9 +5904,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-tl-wr841n.c linux-2.6.35.7/a
+
+MIPS_MACHINE(AR71XX_MACH_TL_WR841N_V1, "TL-WR841N-v1.5", "TP-LINK TL-WR841N v1",
+ tl_wr841n_v1_setup);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-tl-wr941nd.c linux-2.6.35.7/arch/mips/ar71xx/mach-tl-wr941nd.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-tl-wr941nd.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/mach-tl-wr941nd.c 2010-10-14 20:27:58.095601080 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/mach-tl-wr941nd.c linux-2.6.36/arch/mips/ar71xx/mach-tl-wr941nd.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/mach-tl-wr941nd.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/mach-tl-wr941nd.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,142 @@
+/*
+ * TP-LINK TL-WR941ND board support
@@ -5924,73 +6050,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-tl-wr941nd.c linux-2.6.35.7/
+
+MIPS_MACHINE(AR71XX_MACH_TL_WR941ND, "TL-WR941ND", "TP-LINK TL-WR941ND",
+ tl_wr941nd_setup);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/machtype.h linux-2.6.35.7/arch/mips/ar71xx/machtype.h
---- linux-2.6.35.7.orig/arch/mips/ar71xx/machtype.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/machtype.h 2010-10-14 20:27:58.135601194 +0200
-@@ -0,0 +1,60 @@
-+/*
-+ * Atheros AR71xx machine type definitions
-+ *
-+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
-+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ */
-+
-+#ifndef _AR71XX_MACHTYPE_H
-+#define _AR71XX_MACHTYPE_H
-+
-+#include <asm/mips_machine.h>
-+
-+enum ar71xx_mach_type {
-+ AR71XX_MACH_GENERIC = 0,
-+ AR71XX_MACH_AP81, /* Atheros AP81 */
-+ AR71XX_MACH_AP83, /* Atheros AP83 */
-+ AR71XX_MACH_AW_NR580, /* AzureWave AW-NR580 */
-+ AR71XX_MACH_DIR_600_A1, /* D-Link DIR-600 rev. A1 */
-+ AR71XX_MACH_DIR_615_C1, /* D-Link DIR-615 rev. C1 */
-+ AR71XX_MACH_DIR_825_B1, /* D-Link DIR-825 rev. B1 */
-+ AR71XX_MACH_RB_411, /* MikroTik RouterBOARD 411/411A/411AH */
-+ AR71XX_MACH_RB_411U, /* MikroTik RouterBOARD 411U */
-+ AR71XX_MACH_RB_433, /* MikroTik RouterBOARD 433/433AH */
-+ AR71XX_MACH_RB_433U, /* MikroTik RouterBOARD 433UAH */
-+ AR71XX_MACH_RB_450, /* MikroTik RouterBOARD 450 */
-+ AR71XX_MACH_RB_450G, /* MikroTik RouterBOARD 450G */
-+ AR71XX_MACH_RB_493, /* Mikrotik RouterBOARD 493/493AH */
-+ AR71XX_MACH_RB_750, /* MikroTik RouterBOARD 750 */
-+ AR71XX_MACH_PB42, /* Atheros PB42 */
-+ AR71XX_MACH_PB44, /* Atheros PB44 */
-+ AR71XX_MACH_PB92, /* Atheros PB92 */
-+ AR71XX_MACH_MZK_W04NU, /* Planex MZK-W04NU */
-+ AR71XX_MACH_MZK_W300NH, /* Planex MZK-W300NH */
-+ AR71XX_MACH_NBG460N, /* Zyxel NBG460N/550N/550NH */
-+ AR71XX_MACH_TEW_632BRP, /* TRENDnet TEW-632BRP */
-+ AR71XX_MACH_TL_WR741ND, /* TP-LINK TL-WR741ND */
-+ AR71XX_MACH_TL_WR841N_V1, /* TP-LINK TL-WR841N v1 */
-+ AR71XX_MACH_TL_WR941ND, /* TP-LINK TL-WR941ND */
-+ AR71XX_MACH_TL_WR1043ND, /* TP-LINK TL-WR1041ND */
-+ AR71XX_MACH_UBNT_LSSR71, /* Ubiquiti LS-SR71 */
-+ AR71XX_MACH_UBNT_LSX, /* Ubiquiti LSX */
-+ AR71XX_MACH_UBNT_RS, /* Ubiquiti RouterStation */
-+ AR71XX_MACH_UBNT_AR71XX, /* Ubiquiti AR71xx-based board */
-+ AR71XX_MACH_UBNT_RSPRO, /* Ubiquiti RouterStation Pro */
-+ AR71XX_MACH_UBNT_BULLET_M, /* Ubiquiti Bullet M */
-+ AR71XX_MACH_UBNT_ROCKET_M, /* Ubiquiti Rocket M */
-+ AR71XX_MACH_UBNT_NANO_M, /* Ubiquiti NanoStation M */
-+ AR71XX_MACH_WNDR3700, /* NETGEAR WNDR3700 */
-+ AR71XX_MACH_WNR2000, /* NETGEAR WNR2000 */
-+ AR71XX_MACH_WP543, /* Compex WP543 */
-+ AR71XX_MACH_WRT160NL, /* Linksys WRT160NL */
-+ AR71XX_MACH_WRT400N, /* Linksys WRT400N */
-+ AR71XX_MACH_WZR_HP_G300NH, /* Buffalo WZR-HP-G300NH */
-+};
-+
-+#endif /* _AR71XX_MACHTYPE_H */
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-ubnt.c linux-2.6.35.7/arch/mips/ar71xx/mach-ubnt.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-ubnt.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/mach-ubnt.c 2010-10-14 20:27:58.190029906 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/mach-ubnt.c linux-2.6.36/arch/mips/ar71xx/mach-ubnt.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/mach-ubnt.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/mach-ubnt.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,281 @@
+/*
+ * Ubiquiti RouterStation support
@@ -6273,9 +6335,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-ubnt.c linux-2.6.35.7/arch/m
+
+MIPS_MACHINE(AR71XX_MACH_UBNT_NANO_M, "UBNT-NM", "Ubiquiti Nanostation M",
+ ubnt_nano_m_setup);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wndr3700.c linux-2.6.35.7/arch/mips/ar71xx/mach-wndr3700.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wndr3700.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/mach-wndr3700.c 2010-10-14 20:27:58.228101285 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/mach-wndr3700.c linux-2.6.36/arch/mips/ar71xx/mach-wndr3700.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/mach-wndr3700.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/mach-wndr3700.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,209 @@
+/*
+ * Netgear WNDR3700 board support
@@ -6486,9 +6548,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wndr3700.c linux-2.6.35.7/ar
+
+MIPS_MACHINE(AR71XX_MACH_WNDR3700, "WNDR3700", "NETGEAR WNDR3700",
+ wndr3700_setup);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wnr2000.c linux-2.6.35.7/arch/mips/ar71xx/mach-wnr2000.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wnr2000.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/mach-wnr2000.c 2010-10-14 20:27:58.268101150 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/mach-wnr2000.c linux-2.6.36/arch/mips/ar71xx/mach-wnr2000.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/mach-wnr2000.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/mach-wnr2000.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,148 @@
+/*
+ * NETGEAR WNR2000 board support
@@ -6638,9 +6700,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wnr2000.c linux-2.6.35.7/arc
+}
+
+MIPS_MACHINE(AR71XX_MACH_WNR2000, "WNR2000", "NETGEAR WNR2000", wnr2000_setup);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wp543.c linux-2.6.35.7/arch/mips/ar71xx/mach-wp543.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wp543.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/mach-wp543.c 2010-10-14 20:27:58.314545632 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/mach-wp543.c linux-2.6.36/arch/mips/ar71xx/mach-wp543.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/mach-wp543.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/mach-wp543.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,99 @@
+/*
+ * Compex WP543/WPJ543 board support
@@ -6741,9 +6803,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wp543.c linux-2.6.35.7/arch/
+}
+
+MIPS_MACHINE(AR71XX_MACH_WP543, "WP543", "Compex WP543", wp543_setup);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wrt160nl.c linux-2.6.35.7/arch/mips/ar71xx/mach-wrt160nl.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wrt160nl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/mach-wrt160nl.c 2010-10-14 20:27:58.364348612 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/mach-wrt160nl.c linux-2.6.36/arch/mips/ar71xx/mach-wrt160nl.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/mach-wrt160nl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/mach-wrt160nl.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,158 @@
+/*
+ * Linksys WRT160NL board support
@@ -6903,9 +6965,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wrt160nl.c linux-2.6.35.7/ar
+
+MIPS_MACHINE(AR71XX_MACH_WRT160NL, "WRT160NL", "Linksys WRT160NL",
+ wrt160nl_setup);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wrt400n.c linux-2.6.35.7/arch/mips/ar71xx/mach-wrt400n.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wrt400n.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/mach-wrt400n.c 2010-10-14 20:27:58.414355031 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/mach-wrt400n.c linux-2.6.36/arch/mips/ar71xx/mach-wrt400n.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/mach-wrt400n.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/mach-wrt400n.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,168 @@
+/*
+ * Linksys WRT400N board support
@@ -7075,9 +7137,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wrt400n.c linux-2.6.35.7/arc
+}
+
+MIPS_MACHINE(AR71XX_MACH_WRT400N, "WRT400N", "Linksys WRT400N", wrt400n_setup);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wzr-hp-g300nh.c linux-2.6.35.7/arch/mips/ar71xx/mach-wzr-hp-g300nh.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wzr-hp-g300nh.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/mach-wzr-hp-g300nh.c 2010-10-14 20:27:58.455673598 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/mach-wzr-hp-g300nh.c linux-2.6.36/arch/mips/ar71xx/mach-wzr-hp-g300nh.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/mach-wzr-hp-g300nh.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/mach-wzr-hp-g300nh.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,265 @@
+/*
+ * Buffalo WZR-HP-G300NH board support
@@ -7344,67 +7406,73 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wzr-hp-g300nh.c linux-2.6.35
+
+MIPS_MACHINE(AR71XX_MACH_WZR_HP_G300NH, "WZR-HP-G300NH",
+ "Buffalo WZR-HP-G300NH", wzrhpg300nh_setup);
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/Makefile linux-2.6.35.7/arch/mips/ar71xx/Makefile
---- linux-2.6.35.7.orig/arch/mips/ar71xx/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/Makefile 2010-10-14 20:27:58.505507309 +0200
-@@ -0,0 +1,54 @@
-+#
-+# Makefile for the Atheros AR71xx SoC specific parts of the kernel
-+#
-+# Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
-+# Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-+#
-+# This program is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License version 2 as published
-+# by the Free Software Foundation.
-+
-+obj-y := prom.o irq.o setup.o devices.o gpio.o ar71xx.o
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/machtype.h linux-2.6.36/arch/mips/ar71xx/machtype.h
+--- linux-2.6.36.orig/arch/mips/ar71xx/machtype.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/machtype.h 2010-11-18 21:16:05.000000000 +0100
+@@ -0,0 +1,60 @@
++/*
++ * Atheros AR71xx machine type definitions
++ *
++ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
++ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published
++ * by the Free Software Foundation.
++ */
+
-+obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
-+obj-$(CONFIG_PCI) += pci.o
++#ifndef _AR71XX_MACHTYPE_H
++#define _AR71XX_MACHTYPE_H
+
-+obj-$(CONFIG_AR71XX_DEV_AP91_ETH) += dev-ap91-eth.o
-+obj-$(CONFIG_AR71XX_DEV_AP91_PCI) += dev-ap91-pci.o
-+obj-$(CONFIG_AR71XX_DEV_AP94_PCI) += dev-ap94-pci.o
-+obj-$(CONFIG_AR71XX_DEV_AR913X_WMAC) += dev-ar913x-wmac.o
-+obj-$(CONFIG_AR71XX_DEV_DSA) += dev-dsa.o
-+obj-$(CONFIG_AR71XX_DEV_GPIO_BUTTONS) += dev-gpio-buttons.o
-+obj-$(CONFIG_AR71XX_DEV_LEDS_GPIO) += dev-leds-gpio.o
-+obj-$(CONFIG_AR71XX_DEV_M25P80) += dev-m25p80.o
-+obj-$(CONFIG_AR71XX_DEV_PB42_PCI) += dev-pb42-pci.o
-+obj-$(CONFIG_AR71XX_DEV_PB9X_PCI) += dev-pb9x-pci.o
-+obj-$(CONFIG_AR71XX_DEV_USB) += dev-usb.o
++#include <asm/mips_machine.h>
+
-+obj-$(CONFIG_AR71XX_NVRAM) += nvram.o
++enum ar71xx_mach_type {
++ AR71XX_MACH_GENERIC = 0,
++ AR71XX_MACH_AP81, /* Atheros AP81 */
++ AR71XX_MACH_AP83, /* Atheros AP83 */
++ AR71XX_MACH_AW_NR580, /* AzureWave AW-NR580 */
++ AR71XX_MACH_DIR_600_A1, /* D-Link DIR-600 rev. A1 */
++ AR71XX_MACH_DIR_615_C1, /* D-Link DIR-615 rev. C1 */
++ AR71XX_MACH_DIR_825_B1, /* D-Link DIR-825 rev. B1 */
++ AR71XX_MACH_RB_411, /* MikroTik RouterBOARD 411/411A/411AH */
++ AR71XX_MACH_RB_411U, /* MikroTik RouterBOARD 411U */
++ AR71XX_MACH_RB_433, /* MikroTik RouterBOARD 433/433AH */
++ AR71XX_MACH_RB_433U, /* MikroTik RouterBOARD 433UAH */
++ AR71XX_MACH_RB_450, /* MikroTik RouterBOARD 450 */
++ AR71XX_MACH_RB_450G, /* MikroTik RouterBOARD 450G */
++ AR71XX_MACH_RB_493, /* Mikrotik RouterBOARD 493/493AH */
++ AR71XX_MACH_RB_750, /* MikroTik RouterBOARD 750 */
++ AR71XX_MACH_PB42, /* Atheros PB42 */
++ AR71XX_MACH_PB44, /* Atheros PB44 */
++ AR71XX_MACH_PB92, /* Atheros PB92 */
++ AR71XX_MACH_MZK_W04NU, /* Planex MZK-W04NU */
++ AR71XX_MACH_MZK_W300NH, /* Planex MZK-W300NH */
++ AR71XX_MACH_NBG460N, /* Zyxel NBG460N/550N/550NH */
++ AR71XX_MACH_TEW_632BRP, /* TRENDnet TEW-632BRP */
++ AR71XX_MACH_TL_WR741ND, /* TP-LINK TL-WR741ND */
++ AR71XX_MACH_TL_WR841N_V1, /* TP-LINK TL-WR841N v1 */
++ AR71XX_MACH_TL_WR941ND, /* TP-LINK TL-WR941ND */
++ AR71XX_MACH_TL_WR1043ND, /* TP-LINK TL-WR1041ND */
++ AR71XX_MACH_UBNT_LSSR71, /* Ubiquiti LS-SR71 */
++ AR71XX_MACH_UBNT_LSX, /* Ubiquiti LSX */
++ AR71XX_MACH_UBNT_RS, /* Ubiquiti RouterStation */
++ AR71XX_MACH_UBNT_AR71XX, /* Ubiquiti AR71xx-based board */
++ AR71XX_MACH_UBNT_RSPRO, /* Ubiquiti RouterStation Pro */
++ AR71XX_MACH_UBNT_BULLET_M, /* Ubiquiti Bullet M */
++ AR71XX_MACH_UBNT_ROCKET_M, /* Ubiquiti Rocket M */
++ AR71XX_MACH_UBNT_NANO_M, /* Ubiquiti NanoStation M */
++ AR71XX_MACH_WNDR3700, /* NETGEAR WNDR3700 */
++ AR71XX_MACH_WNR2000, /* NETGEAR WNR2000 */
++ AR71XX_MACH_WP543, /* Compex WP543 */
++ AR71XX_MACH_WRT160NL, /* Linksys WRT160NL */
++ AR71XX_MACH_WRT400N, /* Linksys WRT400N */
++ AR71XX_MACH_WZR_HP_G300NH, /* Buffalo WZR-HP-G300NH */
++};
+
-+obj-$(CONFIG_AR71XX_MACH_AP81) += mach-ap81.o
-+obj-$(CONFIG_AR71XX_MACH_AP83) += mach-ap83.o
-+obj-$(CONFIG_AR71XX_MACH_AW_NR580) += mach-aw-nr580.o
-+obj-$(CONFIG_AR71XX_MACH_DIR_600_A1) += mach-dir-600-a1.o
-+obj-$(CONFIG_AR71XX_MACH_DIR_615_C1) += mach-dir-615-c1.o
-+obj-$(CONFIG_AR71XX_MACH_DIR_825_B1) += mach-dir-825-b1.o
-+obj-$(CONFIG_AR71XX_MACH_MZK_W04NU) += mach-mzk-w04nu.o
-+obj-$(CONFIG_AR71XX_MACH_MZK_W300NH) += mach-mzk-w300nh.o
-+obj-$(CONFIG_AR71XX_MACH_NBG460N) += mach-nbg460n.o
-+obj-$(CONFIG_AR71XX_MACH_PB42) += mach-pb42.o
-+obj-$(CONFIG_AR71XX_MACH_PB44) += mach-pb44.o
-+obj-$(CONFIG_AR71XX_MACH_PB92) += mach-pb92.o
-+obj-$(CONFIG_AR71XX_MACH_RB4XX) += mach-rb4xx.o
-+obj-$(CONFIG_AR71XX_MACH_RB750) += mach-rb750.o
-+obj-$(CONFIG_AR71XX_MACH_TEW_632BRP) += mach-tew-632brp.o
-+obj-$(CONFIG_AR71XX_MACH_TL_WR741ND) += mach-tl-wr741nd.o
-+obj-$(CONFIG_AR71XX_MACH_TL_WR841N_V1) += mach-tl-wr841n.o
-+obj-$(CONFIG_AR71XX_MACH_TL_WR941ND) += mach-tl-wr941nd.o
-+obj-$(CONFIG_AR71XX_MACH_TL_WR1043ND) += mach-tl-wr1043nd.o
-+obj-$(CONFIG_AR71XX_MACH_UBNT) += mach-ubnt.o
-+obj-$(CONFIG_AR71XX_MACH_WNDR3700) += mach-wndr3700.o
-+obj-$(CONFIG_AR71XX_MACH_WNR2000) += mach-wnr2000.o
-+obj-$(CONFIG_AR71XX_MACH_WP543) += mach-wp543.o
-+obj-$(CONFIG_AR71XX_MACH_WRT160NL) += mach-wrt160nl.o
-+obj-$(CONFIG_AR71XX_MACH_WRT400N) += mach-wrt400n.o
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/nvram.c linux-2.6.35.7/arch/mips/ar71xx/nvram.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/nvram.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/nvram.c 2010-10-14 20:27:58.555317270 +0200
++#endif /* _AR71XX_MACHTYPE_H */
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/nvram.c linux-2.6.36/arch/mips/ar71xx/nvram.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/nvram.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/nvram.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,75 @@
+/*
+ * Atheros AR71xx minimal nvram support
@@ -7481,9 +7549,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/nvram.c linux-2.6.35.7/arch/mips/
+ vfree(buf);
+ return ret;
+}
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/nvram.h linux-2.6.35.7/arch/mips/ar71xx/nvram.h
---- linux-2.6.35.7.orig/arch/mips/ar71xx/nvram.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/nvram.h 2010-10-14 20:27:58.608101134 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/nvram.h linux-2.6.36/arch/mips/ar71xx/nvram.h
+--- linux-2.6.36.orig/arch/mips/ar71xx/nvram.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/nvram.h 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,19 @@
+/*
+ * Atheros AR71xx minimal nvram support
@@ -7504,9 +7572,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/nvram.h linux-2.6.35.7/arch/mips/
+ const char *name, char *mac) __init;
+
+#endif /* _AR71XX_NVRAM_H */
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/pci.c linux-2.6.35.7/arch/mips/ar71xx/pci.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/pci.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/pci.c 2010-10-14 20:27:58.654350228 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/pci.c linux-2.6.36/arch/mips/ar71xx/pci.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/pci.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/pci.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,93 @@
+/*
+ * Atheros AR71xx PCI setup code
@@ -7601,9 +7669,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/pci.c linux-2.6.35.7/arch/mips/ar
+
+ return ret;
+}
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/prom.c linux-2.6.35.7/arch/mips/ar71xx/prom.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/prom.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/prom.c 2010-10-14 20:27:58.704773879 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/prom.c linux-2.6.36/arch/mips/ar71xx/prom.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/prom.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/prom.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,105 @@
+/*
+ * Atheros AR71xx SoC specific prom routines
@@ -7710,9 +7778,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/prom.c linux-2.6.35.7/arch/mips/a
+{
+ /* We do not have to prom memory to free */
+}
-diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/setup.c linux-2.6.35.7/arch/mips/ar71xx/setup.c
---- linux-2.6.35.7.orig/arch/mips/ar71xx/setup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/ar71xx/setup.c 2010-10-14 20:27:58.754579813 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/ar71xx/setup.c linux-2.6.36/arch/mips/ar71xx/setup.c
+--- linux-2.6.36.orig/arch/mips/ar71xx/setup.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/ar71xx/setup.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,310 @@
+/*
+ * Atheros AR71xx SoC specific setup
@@ -8024,9 +8092,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/setup.c linux-2.6.35.7/arch/mips/
+
+MIPS_MACHINE(AR71XX_MACH_GENERIC, "Generic", "Generic AR71xx board",
+ ar71xx_generic_init);
-diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/ar71xx.h linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/ar71xx.h
---- linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/ar71xx.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/ar71xx.h 2010-10-14 20:27:58.804410665 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/include/asm/mach-ar71xx/ar71xx.h linux-2.6.36/arch/mips/include/asm/mach-ar71xx/ar71xx.h
+--- linux-2.6.36.orig/arch/mips/include/asm/mach-ar71xx/ar71xx.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/include/asm/mach-ar71xx/ar71xx.h 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,514 @@
+/*
+ * Atheros AR71xx SoC specific definitions
@@ -8542,9 +8610,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/ar71xx.h linux-2
+#endif /* __ASSEMBLER__ */
+
+#endif /* __ASM_MACH_AR71XX_H */
-diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/ar91xx_flash.h linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/ar91xx_flash.h
---- linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/ar91xx_flash.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/ar91xx_flash.h 2010-10-14 20:27:58.848101151 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/include/asm/mach-ar71xx/ar91xx_flash.h linux-2.6.36/arch/mips/include/asm/mach-ar71xx/ar91xx_flash.h
+--- linux-2.6.36.orig/arch/mips/include/asm/mach-ar71xx/ar91xx_flash.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/include/asm/mach-ar71xx/ar91xx_flash.h 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,26 @@
+/*
+ * AR91xx parallel flash driver platform data definitions
@@ -8572,9 +8640,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/ar91xx_flash.h l
+};
+
+#endif /* __AR91XX_FLASH_H */
-diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/cpu-feature-overrides.h linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/cpu-feature-overrides.h
---- linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/cpu-feature-overrides.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/cpu-feature-overrides.h 2010-10-14 20:27:58.895601086 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/include/asm/mach-ar71xx/cpu-feature-overrides.h linux-2.6.36/arch/mips/include/asm/mach-ar71xx/cpu-feature-overrides.h
+--- linux-2.6.36.orig/arch/mips/include/asm/mach-ar71xx/cpu-feature-overrides.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/include/asm/mach-ar71xx/cpu-feature-overrides.h 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,56 @@
+/*
+ * Atheros AR71xx specific CPU feature overrides
@@ -8632,9 +8700,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/cpu-feature-over
+#define cpu_icache_line_size() 32
+
+#endif /* __ASM_MACH_AR71XX_CPU_FEATURE_OVERRIDES_H */
-diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/gpio.h linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/gpio.h
---- linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/gpio.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/gpio.h 2010-10-14 20:27:58.945582628 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/include/asm/mach-ar71xx/gpio.h linux-2.6.36/arch/mips/include/asm/mach-ar71xx/gpio.h
+--- linux-2.6.36.orig/arch/mips/include/asm/mach-ar71xx/gpio.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/include/asm/mach-ar71xx/gpio.h 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,53 @@
+/*
+ * Atheros AR71xx GPIO API definitions
@@ -8689,9 +8757,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/gpio.h linux-2.6
+#define gpio_cansleep __gpio_cansleep
+
+#endif /* __ASM_MACH_AR71XX_GPIO_H */
-diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/irq.h linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/irq.h
---- linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/irq.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/irq.h 2010-10-14 20:27:58.994356523 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/include/asm/mach-ar71xx/irq.h linux-2.6.36/arch/mips/include/asm/mach-ar71xx/irq.h
+--- linux-2.6.36.orig/arch/mips/include/asm/mach-ar71xx/irq.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/include/asm/mach-ar71xx/irq.h 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
@@ -8710,9 +8778,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/irq.h linux-2.6.
+#include_next <irq.h>
+
+#endif /* __ASM_MACH_AR71XX_IRQ_H */
-diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/kernel-entry-init.h linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/kernel-entry-init.h
---- linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/kernel-entry-init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/kernel-entry-init.h 2010-10-14 20:27:59.045181409 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/include/asm/mach-ar71xx/kernel-entry-init.h linux-2.6.36/arch/mips/include/asm/mach-ar71xx/kernel-entry-init.h
+--- linux-2.6.36.orig/arch/mips/include/asm/mach-ar71xx/kernel-entry-init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/include/asm/mach-ar71xx/kernel-entry-init.h 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,32 @@
+/*
+ * Atheros AR71xx specific kernel entry setup
@@ -8746,9 +8814,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/kernel-entry-ini
+ .endm
+
+#endif /* __ASM_MACH_AR71XX_KERNEL_ENTRY_H */
-diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/mach-rb750.h linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/mach-rb750.h
---- linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/mach-rb750.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/mach-rb750.h 2010-10-14 20:27:59.095024740 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/include/asm/mach-ar71xx/mach-rb750.h linux-2.6.36/arch/mips/include/asm/mach-ar71xx/mach-rb750.h
+--- linux-2.6.36.orig/arch/mips/include/asm/mach-ar71xx/mach-rb750.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/include/asm/mach-ar71xx/mach-rb750.h 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,66 @@
+/*
+ * MikroTik RouterBOARD 750 definitions
@@ -8817,9 +8885,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/mach-rb750.h lin
+
+#endif /* _MACH_RB750_H */
\ No newline at end of file
-diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/mangle-port.h linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/mangle-port.h
---- linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/mangle-port.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/mangle-port.h 2010-10-14 20:27:59.144833241 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/include/asm/mach-ar71xx/mangle-port.h linux-2.6.36/arch/mips/include/asm/mach-ar71xx/mangle-port.h
+--- linux-2.6.36.orig/arch/mips/include/asm/mach-ar71xx/mangle-port.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/include/asm/mach-ar71xx/mangle-port.h 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2008 Gabor Juhos <juhosg@openwrt.org>
@@ -8866,9 +8934,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/mangle-port.h li
+#endif
+
+#endif /* __ASM_MACH_AR71XX_MANGLE_PORT_H */
-diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/pci.h linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/pci.h
---- linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/pci.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/pci.h 2010-10-14 20:27:59.194642423 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/include/asm/mach-ar71xx/pci.h linux-2.6.36/arch/mips/include/asm/mach-ar71xx/pci.h
+--- linux-2.6.36.orig/arch/mips/include/asm/mach-ar71xx/pci.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/include/asm/mach-ar71xx/pci.h 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,39 @@
+/*
+ * Atheros AR71xx SoC specific PCI definitions
@@ -8909,9 +8977,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/pci.h linux-2.6.
+int ar71xx_pci_init(unsigned nr_irqs, struct ar71xx_pci_irq *map) __init;
+
+#endif /* __ASM_MACH_AR71XX_PCI_H */
-diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/platform.h linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/platform.h
---- linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/platform.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/platform.h 2010-10-14 20:27:59.252778691 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/include/asm/mach-ar71xx/platform.h linux-2.6.36/arch/mips/include/asm/mach-ar71xx/platform.h
+--- linux-2.6.36.orig/arch/mips/include/asm/mach-ar71xx/platform.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/include/asm/mach-ar71xx/platform.h 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,61 @@
+/*
+ * Atheros AR71xx SoC specific platform data definitions
@@ -8974,9 +9042,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/platform.h linux
+#define AR71XX_SPI_CS_ACTIVE 1
+
+#endif /* __ASM_MACH_AR71XX_PLATFORM_H */
-diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/war.h linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/war.h
---- linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/war.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/war.h 2010-10-14 20:27:59.295939760 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/include/asm/mach-ar71xx/war.h linux-2.6.36/arch/mips/include/asm/mach-ar71xx/war.h
+--- linux-2.6.36.orig/arch/mips/include/asm/mach-ar71xx/war.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/include/asm/mach-ar71xx/war.h 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,25 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
@@ -9003,9 +9071,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/war.h linux-2.6.
+#define MIPS34K_MISSED_ITLB_WAR 0
+
+#endif /* __ASM_MACH_AR71XX_WAR_H */
-diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mips_machine.h linux-2.6.35.7/arch/mips/include/asm/mips_machine.h
---- linux-2.6.35.7.orig/arch/mips/include/asm/mips_machine.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/include/asm/mips_machine.h 2010-10-14 20:27:59.335601098 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/include/asm/mips_machine.h linux-2.6.36/arch/mips/include/asm/mips_machine.h
+--- linux-2.6.36.orig/arch/mips/include/asm/mips_machine.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/include/asm/mips_machine.h 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
@@ -9061,9 +9129,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mips_machine.h linux-2.6.35.
+pure_initcall(register_machine_##_type)
+
+#endif /* __ASM_MIPS_MACHINE_H */
-diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/time.h linux-2.6.35.7/arch/mips/include/asm/time.h
---- linux-2.6.35.7.orig/arch/mips/include/asm/time.h 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/arch/mips/include/asm/time.h 2010-10-14 20:27:59.385601208 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/include/asm/time.h linux-2.6.36/arch/mips/include/asm/time.h
+--- linux-2.6.36.orig/arch/mips/include/asm/time.h 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/arch/mips/include/asm/time.h 2010-11-18 21:16:05.000000000 +0100
@@ -52,6 +52,7 @@
*/
#ifdef CONFIG_CEVT_R4K_LIB
@@ -9072,61 +9140,10 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/time.h linux-2.6.35.7/arch/m
extern int r4k_clockevent_init(void);
#endif
-diff -Nur linux-2.6.35.7.orig/arch/mips/Kconfig linux-2.6.35.7/arch/mips/Kconfig
---- linux-2.6.35.7.orig/arch/mips/Kconfig 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/arch/mips/Kconfig 2010-10-14 20:27:59.436851139 +0200
-@@ -48,6 +48,23 @@
- Support for the Texas Instruments AR7 System-on-a-Chip
- family: TNETD7100, 7200 and 7300.
-
-+config ATHEROS_AR71XX
-+ bool "Atheros AR71xx based boards"
-+ select CEVT_R4K
-+ select CSRC_R4K
-+ select DMA_NONCOHERENT
-+ select HW_HAS_PCI
-+ select IRQ_CPU
-+ select ARCH_REQUIRE_GPIOLIB
-+ select SYS_HAS_CPU_MIPS32_R1
-+ select SYS_HAS_CPU_MIPS32_R2
-+ select SYS_SUPPORTS_32BIT_KERNEL
-+ select SYS_SUPPORTS_BIG_ENDIAN
-+ select SYS_HAS_EARLY_PRINTK
-+ select MIPS_MACHINE
-+ help
-+ Support for Atheros AR71xx based boards.
-+
- config BCM47XX
- bool "Broadcom BCM47XX based boards"
- select CEVT_R4K
-@@ -684,6 +701,7 @@
- endchoice
-
- source "arch/mips/alchemy/Kconfig"
-+source "arch/mips/ar71xx/Kconfig"
- source "arch/mips/bcm63xx/Kconfig"
- source "arch/mips/jazz/Kconfig"
- source "arch/mips/lasat/Kconfig"
-@@ -850,9 +868,15 @@
- config MIPS_DISABLE_OBSOLETE_IDE
- bool
-
-+config MYLOADER
-+ bool
-+
- config SYNC_R4K
- bool
-
-+config MIPS_MACHINE
-+ def_bool n
-+
- config NO_IOPORT
- def_bool n
-
-diff -Nur linux-2.6.35.7.orig/arch/mips/kernel/Makefile linux-2.6.35.7/arch/mips/kernel/Makefile
---- linux-2.6.35.7.orig/arch/mips/kernel/Makefile 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/arch/mips/kernel/Makefile 2010-10-14 20:27:59.485313916 +0200
-@@ -93,6 +93,7 @@
+diff -Nur linux-2.6.36.orig/arch/mips/kernel/Makefile linux-2.6.36/arch/mips/kernel/Makefile
+--- linux-2.6.36.orig/arch/mips/kernel/Makefile 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/arch/mips/kernel/Makefile 2010-11-18 21:16:05.000000000 +0100
+@@ -94,6 +94,7 @@
obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
@@ -9134,9 +9151,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/kernel/Makefile linux-2.6.35.7/arch/mips
obj-$(CONFIG_SPINLOCK_TEST) += spinlock_test.o
CFLAGS_cpu-bugs64.o = $(shell if $(CC) $(KBUILD_CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi)
-diff -Nur linux-2.6.35.7.orig/arch/mips/kernel/mips_machine.c linux-2.6.35.7/arch/mips/kernel/mips_machine.c
---- linux-2.6.35.7.orig/arch/mips/kernel/mips_machine.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/kernel/mips_machine.c 2010-10-14 20:27:59.536722433 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/kernel/mips_machine.c linux-2.6.36/arch/mips/kernel/mips_machine.c
+--- linux-2.6.36.orig/arch/mips/kernel/mips_machine.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/kernel/mips_machine.c 2010-11-18 21:16:05.000000000 +0100
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
@@ -9259,9 +9276,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/kernel/mips_machine.c linux-2.6.35.7/arc
+}
+
+core_initcall(mips_machtype_init);
-diff -Nur linux-2.6.35.7.orig/arch/mips/kernel/proc.c linux-2.6.35.7/arch/mips/kernel/proc.c
---- linux-2.6.35.7.orig/arch/mips/kernel/proc.c 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/arch/mips/kernel/proc.c 2010-10-14 20:27:59.578101125 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/kernel/proc.c linux-2.6.36/arch/mips/kernel/proc.c
+--- linux-2.6.36.orig/arch/mips/kernel/proc.c 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/arch/mips/kernel/proc.c 2010-11-18 21:16:05.000000000 +0100
@@ -12,6 +12,7 @@
#include <asm/cpu-features.h>
#include <asm/mipsregs.h>
@@ -9284,10 +9301,10 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/kernel/proc.c linux-2.6.35.7/arch/mips/k
seq_printf(m, "processor\t\t: %ld\n", n);
sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",
-diff -Nur linux-2.6.35.7.orig/arch/mips/kernel/traps.c linux-2.6.35.7/arch/mips/kernel/traps.c
---- linux-2.6.35.7.orig/arch/mips/kernel/traps.c 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/arch/mips/kernel/traps.c 2010-10-14 20:27:59.634370215 +0200
-@@ -51,6 +51,7 @@
+diff -Nur linux-2.6.36.orig/arch/mips/kernel/traps.c linux-2.6.36/arch/mips/kernel/traps.c
+--- linux-2.6.36.orig/arch/mips/kernel/traps.c 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/arch/mips/kernel/traps.c 2010-11-18 21:16:05.000000000 +0100
+@@ -52,6 +52,7 @@
#include <asm/types.h>
#include <asm/stacktrace.h>
#include <asm/irq.h>
@@ -9295,7 +9312,7 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/kernel/traps.c linux-2.6.35.7/arch/mips/
#include <asm/uasm.h>
extern void check_wait(void);
-@@ -1519,6 +1520,8 @@
+@@ -1539,6 +1540,8 @@
if (cpu_has_mips_r2) {
cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP;
cp0_compare_irq = (read_c0_intctl() >> INTCTLB_IPTI) & 7;
@@ -9304,1768 +9321,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/kernel/traps.c linux-2.6.35.7/arch/mips/
cp0_perfcount_irq = (read_c0_intctl() >> INTCTLB_IPPCI) & 7;
if (cp0_perfcount_irq == cp0_compare_irq)
cp0_perfcount_irq = -1;
-diff -Nur linux-2.6.35.7.orig/arch/mips/kernel/traps.c.orig linux-2.6.35.7/arch/mips/kernel/traps.c.orig
---- linux-2.6.35.7.orig/arch/mips/kernel/traps.c.orig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/kernel/traps.c.orig 2010-09-29 03:09:08.000000000 +0200
-@@ -0,0 +1,1738 @@
-+/*
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License. See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ *
-+ * Copyright (C) 1994 - 1999, 2000, 01, 06 Ralf Baechle
-+ * Copyright (C) 1995, 1996 Paul M. Antoine
-+ * Copyright (C) 1998 Ulf Carlsson
-+ * Copyright (C) 1999 Silicon Graphics, Inc.
-+ * Kevin D. Kissell, kevink@mips.com and Carsten Langgaard, carstenl@mips.com
-+ * Copyright (C) 2000, 01 MIPS Technologies, Inc.
-+ * Copyright (C) 2002, 2003, 2004, 2005, 2007 Maciej W. Rozycki
-+ */
-+#include <linux/bug.h>
-+#include <linux/compiler.h>
-+#include <linux/init.h>
-+#include <linux/mm.h>
-+#include <linux/module.h>
-+#include <linux/sched.h>
-+#include <linux/smp.h>
-+#include <linux/spinlock.h>
-+#include <linux/kallsyms.h>
-+#include <linux/bootmem.h>
-+#include <linux/interrupt.h>
-+#include <linux/ptrace.h>
-+#include <linux/kgdb.h>
-+#include <linux/kdebug.h>
-+#include <linux/notifier.h>
-+#include <linux/kdb.h>
-+
-+#include <asm/bootinfo.h>
-+#include <asm/branch.h>
-+#include <asm/break.h>
-+#include <asm/cop2.h>
-+#include <asm/cpu.h>
-+#include <asm/dsp.h>
-+#include <asm/fpu.h>
-+#include <asm/fpu_emulator.h>
-+#include <asm/mipsregs.h>
-+#include <asm/mipsmtregs.h>
-+#include <asm/module.h>
-+#include <asm/pgtable.h>
-+#include <asm/ptrace.h>
-+#include <asm/sections.h>
-+#include <asm/system.h>
-+#include <asm/tlbdebug.h>
-+#include <asm/traps.h>
-+#include <asm/uaccess.h>
-+#include <asm/watch.h>
-+#include <asm/mmu_context.h>
-+#include <asm/types.h>
-+#include <asm/stacktrace.h>
-+#include <asm/irq.h>
-+#include <asm/uasm.h>
-+
-+extern void check_wait(void);
-+extern asmlinkage void r4k_wait(void);
-+extern asmlinkage void rollback_handle_int(void);
-+extern asmlinkage void handle_int(void);
-+extern asmlinkage void handle_tlbm(void);
-+extern asmlinkage void handle_tlbl(void);
-+extern asmlinkage void handle_tlbs(void);
-+extern asmlinkage void handle_adel(void);
-+extern asmlinkage void handle_ades(void);
-+extern asmlinkage void handle_ibe(void);
-+extern asmlinkage void handle_dbe(void);
-+extern asmlinkage void handle_sys(void);
-+extern asmlinkage void handle_bp(void);
-+extern asmlinkage void handle_ri(void);
-+extern asmlinkage void handle_ri_rdhwr_vivt(void);
-+extern asmlinkage void handle_ri_rdhwr(void);
-+extern asmlinkage void handle_cpu(void);
-+extern asmlinkage void handle_ov(void);
-+extern asmlinkage void handle_tr(void);
-+extern asmlinkage void handle_fpe(void);
-+extern asmlinkage void handle_mdmx(void);
-+extern asmlinkage void handle_watch(void);
-+extern asmlinkage void handle_mt(void);
-+extern asmlinkage void handle_dsp(void);
-+extern asmlinkage void handle_mcheck(void);
-+extern asmlinkage void handle_reserved(void);
-+
-+extern int fpu_emulator_cop1Handler(struct pt_regs *xcp,
-+ struct mips_fpu_struct *ctx, int has_fpu);
-+
-+void (*board_be_init)(void);
-+int (*board_be_handler)(struct pt_regs *regs, int is_fixup);
-+void (*board_nmi_handler_setup)(void);
-+void (*board_ejtag_handler_setup)(void);
-+void (*board_bind_eic_interrupt)(int irq, int regset);
-+
-+
-+static void show_raw_backtrace(unsigned long reg29)
-+{
-+ unsigned long *sp = (unsigned long *)(reg29 & ~3);
-+ unsigned long addr;
-+
-+ printk("Call Trace:");
-+#ifdef CONFIG_KALLSYMS
-+ printk("\n");
-+#endif
-+ while (!kstack_end(sp)) {
-+ unsigned long __user *p =
-+ (unsigned long __user *)(unsigned long)sp++;
-+ if (__get_user(addr, p)) {
-+ printk(" (Bad stack address)");
-+ break;
-+ }
-+ if (__kernel_text_address(addr))
-+ print_ip_sym(addr);
-+ }
-+ printk("\n");
-+}
-+
-+#ifdef CONFIG_KALLSYMS
-+int raw_show_trace;
-+static int __init set_raw_show_trace(char *str)
-+{
-+ raw_show_trace = 1;
-+ return 1;
-+}
-+__setup("raw_show_trace", set_raw_show_trace);
-+#endif
-+
-+static void show_backtrace(struct task_struct *task, const struct pt_regs *regs)
-+{
-+ unsigned long sp = regs->regs[29];
-+ unsigned long ra = regs->regs[31];
-+ unsigned long pc = regs->cp0_epc;
-+
-+ if (raw_show_trace || !__kernel_text_address(pc)) {
-+ show_raw_backtrace(sp);
-+ return;
-+ }
-+ printk("Call Trace:\n");
-+ do {
-+ print_ip_sym(pc);
-+ pc = unwind_stack(task, &sp, pc, &ra);
-+ } while (pc);
-+ printk("\n");
-+}
-+
-+/*
-+ * This routine abuses get_user()/put_user() to reference pointers
-+ * with at least a bit of error checking ...
-+ */
-+static void show_stacktrace(struct task_struct *task,
-+ const struct pt_regs *regs)
-+{
-+ const int field = 2 * sizeof(unsigned long);
-+ long stackdata;
-+ int i;
-+ unsigned long __user *sp = (unsigned long __user *)regs->regs[29];
-+
-+ printk("Stack :");
-+ i = 0;
-+ while ((unsigned long) sp & (PAGE_SIZE - 1)) {
-+ if (i && ((i % (64 / field)) == 0))
-+ printk("\n ");
-+ if (i > 39) {
-+ printk(" ...");
-+ break;
-+ }
-+
-+ if (__get_user(stackdata, sp++)) {
-+ printk(" (Bad stack address)");
-+ break;
-+ }
-+
-+ printk(" %0*lx", field, stackdata);
-+ i++;
-+ }
-+ printk("\n");
-+ show_backtrace(task, regs);
-+}
-+
-+void show_stack(struct task_struct *task, unsigned long *sp)
-+{
-+ struct pt_regs regs;
-+ if (sp) {
-+ regs.regs[29] = (unsigned long)sp;
-+ regs.regs[31] = 0;
-+ regs.cp0_epc = 0;
-+ } else {
-+ if (task && task != current) {
-+ regs.regs[29] = task->thread.reg29;
-+ regs.regs[31] = 0;
-+ regs.cp0_epc = task->thread.reg31;
-+#ifdef CONFIG_KGDB_KDB
-+ } else if (atomic_read(&kgdb_active) != -1 &&
-+ kdb_current_regs) {
-+ memcpy(&regs, kdb_current_regs, sizeof(regs));
-+#endif /* CONFIG_KGDB_KDB */
-+ } else {
-+ prepare_frametrace(&regs);
-+ }
-+ }
-+ show_stacktrace(task, &regs);
-+}
-+
-+/*
-+ * The architecture-independent dump_stack generator
-+ */
-+void dump_stack(void)
-+{
-+ struct pt_regs regs;
-+
-+ prepare_frametrace(&regs);
-+ show_backtrace(current, &regs);
-+}
-+
-+EXPORT_SYMBOL(dump_stack);
-+
-+static void show_code(unsigned int __user *pc)
-+{
-+ long i;
-+ unsigned short __user *pc16 = NULL;
-+
-+ printk("\nCode:");
-+
-+ if ((unsigned long)pc & 1)
-+ pc16 = (unsigned short __user *)((unsigned long)pc & ~1);
-+ for(i = -3 ; i < 6 ; i++) {
-+ unsigned int insn;
-+ if (pc16 ? __get_user(insn, pc16 + i) : __get_user(insn, pc + i)) {
-+ printk(" (Bad address in epc)\n");
-+ break;
-+ }
-+ printk("%c%0*x%c", (i?' ':'<'), pc16 ? 4 : 8, insn, (i?' ':'>'));
-+ }
-+}
-+
-+static void __show_regs(const struct pt_regs *regs)
-+{
-+ const int field = 2 * sizeof(unsigned long);
-+ unsigned int cause = regs->cp0_cause;
-+ int i;
-+
-+ printk("Cpu %d\n", smp_processor_id());
-+
-+ /*
-+ * Saved main processor registers
-+ */
-+ for (i = 0; i < 32; ) {
-+ if ((i % 4) == 0)
-+ printk("$%2d :", i);
-+ if (i == 0)
-+ printk(" %0*lx", field, 0UL);
-+ else if (i == 26 || i == 27)
-+ printk(" %*s", field, "");
-+ else
-+ printk(" %0*lx", field, regs->regs[i]);
-+
-+ i++;
-+ if ((i % 4) == 0)
-+ printk("\n");
-+ }
-+
-+#ifdef CONFIG_CPU_HAS_SMARTMIPS
-+ printk("Acx : %0*lx\n", field, regs->acx);
-+#endif
-+ printk("Hi : %0*lx\n", field, regs->hi);
-+ printk("Lo : %0*lx\n", field, regs->lo);
-+
-+ /*
-+ * Saved cp0 registers
-+ */
-+ printk("epc : %0*lx %pS\n", field, regs->cp0_epc,
-+ (void *) regs->cp0_epc);
-+ printk(" %s\n", print_tainted());
-+ printk("ra : %0*lx %pS\n", field, regs->regs[31],
-+ (void *) regs->regs[31]);
-+
-+ printk("Status: %08x ", (uint32_t) regs->cp0_status);
-+
-+ if (current_cpu_data.isa_level == MIPS_CPU_ISA_I) {
-+ if (regs->cp0_status & ST0_KUO)
-+ printk("KUo ");
-+ if (regs->cp0_status & ST0_IEO)
-+ printk("IEo ");
-+ if (regs->cp0_status & ST0_KUP)
-+ printk("KUp ");
-+ if (regs->cp0_status & ST0_IEP)
-+ printk("IEp ");
-+ if (regs->cp0_status & ST0_KUC)
-+ printk("KUc ");
-+ if (regs->cp0_status & ST0_IEC)
-+ printk("IEc ");
-+ } else {
-+ if (regs->cp0_status & ST0_KX)
-+ printk("KX ");
-+ if (regs->cp0_status & ST0_SX)
-+ printk("SX ");
-+ if (regs->cp0_status & ST0_UX)
-+ printk("UX ");
-+ switch (regs->cp0_status & ST0_KSU) {
-+ case KSU_USER:
-+ printk("USER ");
-+ break;
-+ case KSU_SUPERVISOR:
-+ printk("SUPERVISOR ");
-+ break;
-+ case KSU_KERNEL:
-+ printk("KERNEL ");
-+ break;
-+ default:
-+ printk("BAD_MODE ");
-+ break;
-+ }
-+ if (regs->cp0_status & ST0_ERL)
-+ printk("ERL ");
-+ if (regs->cp0_status & ST0_EXL)
-+ printk("EXL ");
-+ if (regs->cp0_status & ST0_IE)
-+ printk("IE ");
-+ }
-+ printk("\n");
-+
-+ printk("Cause : %08x\n", cause);
-+
-+ cause = (cause & CAUSEF_EXCCODE) >> CAUSEB_EXCCODE;
-+ if (1 <= cause && cause <= 5)
-+ printk("BadVA : %0*lx\n", field, regs->cp0_badvaddr);
-+
-+ printk("PrId : %08x (%s)\n", read_c0_prid(),
-+ cpu_name_string());
-+}
-+
-+/*
-+ * FIXME: really the generic show_regs should take a const pointer argument.
-+ */
-+void show_regs(struct pt_regs *regs)
-+{
-+ __show_regs((struct pt_regs *)regs);
-+}
-+
-+void show_registers(const struct pt_regs *regs)
-+{
-+ const int field = 2 * sizeof(unsigned long);
-+
-+ __show_regs(regs);
-+ print_modules();
-+ printk("Process %s (pid: %d, threadinfo=%p, task=%p, tls=%0*lx)\n",
-+ current->comm, current->pid, current_thread_info(), current,
-+ field, current_thread_info()->tp_value);
-+ if (cpu_has_userlocal) {
-+ unsigned long tls;
-+
-+ tls = read_c0_userlocal();
-+ if (tls != current_thread_info()->tp_value)
-+ printk("*HwTLS: %0*lx\n", field, tls);
-+ }
-+
-+ show_stacktrace(current, regs);
-+ show_code((unsigned int __user *) regs->cp0_epc);
-+ printk("\n");
-+}
-+
-+static DEFINE_SPINLOCK(die_lock);
-+
-+void __noreturn die(const char * str, struct pt_regs * regs)
-+{
-+ static int die_counter;
-+ int sig = SIGSEGV;
-+#ifdef CONFIG_MIPS_MT_SMTC
-+ unsigned long dvpret = dvpe();
-+#endif /* CONFIG_MIPS_MT_SMTC */
-+
-+ notify_die(DIE_OOPS, str, (struct pt_regs *)regs, SIGSEGV, 0, 0);
-+
-+ console_verbose();
-+ spin_lock_irq(&die_lock);
-+ bust_spinlocks(1);
-+#ifdef CONFIG_MIPS_MT_SMTC
-+ mips_mt_regdump(dvpret);
-+#endif /* CONFIG_MIPS_MT_SMTC */
-+
-+ if (notify_die(DIE_OOPS, str, regs, 0, current->thread.trap_no, SIGSEGV) == NOTIFY_STOP)
-+ sig = 0;
-+
-+ printk("%s[#%d]:\n", str, ++die_counter);
-+ show_registers(regs);
-+ add_taint(TAINT_DIE);
-+ spin_unlock_irq(&die_lock);
-+
-+ if (in_interrupt())
-+ panic("Fatal exception in interrupt");
-+
-+ if (panic_on_oops) {
-+ printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n");
-+ ssleep(5);
-+ panic("Fatal exception");
-+ }
-+
-+ do_exit(sig);
-+}
-+
-+extern struct exception_table_entry __start___dbe_table[];
-+extern struct exception_table_entry __stop___dbe_table[];
-+
-+__asm__(
-+" .section __dbe_table, \"a\"\n"
-+" .previous \n");
-+
-+/* Given an address, look for it in the exception tables. */
-+static const struct exception_table_entry *search_dbe_tables(unsigned long addr)
-+{
-+ const struct exception_table_entry *e;
-+
-+ e = search_extable(__start___dbe_table, __stop___dbe_table - 1, addr);
-+ if (!e)
-+ e = search_module_dbetables(addr);
-+ return e;
-+}
-+
-+asmlinkage void do_be(struct pt_regs *regs)
-+{
-+ const int field = 2 * sizeof(unsigned long);
-+ const struct exception_table_entry *fixup = NULL;
-+ int data = regs->cp0_cause & 4;
-+ int action = MIPS_BE_FATAL;
-+
-+ /* XXX For now. Fixme, this searches the wrong table ... */
-+ if (data && !user_mode(regs))
-+ fixup = search_dbe_tables(exception_epc(regs));
-+
-+ if (fixup)
-+ action = MIPS_BE_FIXUP;
-+
-+ if (board_be_handler)
-+ action = board_be_handler(regs, fixup != NULL);
-+
-+ switch (action) {
-+ case MIPS_BE_DISCARD:
-+ return;
-+ case MIPS_BE_FIXUP:
-+ if (fixup) {
-+ regs->cp0_epc = fixup->nextinsn;
-+ return;
-+ }
-+ break;
-+ default:
-+ break;
-+ }
-+
-+ /*
-+ * Assume it would be too dangerous to continue ...
-+ */
-+ printk(KERN_ALERT "%s bus error, epc == %0*lx, ra == %0*lx\n",
-+ data ? "Data" : "Instruction",
-+ field, regs->cp0_epc, field, regs->regs[31]);
-+ if (notify_die(DIE_OOPS, "bus error", regs, SIGBUS, 0, 0)
-+ == NOTIFY_STOP)
-+ return;
-+
-+ die_if_kernel("Oops", regs);
-+ force_sig(SIGBUS, current);
-+}
-+
-+/*
-+ * ll/sc, rdhwr, sync emulation
-+ */
-+
-+#define OPCODE 0xfc000000
-+#define BASE 0x03e00000
-+#define RT 0x001f0000
-+#define OFFSET 0x0000ffff
-+#define LL 0xc0000000
-+#define SC 0xe0000000
-+#define SPEC0 0x00000000
-+#define SPEC3 0x7c000000
-+#define RD 0x0000f800
-+#define FUNC 0x0000003f
-+#define SYNC 0x0000000f
-+#define RDHWR 0x0000003b
-+
-+/*
-+ * The ll_bit is cleared by r*_switch.S
-+ */
-+
-+unsigned int ll_bit;
-+struct task_struct *ll_task;
-+
-+static inline int simulate_ll(struct pt_regs *regs, unsigned int opcode)
-+{
-+ unsigned long value, __user *vaddr;
-+ long offset;
-+
-+ /*
-+ * analyse the ll instruction that just caused a ri exception
-+ * and put the referenced address to addr.
-+ */
-+
-+ /* sign extend offset */
-+ offset = opcode & OFFSET;
-+ offset <<= 16;
-+ offset >>= 16;
-+
-+ vaddr = (unsigned long __user *)
-+ ((unsigned long)(regs->regs[(opcode & BASE) >> 21]) + offset);
-+
-+ if ((unsigned long)vaddr & 3)
-+ return SIGBUS;
-+ if (get_user(value, vaddr))
-+ return SIGSEGV;
-+
-+ preempt_disable();
-+
-+ if (ll_task == NULL || ll_task == current) {
-+ ll_bit = 1;
-+ } else {
-+ ll_bit = 0;
-+ }
-+ ll_task = current;
-+
-+ preempt_enable();
-+
-+ regs->regs[(opcode & RT) >> 16] = value;
-+
-+ return 0;
-+}
-+
-+static inline int simulate_sc(struct pt_regs *regs, unsigned int opcode)
-+{
-+ unsigned long __user *vaddr;
-+ unsigned long reg;
-+ long offset;
-+
-+ /*
-+ * analyse the sc instruction that just caused a ri exception
-+ * and put the referenced address to addr.
-+ */
-+
-+ /* sign extend offset */
-+ offset = opcode & OFFSET;
-+ offset <<= 16;
-+ offset >>= 16;
-+
-+ vaddr = (unsigned long __user *)
-+ ((unsigned long)(regs->regs[(opcode & BASE) >> 21]) + offset);
-+ reg = (opcode & RT) >> 16;
-+
-+ if ((unsigned long)vaddr & 3)
-+ return SIGBUS;
-+
-+ preempt_disable();
-+
-+ if (ll_bit == 0 || ll_task != current) {
-+ regs->regs[reg] = 0;
-+ preempt_enable();
-+ return 0;
-+ }
-+
-+ preempt_enable();
-+
-+ if (put_user(regs->regs[reg], vaddr))
-+ return SIGSEGV;
-+
-+ regs->regs[reg] = 1;
-+
-+ return 0;
-+}
-+
-+/*
-+ * ll uses the opcode of lwc0 and sc uses the opcode of swc0. That is both
-+ * opcodes are supposed to result in coprocessor unusable exceptions if
-+ * executed on ll/sc-less processors. That's the theory. In practice a
-+ * few processors such as NEC's VR4100 throw reserved instruction exceptions
-+ * instead, so we're doing the emulation thing in both exception handlers.
-+ */
-+static int simulate_llsc(struct pt_regs *regs, unsigned int opcode)
-+{
-+ if ((opcode & OPCODE) == LL)
-+ return simulate_ll(regs, opcode);
-+ if ((opcode & OPCODE) == SC)
-+ return simulate_sc(regs, opcode);
-+
-+ return -1; /* Must be something else ... */
-+}
-+
-+/*
-+ * Simulate trapping 'rdhwr' instructions to provide user accessible
-+ * registers not implemented in hardware.
-+ */
-+static int simulate_rdhwr(struct pt_regs *regs, unsigned int opcode)
-+{
-+ struct thread_info *ti = task_thread_info(current);
-+
-+ if ((opcode & OPCODE) == SPEC3 && (opcode & FUNC) == RDHWR) {
-+ int rd = (opcode & RD) >> 11;
-+ int rt = (opcode & RT) >> 16;
-+ switch (rd) {
-+ case 0: /* CPU number */
-+ regs->regs[rt] = smp_processor_id();
-+ return 0;
-+ case 1: /* SYNCI length */
-+ regs->regs[rt] = min(current_cpu_data.dcache.linesz,
-+ current_cpu_data.icache.linesz);
-+ return 0;
-+ case 2: /* Read count register */
-+ regs->regs[rt] = read_c0_count();
-+ return 0;
-+ case 3: /* Count register resolution */
-+ switch (current_cpu_data.cputype) {
-+ case CPU_20KC:
-+ case CPU_25KF:
-+ regs->regs[rt] = 1;
-+ break;
-+ default:
-+ regs->regs[rt] = 2;
-+ }
-+ return 0;
-+ case 29:
-+ regs->regs[rt] = ti->tp_value;
-+ return 0;
-+ default:
-+ return -1;
-+ }
-+ }
-+
-+ /* Not ours. */
-+ return -1;
-+}
-+
-+static int simulate_sync(struct pt_regs *regs, unsigned int opcode)
-+{
-+ if ((opcode & OPCODE) == SPEC0 && (opcode & FUNC) == SYNC)
-+ return 0;
-+
-+ return -1; /* Must be something else ... */
-+}
-+
-+asmlinkage void do_ov(struct pt_regs *regs)
-+{
-+ siginfo_t info;
-+
-+ die_if_kernel("Integer overflow", regs);
-+
-+ info.si_code = FPE_INTOVF;
-+ info.si_signo = SIGFPE;
-+ info.si_errno = 0;
-+ info.si_addr = (void __user *) regs->cp0_epc;
-+ force_sig_info(SIGFPE, &info, current);
-+}
-+
-+/*
-+ * XXX Delayed fp exceptions when doing a lazy ctx switch XXX
-+ */
-+asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31)
-+{
-+ siginfo_t info;
-+
-+ if (notify_die(DIE_FP, "FP exception", regs, SIGFPE, 0, 0)
-+ == NOTIFY_STOP)
-+ return;
-+ die_if_kernel("FP exception in kernel code", regs);
-+
-+ if (fcr31 & FPU_CSR_UNI_X) {
-+ int sig;
-+
-+ /*
-+ * Unimplemented operation exception. If we've got the full
-+ * software emulator on-board, let's use it...
-+ *
-+ * Force FPU to dump state into task/thread context. We're
-+ * moving a lot of data here for what is probably a single
-+ * instruction, but the alternative is to pre-decode the FP
-+ * register operands before invoking the emulator, which seems
-+ * a bit extreme for what should be an infrequent event.
-+ */
-+ /* Ensure 'resume' not overwrite saved fp context again. */
-+ lose_fpu(1);
-+
-+ /* Run the emulator */
-+ sig = fpu_emulator_cop1Handler(regs, &current->thread.fpu, 1);
-+
-+ /*
-+ * We can't allow the emulated instruction to leave any of
-+ * the cause bit set in $fcr31.
-+ */
-+ current->thread.fpu.fcr31 &= ~FPU_CSR_ALL_X;
-+
-+ /* Restore the hardware register state */
-+ own_fpu(1); /* Using the FPU again. */
-+
-+ /* If something went wrong, signal */
-+ if (sig)
-+ force_sig(sig, current);
-+
-+ return;
-+ } else if (fcr31 & FPU_CSR_INV_X)
-+ info.si_code = FPE_FLTINV;
-+ else if (fcr31 & FPU_CSR_DIV_X)
-+ info.si_code = FPE_FLTDIV;
-+ else if (fcr31 & FPU_CSR_OVF_X)
-+ info.si_code = FPE_FLTOVF;
-+ else if (fcr31 & FPU_CSR_UDF_X)
-+ info.si_code = FPE_FLTUND;
-+ else if (fcr31 & FPU_CSR_INE_X)
-+ info.si_code = FPE_FLTRES;
-+ else
-+ info.si_code = __SI_FAULT;
-+ info.si_signo = SIGFPE;
-+ info.si_errno = 0;
-+ info.si_addr = (void __user *) regs->cp0_epc;
-+ force_sig_info(SIGFPE, &info, current);
-+}
-+
-+static void do_trap_or_bp(struct pt_regs *regs, unsigned int code,
-+ const char *str)
-+{
-+ siginfo_t info;
-+ char b[40];
-+
-+#ifdef CONFIG_KGDB_LOW_LEVEL_TRAP
-+ if (kgdb_ll_trap(DIE_TRAP, str, regs, code, 0, 0) == NOTIFY_STOP)
-+ return;
-+#endif /* CONFIG_KGDB_LOW_LEVEL_TRAP */
-+
-+ if (notify_die(DIE_TRAP, str, regs, code, 0, 0) == NOTIFY_STOP)
-+ return;
-+
-+ /*
-+ * A short test says that IRIX 5.3 sends SIGTRAP for all trap
-+ * insns, even for trap and break codes that indicate arithmetic
-+ * failures. Weird ...
-+ * But should we continue the brokenness??? --macro
-+ */
-+ switch (code) {
-+ case BRK_OVERFLOW:
-+ case BRK_DIVZERO:
-+ scnprintf(b, sizeof(b), "%s instruction in kernel code", str);
-+ die_if_kernel(b, regs);
-+ if (code == BRK_DIVZERO)
-+ info.si_code = FPE_INTDIV;
-+ else
-+ info.si_code = FPE_INTOVF;
-+ info.si_signo = SIGFPE;
-+ info.si_errno = 0;
-+ info.si_addr = (void __user *) regs->cp0_epc;
-+ force_sig_info(SIGFPE, &info, current);
-+ break;
-+ case BRK_BUG:
-+ die_if_kernel("Kernel bug detected", regs);
-+ force_sig(SIGTRAP, current);
-+ break;
-+ case BRK_MEMU:
-+ /*
-+ * Address errors may be deliberately induced by the FPU
-+ * emulator to retake control of the CPU after executing the
-+ * instruction in the delay slot of an emulated branch.
-+ *
-+ * Terminate if exception was recognized as a delay slot return
-+ * otherwise handle as normal.
-+ */
-+ if (do_dsemulret(regs))
-+ return;
-+
-+ die_if_kernel("Math emu break/trap", regs);
-+ force_sig(SIGTRAP, current);
-+ break;
-+ default:
-+ scnprintf(b, sizeof(b), "%s instruction in kernel code", str);
-+ die_if_kernel(b, regs);
-+ force_sig(SIGTRAP, current);
-+ }
-+}
-+
-+asmlinkage void do_bp(struct pt_regs *regs)
-+{
-+ unsigned int opcode, bcode;
-+
-+ if (__get_user(opcode, (unsigned int __user *) exception_epc(regs)))
-+ goto out_sigsegv;
-+
-+ /*
-+ * There is the ancient bug in the MIPS assemblers that the break
-+ * code starts left to bit 16 instead to bit 6 in the opcode.
-+ * Gas is bug-compatible, but not always, grrr...
-+ * We handle both cases with a simple heuristics. --macro
-+ */
-+ bcode = ((opcode >> 6) & ((1 << 20) - 1));
-+ if (bcode >= (1 << 10))
-+ bcode >>= 10;
-+
-+ do_trap_or_bp(regs, bcode, "Break");
-+ return;
-+
-+out_sigsegv:
-+ force_sig(SIGSEGV, current);
-+}
-+
-+asmlinkage void do_tr(struct pt_regs *regs)
-+{
-+ unsigned int opcode, tcode = 0;
-+
-+ if (__get_user(opcode, (unsigned int __user *) exception_epc(regs)))
-+ goto out_sigsegv;
-+
-+ /* Immediate versions don't provide a code. */
-+ if (!(opcode & OPCODE))
-+ tcode = ((opcode >> 6) & ((1 << 10) - 1));
-+
-+ do_trap_or_bp(regs, tcode, "Trap");
-+ return;
-+
-+out_sigsegv:
-+ force_sig(SIGSEGV, current);
-+}
-+
-+asmlinkage void do_ri(struct pt_regs *regs)
-+{
-+ unsigned int __user *epc = (unsigned int __user *)exception_epc(regs);
-+ unsigned long old_epc = regs->cp0_epc;
-+ unsigned int opcode = 0;
-+ int status = -1;
-+
-+ if (notify_die(DIE_RI, "RI Fault", regs, SIGSEGV, 0, 0)
-+ == NOTIFY_STOP)
-+ return;
-+
-+ die_if_kernel("Reserved instruction in kernel code", regs);
-+
-+ if (unlikely(compute_return_epc(regs) < 0))
-+ return;
-+
-+ if (unlikely(get_user(opcode, epc) < 0))
-+ status = SIGSEGV;
-+
-+ if (!cpu_has_llsc && status < 0)
-+ status = simulate_llsc(regs, opcode);
-+
-+ if (status < 0)
-+ status = simulate_rdhwr(regs, opcode);
-+
-+ if (status < 0)
-+ status = simulate_sync(regs, opcode);
-+
-+ if (status < 0)
-+ status = SIGILL;
-+
-+ if (unlikely(status > 0)) {
-+ regs->cp0_epc = old_epc; /* Undo skip-over. */
-+ force_sig(status, current);
-+ }
-+}
-+
-+/*
-+ * MIPS MT processors may have fewer FPU contexts than CPU threads. If we've
-+ * emulated more than some threshold number of instructions, force migration to
-+ * a "CPU" that has FP support.
-+ */
-+static void mt_ase_fp_affinity(void)
-+{
-+#ifdef CONFIG_MIPS_MT_FPAFF
-+ if (mt_fpemul_threshold > 0 &&
-+ ((current->thread.emulated_fp++ > mt_fpemul_threshold))) {
-+ /*
-+ * If there's no FPU present, or if the application has already
-+ * restricted the allowed set to exclude any CPUs with FPUs,
-+ * we'll skip the procedure.
-+ */
-+ if (cpus_intersects(current->cpus_allowed, mt_fpu_cpumask)) {
-+ cpumask_t tmask;
-+
-+ current->thread.user_cpus_allowed
-+ = current->cpus_allowed;
-+ cpus_and(tmask, current->cpus_allowed,
-+ mt_fpu_cpumask);
-+ set_cpus_allowed_ptr(current, &tmask);
-+ set_thread_flag(TIF_FPUBOUND);
-+ }
-+ }
-+#endif /* CONFIG_MIPS_MT_FPAFF */
-+}
-+
-+/*
-+ * No lock; only written during early bootup by CPU 0.
-+ */
-+static RAW_NOTIFIER_HEAD(cu2_chain);
-+
-+int __ref register_cu2_notifier(struct notifier_block *nb)
-+{
-+ return raw_notifier_chain_register(&cu2_chain, nb);
-+}
-+
-+int cu2_notifier_call_chain(unsigned long val, void *v)
-+{
-+ return raw_notifier_call_chain(&cu2_chain, val, v);
-+}
-+
-+static int default_cu2_call(struct notifier_block *nfb, unsigned long action,
-+ void *data)
-+{
-+ struct pt_regs *regs = data;
-+
-+ switch (action) {
-+ default:
-+ die_if_kernel("Unhandled kernel unaligned access or invalid "
-+ "instruction", regs);
-+ /* Fall through */
-+
-+ case CU2_EXCEPTION:
-+ force_sig(SIGILL, current);
-+ }
-+
-+ return NOTIFY_OK;
-+}
-+
-+static struct notifier_block default_cu2_notifier = {
-+ .notifier_call = default_cu2_call,
-+ .priority = 0x80000000, /* Run last */
-+};
-+
-+asmlinkage void do_cpu(struct pt_regs *regs)
-+{
-+ unsigned int __user *epc;
-+ unsigned long old_epc;
-+ unsigned int opcode;
-+ unsigned int cpid;
-+ int status;
-+ unsigned long __maybe_unused flags;
-+
-+ die_if_kernel("do_cpu invoked from kernel context!", regs);
-+
-+ cpid = (regs->cp0_cause >> CAUSEB_CE) & 3;
-+
-+ switch (cpid) {
-+ case 0:
-+ epc = (unsigned int __user *)exception_epc(regs);
-+ old_epc = regs->cp0_epc;
-+ opcode = 0;
-+ status = -1;
-+
-+ if (unlikely(compute_return_epc(regs) < 0))
-+ return;
-+
-+ if (unlikely(get_user(opcode, epc) < 0))
-+ status = SIGSEGV;
-+
-+ if (!cpu_has_llsc && status < 0)
-+ status = simulate_llsc(regs, opcode);
-+
-+ if (status < 0)
-+ status = simulate_rdhwr(regs, opcode);
-+
-+ if (status < 0)
-+ status = SIGILL;
-+
-+ if (unlikely(status > 0)) {
-+ regs->cp0_epc = old_epc; /* Undo skip-over. */
-+ force_sig(status, current);
-+ }
-+
-+ return;
-+
-+ case 1:
-+ if (used_math()) /* Using the FPU again. */
-+ own_fpu(1);
-+ else { /* First time FPU user. */
-+ init_fpu();
-+ set_used_math();
-+ }
-+
-+ if (!raw_cpu_has_fpu) {
-+ int sig;
-+ sig = fpu_emulator_cop1Handler(regs,
-+ &current->thread.fpu, 0);
-+ if (sig)
-+ force_sig(sig, current);
-+ else
-+ mt_ase_fp_affinity();
-+ }
-+
-+ return;
-+
-+ case 2:
-+ raw_notifier_call_chain(&cu2_chain, CU2_EXCEPTION, regs);
-+ return;
-+
-+ case 3:
-+ break;
-+ }
-+
-+ force_sig(SIGILL, current);
-+}
-+
-+asmlinkage void do_mdmx(struct pt_regs *regs)
-+{
-+ force_sig(SIGILL, current);
-+}
-+
-+/*
-+ * Called with interrupts disabled.
-+ */
-+asmlinkage void do_watch(struct pt_regs *regs)
-+{
-+ u32 cause;
-+
-+ /*
-+ * Clear WP (bit 22) bit of cause register so we don't loop
-+ * forever.
-+ */
-+ cause = read_c0_cause();
-+ cause &= ~(1 << 22);
-+ write_c0_cause(cause);
-+
-+ /*
-+ * If the current thread has the watch registers loaded, save
-+ * their values and send SIGTRAP. Otherwise another thread
-+ * left the registers set, clear them and continue.
-+ */
-+ if (test_tsk_thread_flag(current, TIF_LOAD_WATCH)) {
-+ mips_read_watch_registers();
-+ local_irq_enable();
-+ force_sig(SIGTRAP, current);
-+ } else {
-+ mips_clear_watch_registers();
-+ local_irq_enable();
-+ }
-+}
-+
-+asmlinkage void do_mcheck(struct pt_regs *regs)
-+{
-+ const int field = 2 * sizeof(unsigned long);
-+ int multi_match = regs->cp0_status & ST0_TS;
-+
-+ show_regs(regs);
-+
-+ if (multi_match) {
-+ printk("Index : %0x\n", read_c0_index());
-+ printk("Pagemask: %0x\n", read_c0_pagemask());
-+ printk("EntryHi : %0*lx\n", field, read_c0_entryhi());
-+ printk("EntryLo0: %0*lx\n", field, read_c0_entrylo0());
-+ printk("EntryLo1: %0*lx\n", field, read_c0_entrylo1());
-+ printk("\n");
-+ dump_tlb_all();
-+ }
-+
-+ show_code((unsigned int __user *) regs->cp0_epc);
-+
-+ /*
-+ * Some chips may have other causes of machine check (e.g. SB1
-+ * graduation timer)
-+ */
-+ panic("Caught Machine Check exception - %scaused by multiple "
-+ "matching entries in the TLB.",
-+ (multi_match) ? "" : "not ");
-+}
-+
-+asmlinkage void do_mt(struct pt_regs *regs)
-+{
-+ int subcode;
-+
-+ subcode = (read_vpe_c0_vpecontrol() & VPECONTROL_EXCPT)
-+ >> VPECONTROL_EXCPT_SHIFT;
-+ switch (subcode) {
-+ case 0:
-+ printk(KERN_DEBUG "Thread Underflow\n");
-+ break;
-+ case 1:
-+ printk(KERN_DEBUG "Thread Overflow\n");
-+ break;
-+ case 2:
-+ printk(KERN_DEBUG "Invalid YIELD Qualifier\n");
-+ break;
-+ case 3:
-+ printk(KERN_DEBUG "Gating Storage Exception\n");
-+ break;
-+ case 4:
-+ printk(KERN_DEBUG "YIELD Scheduler Exception\n");
-+ break;
-+ case 5:
-+ printk(KERN_DEBUG "Gating Storage Schedulier Exception\n");
-+ break;
-+ default:
-+ printk(KERN_DEBUG "*** UNKNOWN THREAD EXCEPTION %d ***\n",
-+ subcode);
-+ break;
-+ }
-+ die_if_kernel("MIPS MT Thread exception in kernel", regs);
-+
-+ force_sig(SIGILL, current);
-+}
-+
-+
-+asmlinkage void do_dsp(struct pt_regs *regs)
-+{
-+ if (cpu_has_dsp)
-+ panic("Unexpected DSP exception\n");
-+
-+ force_sig(SIGILL, current);
-+}
-+
-+asmlinkage void do_reserved(struct pt_regs *regs)
-+{
-+ /*
-+ * Game over - no way to handle this if it ever occurs. Most probably
-+ * caused by a new unknown cpu type or after another deadly
-+ * hard/software error.
-+ */
-+ show_regs(regs);
-+ panic("Caught reserved exception %ld - should not happen.",
-+ (regs->cp0_cause & 0x7f) >> 2);
-+}
-+
-+static int __initdata l1parity = 1;
-+static int __init nol1parity(char *s)
-+{
-+ l1parity = 0;
-+ return 1;
-+}
-+__setup("nol1par", nol1parity);
-+static int __initdata l2parity = 1;
-+static int __init nol2parity(char *s)
-+{
-+ l2parity = 0;
-+ return 1;
-+}
-+__setup("nol2par", nol2parity);
-+
-+/*
-+ * Some MIPS CPUs can enable/disable for cache parity detection, but do
-+ * it different ways.
-+ */
-+static inline void parity_protection_init(void)
-+{
-+ switch (current_cpu_type()) {
-+ case CPU_24K:
-+ case CPU_34K:
-+ case CPU_74K:
-+ case CPU_1004K:
-+ {
-+#define ERRCTL_PE 0x80000000
-+#define ERRCTL_L2P 0x00800000
-+ unsigned long errctl;
-+ unsigned int l1parity_present, l2parity_present;
-+
-+ errctl = read_c0_ecc();
-+ errctl &= ~(ERRCTL_PE|ERRCTL_L2P);
-+
-+ /* probe L1 parity support */
-+ write_c0_ecc(errctl | ERRCTL_PE);
-+ back_to_back_c0_hazard();
-+ l1parity_present = (read_c0_ecc() & ERRCTL_PE);
-+
-+ /* probe L2 parity support */
-+ write_c0_ecc(errctl|ERRCTL_L2P);
-+ back_to_back_c0_hazard();
-+ l2parity_present = (read_c0_ecc() & ERRCTL_L2P);
-+
-+ if (l1parity_present && l2parity_present) {
-+ if (l1parity)
-+ errctl |= ERRCTL_PE;
-+ if (l1parity ^ l2parity)
-+ errctl |= ERRCTL_L2P;
-+ } else if (l1parity_present) {
-+ if (l1parity)
-+ errctl |= ERRCTL_PE;
-+ } else if (l2parity_present) {
-+ if (l2parity)
-+ errctl |= ERRCTL_L2P;
-+ } else {
-+ /* No parity available */
-+ }
-+
-+ printk(KERN_INFO "Writing ErrCtl register=%08lx\n", errctl);
-+
-+ write_c0_ecc(errctl);
-+ back_to_back_c0_hazard();
-+ errctl = read_c0_ecc();
-+ printk(KERN_INFO "Readback ErrCtl register=%08lx\n", errctl);
-+
-+ if (l1parity_present)
-+ printk(KERN_INFO "Cache parity protection %sabled\n",
-+ (errctl & ERRCTL_PE) ? "en" : "dis");
-+
-+ if (l2parity_present) {
-+ if (l1parity_present && l1parity)
-+ errctl ^= ERRCTL_L2P;
-+ printk(KERN_INFO "L2 cache parity protection %sabled\n",
-+ (errctl & ERRCTL_L2P) ? "en" : "dis");
-+ }
-+ }
-+ break;
-+
-+ case CPU_5KC:
-+ write_c0_ecc(0x80000000);
-+ back_to_back_c0_hazard();
-+ /* Set the PE bit (bit 31) in the c0_errctl register. */
-+ printk(KERN_INFO "Cache parity protection %sabled\n",
-+ (read_c0_ecc() & 0x80000000) ? "en" : "dis");
-+ break;
-+ case CPU_20KC:
-+ case CPU_25KF:
-+ /* Clear the DE bit (bit 16) in the c0_status register. */
-+ printk(KERN_INFO "Enable cache parity protection for "
-+ "MIPS 20KC/25KF CPUs.\n");
-+ clear_c0_status(ST0_DE);
-+ break;
-+ default:
-+ break;
-+ }
-+}
-+
-+asmlinkage void cache_parity_error(void)
-+{
-+ const int field = 2 * sizeof(unsigned long);
-+ unsigned int reg_val;
-+
-+ /* For the moment, report the problem and hang. */
-+ printk("Cache error exception:\n");
-+ printk("cp0_errorepc == %0*lx\n", field, read_c0_errorepc());
-+ reg_val = read_c0_cacheerr();
-+ printk("c0_cacheerr == %08x\n", reg_val);
-+
-+ printk("Decoded c0_cacheerr: %s cache fault in %s reference.\n",
-+ reg_val & (1<<30) ? "secondary" : "primary",
-+ reg_val & (1<<31) ? "data" : "insn");
-+ printk("Error bits: %s%s%s%s%s%s%s\n",
-+ reg_val & (1<<29) ? "ED " : "",
-+ reg_val & (1<<28) ? "ET " : "",
-+ reg_val & (1<<26) ? "EE " : "",
-+ reg_val & (1<<25) ? "EB " : "",
-+ reg_val & (1<<24) ? "EI " : "",
-+ reg_val & (1<<23) ? "E1 " : "",
-+ reg_val & (1<<22) ? "E0 " : "");
-+ printk("IDX: 0x%08x\n", reg_val & ((1<<22)-1));
-+
-+#if defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64)
-+ if (reg_val & (1<<22))
-+ printk("DErrAddr0: 0x%0*lx\n", field, read_c0_derraddr0());
-+
-+ if (reg_val & (1<<23))
-+ printk("DErrAddr1: 0x%0*lx\n", field, read_c0_derraddr1());
-+#endif
-+
-+ panic("Can't handle the cache error!");
-+}
-+
-+/*
-+ * SDBBP EJTAG debug exception handler.
-+ * We skip the instruction and return to the next instruction.
-+ */
-+void ejtag_exception_handler(struct pt_regs *regs)
-+{
-+ const int field = 2 * sizeof(unsigned long);
-+ unsigned long depc, old_epc;
-+ unsigned int debug;
-+
-+ printk(KERN_DEBUG "SDBBP EJTAG debug exception - not handled yet, just ignored!\n");
-+ depc = read_c0_depc();
-+ debug = read_c0_debug();
-+ printk(KERN_DEBUG "c0_depc = %0*lx, DEBUG = %08x\n", field, depc, debug);
-+ if (debug & 0x80000000) {
-+ /*
-+ * In branch delay slot.
-+ * We cheat a little bit here and use EPC to calculate the
-+ * debug return address (DEPC). EPC is restored after the
-+ * calculation.
-+ */
-+ old_epc = regs->cp0_epc;
-+ regs->cp0_epc = depc;
-+ __compute_return_epc(regs);
-+ depc = regs->cp0_epc;
-+ regs->cp0_epc = old_epc;
-+ } else
-+ depc += 4;
-+ write_c0_depc(depc);
-+
-+#if 0
-+ printk(KERN_DEBUG "\n\n----- Enable EJTAG single stepping ----\n\n");
-+ write_c0_debug(debug | 0x100);
-+#endif
-+}
-+
-+/*
-+ * NMI exception handler.
-+ */
-+NORET_TYPE void ATTRIB_NORET nmi_exception_handler(struct pt_regs *regs)
-+{
-+ bust_spinlocks(1);
-+ printk("NMI taken!!!!\n");
-+ die("NMI", regs);
-+}
-+
-+#define VECTORSPACING 0x100 /* for EI/VI mode */
-+
-+unsigned long ebase;
-+unsigned long exception_handlers[32];
-+unsigned long vi_handlers[64];
-+
-+void __init *set_except_vector(int n, void *addr)
-+{
-+ unsigned long handler = (unsigned long) addr;
-+ unsigned long old_handler = exception_handlers[n];
-+
-+ exception_handlers[n] = handler;
-+ if (n == 0 && cpu_has_divec) {
-+ unsigned long jump_mask = ~((1 << 28) - 1);
-+ u32 *buf = (u32 *)(ebase + 0x200);
-+ unsigned int k0 = 26;
-+ if ((handler & jump_mask) == ((ebase + 0x200) & jump_mask)) {
-+ uasm_i_j(&buf, handler & ~jump_mask);
-+ uasm_i_nop(&buf);
-+ } else {
-+ UASM_i_LA(&buf, k0, handler);
-+ uasm_i_jr(&buf, k0);
-+ uasm_i_nop(&buf);
-+ }
-+ local_flush_icache_range(ebase + 0x200, (unsigned long)buf);
-+ }
-+ return (void *)old_handler;
-+}
-+
-+static asmlinkage void do_default_vi(void)
-+{
-+ show_regs(get_irq_regs());
-+ panic("Caught unexpected vectored interrupt.");
-+}
-+
-+static void *set_vi_srs_handler(int n, vi_handler_t addr, int srs)
-+{
-+ unsigned long handler;
-+ unsigned long old_handler = vi_handlers[n];
-+ int srssets = current_cpu_data.srsets;
-+ u32 *w;
-+ unsigned char *b;
-+
-+ BUG_ON(!cpu_has_veic && !cpu_has_vint);
-+
-+ if (addr == NULL) {
-+ handler = (unsigned long) do_default_vi;
-+ srs = 0;
-+ } else
-+ handler = (unsigned long) addr;
-+ vi_handlers[n] = (unsigned long) addr;
-+
-+ b = (unsigned char *)(ebase + 0x200 + n*VECTORSPACING);
-+
-+ if (srs >= srssets)
-+ panic("Shadow register set %d not supported", srs);
-+
-+ if (cpu_has_veic) {
-+ if (board_bind_eic_interrupt)
-+ board_bind_eic_interrupt(n, srs);
-+ } else if (cpu_has_vint) {
-+ /* SRSMap is only defined if shadow sets are implemented */
-+ if (srssets > 1)
-+ change_c0_srsmap(0xf << n*4, srs << n*4);
-+ }
-+
-+ if (srs == 0) {
-+ /*
-+ * If no shadow set is selected then use the default handler
-+ * that does normal register saving and a standard interrupt exit
-+ */
-+
-+ extern char except_vec_vi, except_vec_vi_lui;
-+ extern char except_vec_vi_ori, except_vec_vi_end;
-+ extern char rollback_except_vec_vi;
-+ char *vec_start = (cpu_wait == r4k_wait) ?
-+ &rollback_except_vec_vi : &except_vec_vi;
-+#ifdef CONFIG_MIPS_MT_SMTC
-+ /*
-+ * We need to provide the SMTC vectored interrupt handler
-+ * not only with the address of the handler, but with the
-+ * Status.IM bit to be masked before going there.
-+ */
-+ extern char except_vec_vi_mori;
-+ const int mori_offset = &except_vec_vi_mori - vec_start;
-+#endif /* CONFIG_MIPS_MT_SMTC */
-+ const int handler_len = &except_vec_vi_end - vec_start;
-+ const int lui_offset = &except_vec_vi_lui - vec_start;
-+ const int ori_offset = &except_vec_vi_ori - vec_start;
-+
-+ if (handler_len > VECTORSPACING) {
-+ /*
-+ * Sigh... panicing won't help as the console
-+ * is probably not configured :(
-+ */
-+ panic("VECTORSPACING too small");
-+ }
-+
-+ memcpy(b, vec_start, handler_len);
-+#ifdef CONFIG_MIPS_MT_SMTC
-+ BUG_ON(n > 7); /* Vector index %d exceeds SMTC maximum. */
-+
-+ w = (u32 *)(b + mori_offset);
-+ *w = (*w & 0xffff0000) | (0x100 << n);
-+#endif /* CONFIG_MIPS_MT_SMTC */
-+ w = (u32 *)(b + lui_offset);
-+ *w = (*w & 0xffff0000) | (((u32)handler >> 16) & 0xffff);
-+ w = (u32 *)(b + ori_offset);
-+ *w = (*w & 0xffff0000) | ((u32)handler & 0xffff);
-+ local_flush_icache_range((unsigned long)b,
-+ (unsigned long)(b+handler_len));
-+ }
-+ else {
-+ /*
-+ * In other cases jump directly to the interrupt handler
-+ *
-+ * It is the handlers responsibility to save registers if required
-+ * (eg hi/lo) and return from the exception using "eret"
-+ */
-+ w = (u32 *)b;
-+ *w++ = 0x08000000 | (((u32)handler >> 2) & 0x03fffff); /* j handler */
-+ *w = 0;
-+ local_flush_icache_range((unsigned long)b,
-+ (unsigned long)(b+8));
-+ }
-+
-+ return (void *)old_handler;
-+}
-+
-+void *set_vi_handler(int n, vi_handler_t addr)
-+{
-+ return set_vi_srs_handler(n, addr, 0);
-+}
-+
-+extern void cpu_cache_init(void);
-+extern void tlb_init(void);
-+extern void flush_tlb_handlers(void);
-+
-+/*
-+ * Timer interrupt
-+ */
-+int cp0_compare_irq;
-+int cp0_compare_irq_shift;
-+
-+/*
-+ * Performance counter IRQ or -1 if shared with timer
-+ */
-+int cp0_perfcount_irq;
-+EXPORT_SYMBOL_GPL(cp0_perfcount_irq);
-+
-+static int __cpuinitdata noulri;
-+
-+static int __init ulri_disable(char *s)
-+{
-+ pr_info("Disabling ulri\n");
-+ noulri = 1;
-+
-+ return 1;
-+}
-+__setup("noulri", ulri_disable);
-+
-+void __cpuinit per_cpu_trap_init(void)
-+{
-+ unsigned int cpu = smp_processor_id();
-+ unsigned int status_set = ST0_CU0;
-+#ifdef CONFIG_MIPS_MT_SMTC
-+ int secondaryTC = 0;
-+ int bootTC = (cpu == 0);
-+
-+ /*
-+ * Only do per_cpu_trap_init() for first TC of Each VPE.
-+ * Note that this hack assumes that the SMTC init code
-+ * assigns TCs consecutively and in ascending order.
-+ */
-+
-+ if (((read_c0_tcbind() & TCBIND_CURTC) != 0) &&
-+ ((read_c0_tcbind() & TCBIND_CURVPE) == cpu_data[cpu - 1].vpe_id))
-+ secondaryTC = 1;
-+#endif /* CONFIG_MIPS_MT_SMTC */
-+
-+ /*
-+ * Disable coprocessors and select 32-bit or 64-bit addressing
-+ * and the 16/32 or 32/32 FPR register model. Reset the BEV
-+ * flag that some firmware may have left set and the TS bit (for
-+ * IP27). Set XX for ISA IV code to work.
-+ */
-+#ifdef CONFIG_64BIT
-+ status_set |= ST0_FR|ST0_KX|ST0_SX|ST0_UX;
-+#endif
-+ if (current_cpu_data.isa_level == MIPS_CPU_ISA_IV)
-+ status_set |= ST0_XX;
-+ if (cpu_has_dsp)
-+ status_set |= ST0_MX;
-+
-+ change_c0_status(ST0_CU|ST0_MX|ST0_RE|ST0_FR|ST0_BEV|ST0_TS|ST0_KX|ST0_SX|ST0_UX,
-+ status_set);
-+
-+ if (cpu_has_mips_r2) {
-+ unsigned int enable = 0x0000000f | cpu_hwrena_impl_bits;
-+
-+ if (!noulri && cpu_has_userlocal)
-+ enable |= (1 << 29);
-+
-+ write_c0_hwrena(enable);
-+ }
-+
-+#ifdef CONFIG_MIPS_MT_SMTC
-+ if (!secondaryTC) {
-+#endif /* CONFIG_MIPS_MT_SMTC */
-+
-+ if (cpu_has_veic || cpu_has_vint) {
-+ unsigned long sr = set_c0_status(ST0_BEV);
-+ write_c0_ebase(ebase);
-+ write_c0_status(sr);
-+ /* Setting vector spacing enables EI/VI mode */
-+ change_c0_intctl(0x3e0, VECTORSPACING);
-+ }
-+ if (cpu_has_divec) {
-+ if (cpu_has_mipsmt) {
-+ unsigned int vpflags = dvpe();
-+ set_c0_cause(CAUSEF_IV);
-+ evpe(vpflags);
-+ } else
-+ set_c0_cause(CAUSEF_IV);
-+ }
-+
-+ /*
-+ * Before R2 both interrupt numbers were fixed to 7, so on R2 only:
-+ *
-+ * o read IntCtl.IPTI to determine the timer interrupt
-+ * o read IntCtl.IPPCI to determine the performance counter interrupt
-+ */
-+ if (cpu_has_mips_r2) {
-+ cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP;
-+ cp0_compare_irq = (read_c0_intctl() >> INTCTLB_IPTI) & 7;
-+ cp0_perfcount_irq = (read_c0_intctl() >> INTCTLB_IPPCI) & 7;
-+ if (cp0_perfcount_irq == cp0_compare_irq)
-+ cp0_perfcount_irq = -1;
-+ } else {
-+ cp0_compare_irq = CP0_LEGACY_COMPARE_IRQ;
-+ cp0_compare_irq_shift = cp0_compare_irq;
-+ cp0_perfcount_irq = -1;
-+ }
-+
-+#ifdef CONFIG_MIPS_MT_SMTC
-+ }
-+#endif /* CONFIG_MIPS_MT_SMTC */
-+
-+ cpu_data[cpu].asid_cache = ASID_FIRST_VERSION;
-+ TLBMISS_HANDLER_SETUP();
-+
-+ atomic_inc(&init_mm.mm_count);
-+ current->active_mm = &init_mm;
-+ BUG_ON(current->mm);
-+ enter_lazy_tlb(&init_mm, current);
-+
-+#ifdef CONFIG_MIPS_MT_SMTC
-+ if (bootTC) {
-+#endif /* CONFIG_MIPS_MT_SMTC */
-+ cpu_cache_init();
-+ tlb_init();
-+#ifdef CONFIG_MIPS_MT_SMTC
-+ } else if (!secondaryTC) {
-+ /*
-+ * First TC in non-boot VPE must do subset of tlb_init()
-+ * for MMU countrol registers.
-+ */
-+ write_c0_pagemask(PM_DEFAULT_MASK);
-+ write_c0_wired(0);
-+ }
-+#endif /* CONFIG_MIPS_MT_SMTC */
-+}
-+
-+/* Install CPU exception handler */
-+void __init set_handler(unsigned long offset, void *addr, unsigned long size)
-+{
-+ memcpy((void *)(ebase + offset), addr, size);
-+ local_flush_icache_range(ebase + offset, ebase + offset + size);
-+}
-+
-+static char panic_null_cerr[] __cpuinitdata =
-+ "Trying to set NULL cache error exception handler";
-+
-+/*
-+ * Install uncached CPU exception handler.
-+ * This is suitable only for the cache error exception which is the only
-+ * exception handler that is being run uncached.
-+ */
-+void __cpuinit set_uncached_handler(unsigned long offset, void *addr,
-+ unsigned long size)
-+{
-+ unsigned long uncached_ebase = CKSEG1ADDR(ebase);
-+
-+ if (!addr)
-+ panic(panic_null_cerr);
-+
-+ memcpy((void *)(uncached_ebase + offset), addr, size);
-+}
-+
-+static int __initdata rdhwr_noopt;
-+static int __init set_rdhwr_noopt(char *str)
-+{
-+ rdhwr_noopt = 1;
-+ return 1;
-+}
-+
-+__setup("rdhwr_noopt", set_rdhwr_noopt);
-+
-+void __init trap_init(void)
-+{
-+ extern char except_vec3_generic, except_vec3_r4000;
-+ extern char except_vec4;
-+ unsigned long i;
-+ int rollback;
-+
-+ check_wait();
-+ rollback = (cpu_wait == r4k_wait);
-+
-+#if defined(CONFIG_KGDB)
-+ if (kgdb_early_setup)
-+ return; /* Already done */
-+#endif
-+
-+ if (cpu_has_veic || cpu_has_vint) {
-+ unsigned long size = 0x200 + VECTORSPACING*64;
-+ ebase = (unsigned long)
-+ __alloc_bootmem(size, 1 << fls(size), 0);
-+ } else {
-+ ebase = CKSEG0;
-+ if (cpu_has_mips_r2)
-+ ebase += (read_c0_ebase() & 0x3ffff000);
-+ }
-+
-+ per_cpu_trap_init();
-+
-+ /*
-+ * Copy the generic exception handlers to their final destination.
-+ * This will be overriden later as suitable for a particular
-+ * configuration.
-+ */
-+ set_handler(0x180, &except_vec3_generic, 0x80);
-+
-+ /*
-+ * Setup default vectors
-+ */
-+ for (i = 0; i <= 31; i++)
-+ set_except_vector(i, handle_reserved);
-+
-+ /*
-+ * Copy the EJTAG debug exception vector handler code to it's final
-+ * destination.
-+ */
-+ if (cpu_has_ejtag && board_ejtag_handler_setup)
-+ board_ejtag_handler_setup();
-+
-+ /*
-+ * Only some CPUs have the watch exceptions.
-+ */
-+ if (cpu_has_watch)
-+ set_except_vector(23, handle_watch);
-+
-+ /*
-+ * Initialise interrupt handlers
-+ */
-+ if (cpu_has_veic || cpu_has_vint) {
-+ int nvec = cpu_has_veic ? 64 : 8;
-+ for (i = 0; i < nvec; i++)
-+ set_vi_handler(i, NULL);
-+ }
-+ else if (cpu_has_divec)
-+ set_handler(0x200, &except_vec4, 0x8);
-+
-+ /*
-+ * Some CPUs can enable/disable for cache parity detection, but does
-+ * it different ways.
-+ */
-+ parity_protection_init();
-+
-+ /*
-+ * The Data Bus Errors / Instruction Bus Errors are signaled
-+ * by external hardware. Therefore these two exceptions
-+ * may have board specific handlers.
-+ */
-+ if (board_be_init)
-+ board_be_init();
-+
-+ set_except_vector(0, rollback ? rollback_handle_int : handle_int);
-+ set_except_vector(1, handle_tlbm);
-+ set_except_vector(2, handle_tlbl);
-+ set_except_vector(3, handle_tlbs);
-+
-+ set_except_vector(4, handle_adel);
-+ set_except_vector(5, handle_ades);
-+
-+ set_except_vector(6, handle_ibe);
-+ set_except_vector(7, handle_dbe);
-+
-+ set_except_vector(8, handle_sys);
-+ set_except_vector(9, handle_bp);
-+ set_except_vector(10, rdhwr_noopt ? handle_ri :
-+ (cpu_has_vtag_icache ?
-+ handle_ri_rdhwr_vivt : handle_ri_rdhwr));
-+ set_except_vector(11, handle_cpu);
-+ set_except_vector(12, handle_ov);
-+ set_except_vector(13, handle_tr);
-+
-+ if (current_cpu_type() == CPU_R6000 ||
-+ current_cpu_type() == CPU_R6000A) {
-+ /*
-+ * The R6000 is the only R-series CPU that features a machine
-+ * check exception (similar to the R4000 cache error) and
-+ * unaligned ldc1/sdc1 exception. The handlers have not been
-+ * written yet. Well, anyway there is no R6000 machine on the
-+ * current list of targets for Linux/MIPS.
-+ * (Duh, crap, there is someone with a triple R6k machine)
-+ */
-+ //set_except_vector(14, handle_mc);
-+ //set_except_vector(15, handle_ndc);
-+ }
-+
-+
-+ if (board_nmi_handler_setup)
-+ board_nmi_handler_setup();
-+
-+ if (cpu_has_fpu && !cpu_has_nofpuex)
-+ set_except_vector(15, handle_fpe);
-+
-+ set_except_vector(22, handle_mdmx);
-+
-+ if (cpu_has_mcheck)
-+ set_except_vector(24, handle_mcheck);
-+
-+ if (cpu_has_mipsmt)
-+ set_except_vector(25, handle_mt);
-+
-+ set_except_vector(26, handle_dsp);
-+
-+ if (cpu_has_vce)
-+ /* Special exception: R4[04]00 uses also the divec space. */
-+ memcpy((void *)(ebase + 0x180), &except_vec3_r4000, 0x100);
-+ else if (cpu_has_4kex)
-+ memcpy((void *)(ebase + 0x180), &except_vec3_generic, 0x80);
-+ else
-+ memcpy((void *)(ebase + 0x080), &except_vec3_generic, 0x80);
-+
-+ local_flush_icache_range(ebase, ebase + 0x400);
-+ flush_tlb_handlers();
-+
-+ sort_extable(__start___dbe_table, __stop___dbe_table);
-+
-+ register_cu2_notifier(&default_cu2_notifier);
-+}
-diff -Nur linux-2.6.35.7.orig/arch/mips/Makefile linux-2.6.35.7/arch/mips/Makefile
---- linux-2.6.35.7.orig/arch/mips/Makefile 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/arch/mips/Makefile 2010-10-14 20:27:59.685601082 +0200
-@@ -179,6 +179,13 @@
- cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += -Wa,-march=octeon
- endif
-
-+#
-+# Atheros AR71xx
-+#
-+core-$(CONFIG_ATHEROS_AR71XX) += arch/mips/ar71xx/
-+cflags-$(CONFIG_ATHEROS_AR71XX) += -I$(srctree)/arch/mips/include/asm/mach-ar71xx
-+load-$(CONFIG_ATHEROS_AR71XX) += 0xffffffff80060000
-+
- cflags-$(CONFIG_CPU_R4000_WORKAROUNDS) += $(call cc-option,-mfix-r4000,)
- cflags-$(CONFIG_CPU_R4400_WORKAROUNDS) += $(call cc-option,-mfix-r4400,)
- cflags-$(CONFIG_CPU_DADDI_WORKAROUNDS) += $(call cc-option,-mno-daddi,)
-diff -Nur linux-2.6.35.7.orig/arch/mips/pci/Makefile linux-2.6.35.7/arch/mips/pci/Makefile
---- linux-2.6.35.7.orig/arch/mips/pci/Makefile 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/arch/mips/pci/Makefile 2010-10-14 20:27:59.718092160 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/pci/Makefile linux-2.6.36/arch/mips/pci/Makefile
+--- linux-2.6.36.orig/arch/mips/pci/Makefile 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/arch/mips/pci/Makefile 2010-11-18 21:16:07.000000000 +0100
@@ -18,6 +18,7 @@
obj-$(CONFIG_BCM47XX) += pci-bcm47xx.o
obj-$(CONFIG_BCM63XX) += pci-bcm63xx.o fixup-bcm63xx.o \
@@ -11074,9 +9332,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/pci/Makefile linux-2.6.35.7/arch/mips/pc
#
# These are still pretty much in the old state, watch, go blind.
-diff -Nur linux-2.6.35.7.orig/arch/mips/pci/pci-ar71xx.c linux-2.6.35.7/arch/mips/pci/pci-ar71xx.c
---- linux-2.6.35.7.orig/arch/mips/pci/pci-ar71xx.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/pci/pci-ar71xx.c 2010-10-14 20:27:59.758101117 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/pci/pci-ar71xx.c linux-2.6.36/arch/mips/pci/pci-ar71xx.c
+--- linux-2.6.36.orig/arch/mips/pci/pci-ar71xx.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/pci/pci-ar71xx.c 2010-11-18 21:16:07.000000000 +0100
@@ -0,0 +1,409 @@
+/*
+ * Atheros AR71xx PCI host controller driver
@@ -11487,9 +9745,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/pci/pci-ar71xx.c linux-2.6.35.7/arch/mip
+
+ return 0;
+}
-diff -Nur linux-2.6.35.7.orig/arch/mips/pci/pci-ar724x.c linux-2.6.35.7/arch/mips/pci/pci-ar724x.c
---- linux-2.6.35.7.orig/arch/mips/pci/pci-ar724x.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/arch/mips/pci/pci-ar724x.c 2010-10-14 20:27:59.798101290 +0200
+diff -Nur linux-2.6.36.orig/arch/mips/pci/pci-ar724x.c linux-2.6.36/arch/mips/pci/pci-ar724x.c
+--- linux-2.6.36.orig/arch/mips/pci/pci-ar724x.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/arch/mips/pci/pci-ar724x.c 2010-11-18 21:16:07.000000000 +0100
@@ -0,0 +1,395 @@
+/*
+ * Atheros AR724x PCI host controller driver
@@ -11886,9 +10144,9 @@ diff -Nur linux-2.6.35.7.orig/arch/mips/pci/pci-ar724x.c linux-2.6.35.7/arch/mip
+ err:
+ return ret;
+}
-diff -Nur linux-2.6.35.7.orig/drivers/char/Kconfig linux-2.6.35.7/drivers/char/Kconfig
---- linux-2.6.35.7.orig/drivers/char/Kconfig 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/drivers/char/Kconfig 2010-10-14 20:27:59.828101117 +0200
+diff -Nur linux-2.6.36.orig/drivers/char/Kconfig linux-2.6.36/drivers/char/Kconfig
+--- linux-2.6.36.orig/drivers/char/Kconfig 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/char/Kconfig 2010-11-18 21:16:07.000000000 +0100
@@ -1032,6 +1032,14 @@
If compiled as a module, it will be called cs5535_gpio.
@@ -11904,1147 +10162,10 @@ diff -Nur linux-2.6.35.7.orig/drivers/char/Kconfig linux-2.6.35.7/drivers/char/K
config RAW_DRIVER
tristate "RAW driver (/dev/raw/rawN)"
depends on BLOCK
-diff -Nur linux-2.6.35.7.orig/drivers/char/Kconfig.orig linux-2.6.35.7/drivers/char/Kconfig.orig
---- linux-2.6.35.7.orig/drivers/char/Kconfig.orig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/char/Kconfig.orig 2010-09-29 03:09:08.000000000 +0200
-@@ -0,0 +1,1133 @@
-+#
-+# Character device configuration
-+#
-+
-+menu "Character devices"
-+
-+config VT
-+ bool "Virtual terminal" if EMBEDDED
-+ depends on !S390
-+ select INPUT
-+ default y
-+ ---help---
-+ If you say Y here, you will get support for terminal devices with
-+ display and keyboard devices. These are called "virtual" because you
-+ can run several virtual terminals (also called virtual consoles) on
-+ one physical terminal. This is rather useful, for example one
-+ virtual terminal can collect system messages and warnings, another
-+ one can be used for a text-mode user session, and a third could run
-+ an X session, all in parallel. Switching between virtual terminals
-+ is done with certain key combinations, usually Alt-<function key>.
-+
-+ The setterm command ("man setterm") can be used to change the
-+ properties (such as colors or beeping) of a virtual terminal. The
-+ man page console_codes(4) ("man console_codes") contains the special
-+ character sequences that can be used to change those properties
-+ directly. The fonts used on virtual terminals can be changed with
-+ the setfont ("man setfont") command and the key bindings are defined
-+ with the loadkeys ("man loadkeys") command.
-+
-+ You need at least one virtual terminal device in order to make use
-+ of your keyboard and monitor. Therefore, only people configuring an
-+ embedded system would want to say N here in order to save some
-+ memory; the only way to log into such a system is then via a serial
-+ or network connection.
-+
-+ If unsure, say Y, or else you won't be able to do much with your new
-+ shiny Linux system :-)
-+
-+config CONSOLE_TRANSLATIONS
-+ depends on VT
-+ default y
-+ bool "Enable character translations in console" if EMBEDDED
-+ ---help---
-+ This enables support for font mapping and Unicode translation
-+ on virtual consoles.
-+
-+config VT_CONSOLE
-+ bool "Support for console on virtual terminal" if EMBEDDED
-+ depends on VT
-+ default y
-+ ---help---
-+ The system console is the device which receives all kernel messages
-+ and warnings and which allows logins in single user mode. If you
-+ answer Y here, a virtual terminal (the device used to interact with
-+ a physical terminal) can be used as system console. This is the most
-+ common mode of operations, so you should say Y here unless you want
-+ the kernel messages be output only to a serial port (in which case
-+ you should say Y to "Console on serial port", below).
-+
-+ If you do say Y here, by default the currently visible virtual
-+ terminal (/dev/tty0) will be used as system console. You can change
-+ that with a kernel command line option such as "console=tty3" which
-+ would use the third virtual terminal as system console. (Try "man
-+ bootparam" or see the documentation of your boot loader (lilo or
-+ loadlin) about how to pass options to the kernel at boot time.)
-+
-+ If unsure, say Y.
-+
-+config HW_CONSOLE
-+ bool
-+ depends on VT && !S390 && !UML
-+ default y
-+
-+config VT_HW_CONSOLE_BINDING
-+ bool "Support for binding and unbinding console drivers"
-+ depends on HW_CONSOLE
-+ default n
-+ ---help---
-+ The virtual terminal is the device that interacts with the physical
-+ terminal through console drivers. On these systems, at least one
-+ console driver is loaded. In other configurations, additional console
-+ drivers may be enabled, such as the framebuffer console. If more than
-+ 1 console driver is enabled, setting this to 'y' will allow you to
-+ select the console driver that will serve as the backend for the
-+ virtual terminals.
-+
-+ See <file:Documentation/console/console.txt> for more
-+ information. For framebuffer console users, please refer to
-+ <file:Documentation/fb/fbcon.txt>.
-+
-+config DEVKMEM
-+ bool "/dev/kmem virtual device support"
-+ default y
-+ help
-+ Say Y here if you want to support the /dev/kmem device. The
-+ /dev/kmem device is rarely used, but can be used for certain
-+ kind of kernel debugging operations.
-+ When in doubt, say "N".
-+
-+config BFIN_JTAG_COMM
-+ tristate "Blackfin JTAG Communication"
-+ depends on BLACKFIN
-+ help
-+ Add support for emulating a TTY device over the Blackfin JTAG.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called bfin_jtag_comm.
-+
-+config BFIN_JTAG_COMM_CONSOLE
-+ bool "Console on Blackfin JTAG"
-+ depends on BFIN_JTAG_COMM=y
-+
-+config SERIAL_NONSTANDARD
-+ bool "Non-standard serial port support"
-+ depends on HAS_IOMEM
-+ ---help---
-+ Say Y here if you have any non-standard serial boards -- boards
-+ which aren't supported using the standard "dumb" serial driver.
-+ This includes intelligent serial boards such as Cyclades,
-+ Digiboards, etc. These are usually used for systems that need many
-+ serial ports because they serve many terminals or dial-in
-+ connections.
-+
-+ Note that the answer to this question won't directly affect the
-+ kernel: saying N will just cause the configurator to skip all
-+ the questions about non-standard serial boards.
-+
-+ Most people can say N here.
-+
-+config COMPUTONE
-+ tristate "Computone IntelliPort Plus serial support"
-+ depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
-+ ---help---
-+ This driver supports the entire family of Intelliport II/Plus
-+ controllers with the exception of the MicroChannel controllers and
-+ products previous to the Intelliport II. These are multiport cards,
-+ which give you many serial ports. You would need something like this
-+ to connect more than two modems to your Linux box, for instance in
-+ order to become a dial-in server. If you have a card like that, say
-+ Y here and read <file:Documentation/serial/computone.txt>.
-+
-+ To compile this driver as module, choose M here: the
-+ module will be called ip2.
-+
-+config ROCKETPORT
-+ tristate "Comtrol RocketPort support"
-+ depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
-+ help
-+ This driver supports Comtrol RocketPort and RocketModem PCI boards.
-+ These boards provide 2, 4, 8, 16, or 32 high-speed serial ports or
-+ modems. For information about the RocketPort/RocketModem boards
-+ and this driver read <file:Documentation/serial/rocket.txt>.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called rocket.
-+
-+ If you want to compile this driver into the kernel, say Y here. If
-+ you don't have a Comtrol RocketPort/RocketModem card installed, say N.
-+
-+config CYCLADES
-+ tristate "Cyclades async mux support"
-+ depends on SERIAL_NONSTANDARD && (PCI || ISA)
-+ select FW_LOADER
-+ ---help---
-+ This driver supports Cyclades Z and Y multiserial boards.
-+ You would need something like this to connect more than two modems to
-+ your Linux box, for instance in order to become a dial-in server.
-+
-+ For information about the Cyclades-Z card, read
-+ <file:Documentation/serial/README.cycladesZ>.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called cyclades.
-+
-+ If you haven't heard about it, it's safe to say N.
-+
-+config CYZ_INTR
-+ bool "Cyclades-Z interrupt mode operation (EXPERIMENTAL)"
-+ depends on EXPERIMENTAL && CYCLADES
-+ help
-+ The Cyclades-Z family of multiport cards allows 2 (two) driver op
-+ modes: polling and interrupt. In polling mode, the driver will check
-+ the status of the Cyclades-Z ports every certain amount of time
-+ (which is called polling cycle and is configurable). In interrupt
-+ mode, it will use an interrupt line (IRQ) in order to check the
-+ status of the Cyclades-Z ports. The default op mode is polling. If
-+ unsure, say N.
-+
-+config DIGIEPCA
-+ tristate "Digiboard Intelligent Async Support"
-+ depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
-+ ---help---
-+ This is a driver for Digi International's Xx, Xeve, and Xem series
-+ of cards which provide multiple serial ports. You would need
-+ something like this to connect more than two modems to your Linux
-+ box, for instance in order to become a dial-in server. This driver
-+ supports the original PC (ISA) boards as well as PCI, and EISA. If
-+ you have a card like this, say Y here and read the file
-+ <file:Documentation/serial/digiepca.txt>.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called epca.
-+
-+config MOXA_INTELLIO
-+ tristate "Moxa Intellio support"
-+ depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
-+ select FW_LOADER
-+ help
-+ Say Y here if you have a Moxa Intellio multiport serial card.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called moxa.
-+
-+config MOXA_SMARTIO
-+ tristate "Moxa SmartIO support v. 2.0"
-+ depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA)
-+ help
-+ Say Y here if you have a Moxa SmartIO multiport serial card and/or
-+ want to help develop a new version of this driver.
-+
-+ This is upgraded (1.9.1) driver from original Moxa drivers with
-+ changes finally resulting in PCI probing.
-+
-+ This driver can also be built as a module. The module will be called
-+ mxser. If you want to do that, say M here.
-+
-+config ISI
-+ tristate "Multi-Tech multiport card support (EXPERIMENTAL)"
-+ depends on SERIAL_NONSTANDARD && PCI
-+ select FW_LOADER
-+ help
-+ This is a driver for the Multi-Tech cards which provide several
-+ serial ports. The driver is experimental and can currently only be
-+ built as a module. The module will be called isicom.
-+ If you want to do that, choose M here.
-+
-+config SYNCLINK
-+ tristate "Microgate SyncLink card support"
-+ depends on SERIAL_NONSTANDARD && PCI && ISA_DMA_API
-+ help
-+ Provides support for the SyncLink ISA and PCI multiprotocol serial
-+ adapters. These adapters support asynchronous and HDLC bit
-+ synchronous communication up to 10Mbps (PCI adapter).
-+
-+ This driver can only be built as a module ( = code which can be
-+ inserted in and removed from the running kernel whenever you want).
-+ The module will be called synclink. If you want to do that, say M
-+ here.
-+
-+config SYNCLINKMP
-+ tristate "SyncLink Multiport support"
-+ depends on SERIAL_NONSTANDARD && PCI
-+ help
-+ Enable support for the SyncLink Multiport (2 or 4 ports)
-+ serial adapter, running asynchronous and HDLC communications up
-+ to 2.048Mbps. Each ports is independently selectable for
-+ RS-232, V.35, RS-449, RS-530, and X.21
-+
-+ This driver may be built as a module ( = code which can be
-+ inserted in and removed from the running kernel whenever you want).
-+ The module will be called synclinkmp. If you want to do that, say M
-+ here.
-+
-+config SYNCLINK_GT
-+ tristate "SyncLink GT/AC support"
-+ depends on SERIAL_NONSTANDARD && PCI
-+ help
-+ Support for SyncLink GT and SyncLink AC families of
-+ synchronous and asynchronous serial adapters
-+ manufactured by Microgate Systems, Ltd. (www.microgate.com)
-+
-+config N_HDLC
-+ tristate "HDLC line discipline support"
-+ depends on SERIAL_NONSTANDARD
-+ help
-+ Allows synchronous HDLC communications with tty device drivers that
-+ support synchronous HDLC such as the Microgate SyncLink adapter.
-+
-+ This driver can be built as a module ( = code which can be
-+ inserted in and removed from the running kernel whenever you want).
-+ The module will be called n_hdlc. If you want to do that, say M
-+ here.
-+
-+config N_GSM
-+ tristate "GSM MUX line discipline support (EXPERIMENTAL)"
-+ depends on EXPERIMENTAL
-+ depends on NET
-+ help
-+ This line discipline provides support for the GSM MUX protocol and
-+ presents the mux as a set of 61 individual tty devices.
-+
-+config RISCOM8
-+ tristate "SDL RISCom/8 card support"
-+ depends on SERIAL_NONSTANDARD
-+ help
-+ This is a driver for the SDL Communications RISCom/8 multiport card,
-+ which gives you many serial ports. You would need something like
-+ this to connect more than two modems to your Linux box, for instance
-+ in order to become a dial-in server. If you have a card like that,
-+ say Y here and read the file <file:Documentation/serial/riscom8.txt>.
-+
-+ Also it's possible to say M here and compile this driver as kernel
-+ loadable module; the module will be called riscom8.
-+
-+config SPECIALIX
-+ tristate "Specialix IO8+ card support"
-+ depends on SERIAL_NONSTANDARD
-+ help
-+ This is a driver for the Specialix IO8+ multiport card (both the
-+ ISA and the PCI version) which gives you many serial ports. You
-+ would need something like this to connect more than two modems to
-+ your Linux box, for instance in order to become a dial-in server.
-+
-+ If you have a card like that, say Y here and read the file
-+ <file:Documentation/serial/specialix.txt>. Also it's possible to say
-+ M here and compile this driver as kernel loadable module which will be
-+ called specialix.
-+
-+config SX
-+ tristate "Specialix SX (and SI) card support"
-+ depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA) && BROKEN
-+ help
-+ This is a driver for the SX and SI multiport serial cards.
-+ Please read the file <file:Documentation/serial/sx.txt> for details.
-+
-+ This driver can only be built as a module ( = code which can be
-+ inserted in and removed from the running kernel whenever you want).
-+ The module will be called sx. If you want to do that, say M here.
-+
-+config RIO
-+ tristate "Specialix RIO system support"
-+ depends on SERIAL_NONSTANDARD && BROKEN
-+ help
-+ This is a driver for the Specialix RIO, a smart serial card which
-+ drives an outboard box that can support up to 128 ports. Product
-+ information is at <http://www.perle.com/support/documentation.html#multiport>.
-+ There are both ISA and PCI versions.
-+
-+config RIO_OLDPCI
-+ bool "Support really old RIO/PCI cards"
-+ depends on RIO
-+ help
-+ Older RIO PCI cards need some initialization-time configuration to
-+ determine the IRQ and some control addresses. If you have a RIO and
-+ this doesn't seem to work, try setting this to Y.
-+
-+config STALDRV
-+ bool "Stallion multiport serial support"
-+ depends on SERIAL_NONSTANDARD
-+ help
-+ Stallion cards give you many serial ports. You would need something
-+ like this to connect more than two modems to your Linux box, for
-+ instance in order to become a dial-in server. If you say Y here,
-+ you will be asked for your specific card model in the next
-+ questions. Make sure to read <file:Documentation/serial/stallion.txt>
-+ in this case. If you have never heard about all this, it's safe to
-+ say N.
-+
-+config STALLION
-+ tristate "Stallion EasyIO or EC8/32 support"
-+ depends on STALDRV && (ISA || EISA || PCI)
-+ help
-+ If you have an EasyIO or EasyConnection 8/32 multiport Stallion
-+ card, then this is for you; say Y. Make sure to read
-+ <file:Documentation/serial/stallion.txt>.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called stallion.
-+
-+config ISTALLION
-+ tristate "Stallion EC8/64, ONboard, Brumby support"
-+ depends on STALDRV && (ISA || EISA || PCI)
-+ help
-+ If you have an EasyConnection 8/64, ONboard, Brumby or Stallion
-+ serial multiport card, say Y here. Make sure to read
-+ <file:Documentation/serial/stallion.txt>.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called istallion.
-+
-+config NOZOMI
-+ tristate "HSDPA Broadband Wireless Data Card - Globe Trotter"
-+ depends on PCI && EXPERIMENTAL
-+ help
-+ If you have a HSDPA driver Broadband Wireless Data Card -
-+ Globe Trotter PCMCIA card, say Y here.
-+
-+ To compile this driver as a module, choose M here, the module
-+ will be called nozomi.
-+
-+config A2232
-+ tristate "Commodore A2232 serial support (EXPERIMENTAL)"
-+ depends on EXPERIMENTAL && ZORRO && BROKEN
-+ ---help---
-+ This option supports the 2232 7-port serial card shipped with the
-+ Amiga 2000 and other Zorro-bus machines, dating from 1989. At
-+ a max of 19,200 bps, the ports are served by a 6551 ACIA UART chip
-+ each, plus a 8520 CIA, and a master 6502 CPU and buffer as well. The
-+ ports were connected with 8 pin DIN connectors on the card bracket,
-+ for which 8 pin to DB25 adapters were supplied. The card also had
-+ jumpers internally to toggle various pinning configurations.
-+
-+ This driver can be built as a module; but then "generic_serial"
-+ will also be built as a module. This has to be loaded before
-+ "ser_a2232". If you want to do this, answer M here.
-+
-+config SGI_SNSC
-+ bool "SGI Altix system controller communication support"
-+ depends on (IA64_SGI_SN2 || IA64_GENERIC)
-+ help
-+ If you have an SGI Altix and you want to enable system
-+ controller communication from user space (you want this!),
-+ say Y. Otherwise, say N.
-+
-+config SGI_TIOCX
-+ bool "SGI TIO CX driver support"
-+ depends on (IA64_SGI_SN2 || IA64_GENERIC)
-+ help
-+ If you have an SGI Altix and you have fpga devices attached
-+ to your TIO, say Y here, otherwise say N.
-+
-+config SGI_MBCS
-+ tristate "SGI FPGA Core Services driver support"
-+ depends on SGI_TIOCX
-+ help
-+ If you have an SGI Altix with an attached SABrick
-+ say Y or M here, otherwise say N.
-+
-+source "drivers/serial/Kconfig"
-+
-+config UNIX98_PTYS
-+ bool "Unix98 PTY support" if EMBEDDED
-+ default y
-+ ---help---
-+ A pseudo terminal (PTY) is a software device consisting of two
-+ halves: a master and a slave. The slave device behaves identical to
-+ a physical terminal; the master device is used by a process to
-+ read data from and write data to the slave, thereby emulating a
-+ terminal. Typical programs for the master side are telnet servers
-+ and xterms.
-+
-+ Linux has traditionally used the BSD-like names /dev/ptyxx for
-+ masters and /dev/ttyxx for slaves of pseudo terminals. This scheme
-+ has a number of problems. The GNU C library glibc 2.1 and later,
-+ however, supports the Unix98 naming standard: in order to acquire a
-+ pseudo terminal, a process opens /dev/ptmx; the number of the pseudo
-+ terminal is then made available to the process and the pseudo
-+ terminal slave can be accessed as /dev/pts/<number>. What was
-+ traditionally /dev/ttyp2 will then be /dev/pts/2, for example.
-+
-+ All modern Linux systems use the Unix98 ptys. Say Y unless
-+ you're on an embedded system and want to conserve memory.
-+
-+config DEVPTS_MULTIPLE_INSTANCES
-+ bool "Support multiple instances of devpts"
-+ depends on UNIX98_PTYS
-+ default n
-+ ---help---
-+ Enable support for multiple instances of devpts filesystem.
-+ If you want to have isolated PTY namespaces (eg: in containers),
-+ say Y here. Otherwise, say N. If enabled, each mount of devpts
-+ filesystem with the '-o newinstance' option will create an
-+ independent PTY namespace.
-+
-+config LEGACY_PTYS
-+ bool "Legacy (BSD) PTY support"
-+ default y
-+ ---help---
-+ A pseudo terminal (PTY) is a software device consisting of two
-+ halves: a master and a slave. The slave device behaves identical to
-+ a physical terminal; the master device is used by a process to
-+ read data from and write data to the slave, thereby emulating a
-+ terminal. Typical programs for the master side are telnet servers
-+ and xterms.
-+
-+ Linux has traditionally used the BSD-like names /dev/ptyxx
-+ for masters and /dev/ttyxx for slaves of pseudo
-+ terminals. This scheme has a number of problems, including
-+ security. This option enables these legacy devices; on most
-+ systems, it is safe to say N.
-+
-+
-+config LEGACY_PTY_COUNT
-+ int "Maximum number of legacy PTY in use"
-+ depends on LEGACY_PTYS
-+ range 0 256
-+ default "256"
-+ ---help---
-+ The maximum number of legacy PTYs that can be used at any one time.
-+ The default is 256, and should be more than enough. Embedded
-+ systems may want to reduce this to save memory.
-+
-+ When not in use, each legacy PTY occupies 12 bytes on 32-bit
-+ architectures and 24 bytes on 64-bit architectures.
-+
-+config BRIQ_PANEL
-+ tristate 'Total Impact briQ front panel driver'
-+ depends on PPC_CHRP
-+ ---help---
-+ The briQ is a small footprint CHRP computer with a frontpanel VFD, a
-+ tristate led and two switches. It is the size of a CDROM drive.
-+
-+ If you have such one and want anything showing on the VFD then you
-+ must answer Y here.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called briq_panel.
-+
-+ It's safe to say N here.
-+
-+config BFIN_OTP
-+ tristate "Blackfin On-Chip OTP Memory Support"
-+ depends on BLACKFIN && (BF51x || BF52x || BF54x)
-+ default y
-+ help
-+ If you say Y here, you will get support for a character device
-+ interface into the One Time Programmable memory pages that are
-+ stored on the Blackfin processor. This will not get you access
-+ to the secure memory pages however. You will need to write your
-+ own secure code and reader for that.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called bfin-otp.
-+
-+ If unsure, it is safe to say Y.
-+
-+config BFIN_OTP_WRITE_ENABLE
-+ bool "Enable writing support of OTP pages"
-+ depends on BFIN_OTP
-+ default n
-+ help
-+ If you say Y here, you will enable support for writing of the
-+ OTP pages. This is dangerous by nature as you can only program
-+ the pages once, so only enable this option when you actually
-+ need it so as to not inadvertently clobber data.
-+
-+ If unsure, say N.
-+
-+config PRINTER
-+ tristate "Parallel printer support"
-+ depends on PARPORT
-+ ---help---
-+ If you intend to attach a printer to the parallel port of your Linux
-+ box (as opposed to using a serial printer; if the connector at the
-+ printer has 9 or 25 holes ["female"], then it's serial), say Y.
-+ Also read the Printing-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ It is possible to share one parallel port among several devices
-+ (e.g. printer and ZIP drive) and it is safe to compile the
-+ corresponding drivers into the kernel.
-+
-+ To compile this driver as a module, choose M here and read
-+ <file:Documentation/parport.txt>. The module will be called lp.
-+
-+ If you have several parallel ports, you can specify which ports to
-+ use with the "lp" kernel command line option. (Try "man bootparam"
-+ or see the documentation of your boot loader (lilo or loadlin) about
-+ how to pass options to the kernel at boot time.) The syntax of the
-+ "lp" command line option can be found in <file:drivers/char/lp.c>.
-+
-+ If you have more than 8 printers, you need to increase the LP_NO
-+ macro in lp.c and the PARPORT_MAX macro in parport.h.
-+
-+config LP_CONSOLE
-+ bool "Support for console on line printer"
-+ depends on PRINTER
-+ ---help---
-+ If you want kernel messages to be printed out as they occur, you
-+ can have a console on the printer. This option adds support for
-+ doing that; to actually get it to happen you need to pass the
-+ option "console=lp0" to the kernel at boot time.
-+
-+ If the printer is out of paper (or off, or unplugged, or too
-+ busy..) the kernel will stall until the printer is ready again.
-+ By defining CONSOLE_LP_STRICT to 0 (at your own risk) you
-+ can make the kernel continue when this happens,
-+ but it'll lose the kernel messages.
-+
-+ If unsure, say N.
-+
-+config PPDEV
-+ tristate "Support for user-space parallel port device drivers"
-+ depends on PARPORT
-+ ---help---
-+ Saying Y to this adds support for /dev/parport device nodes. This
-+ is needed for programs that want portable access to the parallel
-+ port, for instance deviceid (which displays Plug-and-Play device
-+ IDs).
-+
-+ This is the parallel port equivalent of SCSI generic support (sg).
-+ It is safe to say N to this -- it is not needed for normal printing
-+ or parallel port CD-ROM/disk support.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called ppdev.
-+
-+ If unsure, say N.
-+
-+config HVC_DRIVER
-+ bool
-+ help
-+ Generic "hypervisor virtual console" infrastructure for various
-+ hypervisors (pSeries, iSeries, Xen, lguest).
-+ It will automatically be selected if one of the back-end console drivers
-+ is selected.
-+
-+config HVC_IRQ
-+ bool
-+
-+config HVC_CONSOLE
-+ bool "pSeries Hypervisor Virtual Console support"
-+ depends on PPC_PSERIES
-+ select HVC_DRIVER
-+ select HVC_IRQ
-+ help
-+ pSeries machines when partitioned support a hypervisor virtual
-+ console. This driver allows each pSeries partition to have a console
-+ which is accessed via the HMC.
-+
-+config HVC_ISERIES
-+ bool "iSeries Hypervisor Virtual Console support"
-+ depends on PPC_ISERIES
-+ default y
-+ select HVC_DRIVER
-+ select HVC_IRQ
-+ select VIOPATH
-+ help
-+ iSeries machines support a hypervisor virtual console.
-+
-+config HVC_RTAS
-+ bool "IBM RTAS Console support"
-+ depends on PPC_RTAS
-+ select HVC_DRIVER
-+ help
-+ IBM Console device driver which makes use of RTAS
-+
-+config HVC_BEAT
-+ bool "Toshiba's Beat Hypervisor Console support"
-+ depends on PPC_CELLEB
-+ select HVC_DRIVER
-+ help
-+ Toshiba's Cell Reference Set Beat Console device driver
-+
-+config HVC_IUCV
-+ bool "z/VM IUCV Hypervisor console support (VM only)"
-+ depends on S390
-+ select HVC_DRIVER
-+ select IUCV
-+ default y
-+ help
-+ This driver provides a Hypervisor console (HVC) back-end to access
-+ a Linux (console) terminal via a z/VM IUCV communication path.
-+
-+config HVC_XEN
-+ bool "Xen Hypervisor Console support"
-+ depends on XEN
-+ select HVC_DRIVER
-+ select HVC_IRQ
-+ default y
-+ help
-+ Xen virtual console device driver
-+
-+config HVC_UDBG
-+ bool "udbg based fake hypervisor console"
-+ depends on PPC && EXPERIMENTAL
-+ select HVC_DRIVER
-+ default n
-+
-+config VIRTIO_CONSOLE
-+ tristate "Virtio console"
-+ depends on VIRTIO
-+ select HVC_DRIVER
-+ help
-+ Virtio console for use with lguest and other hypervisors.
-+
-+ Also serves as a general-purpose serial device for data
-+ transfer between the guest and host. Character devices at
-+ /dev/vportNpn will be created when corresponding ports are
-+ found, where N is the device number and n is the port number
-+ within that device. If specified by the host, a sysfs
-+ attribute called 'name' will be populated with a name for
-+ the port which can be used by udev scripts to create a
-+ symlink to the device.
-+
-+config HVCS
-+ tristate "IBM Hypervisor Virtual Console Server support"
-+ depends on PPC_PSERIES && HVC_CONSOLE
-+ help
-+ Partitionable IBM Power5 ppc64 machines allow hosting of
-+ firmware virtual consoles from one Linux partition by
-+ another Linux partition. This driver allows console data
-+ from Linux partitions to be accessed through TTY device
-+ interfaces in the device tree of a Linux partition running
-+ this driver.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called hvcs. Additionally, this module
-+ will depend on arch specific APIs exported from hvcserver.ko
-+ which will also be compiled when this driver is built as a
-+ module.
-+
-+config IBM_BSR
-+ tristate "IBM POWER Barrier Synchronization Register support"
-+ depends on PPC_PSERIES
-+ help
-+ This devices exposes a hardware mechanism for fast synchronization
-+ of threads across a large system which avoids bouncing a cacheline
-+ between several cores on a system
-+
-+source "drivers/char/ipmi/Kconfig"
-+
-+config DS1620
-+ tristate "NetWinder thermometer support"
-+ depends on ARCH_NETWINDER
-+ help
-+ Say Y here to include support for the thermal management hardware
-+ found in the NetWinder. This driver allows the user to control the
-+ temperature set points and to read the current temperature.
-+
-+ It is also possible to say M here to build it as a module (ds1620)
-+ It is recommended to be used on a NetWinder, but it is not a
-+ necessity.
-+
-+config NWBUTTON
-+ tristate "NetWinder Button"
-+ depends on ARCH_NETWINDER
-+ ---help---
-+ If you say Y here and create a character device node /dev/nwbutton
-+ with major and minor numbers 10 and 158 ("man mknod"), then every
-+ time the orange button is pressed a number of times, the number of
-+ times the button was pressed will be written to that device.
-+
-+ This is most useful for applications, as yet unwritten, which
-+ perform actions based on how many times the button is pressed in a
-+ row.
-+
-+ Do not hold the button down for too long, as the driver does not
-+ alter the behaviour of the hardware reset circuitry attached to the
-+ button; it will still execute a hard reset if the button is held
-+ down for longer than approximately five seconds.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called nwbutton.
-+
-+ Most people will answer Y to this question and "Reboot Using Button"
-+ below to be able to initiate a system shutdown from the button.
-+
-+config NWBUTTON_REBOOT
-+ bool "Reboot Using Button"
-+ depends on NWBUTTON
-+ help
-+ If you say Y here, then you will be able to initiate a system
-+ shutdown and reboot by pressing the orange button a number of times.
-+ The number of presses to initiate the shutdown is two by default,
-+ but this can be altered by modifying the value of NUM_PRESSES_REBOOT
-+ in nwbutton.h and recompiling the driver or, if you compile the
-+ driver as a module, you can specify the number of presses at load
-+ time with "insmod button reboot_count=<something>".
-+
-+config NWFLASH
-+ tristate "NetWinder flash support"
-+ depends on ARCH_NETWINDER
-+ ---help---
-+ If you say Y here and create a character device /dev/flash with
-+ major 10 and minor 160 you can manipulate the flash ROM containing
-+ the NetWinder firmware. Be careful as accidentally overwriting the
-+ flash contents can render your computer unbootable. On no account
-+ allow random users access to this device. :-)
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called nwflash.
-+
-+ If you're not sure, say N.
-+
-+source "drivers/char/hw_random/Kconfig"
-+
-+config NVRAM
-+ tristate "/dev/nvram support"
-+ depends on ATARI || X86 || (ARM && RTC_DRV_CMOS) || GENERIC_NVRAM
-+ ---help---
-+ If you say Y here and create a character special file /dev/nvram
-+ with major number 10 and minor number 144 using mknod ("man mknod"),
-+ you get read and write access to the extra bytes of non-volatile
-+ memory in the real time clock (RTC), which is contained in every PC
-+ and most Ataris. The actual number of bytes varies, depending on the
-+ nvram in the system, but is usually 114 (128-14 for the RTC).
-+
-+ This memory is conventionally called "CMOS RAM" on PCs and "NVRAM"
-+ on Ataris. /dev/nvram may be used to view settings there, or to
-+ change them (with some utility). It could also be used to frequently
-+ save a few bits of very important data that may not be lost over
-+ power-off and for which writing to disk is too insecure. Note
-+ however that most NVRAM space in a PC belongs to the BIOS and you
-+ should NEVER idly tamper with it. See Ralf Brown's interrupt list
-+ for a guide to the use of CMOS bytes by your BIOS.
-+
-+ On Atari machines, /dev/nvram is always configured and does not need
-+ to be selected.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called nvram.
-+
-+#
-+# These legacy RTC drivers just cause too many conflicts with the generic
-+# RTC framework ... let's not even try to coexist any more.
-+#
-+if RTC_LIB=n
-+
-+config RTC
-+ tristate "Enhanced Real Time Clock Support (legacy PC RTC driver)"
-+ depends on !PPC && !PARISC && !IA64 && !M68K && !SPARC && !FRV \
-+ && !ARM && !SUPERH && !S390 && !AVR32 && !BLACKFIN
-+ ---help---
-+ If you say Y here and create a character special file /dev/rtc with
-+ major number 10 and minor number 135 using mknod ("man mknod"), you
-+ will get access to the real time clock (or hardware clock) built
-+ into your computer.
-+
-+ Every PC has such a clock built in. It can be used to generate
-+ signals from as low as 1Hz up to 8192Hz, and can also be used
-+ as a 24 hour alarm. It reports status information via the file
-+ /proc/driver/rtc and its behaviour is set by various ioctls on
-+ /dev/rtc.
-+
-+ If you run Linux on a multiprocessor machine and said Y to
-+ "Symmetric Multi Processing" above, you should say Y here to read
-+ and set the RTC in an SMP compatible fashion.
-+
-+ If you think you have a use for such a device (such as periodic data
-+ sampling), then say Y here, and read <file:Documentation/rtc.txt>
-+ for details.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called rtc.
-+
-+config JS_RTC
-+ tristate "Enhanced Real Time Clock Support"
-+ depends on SPARC32 && PCI
-+ ---help---
-+ If you say Y here and create a character special file /dev/rtc with
-+ major number 10 and minor number 135 using mknod ("man mknod"), you
-+ will get access to the real time clock (or hardware clock) built
-+ into your computer.
-+
-+ Every PC has such a clock built in. It can be used to generate
-+ signals from as low as 1Hz up to 8192Hz, and can also be used
-+ as a 24 hour alarm. It reports status information via the file
-+ /proc/driver/rtc and its behaviour is set by various ioctls on
-+ /dev/rtc.
-+
-+ If you think you have a use for such a device (such as periodic data
-+ sampling), then say Y here, and read <file:Documentation/rtc.txt>
-+ for details.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called js-rtc.
-+
-+config GEN_RTC
-+ tristate "Generic /dev/rtc emulation"
-+ depends on RTC!=y && !IA64 && !ARM && !M32R && !MIPS && !SPARC && !FRV && !S390 && !SUPERH && !AVR32 && !BLACKFIN
-+ ---help---
-+ If you say Y here and create a character special file /dev/rtc with
-+ major number 10 and minor number 135 using mknod ("man mknod"), you
-+ will get access to the real time clock (or hardware clock) built
-+ into your computer.
-+
-+ It reports status information via the file /proc/driver/rtc and its
-+ behaviour is set by various ioctls on /dev/rtc. If you enable the
-+ "extended RTC operation" below it will also provide an emulation
-+ for RTC_UIE which is required by some programs and may improve
-+ precision in some cases.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called genrtc.
-+
-+config GEN_RTC_X
-+ bool "Extended RTC operation"
-+ depends on GEN_RTC
-+ help
-+ Provides an emulation for RTC_UIE which is required by some programs
-+ and may improve precision of the generic RTC support in some cases.
-+
-+config EFI_RTC
-+ bool "EFI Real Time Clock Services"
-+ depends on IA64
-+
-+config DS1302
-+ tristate "DS1302 RTC support"
-+ depends on M32R && (PLAT_M32700UT || PLAT_OPSPUT)
-+ help
-+ If you say Y here and create a character special file /dev/rtc with
-+ major number 121 and minor number 0 using mknod ("man mknod"), you
-+ will get access to the real time clock (or hardware clock) built
-+ into your computer.
-+
-+endif # RTC_LIB
-+
-+config DTLK
-+ tristate "Double Talk PC internal speech card support"
-+ depends on ISA
-+ help
-+ This driver is for the DoubleTalk PC, a speech synthesizer
-+ manufactured by RC Systems (<http://www.rcsys.com/>). It is also
-+ called the `internal DoubleTalk'.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called dtlk.
-+
-+config XILINX_HWICAP
-+ tristate "Xilinx HWICAP Support"
-+ depends on XILINX_VIRTEX || MICROBLAZE
-+ help
-+ This option enables support for Xilinx Internal Configuration
-+ Access Port (ICAP) driver. The ICAP is used on Xilinx Virtex
-+ FPGA platforms to partially reconfigure the FPGA at runtime.
-+
-+ If unsure, say N.
-+
-+config R3964
-+ tristate "Siemens R3964 line discipline"
-+ ---help---
-+ This driver allows synchronous communication with devices using the
-+ Siemens R3964 packet protocol. Unless you are dealing with special
-+ hardware like PLCs, you are unlikely to need this.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called n_r3964.
-+
-+ If unsure, say N.
-+
-+config APPLICOM
-+ tristate "Applicom intelligent fieldbus card support"
-+ depends on PCI
-+ ---help---
-+ This driver provides the kernel-side support for the intelligent
-+ fieldbus cards made by Applicom International. More information
-+ about these cards can be found on the WWW at the address
-+ <http://www.applicom-int.com/>, or by email from David Woodhouse
-+ <dwmw2@infradead.org>.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called applicom.
-+
-+ If unsure, say N.
-+
-+config SONYPI
-+ tristate "Sony Vaio Programmable I/O Control Device support (EXPERIMENTAL)"
-+ depends on EXPERIMENTAL && X86 && PCI && INPUT && !64BIT
-+ ---help---
-+ This driver enables access to the Sony Programmable I/O Control
-+ Device which can be found in many (all ?) Sony Vaio laptops.
-+
-+ If you have one of those laptops, read
-+ <file:Documentation/laptops/sonypi.txt>, and say Y or M here.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called sonypi.
-+
-+config GPIO_TB0219
-+ tristate "TANBAC TB0219 GPIO support"
-+ depends on TANBAC_TB022X
-+ select GPIO_VR41XX
-+
-+source "drivers/char/pcmcia/Kconfig"
-+
-+config MWAVE
-+ tristate "ACP Modem (Mwave) support"
-+ depends on X86
-+ select SERIAL_8250
-+ ---help---
-+ The ACP modem (Mwave) for Linux is a WinModem. It is composed of a
-+ kernel driver and a user level application. Together these components
-+ support direct attachment to public switched telephone networks (PSTNs)
-+ and support selected world wide countries.
-+
-+ This version of the ACP Modem driver supports the IBM Thinkpad 600E,
-+ 600, and 770 that include on board ACP modem hardware.
-+
-+ The modem also supports the standard communications port interface
-+ (ttySx) and is compatible with the Hayes AT Command Set.
-+
-+ The user level application needed to use this driver can be found at
-+ the IBM Linux Technology Center (LTC) web site:
-+ <http://www.ibm.com/linux/ltc/>.
-+
-+ If you own one of the above IBM Thinkpads which has the Mwave chipset
-+ in it, say Y.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called mwave.
-+
-+config SCx200_GPIO
-+ tristate "NatSemi SCx200 GPIO Support"
-+ depends on SCx200
-+ select NSC_GPIO
-+ help
-+ Give userspace access to the GPIO pins on the National
-+ Semiconductor SCx200 processors.
-+
-+ If compiled as a module, it will be called scx200_gpio.
-+
-+config PC8736x_GPIO
-+ tristate "NatSemi PC8736x GPIO Support"
-+ depends on X86
-+ default SCx200_GPIO # mostly N
-+ select NSC_GPIO # needed for support routines
-+ help
-+ Give userspace access to the GPIO pins on the National
-+ Semiconductor PC-8736x (x=[03456]) SuperIO chip. The chip
-+ has multiple functional units, inc several managed by
-+ hwmon/pc87360 driver. Tested with PC-87366
-+
-+ If compiled as a module, it will be called pc8736x_gpio.
-+
-+config NSC_GPIO
-+ tristate "NatSemi Base GPIO Support"
-+ depends on X86_32
-+ # selected by SCx200_GPIO and PC8736x_GPIO
-+ # what about 2 selectors differing: m != y
-+ help
-+ Common support used (and needed) by scx200_gpio and
-+ pc8736x_gpio drivers. If those drivers are built as
-+ modules, this one will be too, named nsc_gpio
-+
-+config CS5535_GPIO
-+ tristate "AMD CS5535/CS5536 GPIO (Geode Companion Device)"
-+ depends on X86_32
-+ help
-+ Give userspace access to the GPIO pins on the AMD CS5535 and
-+ CS5536 Geode companion devices.
-+
-+ If compiled as a module, it will be called cs5535_gpio.
-+
-+config RAW_DRIVER
-+ tristate "RAW driver (/dev/raw/rawN)"
-+ depends on BLOCK
-+ help
-+ The raw driver permits block devices to be bound to /dev/raw/rawN.
-+ Once bound, I/O against /dev/raw/rawN uses efficient zero-copy I/O.
-+ See the raw(8) manpage for more details.
-+
-+ Applications should preferably open the device (eg /dev/hda1)
-+ with the O_DIRECT flag.
-+
-+config MAX_RAW_DEVS
-+ int "Maximum number of RAW devices to support (1-8192)"
-+ depends on RAW_DRIVER
-+ default "256"
-+ help
-+ The maximum number of RAW devices that are supported.
-+ Default is 256. Increase this number in case you need lots of
-+ raw devices.
-+
-+config HPET
-+ bool "HPET - High Precision Event Timer" if (X86 || IA64)
-+ default n
-+ depends on ACPI
-+ help
-+ If you say Y here, you will have a miscdevice named "/dev/hpet/". Each
-+ open selects one of the timers supported by the HPET. The timers are
-+ non-periodic and/or periodic.
-+
-+config HPET_MMAP
-+ bool "Allow mmap of HPET"
-+ default y
-+ depends on HPET
-+ help
-+ If you say Y here, user applications will be able to mmap
-+ the HPET registers.
-+
-+ In some hardware implementations, the page containing HPET
-+ registers may also contain other things that shouldn't be
-+ exposed to the user. If this applies to your hardware,
-+ say N here.
-+
-+config HANGCHECK_TIMER
-+ tristate "Hangcheck timer"
-+ depends on X86 || IA64 || PPC64 || S390
-+ help
-+ The hangcheck-timer module detects when the system has gone
-+ out to lunch past a certain margin. It can reboot the system
-+ or merely print a warning.
-+
-+config MMTIMER
-+ tristate "MMTIMER Memory mapped RTC for SGI Altix"
-+ depends on IA64_GENERIC || IA64_SGI_SN2
-+ default y
-+ help
-+ The mmtimer device allows direct userspace access to the
-+ Altix system timer.
-+
-+config UV_MMTIMER
-+ tristate "UV_MMTIMER Memory mapped RTC for SGI UV"
-+ depends on X86_UV
-+ default m
-+ help
-+ The uv_mmtimer device allows direct userspace access to the
-+ UV system timer.
-+
-+source "drivers/char/tpm/Kconfig"
-+
-+config TELCLOCK
-+ tristate "Telecom clock driver for ATCA SBC"
-+ depends on EXPERIMENTAL && X86
-+ default n
-+ help
-+ The telecom clock device is specific to the MPCBL0010 and MPCBL0050
-+ ATCA computers and allows direct userspace access to the
-+ configuration of the telecom clock configuration settings. This
-+ device is used for hardware synchronization across the ATCA backplane
-+ fabric. Upon loading, the driver exports a sysfs directory,
-+ /sys/devices/platform/telco_clock, with a number of files for
-+ controlling the behavior of this hardware.
-+
-+config DEVPORT
-+ bool
-+ depends on !M68K
-+ depends on ISA || PCI
-+ default y
-+
-+source "drivers/s390/char/Kconfig"
-+
-+config RAMOOPS
-+ tristate "Log panic/oops to a RAM buffer"
-+ depends on HAS_IOMEM
-+ default n
-+ help
-+ This enables panic and oops messages to be logged to a circular
-+ buffer in RAM where it can be read back at some later point.
-+
-+endmenu
-+
-diff -Nur linux-2.6.35.7.orig/drivers/char/Makefile linux-2.6.35.7/drivers/char/Makefile
---- linux-2.6.35.7.orig/drivers/char/Makefile 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/drivers/char/Makefile 2010-10-14 20:27:59.875601109 +0200
-@@ -96,6 +96,7 @@
+diff -Nur linux-2.6.36.orig/drivers/char/Makefile linux-2.6.36/drivers/char/Makefile
+--- linux-2.6.36.orig/drivers/char/Makefile 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/char/Makefile 2010-11-18 21:16:07.000000000 +0100
+@@ -98,6 +98,7 @@
obj-$(CONFIG_PC8736x_GPIO) += pc8736x_gpio.o
obj-$(CONFIG_NSC_GPIO) += nsc_gpio.o
obj-$(CONFIG_CS5535_GPIO) += cs5535_gpio.o
@@ -13052,152 +10173,9 @@ diff -Nur linux-2.6.35.7.orig/drivers/char/Makefile linux-2.6.35.7/drivers/char/
obj-$(CONFIG_GPIO_TB0219) += tb0219.o
obj-$(CONFIG_TELCLOCK) += tlclk.o
-diff -Nur linux-2.6.35.7.orig/drivers/char/Makefile.orig linux-2.6.35.7/drivers/char/Makefile.orig
---- linux-2.6.35.7.orig/drivers/char/Makefile.orig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/char/Makefile.orig 2010-09-29 03:09:08.000000000 +0200
-@@ -0,0 +1,139 @@
-+#
-+# Makefile for the kernel character device drivers.
-+#
-+
-+#
-+# This file contains the font map for the default (hardware) font
-+#
-+FONTMAPFILE = cp437.uni
-+
-+obj-y += mem.o random.o tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o tty_buffer.o tty_port.o
-+
-+obj-$(CONFIG_LEGACY_PTYS) += pty.o
-+obj-$(CONFIG_UNIX98_PTYS) += pty.o
-+obj-y += misc.o
-+obj-$(CONFIG_VT) += vt_ioctl.o vc_screen.o selection.o keyboard.o
-+obj-$(CONFIG_BFIN_JTAG_COMM) += bfin_jtag_comm.o
-+obj-$(CONFIG_CONSOLE_TRANSLATIONS) += consolemap.o consolemap_deftbl.o
-+obj-$(CONFIG_HW_CONSOLE) += vt.o defkeymap.o
-+obj-$(CONFIG_AUDIT) += tty_audit.o
-+obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o
-+obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o
-+obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o
-+obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o
-+obj-$(CONFIG_ROCKETPORT) += rocket.o
-+obj-$(CONFIG_SERIAL167) += serial167.o
-+obj-$(CONFIG_CYCLADES) += cyclades.o
-+obj-$(CONFIG_STALLION) += stallion.o
-+obj-$(CONFIG_ISTALLION) += istallion.o
-+obj-$(CONFIG_NOZOMI) += nozomi.o
-+obj-$(CONFIG_DIGIEPCA) += epca.o
-+obj-$(CONFIG_SPECIALIX) += specialix.o
-+obj-$(CONFIG_MOXA_INTELLIO) += moxa.o
-+obj-$(CONFIG_A2232) += ser_a2232.o generic_serial.o
-+obj-$(CONFIG_ATARI_DSP56K) += dsp56k.o
-+obj-$(CONFIG_MOXA_SMARTIO) += mxser.o
-+obj-$(CONFIG_COMPUTONE) += ip2/
-+obj-$(CONFIG_RISCOM8) += riscom8.o
-+obj-$(CONFIG_ISI) += isicom.o
-+obj-$(CONFIG_SYNCLINK) += synclink.o
-+obj-$(CONFIG_SYNCLINKMP) += synclinkmp.o
-+obj-$(CONFIG_SYNCLINK_GT) += synclink_gt.o
-+obj-$(CONFIG_N_HDLC) += n_hdlc.o
-+obj-$(CONFIG_N_GSM) += n_gsm.o
-+obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
-+obj-$(CONFIG_SX) += sx.o generic_serial.o
-+obj-$(CONFIG_RIO) += rio/ generic_serial.o
-+obj-$(CONFIG_HVC_CONSOLE) += hvc_vio.o hvsi.o
-+obj-$(CONFIG_HVC_ISERIES) += hvc_iseries.o
-+obj-$(CONFIG_HVC_RTAS) += hvc_rtas.o
-+obj-$(CONFIG_HVC_BEAT) += hvc_beat.o
-+obj-$(CONFIG_HVC_DRIVER) += hvc_console.o
-+obj-$(CONFIG_HVC_IRQ) += hvc_irq.o
-+obj-$(CONFIG_HVC_XEN) += hvc_xen.o
-+obj-$(CONFIG_HVC_IUCV) += hvc_iucv.o
-+obj-$(CONFIG_HVC_UDBG) += hvc_udbg.o
-+obj-$(CONFIG_VIRTIO_CONSOLE) += virtio_console.o
-+obj-$(CONFIG_RAW_DRIVER) += raw.o
-+obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o
-+obj-$(CONFIG_MSPEC) += mspec.o
-+obj-$(CONFIG_MMTIMER) += mmtimer.o
-+obj-$(CONFIG_UV_MMTIMER) += uv_mmtimer.o
-+obj-$(CONFIG_VIOTAPE) += viotape.o
-+obj-$(CONFIG_HVCS) += hvcs.o
-+obj-$(CONFIG_IBM_BSR) += bsr.o
-+obj-$(CONFIG_SGI_MBCS) += mbcs.o
-+obj-$(CONFIG_BRIQ_PANEL) += briq_panel.o
-+obj-$(CONFIG_BFIN_OTP) += bfin-otp.o
-+
-+obj-$(CONFIG_PRINTER) += lp.o
-+
-+obj-$(CONFIG_APM_EMULATION) += apm-emulation.o
-+
-+obj-$(CONFIG_DTLK) += dtlk.o
-+obj-$(CONFIG_R3964) += n_r3964.o
-+obj-$(CONFIG_APPLICOM) += applicom.o
-+obj-$(CONFIG_SONYPI) += sonypi.o
-+obj-$(CONFIG_RTC) += rtc.o
-+obj-$(CONFIG_HPET) += hpet.o
-+obj-$(CONFIG_GEN_RTC) += genrtc.o
-+obj-$(CONFIG_EFI_RTC) += efirtc.o
-+obj-$(CONFIG_DS1302) += ds1302.o
-+obj-$(CONFIG_XILINX_HWICAP) += xilinx_hwicap/
-+ifeq ($(CONFIG_GENERIC_NVRAM),y)
-+ obj-$(CONFIG_NVRAM) += generic_nvram.o
-+else
-+ obj-$(CONFIG_NVRAM) += nvram.o
-+endif
-+obj-$(CONFIG_TOSHIBA) += toshiba.o
-+obj-$(CONFIG_I8K) += i8k.o
-+obj-$(CONFIG_DS1620) += ds1620.o
-+obj-$(CONFIG_HW_RANDOM) += hw_random/
-+obj-$(CONFIG_PPDEV) += ppdev.o
-+obj-$(CONFIG_NWBUTTON) += nwbutton.o
-+obj-$(CONFIG_NWFLASH) += nwflash.o
-+obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o
-+obj-$(CONFIG_PC8736x_GPIO) += pc8736x_gpio.o
-+obj-$(CONFIG_NSC_GPIO) += nsc_gpio.o
-+obj-$(CONFIG_CS5535_GPIO) += cs5535_gpio.o
-+obj-$(CONFIG_GPIO_TB0219) += tb0219.o
-+obj-$(CONFIG_TELCLOCK) += tlclk.o
-+
-+obj-$(CONFIG_MWAVE) += mwave/
-+obj-$(CONFIG_AGP) += agp/
-+obj-$(CONFIG_PCMCIA) += pcmcia/
-+obj-$(CONFIG_IPMI_HANDLER) += ipmi/
-+
-+obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o
-+obj-$(CONFIG_TCG_TPM) += tpm/
-+
-+obj-$(CONFIG_PS3_FLASH) += ps3flash.o
-+obj-$(CONFIG_RAMOOPS) += ramoops.o
-+
-+obj-$(CONFIG_JS_RTC) += js-rtc.o
-+js-rtc-y = rtc.o
-+
-+# Files generated that shall be removed upon make clean
-+clean-files := consolemap_deftbl.c defkeymap.c
-+
-+quiet_cmd_conmk = CONMK $@
-+ cmd_conmk = scripts/conmakehash $< > $@
-+
-+$(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE)
-+ $(call cmd,conmk)
-+
-+$(obj)/defkeymap.o: $(obj)/defkeymap.c
-+
-+# Uncomment if you're changing the keymap and have an appropriate
-+# loadkeys version for the map. By default, we'll use the shipped
-+# versions.
-+# GENERATE_KEYMAP := 1
-+
-+ifdef GENERATE_KEYMAP
-+
-+$(obj)/defkeymap.c: $(obj)/%.c: $(src)/%.map
-+ loadkeys --mktable $< > $@.tmp
-+ sed -e 's/^static *//' $@.tmp > $@
-+ rm $@.tmp
-+
-+endif
-diff -Nur linux-2.6.35.7.orig/drivers/gpio/nxp_74hc153.c linux-2.6.35.7/drivers/gpio/nxp_74hc153.c
---- linux-2.6.35.7.orig/drivers/gpio/nxp_74hc153.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/gpio/nxp_74hc153.c 2010-10-14 20:27:59.918101359 +0200
+diff -Nur linux-2.6.36.orig/drivers/gpio/nxp_74hc153.c linux-2.6.36/drivers/gpio/nxp_74hc153.c
+--- linux-2.6.36.orig/drivers/gpio/nxp_74hc153.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/drivers/gpio/nxp_74hc153.c 2010-11-18 21:16:11.000000000 +0100
@@ -0,0 +1,246 @@
+/*
+ * NXP 74HC153 - Dual 4-input multiplexer GPIO driver
@@ -13445,9 +10423,42 @@ diff -Nur linux-2.6.35.7.orig/drivers/gpio/nxp_74hc153.c linux-2.6.35.7/drivers/
+MODULE_DESCRIPTION("GPIO expander driver for NXP 74HC153");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" NXP_74HC153_DRIVER_NAME);
-diff -Nur linux-2.6.35.7.orig/drivers/input/misc/gpio_buttons.c linux-2.6.35.7/drivers/input/misc/gpio_buttons.c
---- linux-2.6.35.7.orig/drivers/input/misc/gpio_buttons.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/input/misc/gpio_buttons.c 2010-10-14 20:27:59.954442279 +0200
+diff -Nur linux-2.6.36.orig/drivers/input/misc/Kconfig linux-2.6.36/drivers/input/misc/Kconfig
+--- linux-2.6.36.orig/drivers/input/misc/Kconfig 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/input/misc/Kconfig 2010-11-18 21:16:11.000000000 +0100
+@@ -438,4 +438,20 @@
+ To compile this driver as a module, choose M here: the
+ module will be called adxl34x-spi.
+
++config INPUT_GPIO_BUTTONS
++ tristate "Polled GPIO buttons interface"
++ depends on GENERIC_GPIO
++ select INPUT_POLLDEV
++ help
++ This driver implements support for buttons connected
++ to GPIO pins of various CPUs (and some other chips).
++
++ Say Y here if your device has buttons connected
++ directly to such GPIO pins. Your board-specific
++ setup logic must also provide a platform device,
++ with configuration data saying which GPIOs are used.
++
++ To compile this driver as a module, choose M here: the
++ module will be called gpio-buttons.
++
+ endif
+diff -Nur linux-2.6.36.orig/drivers/input/misc/Makefile linux-2.6.36/drivers/input/misc/Makefile
+--- linux-2.6.36.orig/drivers/input/misc/Makefile 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/input/misc/Makefile 2010-11-18 21:16:12.000000000 +0100
+@@ -41,4 +41,5 @@
+ obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o
+ obj-$(CONFIG_INPUT_WM831X_ON) += wm831x-on.o
+ obj-$(CONFIG_INPUT_YEALINK) += yealink.o
++obj-$(CONFIG_INPUT_GPIO_BUTTONS) += gpio_buttons.o
+
+diff -Nur linux-2.6.36.orig/drivers/input/misc/gpio_buttons.c linux-2.6.36/drivers/input/misc/gpio_buttons.c
+--- linux-2.6.36.orig/drivers/input/misc/gpio_buttons.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/drivers/input/misc/gpio_buttons.c 2010-11-18 21:16:11.000000000 +0100
@@ -0,0 +1,216 @@
+/*
+ * Driver for buttons on GPIO lines not capable of generating interrupts
@@ -13665,483 +10676,9 @@ diff -Nur linux-2.6.35.7.orig/drivers/input/misc/gpio_buttons.c linux-2.6.35.7/d
+MODULE_VERSION(DRV_VERSION);
+MODULE_DESCRIPTION("Polled buttons driver for CPU GPIOs");
+
-diff -Nur linux-2.6.35.7.orig/drivers/input/misc/Kconfig linux-2.6.35.7/drivers/input/misc/Kconfig
---- linux-2.6.35.7.orig/drivers/input/misc/Kconfig 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/drivers/input/misc/Kconfig 2010-10-14 20:27:59.998101300 +0200
-@@ -390,4 +390,20 @@
- To compile this driver as a module, choose M here: the
- module will be called pcap_keys.
-
-+config INPUT_GPIO_BUTTONS
-+ tristate "Polled GPIO buttons interface"
-+ depends on GENERIC_GPIO
-+ select INPUT_POLLDEV
-+ help
-+ This driver implements support for buttons connected
-+ to GPIO pins of various CPUs (and some other chips).
-+
-+ Say Y here if your device has buttons connected
-+ directly to such GPIO pins. Your board-specific
-+ setup logic must also provide a platform device,
-+ with configuration data saying which GPIOs are used.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called gpio-buttons.
-+
- endif
-diff -Nur linux-2.6.35.7.orig/drivers/input/misc/Kconfig.orig linux-2.6.35.7/drivers/input/misc/Kconfig.orig
---- linux-2.6.35.7.orig/drivers/input/misc/Kconfig.orig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/input/misc/Kconfig.orig 2010-09-29 03:09:08.000000000 +0200
-@@ -0,0 +1,393 @@
-+#
-+# Input misc drivers configuration
-+#
-+menuconfig INPUT_MISC
-+ bool "Miscellaneous devices"
-+ help
-+ Say Y here, and a list of miscellaneous input drivers will be displayed.
-+ Everything that didn't fit into the other categories is here. This option
-+ doesn't affect the kernel.
-+
-+ If unsure, say Y.
-+
-+if INPUT_MISC
-+
-+config INPUT_88PM860X_ONKEY
-+ tristate "88PM860x ONKEY support"
-+ depends on MFD_88PM860X
-+ help
-+ Support the ONKEY of Marvell 88PM860x PMICs as an input device
-+ reporting power button status.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called 88pm860x_onkey.
-+
-+config INPUT_AD714X
-+ tristate "Analog Devices AD714x Capacitance Touch Sensor"
-+ help
-+ Say Y here if you want to support an AD7142/3/7/8/7A touch sensor.
-+
-+ You should select a bus connection too.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called ad714x.
-+
-+config INPUT_AD714X_I2C
-+ tristate "support I2C bus connection"
-+ depends on INPUT_AD714X && I2C
-+ default y
-+ help
-+ Say Y here if you have AD7142/AD7147 hooked to an I2C bus.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called ad714x-i2c.
-+
-+config INPUT_AD714X_SPI
-+ tristate "support SPI bus connection"
-+ depends on INPUT_AD714X && SPI
-+ default y
-+ help
-+ Say Y here if you have AD7142/AD7147 hooked to a SPI bus.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called ad714x-spi.
-+
-+config INPUT_PCSPKR
-+ tristate "PC Speaker support"
-+ depends on PCSPKR_PLATFORM
-+ help
-+ Say Y here if you want the standard PC Speaker to be used for
-+ bells and whistles.
-+
-+ If unsure, say Y.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called pcspkr.
-+
-+config INPUT_SPARCSPKR
-+ tristate "SPARC Speaker support"
-+ depends on PCI && SPARC64
-+ help
-+ Say Y here if you want the standard Speaker on Sparc PCI systems
-+ to be used for bells and whistles.
-+
-+ If unsure, say Y.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called sparcspkr.
-+
-+config INPUT_M68K_BEEP
-+ tristate "M68k Beeper support"
-+ depends on M68K
-+
-+config INPUT_MAX8925_ONKEY
-+ tristate "MAX8925 ONKEY support"
-+ depends on MFD_MAX8925
-+ help
-+ Support the ONKEY of MAX8925 PMICs as an input device
-+ reporting power button status.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called max8925_onkey.
-+
-+config INPUT_APANEL
-+ tristate "Fujitsu Lifebook Application Panel buttons"
-+ depends on X86 && I2C && LEDS_CLASS
-+ select INPUT_POLLDEV
-+ select CHECK_SIGNATURE
-+ help
-+ Say Y here for support of the Application Panel buttons, used on
-+ Fujitsu Lifebook. These are attached to the mainboard through
-+ an SMBus interface managed by the I2C Intel ICH (i801) driver,
-+ which you should also build for this kernel.
-+
-+ To compile this driver as a module, choose M here: the module will
-+ be called apanel.
-+
-+config INPUT_IXP4XX_BEEPER
-+ tristate "IXP4XX Beeper support"
-+ depends on ARCH_IXP4XX
-+ help
-+ If you say yes here, you can connect a beeper to the
-+ ixp4xx gpio pins. This is used by the LinkSys NSLU2.
-+
-+ If unsure, say Y.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called ixp4xx-beeper.
-+
-+config INPUT_COBALT_BTNS
-+ tristate "Cobalt button interface"
-+ depends on MIPS_COBALT
-+ select INPUT_POLLDEV
-+ help
-+ Say Y here if you want to support MIPS Cobalt button interface.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called cobalt_btns.
-+
-+config INPUT_WISTRON_BTNS
-+ tristate "x86 Wistron laptop button interface"
-+ depends on X86 && !X86_64
-+ select INPUT_POLLDEV
-+ select INPUT_SPARSEKMAP
-+ select NEW_LEDS
-+ select LEDS_CLASS
-+ select CHECK_SIGNATURE
-+ help
-+ Say Y here for support of Wistron laptop button interfaces, used on
-+ laptops of various brands, including Acer and Fujitsu-Siemens. If
-+ available, mail and wifi LEDs will be controllable via /sys/class/leds.
-+
-+ To compile this driver as a module, choose M here: the module will
-+ be called wistron_btns.
-+
-+config INPUT_ATLAS_BTNS
-+ tristate "x86 Atlas button interface"
-+ depends on X86 && ACPI
-+ help
-+ Say Y here for support of Atlas wallmount touchscreen buttons.
-+ The events will show up as scancodes F1 through F9 via evdev.
-+
-+ To compile this driver as a module, choose M here: the module will
-+ be called atlas_btns.
-+
-+config INPUT_ATI_REMOTE
-+ tristate "ATI / X10 USB RF remote control"
-+ depends on USB_ARCH_HAS_HCD
-+ select USB
-+ help
-+ Say Y here if you want to use an ATI or X10 "Lola" USB remote control.
-+ These are RF remotes with USB receivers.
-+ The ATI remote comes with many of ATI's All-In-Wonder video cards.
-+ The X10 "Lola" remote is available at:
-+ <http://www.x10.com/products/lola_sg1.htm>
-+ This driver provides mouse pointer, left and right mouse buttons,
-+ and maps all the other remote buttons to keypress events.
-+
-+ To compile this driver as a module, choose M here: the module will be
-+ called ati_remote.
-+
-+config INPUT_ATI_REMOTE2
-+ tristate "ATI / Philips USB RF remote control"
-+ depends on USB_ARCH_HAS_HCD
-+ select USB
-+ help
-+ Say Y here if you want to use an ATI or Philips USB RF remote control.
-+ These are RF remotes with USB receivers.
-+ ATI Remote Wonder II comes with some ATI's All-In-Wonder video cards
-+ and is also available as a separate product.
-+ This driver provides mouse pointer, left and right mouse buttons,
-+ and maps all the other remote buttons to keypress events.
-+
-+ To compile this driver as a module, choose M here: the module will be
-+ called ati_remote2.
-+
-+config INPUT_KEYSPAN_REMOTE
-+ tristate "Keyspan DMR USB remote control (EXPERIMENTAL)"
-+ depends on EXPERIMENTAL
-+ depends on USB_ARCH_HAS_HCD
-+ select USB
-+ help
-+ Say Y here if you want to use a Keyspan DMR USB remote control.
-+ Currently only the UIA-11 type of receiver has been tested. The tag
-+ on the receiver that connects to the USB port should have a P/N that
-+ will tell you what type of DMR you have. The UIA-10 type is not
-+ supported at this time. This driver maps all buttons to keypress
-+ events.
-+
-+ To compile this driver as a module, choose M here: the module will
-+ be called keyspan_remote.
-+
-+config INPUT_POWERMATE
-+ tristate "Griffin PowerMate and Contour Jog support"
-+ depends on USB_ARCH_HAS_HCD
-+ select USB
-+ help
-+ Say Y here if you want to use Griffin PowerMate or Contour Jog devices.
-+ These are aluminum dials which can measure clockwise and anticlockwise
-+ rotation. The dial also acts as a pushbutton. The base contains an LED
-+ which can be instructed to pulse or to switch to a particular intensity.
-+
-+ You can download userspace tools from
-+ <http://sowerbutts.com/powermate/>.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called powermate.
-+
-+config INPUT_YEALINK
-+ tristate "Yealink usb-p1k voip phone"
-+ depends on EXPERIMENTAL
-+ depends on USB_ARCH_HAS_HCD
-+ select USB
-+ help
-+ Say Y here if you want to enable keyboard and LCD functions of the
-+ Yealink usb-p1k usb phones. The audio part is enabled by the generic
-+ usb sound driver, so you might want to enable that as well.
-+
-+ For information about how to use these additional functions, see
-+ <file:Documentation/input/yealink.txt>.
-+
-+ To compile this driver as a module, choose M here: the module will be
-+ called yealink.
-+
-+config INPUT_CM109
-+ tristate "C-Media CM109 USB I/O Controller"
-+ depends on EXPERIMENTAL
-+ depends on USB_ARCH_HAS_HCD
-+ select USB
-+ help
-+ Say Y here if you want to enable keyboard and buzzer functions of the
-+ C-Media CM109 usb phones. The audio part is enabled by the generic
-+ usb sound driver, so you might want to enable that as well.
-+
-+ To compile this driver as a module, choose M here: the module will be
-+ called cm109.
-+
-+config INPUT_TWL4030_PWRBUTTON
-+ tristate "TWL4030 Power button Driver"
-+ depends on TWL4030_CORE
-+ help
-+ Say Y here if you want to enable power key reporting via the
-+ TWL4030 family of chips.
-+
-+ To compile this driver as a module, choose M here. The module will
-+ be called twl4030_pwrbutton.
-+
-+config INPUT_TWL4030_VIBRA
-+ tristate "Support for TWL4030 Vibrator"
-+ depends on TWL4030_CORE
-+ select TWL4030_CODEC
-+ select INPUT_FF_MEMLESS
-+ help
-+ This option enables support for TWL4030 Vibrator Driver.
-+
-+ To compile this driver as a module, choose M here. The module will
-+ be called twl4030_vibra.
-+
-+config INPUT_UINPUT
-+ tristate "User level driver support"
-+ help
-+ Say Y here if you want to support user level drivers for input
-+ subsystem accessible under char device 10:223 - /dev/input/uinput.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called uinput.
-+
-+config INPUT_SGI_BTNS
-+ tristate "SGI Indy/O2 volume button interface"
-+ depends on SGI_IP22 || SGI_IP32
-+ select INPUT_POLLDEV
-+ help
-+ Say Y here if you want to support SGI Indy/O2 volume button interface.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called sgi_btns.
-+
-+config INPUT_WINBOND_CIR
-+ tristate "Winbond IR remote control"
-+ depends on X86 && PNP
-+ select NEW_LEDS
-+ select LEDS_CLASS
-+ select LEDS_TRIGGERS
-+ select BITREVERSE
-+ help
-+ Say Y here if you want to use the IR remote functionality found
-+ in some Winbond SuperI/O chips. Currently only the WPCD376I
-+ chip is supported (included in some Intel Media series motherboards).
-+
-+ IR Receive and wake-on-IR from suspend and power-off is currently
-+ supported.
-+
-+ To compile this driver as a module, choose M here: the module will be
-+ called winbond_cir.
-+
-+config HP_SDC_RTC
-+ tristate "HP SDC Real Time Clock"
-+ depends on (GSC || HP300) && SERIO
-+ select HP_SDC
-+ help
-+ Say Y here if you want to support the built-in real time clock
-+ of the HP SDC controller.
-+
-+config INPUT_PCF50633_PMU
-+ tristate "PCF50633 PMU events"
-+ depends on MFD_PCF50633
-+ help
-+ Say Y to include support for delivering PMU events via input
-+ layer on NXP PCF50633.
-+
-+config INPUT_PCF8574
-+ tristate "PCF8574 Keypad input device"
-+ depends on I2C && EXPERIMENTAL
-+ help
-+ Say Y here if you want to support a keypad connetced via I2C
-+ with a PCF8574.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called pcf8574_keypad.
-+
-+config INPUT_GPIO_ROTARY_ENCODER
-+ tristate "Rotary encoders connected to GPIO pins"
-+ depends on GPIOLIB && GENERIC_GPIO
-+ help
-+ Say Y here to add support for rotary encoders connected to GPIO lines.
-+ Check file:Documentation/input/rotary-encoder.txt for more
-+ information.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called rotary_encoder.
-+
-+config INPUT_RB532_BUTTON
-+ tristate "Mikrotik Routerboard 532 button interface"
-+ depends on MIKROTIK_RB532
-+ depends on GPIOLIB && GENERIC_GPIO
-+ select INPUT_POLLDEV
-+ help
-+ Say Y here if you want support for the S1 button built into
-+ Mikrotik's Routerboard 532.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called rb532_button.
-+
-+config INPUT_DM355EVM
-+ tristate "TI DaVinci DM355 EVM Keypad and IR Remote"
-+ depends on MFD_DM355EVM_MSP
-+ select INPUT_SPARSEKMAP
-+ help
-+ Supports the pushbuttons and IR remote used with
-+ the DM355 EVM board.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called dm355evm_keys.
-+
-+config INPUT_BFIN_ROTARY
-+ tristate "Blackfin Rotary support"
-+ depends on BF54x || BF52x
-+ help
-+ Say Y here if you want to use the Blackfin Rotary.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called bfin-rotary.
-+
-+config INPUT_WM831X_ON
-+ tristate "WM831X ON pin"
-+ depends on MFD_WM831X
-+ help
-+ Support the ON pin of WM831X PMICs as an input device
-+ reporting power button status.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called wm831x_on.
-+
-+config INPUT_PCAP
-+ tristate "Motorola EZX PCAP misc input events"
-+ depends on EZX_PCAP
-+ help
-+ Say Y here if you want to use Power key and Headphone button
-+ on Motorola EZX phones.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called pcap_keys.
-+
-+endif
-diff -Nur linux-2.6.35.7.orig/drivers/input/misc/Makefile linux-2.6.35.7/drivers/input/misc/Makefile
---- linux-2.6.35.7.orig/drivers/input/misc/Makefile 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/drivers/input/misc/Makefile 2010-10-14 20:28:00.038101118 +0200
-@@ -37,4 +37,5 @@
- obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o
- obj-$(CONFIG_INPUT_WM831X_ON) += wm831x-on.o
- obj-$(CONFIG_INPUT_YEALINK) += yealink.o
-+obj-$(CONFIG_INPUT_GPIO_BUTTONS) += gpio_buttons.o
-
-diff -Nur linux-2.6.35.7.orig/drivers/input/misc/Makefile.orig linux-2.6.35.7/drivers/input/misc/Makefile.orig
---- linux-2.6.35.7.orig/drivers/input/misc/Makefile.orig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/input/misc/Makefile.orig 2010-09-29 03:09:08.000000000 +0200
-@@ -0,0 +1,40 @@
-+#
-+# Makefile for the input misc drivers.
-+#
-+
-+# Each configuration option enables a list of files.
-+
-+obj-$(CONFIG_INPUT_88PM860X_ONKEY) += 88pm860x_onkey.o
-+obj-$(CONFIG_INPUT_AD714X) += ad714x.o
-+obj-$(CONFIG_INPUT_AD714X_I2C) += ad714x-i2c.o
-+obj-$(CONFIG_INPUT_AD714X_SPI) += ad714x-spi.o
-+obj-$(CONFIG_INPUT_APANEL) += apanel.o
-+obj-$(CONFIG_INPUT_ATI_REMOTE) += ati_remote.o
-+obj-$(CONFIG_INPUT_ATI_REMOTE2) += ati_remote2.o
-+obj-$(CONFIG_INPUT_ATLAS_BTNS) += atlas_btns.o
-+obj-$(CONFIG_INPUT_BFIN_ROTARY) += bfin_rotary.o
-+obj-$(CONFIG_INPUT_CM109) += cm109.o
-+obj-$(CONFIG_INPUT_COBALT_BTNS) += cobalt_btns.o
-+obj-$(CONFIG_INPUT_DM355EVM) += dm355evm_keys.o
-+obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o
-+obj-$(CONFIG_INPUT_IXP4XX_BEEPER) += ixp4xx-beeper.o
-+obj-$(CONFIG_INPUT_KEYSPAN_REMOTE) += keyspan_remote.o
-+obj-$(CONFIG_INPUT_M68K_BEEP) += m68kspkr.o
-+obj-$(CONFIG_INPUT_MAX8925_ONKEY) += max8925_onkey.o
-+obj-$(CONFIG_INPUT_PCAP) += pcap_keys.o
-+obj-$(CONFIG_INPUT_PCF50633_PMU) += pcf50633-input.o
-+obj-$(CONFIG_INPUT_PCF8574) += pcf8574_keypad.o
-+obj-$(CONFIG_INPUT_PCSPKR) += pcspkr.o
-+obj-$(CONFIG_INPUT_POWERMATE) += powermate.o
-+obj-$(CONFIG_INPUT_RB532_BUTTON) += rb532_button.o
-+obj-$(CONFIG_INPUT_GPIO_ROTARY_ENCODER) += rotary_encoder.o
-+obj-$(CONFIG_INPUT_SGI_BTNS) += sgi_btns.o
-+obj-$(CONFIG_INPUT_SPARCSPKR) += sparcspkr.o
-+obj-$(CONFIG_INPUT_TWL4030_PWRBUTTON) += twl4030-pwrbutton.o
-+obj-$(CONFIG_INPUT_TWL4030_VIBRA) += twl4030-vibra.o
-+obj-$(CONFIG_INPUT_UINPUT) += uinput.o
-+obj-$(CONFIG_INPUT_WINBOND_CIR) += winbond-cir.o
-+obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o
-+obj-$(CONFIG_INPUT_WM831X_ON) += wm831x-on.o
-+obj-$(CONFIG_INPUT_YEALINK) += yealink.o
-+
-diff -Nur linux-2.6.35.7.orig/drivers/leds/leds-rb750.c linux-2.6.35.7/drivers/leds/leds-rb750.c
---- linux-2.6.35.7.orig/drivers/leds/leds-rb750.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/leds/leds-rb750.c 2010-10-14 20:28:00.074930320 +0200
+diff -Nur linux-2.6.36.orig/drivers/leds/leds-rb750.c linux-2.6.36/drivers/leds/leds-rb750.c
+--- linux-2.6.36.orig/drivers/leds/leds-rb750.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/drivers/leds/leds-rb750.c 2010-11-18 21:16:13.000000000 +0100
@@ -0,0 +1,140 @@
+/*
+ * LED driver for the RouterBOARD 750
@@ -14283,9 +10820,9 @@ diff -Nur linux-2.6.35.7.orig/drivers/leds/leds-rb750.c linux-2.6.35.7/drivers/l
+MODULE_DESCRIPTION("LED driver for the RouterBOARD 750");
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-2.6.35.7.orig/drivers/leds/leds-wndr3700-usb.c linux-2.6.35.7/drivers/leds/leds-wndr3700-usb.c
---- linux-2.6.35.7.orig/drivers/leds/leds-wndr3700-usb.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/leds/leds-wndr3700-usb.c 2010-10-14 20:28:00.116443396 +0200
+diff -Nur linux-2.6.36.orig/drivers/leds/leds-wndr3700-usb.c linux-2.6.36/drivers/leds/leds-wndr3700-usb.c
+--- linux-2.6.36.orig/drivers/leds/leds-wndr3700-usb.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/drivers/leds/leds-wndr3700-usb.c 2010-11-18 21:16:13.000000000 +0100
@@ -0,0 +1,75 @@
+/*
+ * USB LED driver for the NETGEAR WNDR3700
@@ -14362,9 +10899,37 @@ diff -Nur linux-2.6.35.7.orig/drivers/leds/leds-wndr3700-usb.c linux-2.6.35.7/dr
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRIVER_NAME);
-diff -Nur linux-2.6.35.7.orig/drivers/mtd/maps/ar91xx_flash.c linux-2.6.35.7/drivers/mtd/maps/ar91xx_flash.c
---- linux-2.6.35.7.orig/drivers/mtd/maps/ar91xx_flash.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/mtd/maps/ar91xx_flash.c 2010-10-14 20:28:00.154356608 +0200
+diff -Nur linux-2.6.36.orig/drivers/mtd/maps/Kconfig linux-2.6.36/drivers/mtd/maps/Kconfig
+--- linux-2.6.36.orig/drivers/mtd/maps/Kconfig 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/mtd/maps/Kconfig 2010-11-18 21:16:13.000000000 +0100
+@@ -251,6 +251,13 @@
+ help
+ Support for flash chips on NETtel/SecureEdge/SnapGear boards.
+
++config MTD_AR91XX_FLASH
++ tristate "Atheros AR91xx parallel flash support"
++ depends on ATHEROS_AR71XX
++ select MTD_COMPLEX_MAPPINGS
++ help
++ Parallel flash driver for the Atheros AR91xx based boards.
++
+ config MTD_DILNETPC
+ tristate "CFI Flash device mapped on DIL/Net PC"
+ depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT && BROKEN
+diff -Nur linux-2.6.36.orig/drivers/mtd/maps/Makefile linux-2.6.36/drivers/mtd/maps/Makefile
+--- linux-2.6.36.orig/drivers/mtd/maps/Makefile 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/mtd/maps/Makefile 2010-11-18 21:16:13.000000000 +0100
+@@ -7,6 +7,7 @@
+ endif
+
+ # Chip mappings
++obj-$(CONFIG_MTD_AR91XX_FLASH) += ar91xx_flash.o
+ obj-$(CONFIG_MTD_CDB89712) += cdb89712.o
+ obj-$(CONFIG_MTD_ARM_INTEGRATOR)+= integrator-flash.o
+ obj-$(CONFIG_MTD_CFI_FLAGADM) += cfi_flagadm.o
+diff -Nur linux-2.6.36.orig/drivers/mtd/maps/ar91xx_flash.c linux-2.6.36/drivers/mtd/maps/ar91xx_flash.c
+--- linux-2.6.36.orig/drivers/mtd/maps/ar91xx_flash.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/drivers/mtd/maps/ar91xx_flash.c 2010-11-18 21:16:13.000000000 +0100
@@ -0,0 +1,310 @@
+/*
+ * Parallel flash driver for the Atheros AR91xx SoC
@@ -14676,582 +11241,21 @@ diff -Nur linux-2.6.35.7.orig/drivers/mtd/maps/ar91xx_flash.c linux-2.6.35.7/dri
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_DESCRIPTION("Parallel flash driver for the Atheros AR91xx SoC");
+MODULE_ALIAS("platform:" DRV_NAME);
-diff -Nur linux-2.6.35.7.orig/drivers/mtd/maps/Kconfig linux-2.6.35.7/drivers/mtd/maps/Kconfig
---- linux-2.6.35.7.orig/drivers/mtd/maps/Kconfig 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/drivers/mtd/maps/Kconfig 2010-10-14 20:28:00.198101134 +0200
-@@ -251,6 +251,13 @@
+diff -Nur linux-2.6.36.orig/drivers/mtd/nand/Kconfig linux-2.6.36/drivers/mtd/nand/Kconfig
+--- linux-2.6.36.orig/drivers/mtd/nand/Kconfig 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/mtd/nand/Kconfig 2010-11-18 21:16:13.000000000 +0100
+@@ -531,4 +531,8 @@
help
- Support for flash chips on NETtel/SecureEdge/SnapGear boards.
-
-+config MTD_AR91XX_FLASH
-+ tristate "Atheros AR91xx parallel flash support"
-+ depends on ATHEROS_AR71XX
-+ select MTD_COMPLEX_MAPPINGS
-+ help
-+ Parallel flash driver for the Atheros AR91xx based boards.
-+
- config MTD_DILNETPC
- tristate "CFI Flash device mapped on DIL/Net PC"
- depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT && BROKEN
-diff -Nur linux-2.6.35.7.orig/drivers/mtd/maps/Makefile linux-2.6.35.7/drivers/mtd/maps/Makefile
---- linux-2.6.35.7.orig/drivers/mtd/maps/Makefile 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/drivers/mtd/maps/Makefile 2010-10-14 20:28:00.238101165 +0200
-@@ -7,6 +7,7 @@
- endif
-
- # Chip mappings
-+obj-$(CONFIG_MTD_AR91XX_FLASH) += ar91xx_flash.o
- obj-$(CONFIG_MTD_CDB89712) += cdb89712.o
- obj-$(CONFIG_MTD_ARM_INTEGRATOR)+= integrator-flash.o
- obj-$(CONFIG_MTD_CFI_FLAGADM) += cfi_flagadm.o
-diff -Nur linux-2.6.35.7.orig/drivers/mtd/nand/Kconfig linux-2.6.35.7/drivers/mtd/nand/Kconfig
---- linux-2.6.35.7.orig/drivers/mtd/nand/Kconfig 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/drivers/mtd/nand/Kconfig 2010-10-14 20:28:00.288101273 +0200
-@@ -526,4 +526,8 @@
- This enables the driver for the NAND Flash on evaluation board based
- on w90p910 / NUC9xx.
+ Enables support for NAND Flash on JZ4740 SoC based boards.
+config MTD_NAND_RB4XX
+ tristate "NAND flash driver for RouterBoard 4xx series"
+ depends on MTD_NAND && AR71XX_MACH_RB4XX
+
endif # MTD_NAND
-diff -Nur linux-2.6.35.7.orig/drivers/mtd/nand/Kconfig.orig linux-2.6.35.7/drivers/mtd/nand/Kconfig.orig
---- linux-2.6.35.7.orig/drivers/mtd/nand/Kconfig.orig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/mtd/nand/Kconfig.orig 2010-09-29 03:09:08.000000000 +0200
-@@ -0,0 +1,529 @@
-+config MTD_NAND_ECC
-+ tristate
-+
-+config MTD_NAND_ECC_SMC
-+ bool "NAND ECC Smart Media byte order"
-+ depends on MTD_NAND_ECC
-+ default n
-+ help
-+ Software ECC according to the Smart Media Specification.
-+ The original Linux implementation had byte 0 and 1 swapped.
-+
-+
-+menuconfig MTD_NAND
-+ tristate "NAND Device Support"
-+ depends on MTD
-+ select MTD_NAND_IDS
-+ select MTD_NAND_ECC
-+ help
-+ This enables support for accessing all type of NAND flash
-+ devices. For further information see
-+ <http://www.linux-mtd.infradead.org/doc/nand.html>.
-+
-+if MTD_NAND
-+
-+config MTD_NAND_VERIFY_WRITE
-+ bool "Verify NAND page writes"
-+ help
-+ This adds an extra check when data is written to the flash. The
-+ NAND flash device internally checks only bits transitioning
-+ from 1 to 0. There is a rare possibility that even though the
-+ device thinks the write was successful, a bit could have been
-+ flipped accidentally due to device wear or something else.
-+
-+config MTD_SM_COMMON
-+ tristate
-+ default n
-+
-+config MTD_NAND_MUSEUM_IDS
-+ bool "Enable chip ids for obsolete ancient NAND devices"
-+ depends on MTD_NAND
-+ default n
-+ help
-+ Enable this option only when your board has first generation
-+ NAND chips (page size 256 byte, erase size 4-8KiB). The IDs
-+ of these chips were reused by later, larger chips.
-+
-+config MTD_NAND_AUTCPU12
-+ tristate "SmartMediaCard on autronix autcpu12 board"
-+ depends on ARCH_AUTCPU12
-+ help
-+ This enables the driver for the autronix autcpu12 board to
-+ access the SmartMediaCard.
-+
-+config MTD_NAND_DENALI
-+ depends on PCI
-+ tristate "Support Denali NAND controller on Intel Moorestown"
-+ help
-+ Enable the driver for NAND flash on Intel Moorestown, using the
-+ Denali NAND controller core.
-+
-+config MTD_NAND_DENALI_SCRATCH_REG_ADDR
-+ hex "Denali NAND size scratch register address"
-+ default "0xFF108018"
-+ help
-+ Some platforms place the NAND chip size in a scratch register
-+ because (some versions of) the driver aren't able to automatically
-+ determine the size of certain chips. Set the address of the
-+ scratch register here to enable this feature. On Intel Moorestown
-+ boards, the scratch register is at 0xFF108018.
-+
-+config MTD_NAND_EDB7312
-+ tristate "Support for Cirrus Logic EBD7312 evaluation board"
-+ depends on ARCH_EDB7312
-+ help
-+ This enables the driver for the Cirrus Logic EBD7312 evaluation
-+ board to access the onboard NAND Flash.
-+
-+config MTD_NAND_H1900
-+ tristate "iPAQ H1900 flash"
-+ depends on ARCH_PXA && MTD_PARTITIONS
-+ help
-+ This enables the driver for the iPAQ h1900 flash.
-+
-+config MTD_NAND_GPIO
-+ tristate "GPIO NAND Flash driver"
-+ depends on GENERIC_GPIO && ARM
-+ help
-+ This enables a GPIO based NAND flash driver.
-+
-+config MTD_NAND_SPIA
-+ tristate "NAND Flash device on SPIA board"
-+ depends on ARCH_P720T
-+ help
-+ If you had to ask, you don't have one. Say 'N'.
-+
-+config MTD_NAND_AMS_DELTA
-+ tristate "NAND Flash device on Amstrad E3"
-+ depends on MACH_AMS_DELTA
-+ help
-+ Support for NAND flash on Amstrad E3 (Delta).
-+
-+config MTD_NAND_OMAP2
-+ tristate "NAND Flash device on OMAP2 and OMAP3"
-+ depends on ARM && MTD_NAND && (ARCH_OMAP2 || ARCH_OMAP3)
-+ help
-+ Support for NAND flash on Texas Instruments OMAP2 and OMAP3 platforms.
-+
-+config MTD_NAND_OMAP_PREFETCH
-+ bool "GPMC prefetch support for NAND Flash device"
-+ depends on MTD_NAND && MTD_NAND_OMAP2
-+ default y
-+ help
-+ The NAND device can be accessed for Read/Write using GPMC PREFETCH engine
-+ to improve the performance.
-+
-+config MTD_NAND_OMAP_PREFETCH_DMA
-+ depends on MTD_NAND_OMAP_PREFETCH
-+ bool "DMA mode"
-+ default n
-+ help
-+ The GPMC PREFETCH engine can be configured eigther in MPU interrupt mode
-+ or in DMA interrupt mode.
-+ Say y for DMA mode or MPU mode will be used
-+
-+config MTD_NAND_IDS
-+ tristate
-+
-+config MTD_NAND_RICOH
-+ tristate "Ricoh xD card reader"
-+ default n
-+ depends on PCI
-+ select MTD_SM_COMMON
-+ help
-+ Enable support for Ricoh R5C852 xD card reader
-+ You also need to enable ether
-+ NAND SSFDC (SmartMedia) read only translation layer' or new
-+ expermental, readwrite
-+ 'SmartMedia/xD new translation layer'
-+
-+config MTD_NAND_AU1550
-+ tristate "Au1550/1200 NAND support"
-+ depends on SOC_AU1200 || SOC_AU1550
-+ help
-+ This enables the driver for the NAND flash controller on the
-+ AMD/Alchemy 1550 SOC.
-+
-+config MTD_NAND_BF5XX
-+ tristate "Blackfin on-chip NAND Flash Controller driver"
-+ depends on (BF54x || BF52x) && MTD_NAND
-+ help
-+ This enables the Blackfin on-chip NAND flash controller
-+
-+ No board specific support is done by this driver, each board
-+ must advertise a platform_device for the driver to attach.
-+
-+ This driver can also be built as a module. If so, the module
-+ will be called bf5xx-nand.
-+
-+config MTD_NAND_BF5XX_HWECC
-+ bool "BF5XX NAND Hardware ECC"
-+ default y
-+ depends on MTD_NAND_BF5XX
-+ help
-+ Enable the use of the BF5XX's internal ECC generator when
-+ using NAND.
-+
-+config MTD_NAND_BF5XX_BOOTROM_ECC
-+ bool "Use Blackfin BootROM ECC Layout"
-+ default n
-+ depends on MTD_NAND_BF5XX_HWECC
-+ help
-+ If you wish to modify NAND pages and allow the Blackfin on-chip
-+ BootROM to boot from them, say Y here. This is only necessary
-+ if you are booting U-Boot out of NAND and you wish to update
-+ U-Boot from Linux' userspace. Otherwise, you should say N here.
-+
-+ If unsure, say N.
-+
-+config MTD_NAND_RTC_FROM4
-+ tristate "Renesas Flash ROM 4-slot interface board (FROM_BOARD4)"
-+ depends on SH_SOLUTION_ENGINE
-+ select REED_SOLOMON
-+ select REED_SOLOMON_DEC8
-+ select BITREVERSE
-+ help
-+ This enables the driver for the Renesas Technology AG-AND
-+ flash interface board (FROM_BOARD4)
-+
-+config MTD_NAND_PPCHAMELEONEVB
-+ tristate "NAND Flash device on PPChameleonEVB board"
-+ depends on PPCHAMELEONEVB && BROKEN
-+ help
-+ This enables the NAND flash driver on the PPChameleon EVB Board.
-+
-+config MTD_NAND_S3C2410
-+ tristate "NAND Flash support for Samsung S3C SoCs"
-+ depends on ARCH_S3C2410 || ARCH_S3C64XX
-+ help
-+ This enables the NAND flash controller on the S3C24xx and S3C64xx
-+ SoCs
-+
-+ No board specific support is done by this driver, each board
-+ must advertise a platform_device for the driver to attach.
-+
-+config MTD_NAND_S3C2410_DEBUG
-+ bool "Samsung S3C NAND driver debug"
-+ depends on MTD_NAND_S3C2410
-+ help
-+ Enable debugging of the S3C NAND driver
-+
-+config MTD_NAND_S3C2410_HWECC
-+ bool "Samsung S3C NAND Hardware ECC"
-+ depends on MTD_NAND_S3C2410
-+ help
-+ Enable the use of the controller's internal ECC generator when
-+ using NAND. Early versions of the chips have had problems with
-+ incorrect ECC generation, and if using these, the default of
-+ software ECC is preferable.
-+
-+config MTD_NAND_NDFC
-+ tristate "NDFC NanD Flash Controller"
-+ depends on 4xx
-+ select MTD_NAND_ECC_SMC
-+ help
-+ NDFC Nand Flash Controllers are integrated in IBM/AMCC's 4xx SoCs
-+
-+config MTD_NAND_S3C2410_CLKSTOP
-+ bool "Samsung S3C NAND IDLE clock stop"
-+ depends on MTD_NAND_S3C2410
-+ default n
-+ help
-+ Stop the clock to the NAND controller when there is no chip
-+ selected to save power. This will mean there is a small delay
-+ when the is NAND chip selected or released, but will save
-+ approximately 5mA of power when there is nothing happening.
-+
-+config MTD_NAND_BCM_UMI
-+ tristate "NAND Flash support for BCM Reference Boards"
-+ depends on ARCH_BCMRING && MTD_NAND
-+ help
-+ This enables the NAND flash controller on the BCM UMI block.
-+
-+ No board specfic support is done by this driver, each board
-+ must advertise a platform_device for the driver to attach.
-+
-+config MTD_NAND_BCM_UMI_HWCS
-+ bool "BCM UMI NAND Hardware CS"
-+ depends on MTD_NAND_BCM_UMI
-+ help
-+ Enable the use of the BCM UMI block's internal CS using NAND.
-+ This should only be used if you know the external NAND CS can toggle.
-+
-+config MTD_NAND_DISKONCHIP
-+ tristate "DiskOnChip 2000, Millennium and Millennium Plus (NAND reimplementation) (EXPERIMENTAL)"
-+ depends on EXPERIMENTAL
-+ select REED_SOLOMON
-+ select REED_SOLOMON_DEC16
-+ help
-+ This is a reimplementation of M-Systems DiskOnChip 2000,
-+ Millennium and Millennium Plus as a standard NAND device driver,
-+ as opposed to the earlier self-contained MTD device drivers.
-+ This should enable, among other things, proper JFFS2 operation on
-+ these devices.
-+
-+config MTD_NAND_DISKONCHIP_PROBE_ADVANCED
-+ bool "Advanced detection options for DiskOnChip"
-+ depends on MTD_NAND_DISKONCHIP
-+ help
-+ This option allows you to specify nonstandard address at which to
-+ probe for a DiskOnChip, or to change the detection options. You
-+ are unlikely to need any of this unless you are using LinuxBIOS.
-+ Say 'N'.
-+
-+config MTD_NAND_DISKONCHIP_PROBE_ADDRESS
-+ hex "Physical address of DiskOnChip" if MTD_NAND_DISKONCHIP_PROBE_ADVANCED
-+ depends on MTD_NAND_DISKONCHIP
-+ default "0"
-+ ---help---
-+ By default, the probe for DiskOnChip devices will look for a
-+ DiskOnChip at every multiple of 0x2000 between 0xC8000 and 0xEE000.
-+ This option allows you to specify a single address at which to probe
-+ for the device, which is useful if you have other devices in that
-+ range which get upset when they are probed.
-+
-+ (Note that on PowerPC, the normal probe will only check at
-+ 0xE4000000.)
-+
-+ Normally, you should leave this set to zero, to allow the probe at
-+ the normal addresses.
-+
-+config MTD_NAND_DISKONCHIP_PROBE_HIGH
-+ bool "Probe high addresses"
-+ depends on MTD_NAND_DISKONCHIP_PROBE_ADVANCED
-+ help
-+ By default, the probe for DiskOnChip devices will look for a
-+ DiskOnChip at every multiple of 0x2000 between 0xC8000 and 0xEE000.
-+ This option changes to make it probe between 0xFFFC8000 and
-+ 0xFFFEE000. Unless you are using LinuxBIOS, this is unlikely to be
-+ useful to you. Say 'N'.
-+
-+config MTD_NAND_DISKONCHIP_BBTWRITE
-+ bool "Allow BBT writes on DiskOnChip Millennium and 2000TSOP"
-+ depends on MTD_NAND_DISKONCHIP
-+ help
-+ On DiskOnChip devices shipped with the INFTL filesystem (Millennium
-+ and 2000 TSOP/Alon), Linux reserves some space at the end of the
-+ device for the Bad Block Table (BBT). If you have existing INFTL
-+ data on your device (created by non-Linux tools such as M-Systems'
-+ DOS drivers), your data might overlap the area Linux wants to use for
-+ the BBT. If this is a concern for you, leave this option disabled and
-+ Linux will not write BBT data into this area.
-+ The downside of leaving this option disabled is that if bad blocks
-+ are detected by Linux, they will not be recorded in the BBT, which
-+ could cause future problems.
-+ Once you enable this option, new filesystems (INFTL or others, created
-+ in Linux or other operating systems) will not use the reserved area.
-+ The only reason not to enable this option is to prevent damage to
-+ preexisting filesystems.
-+ Even if you leave this disabled, you can enable BBT writes at module
-+ load time (assuming you build diskonchip as a module) with the module
-+ parameter "inftl_bbt_write=1".
-+
-+config MTD_NAND_SHARPSL
-+ tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)"
-+ depends on ARCH_PXA
-+
-+config MTD_NAND_CAFE
-+ tristate "NAND support for OLPC CAFÉ chip"
-+ depends on PCI
-+ select REED_SOLOMON
-+ select REED_SOLOMON_DEC16
-+ help
-+ Use NAND flash attached to the CAFÉ chip designed for the OLPC
-+ laptop.
-+
-+config MTD_NAND_CS553X
-+ tristate "NAND support for CS5535/CS5536 (AMD Geode companion chip)"
-+ depends on X86_32
-+ help
-+ The CS553x companion chips for the AMD Geode processor
-+ include NAND flash controllers with built-in hardware ECC
-+ capabilities; enabling this option will allow you to use
-+ these. The driver will check the MSRs to verify that the
-+ controller is enabled for NAND, and currently requires that
-+ the controller be in MMIO mode.
-+
-+ If you say "m", the module will be called cs553x_nand.
-+
-+config MTD_NAND_ATMEL
-+ tristate "Support for NAND Flash / SmartMedia on AT91 and AVR32"
-+ depends on ARCH_AT91 || AVR32
-+ help
-+ Enables support for NAND Flash / Smart Media Card interface
-+ on Atmel AT91 and AVR32 processors.
-+choice
-+ prompt "ECC management for NAND Flash / SmartMedia on AT91 / AVR32"
-+ depends on MTD_NAND_ATMEL
-+
-+config MTD_NAND_ATMEL_ECC_HW
-+ bool "Hardware ECC"
-+ depends on ARCH_AT91SAM9263 || ARCH_AT91SAM9260 || AVR32
-+ help
-+ Use hardware ECC instead of software ECC when the chip
-+ supports it.
-+
-+ The hardware ECC controller is capable of single bit error
-+ correction and 2-bit random detection per page.
-+
-+ NB : hardware and software ECC schemes are incompatible.
-+ If you switch from one to another, you'll have to erase your
-+ mtd partition.
-+
-+ If unsure, say Y
-+
-+config MTD_NAND_ATMEL_ECC_SOFT
-+ bool "Software ECC"
-+ help
-+ Use software ECC.
-+
-+ NB : hardware and software ECC schemes are incompatible.
-+ If you switch from one to another, you'll have to erase your
-+ mtd partition.
-+
-+config MTD_NAND_ATMEL_ECC_NONE
-+ bool "No ECC (testing only, DANGEROUS)"
-+ depends on DEBUG_KERNEL
-+ help
-+ No ECC will be used.
-+ It's not a good idea and it should be reserved for testing
-+ purpose only.
-+
-+ If unsure, say N
-+
-+endchoice
-+
-+config MTD_NAND_PXA3xx
-+ tristate "Support for NAND flash devices on PXA3xx"
-+ depends on MTD_NAND && (PXA3xx || ARCH_MMP)
-+ help
-+ This enables the driver for the NAND flash device found on
-+ PXA3xx processors
-+
-+config MTD_NAND_PXA3xx_BUILTIN
-+ bool "Use builtin definitions for some NAND chips (deprecated)"
-+ depends on MTD_NAND_PXA3xx
-+ help
-+ This enables builtin definitions for some NAND chips. This
-+ is deprecated in favor of platform specific data.
-+
-+config MTD_NAND_CM_X270
-+ tristate "Support for NAND Flash on CM-X270 modules"
-+ depends on MTD_NAND && MACH_ARMCORE
-+
-+config MTD_NAND_PASEMI
-+ tristate "NAND support for PA Semi PWRficient"
-+ depends on MTD_NAND && PPC_PASEMI
-+ help
-+ Enables support for NAND Flash interface on PA Semi PWRficient
-+ based boards
-+
-+config MTD_NAND_TMIO
-+ tristate "NAND Flash device on Toshiba Mobile IO Controller"
-+ depends on MTD_NAND && MFD_TMIO
-+ help
-+ Support for NAND flash connected to a Toshiba Mobile IO
-+ Controller in some PDAs, including the Sharp SL6000x.
-+
-+config MTD_NAND_NANDSIM
-+ tristate "Support for NAND Flash Simulator"
-+ depends on MTD_PARTITIONS
-+ help
-+ The simulator may simulate various NAND flash chips for the
-+ MTD nand layer.
-+
-+config MTD_NAND_PLATFORM
-+ tristate "Support for generic platform NAND driver"
-+ depends on MTD_NAND
-+ help
-+ This implements a generic NAND driver for on-SOC platform
-+ devices. You will need to provide platform-specific functions
-+ via platform_data.
-+
-+config MTD_ALAUDA
-+ tristate "MTD driver for Olympus MAUSB-10 and Fujifilm DPC-R1"
-+ depends on MTD_NAND && USB
-+ help
-+ These two (and possibly other) Alauda-based cardreaders for
-+ SmartMedia and xD allow raw flash access.
-+
-+config MTD_NAND_ORION
-+ tristate "NAND Flash support for Marvell Orion SoC"
-+ depends on PLAT_ORION && MTD_NAND
-+ help
-+ This enables the NAND flash controller on Orion machines.
-+
-+ No board specific support is done by this driver, each board
-+ must advertise a platform_device for the driver to attach.
-+
-+config MTD_NAND_FSL_ELBC
-+ tristate "NAND support for Freescale eLBC controllers"
-+ depends on MTD_NAND && PPC_OF
-+ help
-+ Various Freescale chips, including the 8313, include a NAND Flash
-+ Controller Module with built-in hardware ECC capabilities.
-+ Enabling this option will enable you to use this to control
-+ external NAND devices.
-+
-+config MTD_NAND_FSL_UPM
-+ tristate "Support for NAND on Freescale UPM"
-+ depends on MTD_NAND && (PPC_83xx || PPC_85xx)
-+ select FSL_LBC
-+ help
-+ Enables support for NAND Flash chips wired onto Freescale PowerPC
-+ processor localbus with User-Programmable Machine support.
-+
-+config MTD_NAND_MPC5121_NFC
-+ tristate "MPC5121 built-in NAND Flash Controller support"
-+ depends on PPC_MPC512x
-+ help
-+ This enables the driver for the NAND flash controller on the
-+ MPC5121 SoC.
-+
-+config MTD_NAND_MXC
-+ tristate "MXC NAND support"
-+ depends on ARCH_MX2 || ARCH_MX25 || ARCH_MX3
-+ help
-+ This enables the driver for the NAND flash controller on the
-+ MXC processors.
-+
-+config MTD_NAND_NOMADIK
-+ tristate "ST Nomadik 8815 NAND support"
-+ depends on ARCH_NOMADIK
-+ help
-+ Driver for the NAND flash controller on the Nomadik, with ECC.
-+
-+config MTD_NAND_SH_FLCTL
-+ tristate "Support for NAND on Renesas SuperH FLCTL"
-+ depends on MTD_NAND && (SUPERH || ARCH_SHMOBILE)
-+ help
-+ Several Renesas SuperH CPU has FLCTL. This option enables support
-+ for NAND Flash using FLCTL.
-+
-+config MTD_NAND_DAVINCI
-+ tristate "Support NAND on DaVinci SoC"
-+ depends on ARCH_DAVINCI
-+ help
-+ Enable the driver for NAND flash chips on Texas Instruments
-+ DaVinci processors.
-+
-+config MTD_NAND_TXX9NDFMC
-+ tristate "NAND Flash support for TXx9 SoC"
-+ depends on SOC_TX4938 || SOC_TX4939
-+ help
-+ This enables the NAND flash controller on the TXx9 SoCs.
-+
-+config MTD_NAND_SOCRATES
-+ tristate "Support for NAND on Socrates board"
-+ depends on MTD_NAND && SOCRATES
-+ help
-+ Enables support for NAND Flash chips wired onto Socrates board.
-+
-+config MTD_NAND_NUC900
-+ tristate "Support for NAND on Nuvoton NUC9xx/w90p910 evaluation boards."
-+ depends on ARCH_W90X900 && MTD_PARTITIONS
-+ help
-+ This enables the driver for the NAND Flash on evaluation board based
-+ on w90p910 / NUC9xx.
-+
-+endif # MTD_NAND
-diff -Nur linux-2.6.35.7.orig/drivers/mtd/nand/Makefile linux-2.6.35.7/drivers/mtd/nand/Makefile
---- linux-2.6.35.7.orig/drivers/mtd/nand/Makefile 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/drivers/mtd/nand/Makefile 2010-10-14 20:28:00.318093945 +0200
+diff -Nur linux-2.6.36.orig/drivers/mtd/nand/Makefile linux-2.6.36/drivers/mtd/nand/Makefile
+--- linux-2.6.36.orig/drivers/mtd/nand/Makefile 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/mtd/nand/Makefile 2010-11-18 21:16:14.000000000 +0100
@@ -32,6 +32,7 @@
obj-$(CONFIG_MTD_NAND_PXA3xx) += pxa3xx_nand.o
obj-$(CONFIG_MTD_NAND_TMIO) += tmio_nand.o
@@ -15260,63 +11264,9 @@ diff -Nur linux-2.6.35.7.orig/drivers/mtd/nand/Makefile linux-2.6.35.7/drivers/m
obj-$(CONFIG_MTD_ALAUDA) += alauda.o
obj-$(CONFIG_MTD_NAND_PASEMI) += pasemi_nand.o
obj-$(CONFIG_MTD_NAND_ORION) += orion_nand.o
-diff -Nur linux-2.6.35.7.orig/drivers/mtd/nand/Makefile.orig linux-2.6.35.7/drivers/mtd/nand/Makefile.orig
---- linux-2.6.35.7.orig/drivers/mtd/nand/Makefile.orig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/mtd/nand/Makefile.orig 2010-09-29 03:09:08.000000000 +0200
-@@ -0,0 +1,50 @@
-+#
-+# linux/drivers/nand/Makefile
-+#
-+
-+obj-$(CONFIG_MTD_NAND) += nand.o
-+obj-$(CONFIG_MTD_NAND_ECC) += nand_ecc.o
-+obj-$(CONFIG_MTD_NAND_IDS) += nand_ids.o
-+obj-$(CONFIG_MTD_SM_COMMON) += sm_common.o
-+
-+obj-$(CONFIG_MTD_NAND_CAFE) += cafe_nand.o
-+obj-$(CONFIG_MTD_NAND_SPIA) += spia.o
-+obj-$(CONFIG_MTD_NAND_AMS_DELTA) += ams-delta.o
-+obj-$(CONFIG_MTD_NAND_AUTCPU12) += autcpu12.o
-+obj-$(CONFIG_MTD_NAND_DENALI) += denali.o
-+obj-$(CONFIG_MTD_NAND_EDB7312) += edb7312.o
-+obj-$(CONFIG_MTD_NAND_AU1550) += au1550nd.o
-+obj-$(CONFIG_MTD_NAND_BF5XX) += bf5xx_nand.o
-+obj-$(CONFIG_MTD_NAND_PPCHAMELEONEVB) += ppchameleonevb.o
-+obj-$(CONFIG_MTD_NAND_S3C2410) += s3c2410.o
-+obj-$(CONFIG_MTD_NAND_DAVINCI) += davinci_nand.o
-+obj-$(CONFIG_MTD_NAND_DISKONCHIP) += diskonchip.o
-+obj-$(CONFIG_MTD_NAND_H1900) += h1910.o
-+obj-$(CONFIG_MTD_NAND_RTC_FROM4) += rtc_from4.o
-+obj-$(CONFIG_MTD_NAND_SHARPSL) += sharpsl.o
-+obj-$(CONFIG_MTD_NAND_NANDSIM) += nandsim.o
-+obj-$(CONFIG_MTD_NAND_CS553X) += cs553x_nand.o
-+obj-$(CONFIG_MTD_NAND_NDFC) += ndfc.o
-+obj-$(CONFIG_MTD_NAND_ATMEL) += atmel_nand.o
-+obj-$(CONFIG_MTD_NAND_GPIO) += gpio.o
-+obj-$(CONFIG_MTD_NAND_OMAP2) += omap2.o
-+obj-$(CONFIG_MTD_NAND_CM_X270) += cmx270_nand.o
-+obj-$(CONFIG_MTD_NAND_PXA3xx) += pxa3xx_nand.o
-+obj-$(CONFIG_MTD_NAND_TMIO) += tmio_nand.o
-+obj-$(CONFIG_MTD_NAND_PLATFORM) += plat_nand.o
-+obj-$(CONFIG_MTD_ALAUDA) += alauda.o
-+obj-$(CONFIG_MTD_NAND_PASEMI) += pasemi_nand.o
-+obj-$(CONFIG_MTD_NAND_ORION) += orion_nand.o
-+obj-$(CONFIG_MTD_NAND_FSL_ELBC) += fsl_elbc_nand.o
-+obj-$(CONFIG_MTD_NAND_FSL_UPM) += fsl_upm.o
-+obj-$(CONFIG_MTD_NAND_SH_FLCTL) += sh_flctl.o
-+obj-$(CONFIG_MTD_NAND_MXC) += mxc_nand.o
-+obj-$(CONFIG_MTD_NAND_SOCRATES) += socrates_nand.o
-+obj-$(CONFIG_MTD_NAND_TXX9NDFMC) += txx9ndfmc.o
-+obj-$(CONFIG_MTD_NAND_NUC900) += nuc900_nand.o
-+obj-$(CONFIG_MTD_NAND_NOMADIK) += nomadik_nand.o
-+obj-$(CONFIG_MTD_NAND_BCM_UMI) += bcm_umi_nand.o nand_bcm_umi.o
-+obj-$(CONFIG_MTD_NAND_MPC5121_NFC) += mpc5121_nfc.o
-+obj-$(CONFIG_MTD_NAND_RICOH) += r852.o
-+
-+nand-objs := nand_base.o nand_bbt.o
-diff -Nur linux-2.6.35.7.orig/drivers/mtd/nand/rb4xx_nand.c linux-2.6.35.7/drivers/mtd/nand/rb4xx_nand.c
---- linux-2.6.35.7.orig/drivers/mtd/nand/rb4xx_nand.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/mtd/nand/rb4xx_nand.c 2010-10-14 20:28:34.515600563 +0200
+diff -Nur linux-2.6.36.orig/drivers/mtd/nand/rb4xx_nand.c linux-2.6.36/drivers/mtd/nand/rb4xx_nand.c
+--- linux-2.6.36.orig/drivers/mtd/nand/rb4xx_nand.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/drivers/mtd/nand/rb4xx_nand.c 2010-11-18 21:16:14.000000000 +0100
@@ -0,0 +1,513 @@
+/*
+ * NAND flash driver for the MikroTik RouterBoard 4xx series
@@ -15831,9 +11781,9 @@ diff -Nur linux-2.6.35.7.orig/drivers/mtd/nand/rb4xx_nand.c linux-2.6.35.7/drive
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_AUTHOR("Imre Kaloz <kaloz@openwrt.org>");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-2.6.35.7.orig/drivers/mtd/nand/rb750_nand.c linux-2.6.35.7/drivers/mtd/nand/rb750_nand.c
---- linux-2.6.35.7.orig/drivers/mtd/nand/rb750_nand.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/mtd/nand/rb750_nand.c 2010-10-14 20:28:00.398101127 +0200
+diff -Nur linux-2.6.36.orig/drivers/mtd/nand/rb750_nand.c linux-2.6.36/drivers/mtd/nand/rb750_nand.c
+--- linux-2.6.36.orig/drivers/mtd/nand/rb750_nand.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/drivers/mtd/nand/rb750_nand.c 2010-11-18 21:16:14.000000000 +0100
@@ -0,0 +1,360 @@
+/*
+ * NAND flash driver for the MikroTik RouterBOARD 750
@@ -16195,9 +12145,9 @@ diff -Nur linux-2.6.35.7.orig/drivers/mtd/nand/rb750_nand.c linux-2.6.35.7/drive
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-2.6.35.7.orig/drivers/mtd/wrt160nl_part.c linux-2.6.35.7/drivers/mtd/wrt160nl_part.c
---- linux-2.6.35.7.orig/drivers/mtd/wrt160nl_part.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/mtd/wrt160nl_part.c 2010-10-14 20:28:00.438101171 +0200
+diff -Nur linux-2.6.36.orig/drivers/mtd/wrt160nl_part.c linux-2.6.36/drivers/mtd/wrt160nl_part.c
+--- linux-2.6.36.orig/drivers/mtd/wrt160nl_part.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/drivers/mtd/wrt160nl_part.c 2010-11-18 21:16:14.000000000 +0100
@@ -0,0 +1,181 @@
+/*
+ * Copyright (C) 2009 Christian Daniel <cd@maintech.de>
@@ -16380,333 +12330,87 @@ diff -Nur linux-2.6.35.7.orig/drivers/mtd/wrt160nl_part.c linux-2.6.35.7/drivers
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Christian Daniel <cd@maintech.de>");
-diff -Nur linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx_ar8216.c linux-2.6.35.7/drivers/net/ag71xx/ag71xx_ar8216.c
---- linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx_ar8216.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/net/ag71xx/ag71xx_ar8216.c 2010-10-14 20:28:00.478101179 +0200
-@@ -0,0 +1,44 @@
-+/*
-+ * Atheros AR71xx built-in ethernet mac driver
-+ * Special support for the Atheros ar8216 switch chip
-+ *
-+ * Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ * Based on Atheros' AG7100 driver
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ */
-+
-+#include "ag71xx.h"
-+
-+#define AR8216_PACKET_TYPE_MASK 0xf
-+#define AR8216_PACKET_TYPE_NORMAL 0
-+
-+#define AR8216_HEADER_LEN 2
-+
-+void ag71xx_add_ar8216_header(struct ag71xx *ag, struct sk_buff *skb)
-+{
-+ skb_push(skb, AR8216_HEADER_LEN);
-+ skb->data[0] = 0x10;
-+ skb->data[1] = 0x80;
-+}
-+
-+int ag71xx_remove_ar8216_header(struct ag71xx *ag, struct sk_buff *skb,
-+ int pktlen)
-+{
-+ u8 type;
-+
-+ type = skb->data[1] & AR8216_PACKET_TYPE_MASK;
-+ switch (type) {
-+ case AR8216_PACKET_TYPE_NORMAL:
-+ break;
-+
-+ default:
-+ return -EINVAL;
-+ }
-+
-+ skb_pull(skb, AR8216_HEADER_LEN);
-+ return 0;
-+}
-diff -Nur linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx_debugfs.c linux-2.6.35.7/drivers/net/ag71xx/ag71xx_debugfs.c
---- linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx_debugfs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/net/ag71xx/ag71xx_debugfs.c 2010-10-14 20:28:00.514356373 +0200
-@@ -0,0 +1,197 @@
-+/*
-+ * Atheros AR71xx built-in ethernet mac driver
-+ *
-+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
-+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * Based on Atheros' AG7100 driver
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ */
-+
-+#include <linux/debugfs.h>
-+
-+#include "ag71xx.h"
-+
-+static struct dentry *ag71xx_debugfs_root;
-+
-+static int ag71xx_debugfs_generic_open(struct inode *inode, struct file *file)
-+{
-+ file->private_data = inode->i_private;
-+ return 0;
-+}
-+
-+void ag71xx_debugfs_update_int_stats(struct ag71xx *ag, u32 status)
-+{
-+ if (status)
-+ ag->debug.int_stats.total++;
-+ if (status & AG71XX_INT_TX_PS)
-+ ag->debug.int_stats.tx_ps++;
-+ if (status & AG71XX_INT_TX_UR)
-+ ag->debug.int_stats.tx_ur++;
-+ if (status & AG71XX_INT_TX_BE)
-+ ag->debug.int_stats.tx_be++;
-+ if (status & AG71XX_INT_RX_PR)
-+ ag->debug.int_stats.rx_pr++;
-+ if (status & AG71XX_INT_RX_OF)
-+ ag->debug.int_stats.rx_of++;
-+ if (status & AG71XX_INT_RX_BE)
-+ ag->debug.int_stats.rx_be++;
-+}
-+
-+static ssize_t read_file_int_stats(struct file *file, char __user *user_buf,
-+ size_t count, loff_t *ppos)
-+{
-+#define PR_INT_STAT(_label, _field) \
-+ len += snprintf(buf + len, sizeof(buf) - len, \
-+ "%20s: %10lu\n", _label, ag->debug.int_stats._field);
-+
-+ struct ag71xx *ag = file->private_data;
-+ char buf[256];
-+ unsigned int len = 0;
-+
-+ PR_INT_STAT("TX Packet Sent", tx_ps);
-+ PR_INT_STAT("TX Underrun", tx_ur);
-+ PR_INT_STAT("TX Bus Error", tx_be);
-+ PR_INT_STAT("RX Packet Received", rx_pr);
-+ PR_INT_STAT("RX Overflow", rx_of);
-+ PR_INT_STAT("RX Bus Error", rx_be);
-+ len += snprintf(buf + len, sizeof(buf) - len, "\n");
-+ PR_INT_STAT("Total", total);
-+
-+ return simple_read_from_buffer(user_buf, count, ppos, buf, len);
-+#undef PR_INT_STAT
-+}
-+
-+static const struct file_operations ag71xx_fops_int_stats = {
-+ .open = ag71xx_debugfs_generic_open,
-+ .read = read_file_int_stats,
-+ .owner = THIS_MODULE
-+};
-+
-+void ag71xx_debugfs_update_napi_stats(struct ag71xx *ag, int rx, int tx)
-+{
-+ struct ag71xx_napi_stats *stats = &ag->debug.napi_stats;
-+
-+ if (rx) {
-+ stats->rx_count++;
-+ stats->rx_packets += rx;
-+ if (rx <= AG71XX_NAPI_WEIGHT)
-+ stats->rx[rx]++;
-+ if (rx > stats->rx_packets_max)
-+ stats->rx_packets_max = rx;
-+ }
-+
-+ if (tx) {
-+ stats->tx_count++;
-+ stats->tx_packets += tx;
-+ if (tx <= AG71XX_NAPI_WEIGHT)
-+ stats->tx[tx]++;
-+ if (tx > stats->tx_packets_max)
-+ stats->tx_packets_max = tx;
-+ }
-+}
-+
-+static ssize_t read_file_napi_stats(struct file *file, char __user *user_buf,
-+ size_t count, loff_t *ppos)
-+{
-+ struct ag71xx *ag = file->private_data;
-+ struct ag71xx_napi_stats *stats = &ag->debug.napi_stats;
-+ char buf[2048];
-+ unsigned int len = 0;
-+ unsigned long rx_avg = 0;
-+ unsigned long tx_avg = 0;
-+ int i;
-+
-+ if (stats->rx_count)
-+ rx_avg = stats->rx_packets / stats->rx_count;
-+
-+ if (stats->tx_count)
-+ tx_avg = stats->tx_packets / stats->tx_count;
-+
-+ len += snprintf(buf + len, sizeof(buf) - len, "%3s %10s %10s\n",
-+ "len", "rx", "tx");
-+
-+ for (i = 1; i <= AG71XX_NAPI_WEIGHT; i++)
-+ len += snprintf(buf + len, sizeof(buf) - len,
-+ "%3d: %10lu %10lu\n",
-+ i, stats->rx[i], stats->tx[i]);
-+
-+ len += snprintf(buf + len, sizeof(buf) - len, "\n");
-+
-+ len += snprintf(buf + len, sizeof(buf) - len, "%3s: %10lu %10lu\n",
-+ "sum", stats->rx_count, stats->tx_count);
-+ len += snprintf(buf + len, sizeof(buf) - len, "%3s: %10lu %10lu\n",
-+ "avg", rx_avg, tx_avg);
-+ len += snprintf(buf + len, sizeof(buf) - len, "%3s: %10lu %10lu\n",
-+ "max", stats->rx_packets_max, stats->tx_packets_max);
-+ len += snprintf(buf + len, sizeof(buf) - len, "%3s: %10lu %10lu\n",
-+ "pkt", stats->rx_packets, stats->tx_packets);
-+
-+ return simple_read_from_buffer(user_buf, count, ppos, buf, len);
-+}
-+
-+static const struct file_operations ag71xx_fops_napi_stats = {
-+ .open = ag71xx_debugfs_generic_open,
-+ .read = read_file_napi_stats,
-+ .owner = THIS_MODULE
-+};
-+
-+void ag71xx_debugfs_exit(struct ag71xx *ag)
-+{
-+ debugfs_remove(ag->debug.debugfs_napi_stats);
-+ debugfs_remove(ag->debug.debugfs_int_stats);
-+ debugfs_remove(ag->debug.debugfs_dir);
-+}
-+
-+int ag71xx_debugfs_init(struct ag71xx *ag)
-+{
-+ ag->debug.debugfs_dir = debugfs_create_dir(ag->dev->name,
-+ ag71xx_debugfs_root);
-+ if (!ag->debug.debugfs_dir)
-+ goto err;
-+
-+ ag->debug.debugfs_int_stats =
-+ debugfs_create_file("int_stats",
-+ S_IRUGO,
-+ ag->debug.debugfs_dir,
-+ ag,
-+ &ag71xx_fops_int_stats);
-+ if (!ag->debug.debugfs_int_stats)
-+ goto err;
-+
-+ ag->debug.debugfs_napi_stats =
-+ debugfs_create_file("napi_stats",
-+ S_IRUGO,
-+ ag->debug.debugfs_dir,
-+ ag,
-+ &ag71xx_fops_napi_stats);
-+ if (!ag->debug.debugfs_napi_stats)
-+ goto err;
-+
-+ return 0;
-+
-+ err:
-+ ag71xx_debugfs_exit(ag);
-+ return -ENOMEM;
-+}
-+
-+int ag71xx_debugfs_root_init(void)
-+{
-+ if (ag71xx_debugfs_root)
-+ return -EBUSY;
-+
-+ ag71xx_debugfs_root = debugfs_create_dir(KBUILD_MODNAME, NULL);
-+ if (!ag71xx_debugfs_root)
-+ return -ENOENT;
-+
-+ return 0;
-+}
-+
-+void ag71xx_debugfs_root_exit(void)
-+{
-+ debugfs_remove(ag71xx_debugfs_root);
-+ ag71xx_debugfs_root = NULL;
-+}
-diff -Nur linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx_ethtool.c linux-2.6.35.7/drivers/net/ag71xx/ag71xx_ethtool.c
---- linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx_ethtool.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/net/ag71xx/ag71xx_ethtool.c 2010-10-14 20:28:00.558101160 +0200
-@@ -0,0 +1,71 @@
-+/*
-+ * Atheros AR71xx built-in ethernet mac driver
-+ *
-+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
-+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * Based on Atheros' AG7100 driver
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ */
-+
-+#include "ag71xx.h"
-+
-+static int ag71xx_ethtool_get_settings(struct net_device *dev,
-+ struct ethtool_cmd *cmd)
-+{
-+ struct ag71xx *ag = netdev_priv(dev);
-+ struct phy_device *phydev = ag->phy_dev;
-+
-+ if (!phydev)
-+ return -ENODEV;
-+
-+ return phy_ethtool_gset(phydev, cmd);
-+}
+diff -Nur linux-2.6.36.orig/drivers/net/Kconfig linux-2.6.36/drivers/net/Kconfig
+--- linux-2.6.36.orig/drivers/net/Kconfig 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/net/Kconfig 2010-11-18 21:16:14.000000000 +0100
+@@ -2045,6 +2045,8 @@
+
+ The safe and default value for this is N.
+
++source drivers/net/ag71xx/Kconfig
+
-+static int ag71xx_ethtool_set_settings(struct net_device *dev,
-+ struct ethtool_cmd *cmd)
-+{
-+ struct ag71xx *ag = netdev_priv(dev);
-+ struct phy_device *phydev = ag->phy_dev;
+ config DL2K
+ tristate "DL2000/TC902x-based Gigabit Ethernet support"
+ depends on PCI
+diff -Nur linux-2.6.36.orig/drivers/net/Makefile linux-2.6.36/drivers/net/Makefile
+--- linux-2.6.36.orig/drivers/net/Makefile 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/net/Makefile 2010-11-18 21:16:15.000000000 +0100
+@@ -109,6 +109,7 @@
+ # end link order section
+ #
+
++obj-$(CONFIG_AG71XX) += ag71xx/
+ obj-$(CONFIG_SUNDANCE) += sundance.o
+ obj-$(CONFIG_HAMACHI) += hamachi.o
+ obj-$(CONFIG_NET) += Space.o loopback.o
+diff -Nur linux-2.6.36.orig/drivers/net/ag71xx/Kconfig linux-2.6.36/drivers/net/ag71xx/Kconfig
+--- linux-2.6.36.orig/drivers/net/ag71xx/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/drivers/net/ag71xx/Kconfig 2010-11-18 21:16:14.000000000 +0100
+@@ -0,0 +1,33 @@
++config AG71XX
++ tristate "Atheros AR71xx built-in ethernet mac support"
++ depends on ATHEROS_AR71XX
++ select PHYLIB
++ help
++ If you wish to compile a kernel for AR71xx/91xx and enable
++ ethernet support, then you should always answer Y to this.
+
-+ if (!phydev)
-+ return -ENODEV;
++if AG71XX
+
-+ return phy_ethtool_sset(phydev, cmd);
-+}
++config AG71XX_DEBUG
++ bool "Atheros AR71xx built-in ethernet driver debugging"
++ default n
++ help
++ Atheros AR71xx built-in ethernet driver debugging messages.
+
-+static void ag71xx_ethtool_get_drvinfo(struct net_device *dev,
-+ struct ethtool_drvinfo *info)
-+{
-+ struct ag71xx *ag = netdev_priv(dev);
++config AG71XX_DEBUG_FS
++ bool "Atheros AR71xx built-in ethernet driver debugfs support"
++ depends on DEBUG_FS
++ default n
++ help
++ Say Y, if you need access to various statistics provided by
++ the ag71xx driver.
+
-+ strcpy(info->driver, ag->pdev->dev.driver->name);
-+ strcpy(info->version, AG71XX_DRV_VERSION);
-+ strcpy(info->bus_info, dev_name(&ag->pdev->dev));
-+}
++config AG71XX_AR8216_SUPPORT
++ bool "special support for the Atheros AR8216 switch"
++ default n
++ default y if AR71XX_MACH_WNR2000 || AR71XX_MACH_MZK_W04NU
++ help
++ Say 'y' here if you want to enable special support for the
++ Atheros AR8216 switch found on some boards.
+
-+static u32 ag71xx_ethtool_get_msglevel(struct net_device *dev)
-+{
-+ struct ag71xx *ag = netdev_priv(dev);
++endif
+diff -Nur linux-2.6.36.orig/drivers/net/ag71xx/Makefile linux-2.6.36/drivers/net/ag71xx/Makefile
+--- linux-2.6.36.orig/drivers/net/ag71xx/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/drivers/net/ag71xx/Makefile 2010-11-18 21:16:14.000000000 +0100
+@@ -0,0 +1,14 @@
++#
++# Makefile for the Atheros AR71xx built-in ethernet macs
++#
+
-+ return ag->msg_enable;
-+}
++ag71xx-y += ag71xx_main.o
++ag71xx-y += ag71xx_ethtool.o
++ag71xx-y += ag71xx_phy.o
++ag71xx-y += ag71xx_mdio.o
+
-+static void ag71xx_ethtool_set_msglevel(struct net_device *dev, u32 msg_level)
-+{
-+ struct ag71xx *ag = netdev_priv(dev);
++ag71xx-$(CONFIG_AG71XX_DEBUG_FS) += ag71xx_debugfs.o
++ag71xx-$(CONFIG_AG71XX_AR8216_SUPPORT) += ag71xx_ar8216.o
+
-+ ag->msg_enable = msg_level;
-+}
++obj-$(CONFIG_AG71XX) += ag71xx.o
+
-+struct ethtool_ops ag71xx_ethtool_ops = {
-+ .set_settings = ag71xx_ethtool_set_settings,
-+ .get_settings = ag71xx_ethtool_get_settings,
-+ .get_drvinfo = ag71xx_ethtool_get_drvinfo,
-+ .get_msglevel = ag71xx_ethtool_get_msglevel,
-+ .set_msglevel = ag71xx_ethtool_set_msglevel,
-+ .get_link = ethtool_op_get_link,
-+};
-diff -Nur linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx.h linux-2.6.35.7/drivers/net/ag71xx/ag71xx.h
---- linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/net/ag71xx/ag71xx.h 2010-10-14 20:28:00.594356402 +0200
+diff -Nur linux-2.6.36.orig/drivers/net/ag71xx/ag71xx.h linux-2.6.36/drivers/net/ag71xx/ag71xx.h
+--- linux-2.6.36.orig/drivers/net/ag71xx/ag71xx.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/drivers/net/ag71xx/ag71xx.h 2010-11-18 21:16:14.000000000 +0100
@@ -0,0 +1,500 @@
+/*
+ * Atheros AR71xx built-in ethernet mac driver
@@ -17208,9 +12912,333 @@ diff -Nur linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx.h linux-2.6.35.7/drivers
+#endif /* CONFIG_AG71XX_DEBUG_FS */
+
+#endif /* _AG71XX_H */
-diff -Nur linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx_main.c linux-2.6.35.7/drivers/net/ag71xx/ag71xx_main.c
---- linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx_main.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/net/ag71xx/ag71xx_main.c 2010-10-14 20:28:00.638101269 +0200
+diff -Nur linux-2.6.36.orig/drivers/net/ag71xx/ag71xx_ar8216.c linux-2.6.36/drivers/net/ag71xx/ag71xx_ar8216.c
+--- linux-2.6.36.orig/drivers/net/ag71xx/ag71xx_ar8216.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/drivers/net/ag71xx/ag71xx_ar8216.c 2010-11-18 21:16:14.000000000 +0100
+@@ -0,0 +1,44 @@
++/*
++ * Atheros AR71xx built-in ethernet mac driver
++ * Special support for the Atheros ar8216 switch chip
++ *
++ * Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
++ *
++ * Based on Atheros' AG7100 driver
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published
++ * by the Free Software Foundation.
++ */
++
++#include "ag71xx.h"
++
++#define AR8216_PACKET_TYPE_MASK 0xf
++#define AR8216_PACKET_TYPE_NORMAL 0
++
++#define AR8216_HEADER_LEN 2
++
++void ag71xx_add_ar8216_header(struct ag71xx *ag, struct sk_buff *skb)
++{
++ skb_push(skb, AR8216_HEADER_LEN);
++ skb->data[0] = 0x10;
++ skb->data[1] = 0x80;
++}
++
++int ag71xx_remove_ar8216_header(struct ag71xx *ag, struct sk_buff *skb,
++ int pktlen)
++{
++ u8 type;
++
++ type = skb->data[1] & AR8216_PACKET_TYPE_MASK;
++ switch (type) {
++ case AR8216_PACKET_TYPE_NORMAL:
++ break;
++
++ default:
++ return -EINVAL;
++ }
++
++ skb_pull(skb, AR8216_HEADER_LEN);
++ return 0;
++}
+diff -Nur linux-2.6.36.orig/drivers/net/ag71xx/ag71xx_debugfs.c linux-2.6.36/drivers/net/ag71xx/ag71xx_debugfs.c
+--- linux-2.6.36.orig/drivers/net/ag71xx/ag71xx_debugfs.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/drivers/net/ag71xx/ag71xx_debugfs.c 2010-11-18 21:16:14.000000000 +0100
+@@ -0,0 +1,197 @@
++/*
++ * Atheros AR71xx built-in ethernet mac driver
++ *
++ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
++ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
++ *
++ * Based on Atheros' AG7100 driver
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published
++ * by the Free Software Foundation.
++ */
++
++#include <linux/debugfs.h>
++
++#include "ag71xx.h"
++
++static struct dentry *ag71xx_debugfs_root;
++
++static int ag71xx_debugfs_generic_open(struct inode *inode, struct file *file)
++{
++ file->private_data = inode->i_private;
++ return 0;
++}
++
++void ag71xx_debugfs_update_int_stats(struct ag71xx *ag, u32 status)
++{
++ if (status)
++ ag->debug.int_stats.total++;
++ if (status & AG71XX_INT_TX_PS)
++ ag->debug.int_stats.tx_ps++;
++ if (status & AG71XX_INT_TX_UR)
++ ag->debug.int_stats.tx_ur++;
++ if (status & AG71XX_INT_TX_BE)
++ ag->debug.int_stats.tx_be++;
++ if (status & AG71XX_INT_RX_PR)
++ ag->debug.int_stats.rx_pr++;
++ if (status & AG71XX_INT_RX_OF)
++ ag->debug.int_stats.rx_of++;
++ if (status & AG71XX_INT_RX_BE)
++ ag->debug.int_stats.rx_be++;
++}
++
++static ssize_t read_file_int_stats(struct file *file, char __user *user_buf,
++ size_t count, loff_t *ppos)
++{
++#define PR_INT_STAT(_label, _field) \
++ len += snprintf(buf + len, sizeof(buf) - len, \
++ "%20s: %10lu\n", _label, ag->debug.int_stats._field);
++
++ struct ag71xx *ag = file->private_data;
++ char buf[256];
++ unsigned int len = 0;
++
++ PR_INT_STAT("TX Packet Sent", tx_ps);
++ PR_INT_STAT("TX Underrun", tx_ur);
++ PR_INT_STAT("TX Bus Error", tx_be);
++ PR_INT_STAT("RX Packet Received", rx_pr);
++ PR_INT_STAT("RX Overflow", rx_of);
++ PR_INT_STAT("RX Bus Error", rx_be);
++ len += snprintf(buf + len, sizeof(buf) - len, "\n");
++ PR_INT_STAT("Total", total);
++
++ return simple_read_from_buffer(user_buf, count, ppos, buf, len);
++#undef PR_INT_STAT
++}
++
++static const struct file_operations ag71xx_fops_int_stats = {
++ .open = ag71xx_debugfs_generic_open,
++ .read = read_file_int_stats,
++ .owner = THIS_MODULE
++};
++
++void ag71xx_debugfs_update_napi_stats(struct ag71xx *ag, int rx, int tx)
++{
++ struct ag71xx_napi_stats *stats = &ag->debug.napi_stats;
++
++ if (rx) {
++ stats->rx_count++;
++ stats->rx_packets += rx;
++ if (rx <= AG71XX_NAPI_WEIGHT)
++ stats->rx[rx]++;
++ if (rx > stats->rx_packets_max)
++ stats->rx_packets_max = rx;
++ }
++
++ if (tx) {
++ stats->tx_count++;
++ stats->tx_packets += tx;
++ if (tx <= AG71XX_NAPI_WEIGHT)
++ stats->tx[tx]++;
++ if (tx > stats->tx_packets_max)
++ stats->tx_packets_max = tx;
++ }
++}
++
++static ssize_t read_file_napi_stats(struct file *file, char __user *user_buf,
++ size_t count, loff_t *ppos)
++{
++ struct ag71xx *ag = file->private_data;
++ struct ag71xx_napi_stats *stats = &ag->debug.napi_stats;
++ char buf[2048];
++ unsigned int len = 0;
++ unsigned long rx_avg = 0;
++ unsigned long tx_avg = 0;
++ int i;
++
++ if (stats->rx_count)
++ rx_avg = stats->rx_packets / stats->rx_count;
++
++ if (stats->tx_count)
++ tx_avg = stats->tx_packets / stats->tx_count;
++
++ len += snprintf(buf + len, sizeof(buf) - len, "%3s %10s %10s\n",
++ "len", "rx", "tx");
++
++ for (i = 1; i <= AG71XX_NAPI_WEIGHT; i++)
++ len += snprintf(buf + len, sizeof(buf) - len,
++ "%3d: %10lu %10lu\n",
++ i, stats->rx[i], stats->tx[i]);
++
++ len += snprintf(buf + len, sizeof(buf) - len, "\n");
++
++ len += snprintf(buf + len, sizeof(buf) - len, "%3s: %10lu %10lu\n",
++ "sum", stats->rx_count, stats->tx_count);
++ len += snprintf(buf + len, sizeof(buf) - len, "%3s: %10lu %10lu\n",
++ "avg", rx_avg, tx_avg);
++ len += snprintf(buf + len, sizeof(buf) - len, "%3s: %10lu %10lu\n",
++ "max", stats->rx_packets_max, stats->tx_packets_max);
++ len += snprintf(buf + len, sizeof(buf) - len, "%3s: %10lu %10lu\n",
++ "pkt", stats->rx_packets, stats->tx_packets);
++
++ return simple_read_from_buffer(user_buf, count, ppos, buf, len);
++}
++
++static const struct file_operations ag71xx_fops_napi_stats = {
++ .open = ag71xx_debugfs_generic_open,
++ .read = read_file_napi_stats,
++ .owner = THIS_MODULE
++};
++
++void ag71xx_debugfs_exit(struct ag71xx *ag)
++{
++ debugfs_remove(ag->debug.debugfs_napi_stats);
++ debugfs_remove(ag->debug.debugfs_int_stats);
++ debugfs_remove(ag->debug.debugfs_dir);
++}
++
++int ag71xx_debugfs_init(struct ag71xx *ag)
++{
++ ag->debug.debugfs_dir = debugfs_create_dir(ag->dev->name,
++ ag71xx_debugfs_root);
++ if (!ag->debug.debugfs_dir)
++ goto err;
++
++ ag->debug.debugfs_int_stats =
++ debugfs_create_file("int_stats",
++ S_IRUGO,
++ ag->debug.debugfs_dir,
++ ag,
++ &ag71xx_fops_int_stats);
++ if (!ag->debug.debugfs_int_stats)
++ goto err;
++
++ ag->debug.debugfs_napi_stats =
++ debugfs_create_file("napi_stats",
++ S_IRUGO,
++ ag->debug.debugfs_dir,
++ ag,
++ &ag71xx_fops_napi_stats);
++ if (!ag->debug.debugfs_napi_stats)
++ goto err;
++
++ return 0;
++
++ err:
++ ag71xx_debugfs_exit(ag);
++ return -ENOMEM;
++}
++
++int ag71xx_debugfs_root_init(void)
++{
++ if (ag71xx_debugfs_root)
++ return -EBUSY;
++
++ ag71xx_debugfs_root = debugfs_create_dir(KBUILD_MODNAME, NULL);
++ if (!ag71xx_debugfs_root)
++ return -ENOENT;
++
++ return 0;
++}
++
++void ag71xx_debugfs_root_exit(void)
++{
++ debugfs_remove(ag71xx_debugfs_root);
++ ag71xx_debugfs_root = NULL;
++}
+diff -Nur linux-2.6.36.orig/drivers/net/ag71xx/ag71xx_ethtool.c linux-2.6.36/drivers/net/ag71xx/ag71xx_ethtool.c
+--- linux-2.6.36.orig/drivers/net/ag71xx/ag71xx_ethtool.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/drivers/net/ag71xx/ag71xx_ethtool.c 2010-11-18 21:16:14.000000000 +0100
+@@ -0,0 +1,71 @@
++/*
++ * Atheros AR71xx built-in ethernet mac driver
++ *
++ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
++ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
++ *
++ * Based on Atheros' AG7100 driver
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published
++ * by the Free Software Foundation.
++ */
++
++#include "ag71xx.h"
++
++static int ag71xx_ethtool_get_settings(struct net_device *dev,
++ struct ethtool_cmd *cmd)
++{
++ struct ag71xx *ag = netdev_priv(dev);
++ struct phy_device *phydev = ag->phy_dev;
++
++ if (!phydev)
++ return -ENODEV;
++
++ return phy_ethtool_gset(phydev, cmd);
++}
++
++static int ag71xx_ethtool_set_settings(struct net_device *dev,
++ struct ethtool_cmd *cmd)
++{
++ struct ag71xx *ag = netdev_priv(dev);
++ struct phy_device *phydev = ag->phy_dev;
++
++ if (!phydev)
++ return -ENODEV;
++
++ return phy_ethtool_sset(phydev, cmd);
++}
++
++static void ag71xx_ethtool_get_drvinfo(struct net_device *dev,
++ struct ethtool_drvinfo *info)
++{
++ struct ag71xx *ag = netdev_priv(dev);
++
++ strcpy(info->driver, ag->pdev->dev.driver->name);
++ strcpy(info->version, AG71XX_DRV_VERSION);
++ strcpy(info->bus_info, dev_name(&ag->pdev->dev));
++}
++
++static u32 ag71xx_ethtool_get_msglevel(struct net_device *dev)
++{
++ struct ag71xx *ag = netdev_priv(dev);
++
++ return ag->msg_enable;
++}
++
++static void ag71xx_ethtool_set_msglevel(struct net_device *dev, u32 msg_level)
++{
++ struct ag71xx *ag = netdev_priv(dev);
++
++ ag->msg_enable = msg_level;
++}
++
++struct ethtool_ops ag71xx_ethtool_ops = {
++ .set_settings = ag71xx_ethtool_set_settings,
++ .get_settings = ag71xx_ethtool_get_settings,
++ .get_drvinfo = ag71xx_ethtool_get_drvinfo,
++ .get_msglevel = ag71xx_ethtool_get_msglevel,
++ .set_msglevel = ag71xx_ethtool_set_msglevel,
++ .get_link = ethtool_op_get_link,
++};
+diff -Nur linux-2.6.36.orig/drivers/net/ag71xx/ag71xx_main.c linux-2.6.36/drivers/net/ag71xx/ag71xx_main.c
+--- linux-2.6.36.orig/drivers/net/ag71xx/ag71xx_main.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/drivers/net/ag71xx/ag71xx_main.c 2010-11-18 21:16:14.000000000 +0100
@@ -0,0 +1,1184 @@
+/*
+ * Atheros AR71xx built-in ethernet mac driver
@@ -18396,9 +14424,9 @@ diff -Nur linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx_main.c linux-2.6.35.7/dr
+MODULE_AUTHOR("Imre Kaloz <kaloz@openwrt.org>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" AG71XX_DRV_NAME);
-diff -Nur linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx_mdio.c linux-2.6.35.7/drivers/net/ag71xx/ag71xx_mdio.c
---- linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx_mdio.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/net/ag71xx/ag71xx_mdio.c 2010-10-14 20:28:00.678101104 +0200
+diff -Nur linux-2.6.36.orig/drivers/net/ag71xx/ag71xx_mdio.c linux-2.6.36/drivers/net/ag71xx/ag71xx_mdio.c
+--- linux-2.6.36.orig/drivers/net/ag71xx/ag71xx_mdio.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/drivers/net/ag71xx/ag71xx_mdio.c 2010-11-18 21:16:14.000000000 +0100
@@ -0,0 +1,243 @@
+/*
+ * Atheros AR71xx built-in ethernet mac driver
@@ -18643,9 +14671,9 @@ diff -Nur linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx_mdio.c linux-2.6.35.7/dr
+{
+ platform_driver_unregister(&ag71xx_mdio_driver);
+}
-diff -Nur linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx_phy.c linux-2.6.35.7/drivers/net/ag71xx/ag71xx_phy.c
---- linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx_phy.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/net/ag71xx/ag71xx_phy.c 2010-10-14 20:28:00.708092093 +0200
+diff -Nur linux-2.6.36.orig/drivers/net/ag71xx/ag71xx_phy.c linux-2.6.36/drivers/net/ag71xx/ag71xx_phy.c
+--- linux-2.6.36.orig/drivers/net/ag71xx/ag71xx_phy.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/drivers/net/ag71xx/ag71xx_phy.c 2010-11-18 21:16:14.000000000 +0100
@@ -0,0 +1,213 @@
+/*
+ * Atheros AR71xx built-in ethernet mac driver
@@ -18860,3405 +14888,9 @@ diff -Nur linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx_phy.c linux-2.6.35.7/dri
+ if (ag->phy_dev)
+ phy_disconnect(ag->phy_dev);
+}
-diff -Nur linux-2.6.35.7.orig/drivers/net/ag71xx/Kconfig linux-2.6.35.7/drivers/net/ag71xx/Kconfig
---- linux-2.6.35.7.orig/drivers/net/ag71xx/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/net/ag71xx/Kconfig 2010-10-14 20:28:00.748098810 +0200
-@@ -0,0 +1,33 @@
-+config AG71XX
-+ tristate "Atheros AR71xx built-in ethernet mac support"
-+ depends on ATHEROS_AR71XX
-+ select PHYLIB
-+ help
-+ If you wish to compile a kernel for AR71xx/91xx and enable
-+ ethernet support, then you should always answer Y to this.
-+
-+if AG71XX
-+
-+config AG71XX_DEBUG
-+ bool "Atheros AR71xx built-in ethernet driver debugging"
-+ default n
-+ help
-+ Atheros AR71xx built-in ethernet driver debugging messages.
-+
-+config AG71XX_DEBUG_FS
-+ bool "Atheros AR71xx built-in ethernet driver debugfs support"
-+ depends on DEBUG_FS
-+ default n
-+ help
-+ Say Y, if you need access to various statistics provided by
-+ the ag71xx driver.
-+
-+config AG71XX_AR8216_SUPPORT
-+ bool "special support for the Atheros AR8216 switch"
-+ default n
-+ default y if AR71XX_MACH_WNR2000 || AR71XX_MACH_MZK_W04NU
-+ help
-+ Say 'y' here if you want to enable special support for the
-+ Atheros AR8216 switch found on some boards.
-+
-+endif
-diff -Nur linux-2.6.35.7.orig/drivers/net/ag71xx/Makefile linux-2.6.35.7/drivers/net/ag71xx/Makefile
---- linux-2.6.35.7.orig/drivers/net/ag71xx/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/net/ag71xx/Makefile 2010-10-14 20:28:00.784356250 +0200
-@@ -0,0 +1,14 @@
-+#
-+# Makefile for the Atheros AR71xx built-in ethernet macs
-+#
-+
-+ag71xx-y += ag71xx_main.o
-+ag71xx-y += ag71xx_ethtool.o
-+ag71xx-y += ag71xx_phy.o
-+ag71xx-y += ag71xx_mdio.o
-+
-+ag71xx-$(CONFIG_AG71XX_DEBUG_FS) += ag71xx_debugfs.o
-+ag71xx-$(CONFIG_AG71XX_AR8216_SUPPORT) += ag71xx_ar8216.o
-+
-+obj-$(CONFIG_AG71XX) += ag71xx.o
-+
-diff -Nur linux-2.6.35.7.orig/drivers/net/Kconfig linux-2.6.35.7/drivers/net/Kconfig
---- linux-2.6.35.7.orig/drivers/net/Kconfig 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/drivers/net/Kconfig 2010-10-14 20:28:00.828101196 +0200
-@@ -2032,6 +2032,8 @@
-
- The safe and default value for this is N.
-
-+source drivers/net/ag71xx/Kconfig
-+
- config DL2K
- tristate "DL2000/TC902x-based Gigabit Ethernet support"
- depends on PCI
-diff -Nur linux-2.6.35.7.orig/drivers/net/Kconfig.orig linux-2.6.35.7/drivers/net/Kconfig.orig
---- linux-2.6.35.7.orig/drivers/net/Kconfig.orig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/net/Kconfig.orig 2010-09-29 03:09:08.000000000 +0200
-@@ -0,0 +1,3314 @@
-+#
-+# Network device configuration
-+#
-+
-+menuconfig NETDEVICES
-+ default y if UML
-+ depends on NET
-+ bool "Network device support"
-+ ---help---
-+ You can say N here if you don't intend to connect your Linux box to
-+ any other computer at all.
-+
-+ You'll have to say Y if your computer contains a network card that
-+ you want to use under Linux. If you are going to run SLIP or PPP over
-+ telephone line or null modem cable you need say Y here. Connecting
-+ two machines with parallel ports using PLIP needs this, as well as
-+ AX.25/KISS for sending Internet traffic over amateur radio links.
-+
-+ See also "The Linux Network Administrator's Guide" by Olaf Kirch and
-+ Terry Dawson. Available at <http://www.tldp.org/guides.html>.
-+
-+ If unsure, say Y.
-+
-+# All the following symbols are dependent on NETDEVICES - do not repeat
-+# that for each of the symbols.
-+if NETDEVICES
-+
-+config IFB
-+ tristate "Intermediate Functional Block support"
-+ depends on NET_CLS_ACT
-+ ---help---
-+ This is an intermediate driver that allows sharing of
-+ resources.
-+ To compile this driver as a module, choose M here: the module
-+ will be called ifb. If you want to use more than one ifb
-+ device at a time, you need to compile this driver as a module.
-+ Instead of 'ifb', the devices will then be called 'ifb0',
-+ 'ifb1' etc.
-+ Look at the iproute2 documentation directory for usage etc
-+
-+config DUMMY
-+ tristate "Dummy net driver support"
-+ ---help---
-+ This is essentially a bit-bucket device (i.e. traffic you send to
-+ this device is consigned into oblivion) with a configurable IP
-+ address. It is most commonly used in order to make your currently
-+ inactive SLIP address seem like a real address for local programs.
-+ If you use SLIP or PPP, you might want to say Y here. Since this
-+ thing often comes in handy, the default is Y. It won't enlarge your
-+ kernel either. What a deal. Read about it in the Network
-+ Administrator's Guide, available from
-+ <http://www.tldp.org/docs.html#guide>.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called dummy. If you want to use more than one dummy
-+ device at a time, you need to compile this driver as a module.
-+ Instead of 'dummy', the devices will then be called 'dummy0',
-+ 'dummy1' etc.
-+
-+config BONDING
-+ tristate "Bonding driver support"
-+ depends on INET
-+ depends on IPV6 || IPV6=n
-+ ---help---
-+ Say 'Y' or 'M' if you wish to be able to 'bond' multiple Ethernet
-+ Channels together. This is called 'Etherchannel' by Cisco,
-+ 'Trunking' by Sun, 802.3ad by the IEEE, and 'Bonding' in Linux.
-+
-+ The driver supports multiple bonding modes to allow for both high
-+ performance and high availability operation.
-+
-+ Refer to <file:Documentation/networking/bonding.txt> for more
-+ information.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called bonding.
-+
-+config MACVLAN
-+ tristate "MAC-VLAN support (EXPERIMENTAL)"
-+ depends on EXPERIMENTAL
-+ ---help---
-+ This allows one to create virtual interfaces that map packets to
-+ or from specific MAC addresses to a particular interface.
-+
-+ Macvlan devices can be added using the "ip" command from the
-+ iproute2 package starting with the iproute2-2.6.23 release:
-+
-+ "ip link add link <real dev> [ address MAC ] [ NAME ] type macvlan"
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called macvlan.
-+
-+config MACVTAP
-+ tristate "MAC-VLAN based tap driver (EXPERIMENTAL)"
-+ depends on MACVLAN
-+ help
-+ This adds a specialized tap character device driver that is based
-+ on the MAC-VLAN network interface, called macvtap. A macvtap device
-+ can be added in the same way as a macvlan device, using 'type
-+ macvlan', and then be accessed through the tap user space interface.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called macvtap.
-+
-+config EQUALIZER
-+ tristate "EQL (serial line load balancing) support"
-+ ---help---
-+ If you have two serial connections to some other computer (this
-+ usually requires two modems and two telephone lines) and you use
-+ SLIP (the protocol for sending Internet traffic over telephone
-+ lines) or PPP (a better SLIP) on them, you can make them behave like
-+ one double speed connection using this driver. Naturally, this has
-+ to be supported at the other end as well, either with a similar EQL
-+ Linux driver or with a Livingston Portmaster 2e.
-+
-+ Say Y if you want this and read
-+ <file:Documentation/networking/eql.txt>. You may also want to read
-+ section 6.2 of the NET-3-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called eql. If unsure, say N.
-+
-+config TUN
-+ tristate "Universal TUN/TAP device driver support"
-+ select CRC32
-+ ---help---
-+ TUN/TAP provides packet reception and transmission for user space
-+ programs. It can be viewed as a simple Point-to-Point or Ethernet
-+ device, which instead of receiving packets from a physical media,
-+ receives them from user space program and instead of sending packets
-+ via physical media writes them to the user space program.
-+
-+ When a program opens /dev/net/tun, driver creates and registers
-+ corresponding net device tunX or tapX. After a program closed above
-+ devices, driver will automatically delete tunXX or tapXX device and
-+ all routes corresponding to it.
-+
-+ Please read <file:Documentation/networking/tuntap.txt> for more
-+ information.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called tun.
-+
-+ If you don't know what to use this for, you don't need it.
-+
-+config VETH
-+ tristate "Virtual ethernet pair device"
-+ ---help---
-+ This device is a local ethernet tunnel. Devices are created in pairs.
-+ When one end receives the packet it appears on its pair and vice
-+ versa.
-+
-+config NET_SB1000
-+ tristate "General Instruments Surfboard 1000"
-+ depends on PNP
-+ ---help---
-+ This is a driver for the General Instrument (also known as
-+ NextLevel) SURFboard 1000 internal
-+ cable modem. This is an ISA card which is used by a number of cable
-+ TV companies to provide cable modem access. It's a one-way
-+ downstream-only cable modem, meaning that your upstream net link is
-+ provided by your regular phone modem.
-+
-+ At present this driver only compiles as a module, so say M here if
-+ you have this card. The module will be called sb1000. Then read
-+ <file:Documentation/networking/README.sb1000> for information on how
-+ to use this module, as it needs special ppp scripts for establishing
-+ a connection. Further documentation and the necessary scripts can be
-+ found at:
-+
-+ <http://www.jacksonville.net/~fventuri/>
-+ <http://home.adelphia.net/~siglercm/sb1000.html>
-+ <http://linuxpower.cx/~cable/>
-+
-+ If you don't have this card, of course say N.
-+
-+source "drivers/net/arcnet/Kconfig"
-+
-+source "drivers/net/phy/Kconfig"
-+
-+#
-+# Ethernet
-+#
-+
-+menuconfig NET_ETHERNET
-+ bool "Ethernet (10 or 100Mbit)"
-+ depends on !UML
-+ ---help---
-+ Ethernet (also called IEEE 802.3 or ISO 8802-2) is the most common
-+ type of Local Area Network (LAN) in universities and companies.
-+
-+ Common varieties of Ethernet are: 10BASE-2 or Thinnet (10 Mbps over
-+ coaxial cable, linking computers in a chain), 10BASE-T or twisted
-+ pair (10 Mbps over twisted pair cable, linking computers to central
-+ hubs), 10BASE-F (10 Mbps over optical fiber links, using hubs),
-+ 100BASE-TX (100 Mbps over two twisted pair cables, using hubs),
-+ 100BASE-T4 (100 Mbps over 4 standard voice-grade twisted pair
-+ cables, using hubs), 100BASE-FX (100 Mbps over optical fiber links)
-+ [the 100BASE varieties are also known as Fast Ethernet], and Gigabit
-+ Ethernet (1 Gbps over optical fiber or short copper links).
-+
-+ If your Linux machine will be connected to an Ethernet and you have
-+ an Ethernet network interface card (NIC) installed in your computer,
-+ say Y here and read the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>. You will then also have
-+ to say Y to the driver for your particular NIC.
-+
-+ Note that the answer to this question won't directly affect the
-+ kernel: saying N will just cause the configurator to skip all
-+ the questions about Ethernet network cards. If unsure, say N.
-+
-+if NET_ETHERNET
-+
-+config MII
-+ tristate "Generic Media Independent Interface device support"
-+ help
-+ Most ethernet controllers have MII transceiver either as an external
-+ or internal device. It is safe to say Y or M here even if your
-+ ethernet card lack MII.
-+
-+config MACB
-+ tristate "Atmel MACB support"
-+ depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91SAM9G20 || ARCH_AT91SAM9G45 || ARCH_AT91CAP9
-+ select PHYLIB
-+ help
-+ The Atmel MACB ethernet interface is found on many AT32 and AT91
-+ parts. Say Y to include support for the MACB chip.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called macb.
-+
-+source "drivers/net/arm/Kconfig"
-+
-+config AX88796
-+ tristate "ASIX AX88796 NE2000 clone support"
-+ depends on ARM || MIPS || SUPERH
-+ select CRC32
-+ select MII
-+ help
-+ AX88796 driver, using platform bus to provide
-+ chip detection and resources
-+
-+config AX88796_93CX6
-+ bool "ASIX AX88796 external 93CX6 eeprom support"
-+ depends on AX88796
-+ select EEPROM_93CX6
-+ help
-+ Select this if your platform comes with an external 93CX6 eeprom.
-+
-+config MACE
-+ tristate "MACE (Power Mac ethernet) support"
-+ depends on PPC_PMAC && PPC32
-+ select CRC32
-+ help
-+ Power Macintoshes and clones with Ethernet built-in on the
-+ motherboard will usually use a MACE (Medium Access Control for
-+ Ethernet) interface. Say Y to include support for the MACE chip.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called mace.
-+
-+config MACE_AAUI_PORT
-+ bool "Use AAUI port instead of TP by default"
-+ depends on MACE
-+ help
-+ Some Apple machines (notably the Apple Network Server) which use the
-+ MACE ethernet chip have an Apple AUI port (small 15-pin connector),
-+ instead of an 8-pin RJ45 connector for twisted-pair ethernet. Say
-+ Y here if you have such a machine. If unsure, say N.
-+ The driver will default to AAUI on ANS anyway, and if you use it as
-+ a module, you can provide the port_aaui=0|1 to force the driver.
-+
-+config BMAC
-+ tristate "BMAC (G3 ethernet) support"
-+ depends on PPC_PMAC && PPC32
-+ select CRC32
-+ help
-+ Say Y for support of BMAC Ethernet interfaces. These are used on G3
-+ computers.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called bmac.
-+
-+config ARIADNE
-+ tristate "Ariadne support"
-+ depends on ZORRO
-+ help
-+ If you have a Village Tronic Ariadne Ethernet adapter, say Y.
-+ Otherwise, say N.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called ariadne.
-+
-+config A2065
-+ tristate "A2065 support"
-+ depends on ZORRO
-+ select CRC32
-+ help
-+ If you have a Commodore A2065 Ethernet adapter, say Y. Otherwise,
-+ say N.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called a2065.
-+
-+config HYDRA
-+ tristate "Hydra support"
-+ depends on ZORRO
-+ select CRC32
-+ help
-+ If you have a Hydra Ethernet adapter, say Y. Otherwise, say N.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called hydra.
-+
-+config ZORRO8390
-+ tristate "Zorro NS8390-based Ethernet support"
-+ depends on ZORRO
-+ select CRC32
-+ help
-+ This driver is for Zorro Ethernet cards using an NS8390-compatible
-+ chipset, like the Village Tronic Ariadne II and the Individual
-+ Computers X-Surf Ethernet cards. If you have such a card, say Y.
-+ Otherwise, say N.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called zorro8390.
-+
-+config APNE
-+ tristate "PCMCIA NE2000 support"
-+ depends on AMIGA_PCMCIA
-+ select CRC32
-+ help
-+ If you have a PCMCIA NE2000 compatible adapter, say Y. Otherwise,
-+ say N.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called apne.
-+
-+config MAC8390
-+ bool "Macintosh NS 8390 based ethernet cards"
-+ depends on MAC
-+ select CRC32
-+ help
-+ If you want to include a driver to support Nubus or LC-PDS
-+ Ethernet cards using an NS8390 chipset or its equivalent, say Y
-+ and read the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+config MAC89x0
-+ tristate "Macintosh CS89x0 based ethernet cards"
-+ depends on MAC
-+ ---help---
-+ Support for CS89x0 chipset based Ethernet cards. If you have a
-+ Nubus or LC-PDS network (Ethernet) card of this type, say Y and
-+ read the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. This module will
-+ be called mac89x0.
-+
-+config MACSONIC
-+ tristate "Macintosh SONIC based ethernet (onboard, NuBus, LC, CS)"
-+ depends on MAC
-+ ---help---
-+ Support for NatSemi SONIC based Ethernet devices. This includes
-+ the onboard Ethernet in many Quadras as well as some LC-PDS,
-+ a few Nubus and all known Comm Slot Ethernet cards. If you have
-+ one of these say Y and read the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. This module will
-+ be called macsonic.
-+
-+config MACMACE
-+ bool "Macintosh (AV) onboard MACE ethernet"
-+ depends on MAC
-+ select CRC32
-+ help
-+ Support for the onboard AMD 79C940 MACE Ethernet controller used in
-+ the 660AV and 840AV Macintosh. If you have one of these Macintoshes
-+ say Y and read the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+config MVME147_NET
-+ tristate "MVME147 (Lance) Ethernet support"
-+ depends on MVME147
-+ select CRC32
-+ help
-+ Support for the on-board Ethernet interface on the Motorola MVME147
-+ single-board computer. Say Y here to include the
-+ driver for this chip in your kernel.
-+ To compile this driver as a module, choose M here.
-+
-+config MVME16x_NET
-+ tristate "MVME16x Ethernet support"
-+ depends on MVME16x
-+ help
-+ This is the driver for the Ethernet interface on the Motorola
-+ MVME162, 166, 167, 172 and 177 boards. Say Y here to include the
-+ driver for this chip in your kernel.
-+ To compile this driver as a module, choose M here.
-+
-+config BVME6000_NET
-+ tristate "BVME6000 Ethernet support"
-+ depends on BVME6000
-+ help
-+ This is the driver for the Ethernet interface on BVME4000 and
-+ BVME6000 VME boards. Say Y here to include the driver for this chip
-+ in your kernel.
-+ To compile this driver as a module, choose M here.
-+
-+config ATARILANCE
-+ tristate "Atari Lance support"
-+ depends on ATARI
-+ help
-+ Say Y to include support for several Atari Ethernet adapters based
-+ on the AMD Lance chipset: RieblCard (with or without battery), or
-+ PAMCard VME (also the version by Rhotron, with different addresses).
-+
-+config SUN3LANCE
-+ tristate "Sun3/Sun3x on-board LANCE support"
-+ depends on SUN3 || SUN3X
-+ help
-+ Most Sun3 and Sun3x motherboards (including the 3/50, 3/60 and 3/80)
-+ featured an AMD Lance 10Mbit Ethernet controller on board; say Y
-+ here to compile in the Linux driver for this and enable Ethernet.
-+ General Linux information on the Sun 3 and 3x series (now
-+ discontinued) is at
-+ <http://www.angelfire.com/ca2/tech68k/sun3.html>.
-+
-+ If you're not building a kernel for a Sun 3, say N.
-+
-+config SUN3_82586
-+ bool "Sun3 on-board Intel 82586 support"
-+ depends on SUN3
-+ help
-+ This driver enables support for the on-board Intel 82586 based
-+ Ethernet adapter found on Sun 3/1xx and 3/2xx motherboards. Note
-+ that this driver does not support 82586-based adapters on additional
-+ VME boards.
-+
-+config HPLANCE
-+ bool "HP on-board LANCE support"
-+ depends on DIO
-+ select CRC32
-+ help
-+ If you want to use the builtin "LANCE" Ethernet controller on an
-+ HP300 machine, say Y here.
-+
-+config LASI_82596
-+ tristate "Lasi ethernet"
-+ depends on GSC
-+ help
-+ Say Y here to support the builtin Intel 82596 ethernet controller
-+ found in Hewlett-Packard PA-RISC machines with 10Mbit ethernet.
-+
-+config SNI_82596
-+ tristate "SNI RM ethernet"
-+ depends on NET_ETHERNET && SNI_RM
-+ help
-+ Say Y here to support the on-board Intel 82596 ethernet controller
-+ built into SNI RM machines.
-+
-+config KORINA
-+ tristate "Korina (IDT RC32434) Ethernet support"
-+ depends on NET_ETHERNET && MIKROTIK_RB532
-+ help
-+ If you have a Mikrotik RouterBoard 500 or IDT RC32434
-+ based system say Y. Otherwise say N.
-+
-+config MIPS_JAZZ_SONIC
-+ tristate "MIPS JAZZ onboard SONIC Ethernet support"
-+ depends on MACH_JAZZ
-+ help
-+ This is the driver for the onboard card of MIPS Magnum 4000,
-+ Acer PICA, Olivetti M700-10 and a few other identical OEM systems.
-+
-+config XTENSA_XT2000_SONIC
-+ tristate "Xtensa XT2000 onboard SONIC Ethernet support"
-+ depends on XTENSA_PLATFORM_XT2000
-+ help
-+ This is the driver for the onboard card of the Xtensa XT2000 board.
-+
-+config MIPS_AU1X00_ENET
-+ tristate "MIPS AU1000 Ethernet support"
-+ depends on SOC_AU1X00
-+ select PHYLIB
-+ select CRC32
-+ help
-+ If you have an Alchemy Semi AU1X00 based system
-+ say Y. Otherwise, say N.
-+
-+config SGI_IOC3_ETH
-+ bool "SGI IOC3 Ethernet"
-+ depends on PCI && SGI_IP27
-+ select CRC32
-+ select MII
-+ help
-+ If you have a network (Ethernet) card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+config MIPS_SIM_NET
-+ tristate "MIPS simulator Network device"
-+ depends on MIPS_SIM
-+ help
-+ The MIPSNET device is a simple Ethernet network device which is
-+ emulated by the MIPS Simulator.
-+ If you are not using a MIPSsim or are unsure, say N.
-+
-+config SGI_O2MACE_ETH
-+ tristate "SGI O2 MACE Fast Ethernet support"
-+ depends on SGI_IP32=y
-+
-+config STNIC
-+ tristate "National DP83902AV support"
-+ depends on SUPERH
-+ select CRC32
-+ help
-+ Support for cards based on the National Semiconductor DP83902AV
-+ ST-NIC Serial Network Interface Controller for Twisted Pair. This
-+ is a 10Mbit/sec Ethernet controller. Product overview and specs at
-+ <http://www.national.com/pf/DP/DP83902A.html>.
-+
-+ If unsure, say N.
-+
-+config SH_ETH
-+ tristate "Renesas SuperH Ethernet support"
-+ depends on SUPERH && \
-+ (CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712 || \
-+ CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7619 || \
-+ CPU_SUBTYPE_SH7724)
-+ select CRC32
-+ select MII
-+ select MDIO_BITBANG
-+ select PHYLIB
-+ help
-+ Renesas SuperH Ethernet device driver.
-+ This driver support SH7710, SH7712, SH7763, SH7619, and SH7724.
-+
-+config SUNLANCE
-+ tristate "Sun LANCE support"
-+ depends on SBUS
-+ select CRC32
-+ help
-+ This driver supports the "le" interface present on all 32-bit Sparc
-+ systems, on some older Ultra systems and as an Sbus option. These
-+ cards are based on the AMD Lance chipset, which is better known
-+ via the NE2100 cards.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called sunlance.
-+
-+config HAPPYMEAL
-+ tristate "Sun Happy Meal 10/100baseT support"
-+ depends on SBUS || PCI
-+ select CRC32
-+ help
-+ This driver supports the "hme" interface present on most Ultra
-+ systems and as an option on older Sbus systems. This driver supports
-+ both PCI and Sbus devices. This driver also supports the "qfe" quad
-+ 100baseT device available in both PCI and Sbus configurations.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called sunhme.
-+
-+config SUNBMAC
-+ tristate "Sun BigMAC 10/100baseT support (EXPERIMENTAL)"
-+ depends on SBUS && EXPERIMENTAL
-+ select CRC32
-+ help
-+ This driver supports the "be" interface available as an Sbus option.
-+ This is Sun's older 100baseT Ethernet device.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called sunbmac.
-+
-+config SUNQE
-+ tristate "Sun QuadEthernet support"
-+ depends on SBUS
-+ select CRC32
-+ help
-+ This driver supports the "qe" 10baseT Ethernet device, available as
-+ an Sbus option. Note that this is not the same as Quad FastEthernet
-+ "qfe" which is supported by the Happy Meal driver instead.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called sunqe.
-+
-+config SUNGEM
-+ tristate "Sun GEM support"
-+ depends on PCI
-+ select CRC32
-+ help
-+ Support for the Sun GEM chip, aka Sun GigabitEthernet/P 2.0. See also
-+ <http://www.sun.com/products-n-solutions/hardware/docs/pdf/806-3985-10.pdf>.
-+
-+config CASSINI
-+ tristate "Sun Cassini support"
-+ depends on PCI
-+ select CRC32
-+ help
-+ Support for the Sun Cassini chip, aka Sun GigaSwift Ethernet. See also
-+ <http://www.sun.com/products-n-solutions/hardware/docs/pdf/817-4341-10.pdf>
-+
-+config SUNVNET
-+ tristate "Sun Virtual Network support"
-+ depends on SUN_LDOMS
-+ help
-+ Support for virtual network devices under Sun Logical Domains.
-+
-+config NET_VENDOR_3COM
-+ bool "3COM cards"
-+ depends on ISA || EISA || MCA || PCI
-+ help
-+ If you have a network (Ethernet) card belonging to this class, say Y
-+ and read the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ Note that the answer to this question doesn't directly affect the
-+ kernel: saying N will just cause the configurator to skip all
-+ the questions about 3COM cards. If you say Y, you will be asked for
-+ your specific card in the following questions.
-+
-+config EL1
-+ tristate "3c501 \"EtherLink\" support"
-+ depends on NET_VENDOR_3COM && ISA
-+ ---help---
-+ If you have a network (Ethernet) card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>. Also, consider buying a
-+ new card, since the 3c501 is slow, broken, and obsolete: you will
-+ have problems. Some people suggest to ping ("man ping") a nearby
-+ machine every minute ("man cron") when using this card.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called 3c501.
-+
-+config EL2
-+ tristate "3c503 \"EtherLink II\" support"
-+ depends on NET_VENDOR_3COM && ISA
-+ select CRC32
-+ help
-+ If you have a network (Ethernet) card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called 3c503.
-+
-+config ELPLUS
-+ tristate "3c505 \"EtherLink Plus\" support"
-+ depends on NET_VENDOR_3COM && ISA && ISA_DMA_API
-+ ---help---
-+ Information about this network (Ethernet) card can be found in
-+ <file:Documentation/networking/3c505.txt>. If you have a card of
-+ this type, say Y and read the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called 3c505.
-+
-+config EL16
-+ tristate "3c507 \"EtherLink 16\" support (EXPERIMENTAL)"
-+ depends on NET_VENDOR_3COM && ISA && EXPERIMENTAL
-+ help
-+ If you have a network (Ethernet) card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called 3c507.
-+
-+config EL3
-+ tristate "3c509/3c529 (MCA)/3c579 \"EtherLink III\" support"
-+ depends on NET_VENDOR_3COM && (ISA || EISA || MCA)
-+ ---help---
-+ If you have a network (Ethernet) card belonging to the 3Com
-+ EtherLinkIII series, say Y and read the Ethernet-HOWTO, available
-+ from <http://www.tldp.org/docs.html#howto>.
-+
-+ If your card is not working you may need to use the DOS
-+ setup disk to disable Plug & Play mode, and to select the default
-+ media type.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called 3c509.
-+
-+config 3C515
-+ tristate "3c515 ISA \"Fast EtherLink\""
-+ depends on NET_VENDOR_3COM && (ISA || EISA) && ISA_DMA_API
-+ help
-+ If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet
-+ network card, say Y and read the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called 3c515.
-+
-+config ELMC
-+ tristate "3c523 \"EtherLink/MC\" support"
-+ depends on NET_VENDOR_3COM && MCA_LEGACY
-+ help
-+ If you have a network (Ethernet) card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called 3c523.
-+
-+config ELMC_II
-+ tristate "3c527 \"EtherLink/MC 32\" support (EXPERIMENTAL)"
-+ depends on NET_VENDOR_3COM && MCA && MCA_LEGACY
-+ help
-+ If you have a network (Ethernet) card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called 3c527.
-+
-+config VORTEX
-+ tristate "3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" support"
-+ depends on NET_VENDOR_3COM && (PCI || EISA)
-+ select MII
-+ ---help---
-+ This option enables driver support for a large number of 10Mbps and
-+ 10/100Mbps EISA, PCI and PCMCIA 3Com network cards:
-+
-+ "Vortex" (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI
-+ "Boomerang" (EtherLink XL 3c900 or 3c905) PCI
-+ "Cyclone" (3c540/3c900/3c905/3c980/3c575/3c656) PCI and Cardbus
-+ "Tornado" (3c905) PCI
-+ "Hurricane" (3c555/3cSOHO) PCI
-+
-+ If you have such a card, say Y and read the Ethernet-HOWTO,
-+ available from <http://www.tldp.org/docs.html#howto>. More
-+ specific information is in
-+ <file:Documentation/networking/vortex.txt> and in the comments at
-+ the beginning of <file:drivers/net/3c59x.c>.
-+
-+ To compile this support as a module, choose M here.
-+
-+config TYPHOON
-+ tristate "3cr990 series \"Typhoon\" support"
-+ depends on NET_VENDOR_3COM && PCI
-+ select CRC32
-+ ---help---
-+ This option enables driver support for the 3cr990 series of cards:
-+
-+ 3C990-TX, 3CR990-TX-95, 3CR990-TX-97, 3CR990-FX-95, 3CR990-FX-97,
-+ 3CR990SVR, 3CR990SVR95, 3CR990SVR97, 3CR990-FX-95 Server,
-+ 3CR990-FX-97 Server, 3C990B-TX-M, 3C990BSVR
-+
-+ If you have a network (Ethernet) card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called typhoon.
-+
-+config LANCE
-+ tristate "AMD LANCE and PCnet (AT1500 and NE2100) support"
-+ depends on ISA && ISA_DMA_API
-+ help
-+ If you have a network (Ethernet) card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>. Some LinkSys cards are
-+ of this type.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called lance. This is recommended.
-+
-+config NET_VENDOR_SMC
-+ bool "Western Digital/SMC cards"
-+ depends on ISA || MCA || EISA || MAC
-+ help
-+ If you have a network (Ethernet) card belonging to this class, say Y
-+ and read the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ Note that the answer to this question doesn't directly affect the
-+ kernel: saying N will just cause the configurator to skip all
-+ the questions about Western Digital cards. If you say Y, you will be
-+ asked for your specific card in the following questions.
-+
-+config WD80x3
-+ tristate "WD80*3 support"
-+ depends on NET_VENDOR_SMC && ISA
-+ select CRC32
-+ help
-+ If you have a network (Ethernet) card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called wd.
-+
-+config ULTRAMCA
-+ tristate "SMC Ultra MCA support"
-+ depends on NET_VENDOR_SMC && MCA
-+ select CRC32
-+ help
-+ If you have a network (Ethernet) card of this type and are running
-+ an MCA based system (PS/2), say Y and read the Ethernet-HOWTO,
-+ available from <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called smc-mca.
-+
-+config ULTRA
-+ tristate "SMC Ultra support"
-+ depends on NET_VENDOR_SMC && ISA
-+ select CRC32
-+ ---help---
-+ If you have a network (Ethernet) card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ Important: There have been many reports that, with some motherboards
-+ mixing an SMC Ultra and an Adaptec AHA154x SCSI card (or compatible,
-+ such as some BusLogic models) causes corruption problems with many
-+ operating systems. The Linux smc-ultra driver has a work-around for
-+ this but keep it in mind if you have such a SCSI card and have
-+ problems.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called smc-ultra.
-+
-+config ULTRA32
-+ tristate "SMC Ultra32 EISA support"
-+ depends on NET_VENDOR_SMC && EISA
-+ select CRC32
-+ help
-+ If you have a network (Ethernet) card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called smc-ultra32.
-+
-+config BFIN_MAC
-+ tristate "Blackfin on-chip MAC support"
-+ depends on NET_ETHERNET && (BF516 || BF518 || BF526 || BF527 || BF536 || BF537)
-+ select CRC32
-+ select MII
-+ select PHYLIB
-+ select BFIN_MAC_USE_L1 if DMA_UNCACHED_NONE
-+ help
-+ This is the driver for Blackfin on-chip mac device. Say Y if you want it
-+ compiled into the kernel. This driver is also available as a module
-+ ( = code which can be inserted in and removed from the running kernel
-+ whenever you want). The module will be called bfin_mac.
-+
-+config BFIN_MAC_USE_L1
-+ bool "Use L1 memory for rx/tx packets"
-+ depends on BFIN_MAC && (BF527 || BF537)
-+ default y
-+ help
-+ To get maximum network performance, you should use L1 memory as rx/tx buffers.
-+ Say N here if you want to reserve L1 memory for other uses.
-+
-+config BFIN_TX_DESC_NUM
-+ int "Number of transmit buffer packets"
-+ depends on BFIN_MAC
-+ range 6 10 if BFIN_MAC_USE_L1
-+ range 10 100
-+ default "10"
-+ help
-+ Set the number of buffer packets used in driver.
-+
-+config BFIN_RX_DESC_NUM
-+ int "Number of receive buffer packets"
-+ depends on BFIN_MAC
-+ range 20 100 if BFIN_MAC_USE_L1
-+ range 20 800
-+ default "20"
-+ help
-+ Set the number of buffer packets used in driver.
-+
-+config BFIN_MAC_RMII
-+ bool "RMII PHY Interface"
-+ depends on BFIN_MAC
-+ default y if BFIN527_EZKIT
-+ default n if BFIN537_STAMP
-+ help
-+ Use Reduced PHY MII Interface
-+
-+config BFIN_MAC_USE_HWSTAMP
-+ bool "Use IEEE 1588 hwstamp"
-+ depends on BFIN_MAC && BF518
-+ default y
-+ help
-+ To support the IEEE 1588 Precision Time Protocol (PTP), select y here
-+
-+config SMC9194
-+ tristate "SMC 9194 support"
-+ depends on NET_VENDOR_SMC && (ISA || MAC && BROKEN)
-+ select CRC32
-+ ---help---
-+ This is support for the SMC9xxx based Ethernet cards. Choose this
-+ option if you have a DELL laptop with the docking station, or
-+ another SMC9192/9194 based chipset. Say Y if you want it compiled
-+ into the kernel, and read the file
-+ <file:Documentation/networking/smc9.txt> and the Ethernet-HOWTO,
-+ available from <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called smc9194.
-+
-+config SMC91X
-+ tristate "SMC 91C9x/91C1xxx support"
-+ select CRC32
-+ select MII
-+ depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || \
-+ MIPS || BLACKFIN || MN10300 || COLDFIRE
-+ help
-+ This is a driver for SMC's 91x series of Ethernet chipsets,
-+ including the SMC91C94 and the SMC91C111. Say Y if you want it
-+ compiled into the kernel, and read the file
-+ <file:Documentation/networking/smc9.txt> and the Ethernet-HOWTO,
-+ available from <http://www.linuxdoc.org/docs.html#howto>.
-+
-+ This driver is also available as a module ( = code which can be
-+ inserted in and removed from the running kernel whenever you want).
-+ The module will be called smc91x. If you want to compile it as a
-+ module, say M here and read <file:Documentation/kbuild/modules.txt>.
-+
-+config NET_NETX
-+ tristate "NetX Ethernet support"
-+ select MII
-+ depends on ARCH_NETX
-+ help
-+ This is support for the Hilscher netX builtin Ethernet ports
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called netx-eth.
-+
-+config TI_DAVINCI_EMAC
-+ tristate "TI DaVinci EMAC Support"
-+ depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
-+ select PHYLIB
-+ help
-+ This driver supports TI's DaVinci Ethernet .
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called davinci_emac_driver. This is recommended.
-+
-+config DM9000
-+ tristate "DM9000 support"
-+ depends on ARM || BLACKFIN || MIPS
-+ select CRC32
-+ select MII
-+ ---help---
-+ Support for DM9000 chipset.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called dm9000.
-+
-+config DM9000_DEBUGLEVEL
-+ int "DM9000 maximum debug level"
-+ depends on DM9000
-+ default 4
-+ help
-+ The maximum level of debugging code compiled into the DM9000
-+ driver.
-+
-+config DM9000_FORCE_SIMPLE_PHY_POLL
-+ bool "Force simple NSR based PHY polling"
-+ depends on DM9000
-+ ---help---
-+ This configuration forces the DM9000 to use the NSR's LinkStatus
-+ bit to determine if the link is up or down instead of the more
-+ costly MII PHY reads. Note, this will not work if the chip is
-+ operating with an external PHY.
-+
-+config ENC28J60
-+ tristate "ENC28J60 support"
-+ depends on EXPERIMENTAL && SPI && NET_ETHERNET
-+ select CRC32
-+ ---help---
-+ Support for the Microchip EN28J60 ethernet chip.
-+
-+ To compile this driver as a module, choose M here. The module will be
-+ called enc28j60.
-+
-+config ENC28J60_WRITEVERIFY
-+ bool "Enable write verify"
-+ depends on ENC28J60
-+ ---help---
-+ Enable the verify after the buffer write useful for debugging purpose.
-+ If unsure, say N.
-+
-+config ETHOC
-+ tristate "OpenCores 10/100 Mbps Ethernet MAC support"
-+ depends on NET_ETHERNET && HAS_IOMEM && HAS_DMA
-+ select MII
-+ select PHYLIB
-+ select CRC32
-+ select BITREVERSE
-+ help
-+ Say Y here if you want to use the OpenCores 10/100 Mbps Ethernet MAC.
-+
-+config GRETH
-+ tristate "Aeroflex Gaisler GRETH Ethernet MAC support"
-+ depends on SPARC
-+ select PHYLIB
-+ select CRC32
-+ help
-+ Say Y here if you want to use the Aeroflex Gaisler GRETH Ethernet MAC.
-+
-+config SMC911X
-+ tristate "SMSC LAN911[5678] support"
-+ select CRC32
-+ select MII
-+ depends on ARM || SUPERH
-+ help
-+ This is a driver for SMSC's LAN911x series of Ethernet chipsets
-+ including the new LAN9115, LAN9116, LAN9117, and LAN9118.
-+ Say Y if you want it compiled into the kernel,
-+ and read the Ethernet-HOWTO, available from
-+ <http://www.linuxdoc.org/docs.html#howto>.
-+
-+ This driver is also available as a module. The module will be
-+ called smc911x. If you want to compile it as a module, say M
-+ here and read <file:Documentation/kbuild/modules.txt>
-+
-+config SMSC911X
-+ tristate "SMSC LAN911x/LAN921x families embedded ethernet support"
-+ depends on ARM || SUPERH || BLACKFIN || MIPS
-+ select CRC32
-+ select MII
-+ select PHYLIB
-+ ---help---
-+ Say Y here if you want support for SMSC LAN911x and LAN921x families
-+ of ethernet controllers.
-+
-+ To compile this driver as a module, choose M here and read
-+ <file:Documentation/networking/net-modules.txt>. The module
-+ will be called smsc911x.
-+
-+config NET_VENDOR_RACAL
-+ bool "Racal-Interlan (Micom) NI cards"
-+ depends on ISA
-+ help
-+ If you have a network (Ethernet) card belonging to this class, such
-+ as the NI5010, NI5210 or NI6210, say Y and read the Ethernet-HOWTO,
-+ available from <http://www.tldp.org/docs.html#howto>.
-+
-+ Note that the answer to this question doesn't directly affect the
-+ kernel: saying N will just cause the configurator to skip all
-+ the questions about NI cards. If you say Y, you will be asked for
-+ your specific card in the following questions.
-+
-+config NI5010
-+ tristate "NI5010 support (EXPERIMENTAL)"
-+ depends on NET_VENDOR_RACAL && ISA && EXPERIMENTAL && BROKEN_ON_SMP
-+ ---help---
-+ If you have a network (Ethernet) card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>. Note that this is still
-+ experimental code.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called ni5010.
-+
-+config NI52
-+ tristate "NI5210 support"
-+ depends on NET_VENDOR_RACAL && ISA
-+ help
-+ If you have a network (Ethernet) card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called ni52.
-+
-+config NI65
-+ tristate "NI6510 support"
-+ depends on NET_VENDOR_RACAL && ISA && ISA_DMA_API
-+ help
-+ If you have a network (Ethernet) card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called ni65.
-+
-+config DNET
-+ tristate "Dave ethernet support (DNET)"
-+ depends on NET_ETHERNET && HAS_IOMEM
-+ select PHYLIB
-+ help
-+ The Dave ethernet interface (DNET) is found on Qong Board FPGA.
-+ Say Y to include support for the DNET chip.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called dnet.
-+
-+source "drivers/net/tulip/Kconfig"
-+
-+config AT1700
-+ tristate "AT1700/1720 support (EXPERIMENTAL)"
-+ depends on (ISA || MCA_LEGACY) && EXPERIMENTAL
-+ select CRC32
-+ ---help---
-+ If you have a network (Ethernet) card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called at1700.
-+
-+config DEPCA
-+ tristate "DEPCA, DE10x, DE200, DE201, DE202, DE422 support"
-+ depends on ISA || EISA || MCA
-+ select CRC32
-+ ---help---
-+ If you have a network (Ethernet) card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto> as well as
-+ <file:drivers/net/depca.c>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called depca.
-+
-+config HP100
-+ tristate "HP 10/100VG PCLAN (ISA, EISA, PCI) support"
-+ depends on ISA || EISA || PCI
-+ help
-+ If you have a network (Ethernet) card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called hp100.
-+
-+config NET_ISA
-+ bool "Other ISA cards"
-+ depends on ISA
-+ ---help---
-+ If your network (Ethernet) card hasn't been mentioned yet and its
-+ bus system (that's the way the cards talks to the other components
-+ of your computer) is ISA (as opposed to EISA, VLB or PCI), say Y.
-+ Make sure you know the name of your card. Read the Ethernet-HOWTO,
-+ available from <http://www.tldp.org/docs.html#howto>.
-+
-+ If unsure, say Y.
-+
-+ Note that the answer to this question doesn't directly affect the
-+ kernel: saying N will just cause the configurator to skip all
-+ the remaining ISA network card questions. If you say Y, you will be
-+ asked for your specific card in the following questions.
-+
-+config E2100
-+ tristate "Cabletron E21xx support"
-+ depends on NET_ISA
-+ select CRC32
-+ help
-+ If you have a network (Ethernet) card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called e2100.
-+
-+config EWRK3
-+ tristate "EtherWORKS 3 (DE203, DE204, DE205) support"
-+ depends on NET_ISA
-+ select CRC32
-+ ---help---
-+ This driver supports the DE203, DE204 and DE205 network (Ethernet)
-+ cards. If this is for you, say Y and read
-+ <file:Documentation/networking/ewrk3.txt> in the kernel source as
-+ well as the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called ewrk3.
-+
-+config EEXPRESS
-+ tristate "EtherExpress 16 support"
-+ depends on NET_ISA
-+ ---help---
-+ If you have an EtherExpress16 network (Ethernet) card, say Y and
-+ read the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>. Note that the Intel
-+ EtherExpress16 card used to be regarded as a very poor choice
-+ because the driver was very unreliable. We now have a new driver
-+ that should do better.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called eexpress.
-+
-+config EEXPRESS_PRO
-+ tristate "EtherExpressPro support/EtherExpress 10 (i82595) support"
-+ depends on NET_ISA
-+ ---help---
-+ If you have a network (Ethernet) card of this type, say Y. This
-+ driver supports Intel i82595{FX,TX} based boards. Note however
-+ that the EtherExpress PRO/100 Ethernet card has its own separate
-+ driver. Please read the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called eepro.
-+
-+config HPLAN_PLUS
-+ tristate "HP PCLAN+ (27247B and 27252A) support"
-+ depends on NET_ISA
-+ select CRC32
-+ help
-+ If you have a network (Ethernet) card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called hp-plus.
-+
-+config HPLAN
-+ tristate "HP PCLAN (27245 and other 27xxx series) support"
-+ depends on NET_ISA
-+ select CRC32
-+ help
-+ If you have a network (Ethernet) card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called hp.
-+
-+config LP486E
-+ tristate "LP486E on board Ethernet"
-+ depends on NET_ISA
-+ help
-+ Say Y here to support the 82596-based on-board Ethernet controller
-+ for the Panther motherboard, which is one of the two shipped in the
-+ Intel Professional Workstation.
-+
-+config ETH16I
-+ tristate "ICL EtherTeam 16i/32 support"
-+ depends on NET_ISA
-+ help
-+ If you have a network (Ethernet) card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called eth16i.
-+
-+config NE2000
-+ tristate "NE2000/NE1000 support"
-+ depends on NET_ISA || (Q40 && m) || M32R || MACH_TX49XX
-+ select CRC32
-+ ---help---
-+ If you have a network (Ethernet) card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>. Many Ethernet cards
-+ without a specific driver are compatible with NE2000.
-+
-+ If you have a PCI NE2000 card however, say N here and Y to "PCI
-+ NE2000 and clone support" under "EISA, VLB, PCI and on board
-+ controllers" below. If you have a NE2000 card and are running on
-+ an MCA system (a bus system used on some IBM PS/2 computers and
-+ laptops), say N here and Y to "NE/2 (ne2000 MCA version) support",
-+ below.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called ne.
-+
-+config ZNET
-+ tristate "Zenith Z-Note support (EXPERIMENTAL)"
-+ depends on NET_ISA && EXPERIMENTAL && ISA_DMA_API
-+ help
-+ The Zenith Z-Note notebook computer has a built-in network
-+ (Ethernet) card, and this is the Linux driver for it. Note that the
-+ IBM Thinkpad 300 is compatible with the Z-Note and is also supported
-+ by this driver. Read the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+config SEEQ8005
-+ tristate "SEEQ8005 support (EXPERIMENTAL)"
-+ depends on NET_ISA && EXPERIMENTAL
-+ help
-+ This is a driver for the SEEQ 8005 network (Ethernet) card. If this
-+ is for you, read the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called seeq8005.
-+
-+config NE2_MCA
-+ tristate "NE/2 (ne2000 MCA version) support"
-+ depends on MCA_LEGACY
-+ select CRC32
-+ help
-+ If you have a network (Ethernet) card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called ne2.
-+
-+config IBMLANA
-+ tristate "IBM LAN Adapter/A support"
-+ depends on MCA
-+ ---help---
-+ This is a Micro Channel Ethernet adapter. You need to set
-+ CONFIG_MCA to use this driver. It is both available as an in-kernel
-+ driver and as a module.
-+
-+ To compile this driver as a module, choose M here. The only
-+ currently supported card is the IBM LAN Adapter/A for Ethernet. It
-+ will both support 16K and 32K memory windows, however a 32K window
-+ gives a better security against packet losses. Usage of multiple
-+ boards with this driver should be possible, but has not been tested
-+ up to now due to lack of hardware.
-+
-+config IBMVETH
-+ tristate "IBM LAN Virtual Ethernet support"
-+ depends on PPC_PSERIES
-+ ---help---
-+ This driver supports virtual ethernet adapters on newer IBM iSeries
-+ and pSeries systems.
-+
-+ To compile this driver as a module, choose M here. The module will
-+ be called ibmveth.
-+
-+source "drivers/net/ibm_newemac/Kconfig"
-+
-+config NET_PCI
-+ bool "EISA, VLB, PCI and on board controllers"
-+ depends on ISA || EISA || PCI
-+ help
-+ This is another class of network cards which attach directly to the
-+ bus. If you have one of those, say Y and read the Ethernet-HOWTO,
-+ available from <http://www.tldp.org/docs.html#howto>.
-+
-+ Note that the answer to this question doesn't directly affect the
-+ kernel: saying N will just cause the configurator to skip all
-+ the questions about this class of network cards. If you say Y, you
-+ will be asked for your specific card in the following questions. If
-+ you are unsure, say Y.
-+
-+config PCNET32
-+ tristate "AMD PCnet32 PCI support"
-+ depends on NET_PCI && PCI
-+ select CRC32
-+ select MII
-+ help
-+ If you have a PCnet32 or PCnetPCI based network (Ethernet) card,
-+ answer Y here and read the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called pcnet32.
-+
-+config AMD8111_ETH
-+ tristate "AMD 8111 (new PCI lance) support"
-+ depends on NET_PCI && PCI
-+ select CRC32
-+ select MII
-+ help
-+ If you have an AMD 8111-based PCI lance ethernet card,
-+ answer Y here and read the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called amd8111e.
-+
-+config ADAPTEC_STARFIRE
-+ tristate "Adaptec Starfire/DuraLAN support"
-+ depends on NET_PCI && PCI
-+ select CRC32
-+ select MII
-+ help
-+ Say Y here if you have an Adaptec Starfire (or DuraLAN) PCI network
-+ adapter. The DuraLAN chip is used on the 64 bit PCI boards from
-+ Adaptec e.g. the ANA-6922A. The older 32 bit boards use the tulip
-+ driver.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called starfire. This is recommended.
-+
-+config AC3200
-+ tristate "Ansel Communications EISA 3200 support (EXPERIMENTAL)"
-+ depends on NET_PCI && (ISA || EISA) && EXPERIMENTAL
-+ select CRC32
-+ help
-+ If you have a network (Ethernet) card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called ac3200.
-+
-+config KSZ884X_PCI
-+ tristate "Micrel KSZ8841/2 PCI"
-+ depends on NET_PCI && PCI
-+ select MII
-+ select CRC32
-+ help
-+ This PCI driver is for Micrel KSZ8841/KSZ8842 PCI Ethernet chip.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called ksz884x.
-+
-+config APRICOT
-+ tristate "Apricot Xen-II on board Ethernet"
-+ depends on NET_PCI && ISA
-+ help
-+ If you have a network (Ethernet) controller of this type, say Y and
-+ read the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called apricot.
-+
-+config B44
-+ tristate "Broadcom 440x/47xx ethernet support"
-+ depends on SSB_POSSIBLE && HAS_DMA
-+ select SSB
-+ select MII
-+ help
-+ If you have a network (Ethernet) controller of this type, say Y
-+ or M and read the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called b44.
-+
-+# Auto-select SSB PCI-HOST support, if possible
-+config B44_PCI_AUTOSELECT
-+ bool
-+ depends on B44 && SSB_PCIHOST_POSSIBLE
-+ select SSB_PCIHOST
-+ default y
-+
-+# Auto-select SSB PCICORE driver, if possible
-+config B44_PCICORE_AUTOSELECT
-+ bool
-+ depends on B44 && SSB_DRIVER_PCICORE_POSSIBLE
-+ select SSB_DRIVER_PCICORE
-+ default y
-+
-+config B44_PCI
-+ bool
-+ depends on B44_PCI_AUTOSELECT && B44_PCICORE_AUTOSELECT
-+ default y
-+
-+config FORCEDETH
-+ tristate "nForce Ethernet support"
-+ depends on NET_PCI && PCI
-+ help
-+ If you have a network (Ethernet) controller of this type, say Y and
-+ read the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called forcedeth.
-+
-+config CS89x0
-+ tristate "CS89x0 support"
-+ depends on NET_ETHERNET && (ISA || EISA || MACH_IXDP2351 \
-+ || ARCH_IXDP2X01 || ARCH_PNX010X || MACH_MX31ADS)
-+ ---help---
-+ Support for CS89x0 chipset based Ethernet cards. If you have a
-+ network (Ethernet) card of this type, say Y and read the
-+ Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto> as well as
-+ <file:Documentation/networking/cs89x0.txt>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called cs89x0.
-+
-+config CS89x0_NONISA_IRQ
-+ def_bool y
-+ depends on CS89x0 != n
-+ depends on MACH_IXDP2351 || ARCH_IXDP2X01 || ARCH_PNX010X || MACH_MX31ADS
-+
-+config TC35815
-+ tristate "TOSHIBA TC35815 Ethernet support"
-+ depends on NET_PCI && PCI && MIPS
-+ select PHYLIB
-+
-+config E100
-+ tristate "Intel(R) PRO/100+ support"
-+ depends on NET_PCI && PCI
-+ select MII
-+ ---help---
-+ This driver supports Intel(R) PRO/100 family of adapters.
-+ To verify that your adapter is supported, find the board ID number
-+ on the adapter. Look for a label that has a barcode and a number
-+ in the format 123456-001 (six digits hyphen three digits).
-+
-+ Use the above information and the Adapter & Driver ID Guide at:
-+
-+ <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-+
-+ to identify the adapter.
-+
-+ For the latest Intel PRO/100 network driver for Linux, see:
-+
-+ <http://appsr.intel.com/scripts-df/support_intel.asp>
-+
-+ More specific information on configuring the driver is in
-+ <file:Documentation/networking/e100.txt>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called e100.
-+
-+config LNE390
-+ tristate "Mylex EISA LNE390A/B support (EXPERIMENTAL)"
-+ depends on NET_PCI && EISA && EXPERIMENTAL
-+ select CRC32
-+ help
-+ If you have a network (Ethernet) card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called lne390.
-+
-+config FEALNX
-+ tristate "Myson MTD-8xx PCI Ethernet support"
-+ depends on NET_PCI && PCI
-+ select CRC32
-+ select MII
-+ help
-+ Say Y here to support the Mysom MTD-800 family of PCI-based Ethernet
-+ cards. Specifications and data at
-+ <http://www.myson.com.hk/mtd/datasheet/>.
-+
-+config NATSEMI
-+ tristate "National Semiconductor DP8381x series PCI Ethernet support"
-+ depends on NET_PCI && PCI
-+ select CRC32
-+ help
-+ This driver is for the National Semiconductor DP83810 series,
-+ which is used in cards from PureData, NetGear, Linksys
-+ and others, including the 83815 chip.
-+ More specific information and updates are available from
-+ <http://www.scyld.com/network/natsemi.html>.
-+
-+config NE2K_PCI
-+ tristate "PCI NE2000 and clones support (see help)"
-+ depends on NET_PCI && PCI
-+ select CRC32
-+ ---help---
-+ This driver is for NE2000 compatible PCI cards. It will not work
-+ with ISA NE2000 cards (they have their own driver, "NE2000/NE1000
-+ support" below). If you have a PCI NE2000 network (Ethernet) card,
-+ say Y and read the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ This driver also works for the following NE2000 clone cards:
-+ RealTek RTL-8029 Winbond 89C940 Compex RL2000 KTI ET32P2
-+ NetVin NV5000SC Via 86C926 SureCom NE34 Winbond
-+ Holtek HT80232 Holtek HT80229
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called ne2k-pci.
-+
-+config NE3210
-+ tristate "Novell/Eagle/Microdyne NE3210 EISA support (EXPERIMENTAL)"
-+ depends on NET_PCI && EISA && EXPERIMENTAL
-+ select CRC32
-+ ---help---
-+ If you have a network (Ethernet) card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>. Note that this driver
-+ will NOT WORK for NE3200 cards as they are completely different.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called ne3210.
-+
-+config ES3210
-+ tristate "Racal-Interlan EISA ES3210 support (EXPERIMENTAL)"
-+ depends on NET_PCI && EISA && EXPERIMENTAL
-+ select CRC32
-+ help
-+ If you have a network (Ethernet) card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called es3210.
-+
-+config 8139CP
-+ tristate "RealTek RTL-8139 C+ PCI Fast Ethernet Adapter support (EXPERIMENTAL)"
-+ depends on NET_PCI && PCI && EXPERIMENTAL
-+ select CRC32
-+ select MII
-+ help
-+ This is a driver for the Fast Ethernet PCI network cards based on
-+ the RTL8139C+ chips. If you have one of those, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called 8139cp. This is recommended.
-+
-+config 8139TOO
-+ tristate "RealTek RTL-8129/8130/8139 PCI Fast Ethernet Adapter support"
-+ depends on NET_PCI && PCI
-+ select CRC32
-+ select MII
-+ ---help---
-+ This is a driver for the Fast Ethernet PCI network cards based on
-+ the RTL 8129/8130/8139 chips. If you have one of those, say Y and
-+ read the Ethernet-HOWTO <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called 8139too. This is recommended.
-+
-+config 8139TOO_PIO
-+ bool "Use PIO instead of MMIO"
-+ default y
-+ depends on 8139TOO
-+ help
-+ This instructs the driver to use programmed I/O ports (PIO) instead
-+ of PCI shared memory (MMIO). This can possibly solve some problems
-+ in case your mainboard has memory consistency issues. If unsure,
-+ say N.
-+
-+config 8139TOO_TUNE_TWISTER
-+ bool "Support for uncommon RTL-8139 rev. K (automatic channel equalization)"
-+ depends on 8139TOO
-+ help
-+ This implements a function which might come in handy in case you
-+ are using low quality on long cabling. It is required for RealTek
-+ RTL-8139 revision K boards, and totally unused otherwise. It tries
-+ to match the transceiver to the cable characteristics. This is
-+ experimental since hardly documented by the manufacturer.
-+ If unsure, say Y.
-+
-+config 8139TOO_8129
-+ bool "Support for older RTL-8129/8130 boards"
-+ depends on 8139TOO
-+ help
-+ This enables support for the older and uncommon RTL-8129 and
-+ RTL-8130 chips, which support MII via an external transceiver,
-+ instead of an internal one. Disabling this option will save some
-+ memory by making the code size smaller. If unsure, say Y.
-+
-+config 8139_OLD_RX_RESET
-+ bool "Use older RX-reset method"
-+ depends on 8139TOO
-+ help
-+ The 8139too driver was recently updated to contain a more rapid
-+ reset sequence, in the face of severe receive errors. This "new"
-+ RX-reset method should be adequate for all boards. But if you
-+ experience problems, you can enable this option to restore the
-+ old RX-reset behavior. If unsure, say N.
-+
-+config R6040
-+ tristate "RDC R6040 Fast Ethernet Adapter support"
-+ depends on NET_PCI && PCI
-+ select CRC32
-+ select MII
-+ help
-+ This is a driver for the R6040 Fast Ethernet MACs found in the
-+ the RDC R-321x System-on-chips.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called r6040. This is recommended.
-+
-+config SIS900
-+ tristate "SiS 900/7016 PCI Fast Ethernet Adapter support"
-+ depends on NET_PCI && PCI
-+ select CRC32
-+ select MII
-+ ---help---
-+ This is a driver for the Fast Ethernet PCI network cards based on
-+ the SiS 900 and SiS 7016 chips. The SiS 900 core is also embedded in
-+ SiS 630 and SiS 540 chipsets.
-+
-+ This driver also supports AMD 79C901 HomePNA so that you can use
-+ your phone line as a network cable.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called sis900. This is recommended.
-+
-+config EPIC100
-+ tristate "SMC EtherPower II"
-+ depends on NET_PCI && PCI
-+ select CRC32
-+ select MII
-+ help
-+ This driver is for the SMC EtherPower II 9432 PCI Ethernet NIC,
-+ which is based on the SMC83c17x (EPIC/100).
-+ More specific information and updates are available from
-+ <http://www.scyld.com/network/epic100.html>.
-+
-+config SMSC9420
-+ tristate "SMSC LAN9420 PCI ethernet adapter support"
-+ depends on NET_PCI && PCI
-+ select CRC32
-+ select PHYLIB
-+ select SMSC_PHY
-+ help
-+ This is a driver for SMSC's LAN9420 PCI ethernet adapter.
-+ Say Y if you want it compiled into the kernel,
-+ and read the Ethernet-HOWTO, available from
-+ <http://www.linuxdoc.org/docs.html#howto>.
-+
-+ This driver is also available as a module. The module will be
-+ called smsc9420. If you want to compile it as a module, say M
-+ here and read <file:Documentation/kbuild/modules.txt>
-+
-+config SUNDANCE
-+ tristate "Sundance Alta support"
-+ depends on NET_PCI && PCI
-+ select CRC32
-+ select MII
-+ help
-+ This driver is for the Sundance "Alta" chip.
-+ More specific information and updates are available from
-+ <http://www.scyld.com/network/sundance.html>.
-+
-+config SUNDANCE_MMIO
-+ bool "Use MMIO instead of PIO"
-+ depends on SUNDANCE
-+ help
-+ Enable memory-mapped I/O for interaction with Sundance NIC registers.
-+ Do NOT enable this by default, PIO (enabled when MMIO is disabled)
-+ is known to solve bugs on certain chips.
-+
-+ If unsure, say N.
-+
-+config TLAN
-+ tristate "TI ThunderLAN support"
-+ depends on NET_PCI && (PCI || EISA)
-+ ---help---
-+ If you have a PCI Ethernet network card based on the ThunderLAN chip
-+ which is supported by this driver, say Y and read the
-+ Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ Devices currently supported by this driver are Compaq Netelligent,
-+ Compaq NetFlex and Olicom cards. Please read the file
-+ <file:Documentation/networking/tlan.txt> for more details.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called tlan.
-+
-+ Please email feedback to <torben.mathiasen@compaq.com>.
-+
-+config KS8842
-+ tristate "Micrel KSZ8842"
-+ depends on HAS_IOMEM
-+ help
-+ This platform driver is for Micrel KSZ8842 / KS8842
-+ 2-port ethernet switch chip (managed, VLAN, QoS).
-+
-+config KS8851
-+ tristate "Micrel KS8851 SPI"
-+ depends on SPI
-+ select MII
-+ select CRC32
-+ help
-+ SPI driver for Micrel KS8851 SPI attached network chip.
-+
-+config KS8851_MLL
-+ tristate "Micrel KS8851 MLL"
-+ depends on HAS_IOMEM
-+ select MII
-+ help
-+ This platform driver is for Micrel KS8851 Address/data bus
-+ multiplexed network chip.
-+
-+config VIA_RHINE
-+ tristate "VIA Rhine support"
-+ depends on NET_PCI && PCI
-+ select CRC32
-+ select MII
-+ help
-+ If you have a VIA "Rhine" based network card (Rhine-I (VT86C100A),
-+ Rhine-II (VT6102), or Rhine-III (VT6105)), say Y here. Rhine-type
-+ Ethernet functions can also be found integrated on South Bridges
-+ (e.g. VT8235).
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called via-rhine.
-+
-+config VIA_RHINE_MMIO
-+ bool "Use MMIO instead of PIO"
-+ depends on VIA_RHINE
-+ help
-+ This instructs the driver to use PCI shared memory (MMIO) instead of
-+ programmed I/O ports (PIO). Enabling this gives an improvement in
-+ processing time in parts of the driver.
-+
-+ If unsure, say Y.
-+
-+config SC92031
-+ tristate "Silan SC92031 PCI Fast Ethernet Adapter driver (EXPERIMENTAL)"
-+ depends on NET_PCI && PCI && EXPERIMENTAL
-+ select CRC32
-+ ---help---
-+ This is a driver for the Fast Ethernet PCI network cards based on
-+ the Silan SC92031 chip (sometimes also called Rsltek 8139D). If you
-+ have one of these, say Y here.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called sc92031. This is recommended.
-+
-+config CPMAC
-+ tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
-+ depends on NET_ETHERNET && EXPERIMENTAL && AR7
-+ select PHYLIB
-+ help
-+ TI AR7 CPMAC Ethernet support
-+
-+config NET_POCKET
-+ bool "Pocket and portable adapters"
-+ depends on PARPORT
-+ ---help---
-+ Cute little network (Ethernet) devices which attach to the parallel
-+ port ("pocket adapters"), commonly used with laptops. If you have
-+ one of those, say Y and read the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ If you want to plug a network (or some other) card into the PCMCIA
-+ (or PC-card) slot of your laptop instead (PCMCIA is the standard for
-+ credit card size extension cards used by all modern laptops), you
-+ need the pcmcia-cs package (location contained in the file
-+ <file:Documentation/Changes>) and you can say N here.
-+
-+ Laptop users should read the Linux Laptop home page at
-+ <http://www.linux-on-laptops.com/> or
-+ Tuxmobil - Linux on Mobile Computers at <http://www.tuxmobil.org/>.
-+
-+ Note that the answer to this question doesn't directly affect the
-+ kernel: saying N will just cause the configurator to skip all
-+ the questions about this class of network devices. If you say Y, you
-+ will be asked for your specific device in the following questions.
-+
-+config ATP
-+ tristate "AT-LAN-TEC/RealTek pocket adapter support"
-+ depends on NET_POCKET && PARPORT && X86
-+ select CRC32
-+ ---help---
-+ This is a network (Ethernet) device which attaches to your parallel
-+ port. Read <file:drivers/net/atp.c> as well as the Ethernet-HOWTO,
-+ available from <http://www.tldp.org/docs.html#howto>, if you
-+ want to use this. If you intend to use this driver, you should have
-+ said N to the "Parallel printer support", because the two drivers
-+ don't like each other.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called atp.
-+
-+config DE600
-+ tristate "D-Link DE600 pocket adapter support"
-+ depends on NET_POCKET && PARPORT
-+ ---help---
-+ This is a network (Ethernet) device which attaches to your parallel
-+ port. Read <file:Documentation/networking/DLINK.txt> as well as the
-+ Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>, if you want to use
-+ this. It is possible to have several devices share a single parallel
-+ port and it is safe to compile the corresponding drivers into the
-+ kernel.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called de600.
-+
-+config DE620
-+ tristate "D-Link DE620 pocket adapter support"
-+ depends on NET_POCKET && PARPORT
-+ ---help---
-+ This is a network (Ethernet) device which attaches to your parallel
-+ port. Read <file:Documentation/networking/DLINK.txt> as well as the
-+ Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>, if you want to use
-+ this. It is possible to have several devices share a single parallel
-+ port and it is safe to compile the corresponding drivers into the
-+ kernel.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called de620.
-+
-+config SGISEEQ
-+ tristate "SGI Seeq ethernet controller support"
-+ depends on SGI_HAS_SEEQ
-+ help
-+ Say Y here if you have an Seeq based Ethernet network card. This is
-+ used in many Silicon Graphics machines.
-+
-+config DECLANCE
-+ tristate "DEC LANCE ethernet controller support"
-+ depends on MACH_DECSTATION
-+ select CRC32
-+ help
-+ This driver is for the series of Ethernet controllers produced by
-+ DEC (now Compaq) based on the AMD Lance chipset, including the
-+ DEPCA series. (This chipset is better known via the NE2100 cards.)
-+
-+config 68360_ENET
-+ bool "Motorola 68360 ethernet controller"
-+ depends on M68360
-+ help
-+ Say Y here if you want to use the built-in ethernet controller of
-+ the Motorola 68360 processor.
-+
-+config FEC
-+ bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
-+ depends on M523x || M527x || M5272 || M528x || M520x || M532x || \
-+ MACH_MX27 || ARCH_MX35 || ARCH_MX25 || ARCH_MX5
-+ select PHYLIB
-+ help
-+ Say Y here if you want to use the built-in 10/100 Fast ethernet
-+ controller on some Motorola ColdFire and Freescale i.MX processors.
-+
-+config FEC2
-+ bool "Second FEC ethernet controller (on some ColdFire CPUs)"
-+ depends on FEC
-+ help
-+ Say Y here if you want to use the second built-in 10/100 Fast
-+ ethernet controller on some Motorola ColdFire processors.
-+
-+config FEC_MPC52xx
-+ tristate "MPC52xx FEC driver"
-+ depends on PPC_MPC52xx && PPC_BESTCOMM
-+ select CRC32
-+ select PHYLIB
-+ select PPC_BESTCOMM_FEC
-+ ---help---
-+ This option enables support for the MPC5200's on-chip
-+ Fast Ethernet Controller
-+ If compiled as module, it will be called fec_mpc52xx.
-+
-+config FEC_MPC52xx_MDIO
-+ bool "MPC52xx FEC MDIO bus driver"
-+ depends on FEC_MPC52xx
-+ default y
-+ ---help---
-+ The MPC5200's FEC can connect to the Ethernet either with
-+ an external MII PHY chip or 10 Mbps 7-wire interface
-+ (Motorola? industry standard).
-+ If your board uses an external PHY connected to FEC, enable this.
-+ If not sure, enable.
-+ If compiled as module, it will be called fec_mpc52xx_phy.
-+
-+config NE_H8300
-+ tristate "NE2000 compatible support for H8/300"
-+ depends on H8300
-+ help
-+ Say Y here if you want to use the NE2000 compatible
-+ controller on the Renesas H8/300 processor.
-+
-+config ATL2
-+ tristate "Atheros L2 Fast Ethernet support"
-+ depends on PCI
-+ select CRC32
-+ select MII
-+ help
-+ This driver supports the Atheros L2 fast ethernet adapter.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called atl2.
-+
-+config XILINX_EMACLITE
-+ tristate "Xilinx 10/100 Ethernet Lite support"
-+ depends on PPC32 || MICROBLAZE
-+ select PHYLIB
-+ help
-+ This driver supports the 10/100 Ethernet Lite from Xilinx.
-+
-+config BCM63XX_ENET
-+ tristate "Broadcom 63xx internal mac support"
-+ depends on BCM63XX
-+ select MII
-+ select PHYLIB
-+ help
-+ This driver supports the ethernet MACs in the Broadcom 63xx
-+ MIPS chipset family (BCM63XX).
-+
-+source "drivers/net/fs_enet/Kconfig"
-+
-+source "drivers/net/octeon/Kconfig"
-+
-+endif # NET_ETHERNET
-+
-+#
-+# Gigabit Ethernet
-+#
-+
-+menuconfig NETDEV_1000
-+ bool "Ethernet (1000 Mbit)"
-+ depends on !UML
-+ default y
-+ ---help---
-+ Ethernet (also called IEEE 802.3 or ISO 8802-2) is the most common
-+ type of Local Area Network (LAN) in universities and companies.
-+
-+ Say Y here to get to see options for Gigabit Ethernet drivers.
-+ This option alone does not add any kernel code.
-+ Note that drivers supporting both 100 and 1000 MBit may be listed
-+ under "Ethernet (10 or 100MBit)" instead.
-+
-+ If you say N, all options in this submenu will be skipped and disabled.
-+
-+if NETDEV_1000
-+
-+config ACENIC
-+ tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support"
-+ depends on PCI
-+ ---help---
-+ Say Y here if you have an Alteon AceNIC, 3Com 3C985(B), NetGear
-+ GA620, SGI Gigabit or Farallon PN9000-SX PCI Gigabit Ethernet
-+ adapter. The driver allows for using the Jumbo Frame option (9000
-+ bytes/frame) however it requires that your switches can handle this
-+ as well. To enable Jumbo Frames, add `mtu 9000' to your ifconfig
-+ line.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called acenic.
-+
-+config ACENIC_OMIT_TIGON_I
-+ bool "Omit support for old Tigon I based AceNICs"
-+ depends on ACENIC
-+ help
-+ Say Y here if you only have Tigon II based AceNICs and want to leave
-+ out support for the older Tigon I based cards which are no longer
-+ being sold (ie. the original Alteon AceNIC and 3Com 3C985 (non B
-+ version)). This will reduce the size of the driver object by
-+ app. 100KB. If you are not sure whether your card is a Tigon I or a
-+ Tigon II, say N here.
-+
-+ The safe and default value for this is N.
-+
-+config DL2K
-+ tristate "DL2000/TC902x-based Gigabit Ethernet support"
-+ depends on PCI
-+ select CRC32
-+ help
-+ This driver supports DL2000/TC902x-based Gigabit ethernet cards,
-+ which includes
-+ D-Link DGE-550T Gigabit Ethernet Adapter.
-+ D-Link DL2000-based Gigabit Ethernet Adapter.
-+ Sundance/Tamarack TC902x Gigabit Ethernet Adapter.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called dl2k.
-+
-+config E1000
-+ tristate "Intel(R) PRO/1000 Gigabit Ethernet support"
-+ depends on PCI
-+ ---help---
-+ This driver supports Intel(R) PRO/1000 gigabit ethernet family of
-+ adapters. For more information on how to identify your adapter, go
-+ to the Adapter & Driver ID Guide at:
-+
-+ <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-+
-+ For general information and support, go to the Intel support
-+ website at:
-+
-+ <http://support.intel.com>
-+
-+ More specific information on configuring the driver is in
-+ <file:Documentation/networking/e1000.txt>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called e1000.
-+
-+config E1000E
-+ tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support"
-+ depends on PCI && (!SPARC32 || BROKEN)
-+ ---help---
-+ This driver supports the PCI-Express Intel(R) PRO/1000 gigabit
-+ ethernet family of adapters. For PCI or PCI-X e1000 adapters,
-+ use the regular e1000 driver For more information on how to
-+ identify your adapter, go to the Adapter & Driver ID Guide at:
-+
-+ <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-+
-+ For general information and support, go to the Intel support
-+ website at:
-+
-+ <http://support.intel.com>
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called e1000e.
-+
-+config IP1000
-+ tristate "IP1000 Gigabit Ethernet support"
-+ depends on PCI && EXPERIMENTAL
-+ select MII
-+ ---help---
-+ This driver supports IP1000 gigabit Ethernet cards.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called ipg. This is recommended.
-+
-+config IGB
-+ tristate "Intel(R) 82575/82576 PCI-Express Gigabit Ethernet support"
-+ depends on PCI
-+ ---help---
-+ This driver supports Intel(R) 82575/82576 gigabit ethernet family of
-+ adapters. For more information on how to identify your adapter, go
-+ to the Adapter & Driver ID Guide at:
-+
-+ <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-+
-+ For general information and support, go to the Intel support
-+ website at:
-+
-+ <http://support.intel.com>
-+
-+ More specific information on configuring the driver is in
-+ <file:Documentation/networking/e1000.txt>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called igb.
-+
-+config IGB_DCA
-+ bool "Direct Cache Access (DCA) Support"
-+ default y
-+ depends on IGB && DCA && !(IGB=y && DCA=m)
-+ ---help---
-+ Say Y here if you want to use Direct Cache Access (DCA) in the
-+ driver. DCA is a method for warming the CPU cache before data
-+ is used, with the intent of lessening the impact of cache misses.
-+
-+config IGBVF
-+ tristate "Intel(R) 82576 Virtual Function Ethernet support"
-+ depends on PCI
-+ ---help---
-+ This driver supports Intel(R) 82576 virtual functions. For more
-+ information on how to identify your adapter, go to the Adapter &
-+ Driver ID Guide at:
-+
-+ <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-+
-+ For general information and support, go to the Intel support
-+ website at:
-+
-+ <http://support.intel.com>
-+
-+ More specific information on configuring the driver is in
-+ <file:Documentation/networking/e1000.txt>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called igbvf.
-+
-+source "drivers/net/ixp2000/Kconfig"
-+
-+config MYRI_SBUS
-+ tristate "MyriCOM Gigabit Ethernet support"
-+ depends on SBUS
-+ help
-+ This driver supports MyriCOM Sbus gigabit Ethernet cards.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called myri_sbus. This is recommended.
-+
-+config NS83820
-+ tristate "National Semiconductor DP83820 support"
-+ depends on PCI
-+ help
-+ This is a driver for the National Semiconductor DP83820 series
-+ of gigabit ethernet MACs. Cards using this chipset include
-+ the D-Link DGE-500T, PureData's PDP8023Z-TG, SMC's SMC9462TX,
-+ SOHO-GA2000T, SOHO-GA2500T. The driver supports the use of
-+ zero copy.
-+
-+config HAMACHI
-+ tristate "Packet Engines Hamachi GNIC-II support"
-+ depends on PCI
-+ select MII
-+ help
-+ If you have a Gigabit Ethernet card of this type, say Y and read
-+ the Ethernet-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>.
-+
-+ To compile this driver as a module, choose M here. The module will be
-+ called hamachi.
-+
-+config YELLOWFIN
-+ tristate "Packet Engines Yellowfin Gigabit-NIC support (EXPERIMENTAL)"
-+ depends on PCI && EXPERIMENTAL
-+ select CRC32
-+ ---help---
-+ Say Y here if you have a Packet Engines G-NIC PCI Gigabit Ethernet
-+ adapter or the SYM53C885 Ethernet controller. The Gigabit adapter is
-+ used by the Beowulf Linux cluster project. See
-+ <http://cesdis.gsfc.nasa.gov/linux/drivers/yellowfin.html> for more
-+ information about this driver in particular and Beowulf in general.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called yellowfin. This is recommended.
-+
-+config R8169
-+ tristate "Realtek 8169 gigabit ethernet support"
-+ depends on PCI
-+ select CRC32
-+ select MII
-+ ---help---
-+ Say Y here if you have a Realtek 8169 PCI Gigabit Ethernet adapter.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called r8169. This is recommended.
-+
-+config R8169_VLAN
-+ bool "VLAN support"
-+ depends on R8169 && VLAN_8021Q
-+ ---help---
-+ Say Y here for the r8169 driver to support the functions required
-+ by the kernel 802.1Q code.
-+
-+ If in doubt, say Y.
-+
-+config SB1250_MAC
-+ tristate "SB1250 Gigabit Ethernet support"
-+ depends on SIBYTE_SB1xxx_SOC
-+ select PHYLIB
-+ ---help---
-+ This driver supports Gigabit Ethernet interfaces based on the
-+ Broadcom SiByte family of System-On-a-Chip parts. They include
-+ the BCM1120, BCM1125, BCM1125H, BCM1250, BCM1255, BCM1280, BCM1455
-+ and BCM1480 chips.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called sb1250-mac.
-+
-+config SIS190
-+ tristate "SiS190/SiS191 gigabit ethernet support"
-+ depends on PCI
-+ select CRC32
-+ select MII
-+ ---help---
-+ Say Y here if you have a SiS 190 PCI Fast Ethernet adapter or
-+ a SiS 191 PCI Gigabit Ethernet adapter. Both are expected to
-+ appear in lan on motherboard designs which are based on SiS 965
-+ and SiS 966 south bridge.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called sis190. This is recommended.
-+
-+config SKGE
-+ tristate "New SysKonnect GigaEthernet support"
-+ depends on PCI
-+ select CRC32
-+ ---help---
-+ This driver support the Marvell Yukon or SysKonnect SK-98xx/SK-95xx
-+ and related Gigabit Ethernet adapters. It is a new smaller driver
-+ with better performance and more complete ethtool support.
-+
-+ It does not support the link failover and network management
-+ features that "portable" vendor supplied sk98lin driver does.
-+
-+ This driver supports adapters based on the original Yukon chipset:
-+ Marvell 88E8001, Belkin F5D5005, CNet GigaCard, DLink DGE-530T,
-+ Linksys EG1032/EG1064, 3Com 3C940/3C940B, SysKonnect SK-9871/9872.
-+
-+ It does not support the newer Yukon2 chipset: a separate driver,
-+ sky2, is provided for Yukon2-based adapters.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called skge. This is recommended.
-+
-+config SKGE_DEBUG
-+ bool "Debugging interface"
-+ depends on SKGE && DEBUG_FS
-+ help
-+ This option adds the ability to dump driver state for debugging.
-+ The file /sys/kernel/debug/skge/ethX displays the state of the internal
-+ transmit and receive rings.
-+
-+ If unsure, say N.
-+
-+config SKY2
-+ tristate "SysKonnect Yukon2 support"
-+ depends on PCI
-+ select CRC32
-+ ---help---
-+ This driver supports Gigabit Ethernet adapters based on the
-+ Marvell Yukon 2 chipset:
-+ Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/
-+ 88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21
-+
-+ There is companion driver for the older Marvell Yukon and
-+ Genesis based adapters: skge.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called sky2. This is recommended.
-+
-+config SKY2_DEBUG
-+ bool "Debugging interface"
-+ depends on SKY2 && DEBUG_FS
-+ help
-+ This option adds the ability to dump driver state for debugging.
-+ The file /sys/kernel/debug/sky2/ethX displays the state of the internal
-+ transmit and receive rings.
-+
-+ If unsure, say N.
-+
-+config VIA_VELOCITY
-+ tristate "VIA Velocity support"
-+ depends on PCI
-+ select CRC32
-+ select CRC_CCITT
-+ select MII
-+ help
-+ If you have a VIA "Velocity" based network card say Y here.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called via-velocity.
-+
-+config TIGON3
-+ tristate "Broadcom Tigon3 support"
-+ depends on PCI
-+ select PHYLIB
-+ help
-+ This driver supports Broadcom Tigon3 based gigabit Ethernet cards.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called tg3. This is recommended.
-+
-+config BNX2
-+ tristate "Broadcom NetXtremeII support"
-+ depends on PCI
-+ select CRC32
-+ select FW_LOADER
-+ help
-+ This driver supports Broadcom NetXtremeII gigabit Ethernet cards.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called bnx2. This is recommended.
-+
-+config CNIC
-+ tristate "Broadcom CNIC support"
-+ depends on PCI
-+ select BNX2
-+ select UIO
-+ help
-+ This driver supports offload features of Broadcom NetXtremeII
-+ gigabit Ethernet cards.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called cnic. This is recommended.
-+
-+config SPIDER_NET
-+ tristate "Spider Gigabit Ethernet driver"
-+ depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB)
-+ select FW_LOADER
-+ help
-+ This driver supports the Gigabit Ethernet chips present on the
-+ Cell Processor-Based Blades from IBM.
-+
-+config TSI108_ETH
-+ tristate "Tundra TSI108 gigabit Ethernet support"
-+ depends on TSI108_BRIDGE
-+ help
-+ This driver supports Tundra TSI108 gigabit Ethernet ports.
-+ To compile this driver as a module, choose M here: the module
-+ will be called tsi108_eth.
-+
-+config GELIC_NET
-+ tristate "PS3 Gigabit Ethernet driver"
-+ depends on PPC_PS3
-+ select PS3_SYS_MANAGER
-+ help
-+ This driver supports the network device on the PS3 game
-+ console. This driver has built-in support for Ethernet.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called ps3_gelic.
-+
-+config GELIC_WIRELESS
-+ bool "PS3 Wireless support"
-+ depends on WLAN
-+ depends on GELIC_NET
-+ select WIRELESS_EXT
-+ help
-+ This option adds the support for the wireless feature of PS3.
-+ If you have the wireless-less model of PS3 or have no plan to
-+ use wireless feature, disabling this option saves memory. As
-+ the driver automatically distinguishes the models, you can
-+ safely enable this option even if you have a wireless-less model.
-+
-+config FSL_PQ_MDIO
-+ tristate "Freescale PQ MDIO"
-+ depends on FSL_SOC
-+ select PHYLIB
-+ help
-+ This driver supports the MDIO bus used by the gianfar and UCC drivers.
-+
-+config GIANFAR
-+ tristate "Gianfar Ethernet"
-+ depends on FSL_SOC
-+ select FSL_PQ_MDIO
-+ select PHYLIB
-+ select CRC32
-+ help
-+ This driver supports the Gigabit TSEC on the MPC83xx, MPC85xx,
-+ and MPC86xx family of chips, and the FEC on the 8540.
-+
-+config UCC_GETH
-+ tristate "Freescale QE Gigabit Ethernet"
-+ depends on QUICC_ENGINE
-+ select FSL_PQ_MDIO
-+ select PHYLIB
-+ help
-+ This driver supports the Gigabit Ethernet mode of the QUICC Engine,
-+ which is available on some Freescale SOCs.
-+
-+config UGETH_TX_ON_DEMAND
-+ bool "Transmit on Demand support"
-+ depends on UCC_GETH
-+
-+config MV643XX_ETH
-+ tristate "Marvell Discovery (643XX) and Orion ethernet support"
-+ depends on MV64X60 || PPC32 || PLAT_ORION
-+ select INET_LRO
-+ select PHYLIB
-+ help
-+ This driver supports the gigabit ethernet MACs in the
-+ Marvell Discovery PPC/MIPS chipset family (MV643XX) and
-+ in the Marvell Orion ARM SoC family.
-+
-+ Some boards that use the Discovery chipset are the Momenco
-+ Ocelot C and Jaguar ATX and Pegasos II.
-+
-+config XILINX_LL_TEMAC
-+ tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver"
-+ depends on PPC || MICROBLAZE
-+ select PHYLIB
-+ help
-+ This driver supports the Xilinx 10/100/1000 LocalLink TEMAC
-+ core used in Xilinx Spartan and Virtex FPGAs
-+
-+config QLA3XXX
-+ tristate "QLogic QLA3XXX Network Driver Support"
-+ depends on PCI
-+ help
-+ This driver supports QLogic ISP3XXX gigabit Ethernet cards.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called qla3xxx.
-+
-+config ATL1
-+ tristate "Atheros/Attansic L1 Gigabit Ethernet support"
-+ depends on PCI
-+ select CRC32
-+ select MII
-+ help
-+ This driver supports the Atheros/Attansic L1 gigabit ethernet
-+ adapter.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called atl1.
-+
-+config ATL1E
-+ tristate "Atheros L1E Gigabit Ethernet support (EXPERIMENTAL)"
-+ depends on PCI && EXPERIMENTAL
-+ select CRC32
-+ select MII
-+ help
-+ This driver supports the Atheros L1E gigabit ethernet adapter.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called atl1e.
-+
-+config ATL1C
-+ tristate "Atheros L1C Gigabit Ethernet support (EXPERIMENTAL)"
-+ depends on PCI && EXPERIMENTAL
-+ select CRC32
-+ select MII
-+ help
-+ This driver supports the Atheros L1C gigabit ethernet adapter.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called atl1c.
-+
-+config JME
-+ tristate "JMicron(R) PCI-Express Gigabit Ethernet support"
-+ depends on PCI
-+ select CRC32
-+ select MII
-+ ---help---
-+ This driver supports the PCI-Express gigabit ethernet adapters
-+ based on JMicron JMC250 chipset.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called jme.
-+
-+config S6GMAC
-+ tristate "S6105 GMAC ethernet support"
-+ depends on XTENSA_VARIANT_S6000
-+ select PHYLIB
-+ help
-+ This driver supports the on chip ethernet device on the
-+ S6105 xtensa processor.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called s6gmac.
-+
-+source "drivers/net/stmmac/Kconfig"
-+
-+endif # NETDEV_1000
-+
-+#
-+# 10 Gigabit Ethernet
-+#
-+
-+menuconfig NETDEV_10000
-+ bool "Ethernet (10000 Mbit)"
-+ depends on !UML
-+ default y
-+ ---help---
-+ Say Y here to get to see options for 10 Gigabit Ethernet drivers.
-+ This option alone does not add any kernel code.
-+
-+ If you say N, all options in this submenu will be skipped and disabled.
-+
-+if NETDEV_10000
-+
-+config MDIO
-+ tristate
-+
-+config CHELSIO_T1
-+ tristate "Chelsio 10Gb Ethernet support"
-+ depends on PCI
-+ select CRC32
-+ select MDIO
-+ help
-+ This driver supports Chelsio gigabit and 10-gigabit
-+ Ethernet cards. More information about adapter features and
-+ performance tuning is in <file:Documentation/networking/cxgb.txt>.
-+
-+ For general information about Chelsio and our products, visit
-+ our website at <http://www.chelsio.com>.
-+
-+ For customer support, please visit our customer support page at
-+ <http://www.chelsio.com/support.htm>.
-+
-+ Please send feedback to <linux-bugs@chelsio.com>.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called cxgb.
-+
-+config CHELSIO_T1_1G
-+ bool "Chelsio gigabit Ethernet support"
-+ depends on CHELSIO_T1
-+ help
-+ Enables support for Chelsio's gigabit Ethernet PCI cards. If you
-+ are using only 10G cards say 'N' here.
-+
-+config CHELSIO_T3_DEPENDS
-+ tristate
-+ depends on PCI && INET
-+ default y
-+
-+config CHELSIO_T3
-+ tristate "Chelsio Communications T3 10Gb Ethernet support"
-+ depends on CHELSIO_T3_DEPENDS
-+ select FW_LOADER
-+ select MDIO
-+ help
-+ This driver supports Chelsio T3-based gigabit and 10Gb Ethernet
-+ adapters.
-+
-+ For general information about Chelsio and our products, visit
-+ our website at <http://www.chelsio.com>.
-+
-+ For customer support, please visit our customer support page at
-+ <http://www.chelsio.com/support.htm>.
-+
-+ Please send feedback to <linux-bugs@chelsio.com>.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called cxgb3.
-+
-+config CHELSIO_T4_DEPENDS
-+ tristate
-+ depends on PCI && INET
-+ default y
-+
-+config CHELSIO_T4
-+ tristate "Chelsio Communications T4 Ethernet support"
-+ depends on CHELSIO_T4_DEPENDS
-+ select FW_LOADER
-+ select MDIO
-+ help
-+ This driver supports Chelsio T4-based gigabit and 10Gb Ethernet
-+ adapters.
-+
-+ For general information about Chelsio and our products, visit
-+ our website at <http://www.chelsio.com>.
-+
-+ For customer support, please visit our customer support page at
-+ <http://www.chelsio.com/support.htm>.
-+
-+ Please send feedback to <linux-bugs@chelsio.com>.
-+
-+ To compile this driver as a module choose M here; the module
-+ will be called cxgb4.
-+
-+config EHEA
-+ tristate "eHEA Ethernet support"
-+ depends on IBMEBUS && INET && SPARSEMEM
-+ select INET_LRO
-+ ---help---
-+ This driver supports the IBM pSeries eHEA ethernet adapter.
-+
-+ To compile the driver as a module, choose M here. The module
-+ will be called ehea.
-+
-+config ENIC
-+ tristate "Cisco VIC Ethernet NIC Support"
-+ depends on PCI && INET
-+ select INET_LRO
-+ help
-+ This enables the support for the Cisco VIC Ethernet card.
-+
-+config IXGBE
-+ tristate "Intel(R) 10GbE PCI Express adapters support"
-+ depends on PCI && INET
-+ select MDIO
-+ ---help---
-+ This driver supports Intel(R) 10GbE PCI Express family of
-+ adapters. For more information on how to identify your adapter, go
-+ to the Adapter & Driver ID Guide at:
-+
-+ <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-+
-+ For general information and support, go to the Intel support
-+ website at:
-+
-+ <http://support.intel.com>
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called ixgbe.
-+
-+config IXGBE_DCA
-+ bool "Direct Cache Access (DCA) Support"
-+ default y
-+ depends on IXGBE && DCA && !(IXGBE=y && DCA=m)
-+ ---help---
-+ Say Y here if you want to use Direct Cache Access (DCA) in the
-+ driver. DCA is a method for warming the CPU cache before data
-+ is used, with the intent of lessening the impact of cache misses.
-+
-+config IXGBE_DCB
-+ bool "Data Center Bridging (DCB) Support"
-+ default n
-+ depends on IXGBE && DCB
-+ ---help---
-+ Say Y here if you want to use Data Center Bridging (DCB) in the
-+ driver.
-+
-+ If unsure, say N.
-+
-+config IXGBEVF
-+ tristate "Intel(R) 82599 Virtual Function Ethernet support"
-+ depends on PCI_MSI
-+ ---help---
-+ This driver supports Intel(R) 82599 virtual functions. For more
-+ information on how to identify your adapter, go to the Adapter &
-+ Driver ID Guide at:
-+
-+ <http://support.intel.com/support/network/sb/CS-008441.htm>
-+
-+ For general information and support, go to the Intel support
-+ website at:
-+
-+ <http://support.intel.com>
-+
-+ More specific information on configuring the driver is in
-+ <file:Documentation/networking/ixgbevf.txt>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called ixgbevf. MSI-X interrupt support is required
-+ for this driver to work correctly.
-+
-+config IXGB
-+ tristate "Intel(R) PRO/10GbE support"
-+ depends on PCI
-+ ---help---
-+ This driver supports Intel(R) PRO/10GbE family of adapters for
-+ PCI-X type cards. For PCI-E type cards, use the "ixgbe" driver
-+ instead. For more information on how to identify your adapter, go
-+ to the Adapter & Driver ID Guide at:
-+
-+ <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-+
-+ For general information and support, go to the Intel support
-+ website at:
-+
-+ <http://support.intel.com>
-+
-+ More specific information on configuring the driver is in
-+ <file:Documentation/networking/ixgb.txt>.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called ixgb.
-+
-+config S2IO
-+ tristate "S2IO 10Gbe XFrame NIC"
-+ depends on PCI
-+ ---help---
-+ This driver supports the 10Gbe XFrame NIC of S2IO.
-+ More specific information on configuring the driver is in
-+ <file:Documentation/networking/s2io.txt>.
-+
-+config VXGE
-+ tristate "Neterion X3100 Series 10GbE PCIe Server Adapter"
-+ depends on PCI && INET
-+ ---help---
-+ This driver supports Neterion Inc's X3100 Series 10 GbE PCIe
-+ I/O Virtualized Server Adapter.
-+ More specific information on configuring the driver is in
-+ <file:Documentation/networking/vxge.txt>.
-+
-+config VXGE_DEBUG_TRACE_ALL
-+ bool "Enabling All Debug trace statments in driver"
-+ default n
-+ depends on VXGE
-+ ---help---
-+ Say Y here if you want to enabling all the debug trace statements in
-+ driver. By default only few debug trace statements are enabled.
-+
-+config MYRI10GE
-+ tristate "Myricom Myri-10G Ethernet support"
-+ depends on PCI && INET
-+ select FW_LOADER
-+ select CRC32
-+ select INET_LRO
-+ ---help---
-+ This driver supports Myricom Myri-10G Dual Protocol interface in
-+ Ethernet mode. If the eeprom on your board is not recent enough,
-+ you will need a newer firmware image.
-+ You may get this image or more information, at:
-+
-+ <http://www.myri.com/scs/download-Myri10GE.html>
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called myri10ge.
-+
-+config MYRI10GE_DCA
-+ bool "Direct Cache Access (DCA) Support"
-+ default y
-+ depends on MYRI10GE && DCA && !(MYRI10GE=y && DCA=m)
-+ ---help---
-+ Say Y here if you want to use Direct Cache Access (DCA) in the
-+ driver. DCA is a method for warming the CPU cache before data
-+ is used, with the intent of lessening the impact of cache misses.
-+
-+config NETXEN_NIC
-+ tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC"
-+ depends on PCI
-+ select FW_LOADER
-+ help
-+ This enables the support for NetXen's Gigabit Ethernet card.
-+
-+config NIU
-+ tristate "Sun Neptune 10Gbit Ethernet support"
-+ depends on PCI
-+ select CRC32
-+ help
-+ This enables support for cards based upon Sun's
-+ Neptune chipset.
-+
-+config PASEMI_MAC
-+ tristate "PA Semi 1/10Gbit MAC"
-+ depends on PPC_PASEMI && PCI
-+ select PHYLIB
-+ select INET_LRO
-+ help
-+ This driver supports the on-chip 1/10Gbit Ethernet controller on
-+ PA Semi's PWRficient line of chips.
-+
-+config MLX4_EN
-+ tristate "Mellanox Technologies 10Gbit Ethernet support"
-+ depends on PCI && INET
-+ select MLX4_CORE
-+ select INET_LRO
-+ help
-+ This driver supports Mellanox Technologies ConnectX Ethernet
-+ devices.
-+
-+config MLX4_CORE
-+ tristate
-+ depends on PCI
-+ default n
-+
-+config MLX4_DEBUG
-+ bool "Verbose debugging output" if (MLX4_CORE && EMBEDDED)
-+ depends on MLX4_CORE
-+ default y
-+ ---help---
-+ This option causes debugging code to be compiled into the
-+ mlx4_core driver. The output can be turned on via the
-+ debug_level module parameter (which can also be set after
-+ the driver is loaded through sysfs).
-+
-+config TEHUTI
-+ tristate "Tehuti Networks 10G Ethernet"
-+ depends on PCI
-+ help
-+ Tehuti Networks 10G Ethernet NIC
-+
-+config BNX2X
-+ tristate "Broadcom NetXtremeII 10Gb support"
-+ depends on PCI
-+ select FW_LOADER
-+ select ZLIB_INFLATE
-+ select LIBCRC32C
-+ select MDIO
-+ help
-+ This driver supports Broadcom NetXtremeII 10 gigabit Ethernet cards.
-+ To compile this driver as a module, choose M here: the module
-+ will be called bnx2x. This is recommended.
-+
-+config QLCNIC
-+ tristate "QLOGIC QLCNIC 1/10Gb Converged Ethernet NIC Support"
-+ depends on PCI
-+ select FW_LOADER
-+ help
-+ This driver supports QLogic QLE8240 and QLE8242 Converged Ethernet
-+ devices.
-+
-+config QLGE
-+ tristate "QLogic QLGE 10Gb Ethernet Driver Support"
-+ depends on PCI
-+ help
-+ This driver supports QLogic ISP8XXX 10Gb Ethernet cards.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called qlge.
-+
-+source "drivers/net/sfc/Kconfig"
-+
-+source "drivers/net/benet/Kconfig"
-+
-+endif # NETDEV_10000
-+
-+source "drivers/net/tokenring/Kconfig"
-+
-+source "drivers/net/wireless/Kconfig"
-+
-+source "drivers/net/wimax/Kconfig"
-+
-+source "drivers/net/usb/Kconfig"
-+
-+source "drivers/net/pcmcia/Kconfig"
-+
-+source "drivers/net/wan/Kconfig"
-+
-+source "drivers/atm/Kconfig"
-+
-+source "drivers/ieee802154/Kconfig"
-+
-+source "drivers/s390/net/Kconfig"
-+
-+source "drivers/net/caif/Kconfig"
-+
-+config XEN_NETDEV_FRONTEND
-+ tristate "Xen network device frontend driver"
-+ depends on XEN
-+ default y
-+ help
-+ The network device frontend driver allows the kernel to
-+ access network devices exported exported by a virtual
-+ machine containing a physical network device driver. The
-+ frontend driver is intended for unprivileged guest domains;
-+ if you are compiling a kernel for a Xen guest, you almost
-+ certainly want to enable this.
-+
-+config ISERIES_VETH
-+ tristate "iSeries Virtual Ethernet driver support"
-+ depends on PPC_ISERIES
-+
-+config RIONET
-+ tristate "RapidIO Ethernet over messaging driver support"
-+ depends on RAPIDIO
-+
-+config RIONET_TX_SIZE
-+ int "Number of outbound queue entries"
-+ depends on RIONET
-+ default "128"
-+
-+config RIONET_RX_SIZE
-+ int "Number of inbound queue entries"
-+ depends on RIONET
-+ default "128"
-+
-+config FDDI
-+ tristate "FDDI driver support"
-+ depends on (PCI || EISA || TC)
-+ help
-+ Fiber Distributed Data Interface is a high speed local area network
-+ design; essentially a replacement for high speed Ethernet. FDDI can
-+ run over copper or fiber. If you are connected to such a network and
-+ want a driver for the FDDI card in your computer, say Y here (and
-+ then also Y to the driver for your FDDI card, below). Most people
-+ will say N.
-+
-+config DEFXX
-+ tristate "Digital DEFTA/DEFEA/DEFPA adapter support"
-+ depends on FDDI && (PCI || EISA || TC)
-+ ---help---
-+ This is support for the DIGITAL series of TURBOchannel (DEFTA),
-+ EISA (DEFEA) and PCI (DEFPA) controllers which can connect you
-+ to a local FDDI network.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called defxx. If unsure, say N.
-+
-+config DEFXX_MMIO
-+ bool
-+ prompt "Use MMIO instead of PIO" if PCI || EISA
-+ depends on DEFXX
-+ default n if PCI || EISA
-+ default y
-+ ---help---
-+ This instructs the driver to use EISA or PCI memory-mapped I/O
-+ (MMIO) as appropriate instead of programmed I/O ports (PIO).
-+ Enabling this gives an improvement in processing time in parts
-+ of the driver, but it may cause problems with EISA (DEFEA)
-+ adapters. TURBOchannel does not have the concept of I/O ports,
-+ so MMIO is always used for these (DEFTA) adapters.
-+
-+ If unsure, say N.
-+
-+config SKFP
-+ tristate "SysKonnect FDDI PCI support"
-+ depends on FDDI && PCI
-+ select BITREVERSE
-+ ---help---
-+ Say Y here if you have a SysKonnect FDDI PCI adapter.
-+ The following adapters are supported by this driver:
-+ - SK-5521 (SK-NET FDDI-UP)
-+ - SK-5522 (SK-NET FDDI-UP DAS)
-+ - SK-5541 (SK-NET FDDI-FP)
-+ - SK-5543 (SK-NET FDDI-LP)
-+ - SK-5544 (SK-NET FDDI-LP DAS)
-+ - SK-5821 (SK-NET FDDI-UP64)
-+ - SK-5822 (SK-NET FDDI-UP64 DAS)
-+ - SK-5841 (SK-NET FDDI-FP64)
-+ - SK-5843 (SK-NET FDDI-LP64)
-+ - SK-5844 (SK-NET FDDI-LP64 DAS)
-+ - Netelligent 100 FDDI DAS Fibre SC
-+ - Netelligent 100 FDDI SAS Fibre SC
-+ - Netelligent 100 FDDI DAS UTP
-+ - Netelligent 100 FDDI SAS UTP
-+ - Netelligent 100 FDDI SAS Fibre MIC
-+
-+ Read <file:Documentation/networking/skfp.txt> for information about
-+ the driver.
-+
-+ Questions concerning this driver can be addressed to:
-+ <linux@syskonnect.de>
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called skfp. This is recommended.
-+
-+config HIPPI
-+ bool "HIPPI driver support (EXPERIMENTAL)"
-+ depends on EXPERIMENTAL && INET && PCI
-+ help
-+ HIgh Performance Parallel Interface (HIPPI) is a 800Mbit/sec and
-+ 1600Mbit/sec dual-simplex switched or point-to-point network. HIPPI
-+ can run over copper (25m) or fiber (300m on multi-mode or 10km on
-+ single-mode). HIPPI networks are commonly used for clusters and to
-+ connect to super computers. If you are connected to a HIPPI network
-+ and have a HIPPI network card in your computer that you want to use
-+ under Linux, say Y here (you must also remember to enable the driver
-+ for your HIPPI card below). Most people will say N here.
-+
-+config ROADRUNNER
-+ tristate "Essential RoadRunner HIPPI PCI adapter support (EXPERIMENTAL)"
-+ depends on HIPPI && PCI
-+ help
-+ Say Y here if this is your PCI HIPPI network card.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called rrunner. If unsure, say N.
-+
-+config ROADRUNNER_LARGE_RINGS
-+ bool "Use large TX/RX rings (EXPERIMENTAL)"
-+ depends on ROADRUNNER
-+ help
-+ If you say Y here, the RoadRunner driver will preallocate up to 2 MB
-+ of additional memory to allow for fastest operation, both for
-+ transmitting and receiving. This memory cannot be used by any other
-+ kernel code or by user space programs. Say Y here only if you have
-+ the memory.
-+
-+config PLIP
-+ tristate "PLIP (parallel port) support"
-+ depends on PARPORT
-+ ---help---
-+ PLIP (Parallel Line Internet Protocol) is used to create a
-+ reasonably fast mini network consisting of two (or, rarely, more)
-+ local machines. A PLIP link from a Linux box is a popular means to
-+ install a Linux distribution on a machine which doesn't have a
-+ CD-ROM drive (a minimal system has to be transferred with floppies
-+ first). The kernels on both machines need to have this PLIP option
-+ enabled for this to work.
-+
-+ The PLIP driver has two modes, mode 0 and mode 1. The parallel
-+ ports (the connectors at the computers with 25 holes) are connected
-+ with "null printer" or "Turbo Laplink" cables which can transmit 4
-+ bits at a time (mode 0) or with special PLIP cables, to be used on
-+ bidirectional parallel ports only, which can transmit 8 bits at a
-+ time (mode 1); you can find the wiring of these cables in
-+ <file:Documentation/networking/PLIP.txt>. The cables can be up to
-+ 15m long. Mode 0 works also if one of the machines runs DOS/Windows
-+ and has some PLIP software installed, e.g. the Crynwr PLIP packet
-+ driver (<http://oak.oakland.edu/simtel.net/msdos/pktdrvr-pre.html>)
-+ and winsock or NCSA's telnet.
-+
-+ If you want to use PLIP, say Y and read the PLIP mini-HOWTO as well
-+ as the NET-3-HOWTO, both available from
-+ <http://www.tldp.org/docs.html#howto>. Note that the PLIP
-+ protocol has been changed and this PLIP driver won't work together
-+ with the PLIP support in Linux versions 1.0.x. This option enlarges
-+ your kernel by about 8 KB.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called plip. If unsure, say Y or M, in case you buy
-+ a laptop later.
-+
-+config PPP
-+ tristate "PPP (point-to-point protocol) support"
-+ select SLHC
-+ ---help---
-+ PPP (Point to Point Protocol) is a newer and better SLIP. It serves
-+ the same purpose: sending Internet traffic over telephone (and other
-+ serial) lines. Ask your access provider if they support it, because
-+ otherwise you can't use it; most Internet access providers these
-+ days support PPP rather than SLIP.
-+
-+ To use PPP, you need an additional program called pppd as described
-+ in the PPP-HOWTO, available at
-+ <http://www.tldp.org/docs.html#howto>. Make sure that you have
-+ the version of pppd recommended in <file:Documentation/Changes>.
-+ The PPP option enlarges your kernel by about 16 KB.
-+
-+ There are actually two versions of PPP: the traditional PPP for
-+ asynchronous lines, such as regular analog phone lines, and
-+ synchronous PPP which can be used over digital ISDN lines for
-+ example. If you want to use PPP over phone lines or other
-+ asynchronous serial lines, you need to say Y (or M) here and also to
-+ the next option, "PPP support for async serial ports". For PPP over
-+ synchronous lines, you should say Y (or M) here and to "Support
-+ synchronous PPP", below.
-+
-+ If you said Y to "Version information on all symbols" above, then
-+ you cannot compile the PPP driver into the kernel; you can then only
-+ compile it as a module. To compile this driver as a module, choose M
-+ here. The module will be called ppp_generic.
-+
-+config PPP_MULTILINK
-+ bool "PPP multilink support (EXPERIMENTAL)"
-+ depends on PPP && EXPERIMENTAL
-+ help
-+ PPP multilink is a protocol (defined in RFC 1990) which allows you
-+ to combine several (logical or physical) lines into one logical PPP
-+ connection, so that you can utilize your full bandwidth.
-+
-+ This has to be supported at the other end as well and you need a
-+ version of the pppd daemon which understands the multilink protocol.
-+
-+ If unsure, say N.
-+
-+config PPP_FILTER
-+ bool "PPP filtering"
-+ depends on PPP
-+ help
-+ Say Y here if you want to be able to filter the packets passing over
-+ PPP interfaces. This allows you to control which packets count as
-+ activity (i.e. which packets will reset the idle timer or bring up
-+ a demand-dialed link) and which packets are to be dropped entirely.
-+ You need to say Y here if you wish to use the pass-filter and
-+ active-filter options to pppd.
-+
-+ If unsure, say N.
-+
-+config PPP_ASYNC
-+ tristate "PPP support for async serial ports"
-+ depends on PPP
-+ select CRC_CCITT
-+ ---help---
-+ Say Y (or M) here if you want to be able to use PPP over standard
-+ asynchronous serial ports, such as COM1 or COM2 on a PC. If you use
-+ a modem (not a synchronous or ISDN modem) to contact your ISP, you
-+ need this option.
-+
-+ To compile this driver as a module, choose M here.
-+
-+ If unsure, say Y.
-+
-+config PPP_SYNC_TTY
-+ tristate "PPP support for sync tty ports"
-+ depends on PPP
-+ help
-+ Say Y (or M) here if you want to be able to use PPP over synchronous
-+ (HDLC) tty devices, such as the SyncLink adapter. These devices
-+ are often used for high-speed leased lines like T1/E1.
-+
-+ To compile this driver as a module, choose M here.
-+
-+config PPP_DEFLATE
-+ tristate "PPP Deflate compression"
-+ depends on PPP
-+ select ZLIB_INFLATE
-+ select ZLIB_DEFLATE
-+ ---help---
-+ Support for the Deflate compression method for PPP, which uses the
-+ Deflate algorithm (the same algorithm that gzip uses) to compress
-+ each PPP packet before it is sent over the wire. The machine at the
-+ other end of the PPP link (usually your ISP) has to support the
-+ Deflate compression method as well for this to be useful. Even if
-+ they don't support it, it is safe to say Y here.
-+
-+ To compile this driver as a module, choose M here.
-+
-+config PPP_BSDCOMP
-+ tristate "PPP BSD-Compress compression"
-+ depends on PPP
-+ ---help---
-+ Support for the BSD-Compress compression method for PPP, which uses
-+ the LZW compression method to compress each PPP packet before it is
-+ sent over the wire. The machine at the other end of the PPP link
-+ (usually your ISP) has to support the BSD-Compress compression
-+ method as well for this to be useful. Even if they don't support it,
-+ it is safe to say Y here.
-+
-+ The PPP Deflate compression method ("PPP Deflate compression",
-+ above) is preferable to BSD-Compress, because it compresses better
-+ and is patent-free.
-+
-+ Note that the BSD compression code will always be compiled as a
-+ module; it is called bsd_comp and will show up in the directory
-+ modules once you have said "make modules". If unsure, say N.
-+
-+config PPP_MPPE
-+ tristate "PPP MPPE compression (encryption) (EXPERIMENTAL)"
-+ depends on PPP && EXPERIMENTAL
-+ select CRYPTO
-+ select CRYPTO_SHA1
-+ select CRYPTO_ARC4
-+ select CRYPTO_ECB
-+ ---help---
-+ Support for the MPPE Encryption protocol, as employed by the
-+ Microsoft Point-to-Point Tunneling Protocol.
-+
-+ See http://pptpclient.sourceforge.net/ for information on
-+ configuring PPTP clients and servers to utilize this method.
-+
-+config PPPOE
-+ tristate "PPP over Ethernet (EXPERIMENTAL)"
-+ depends on EXPERIMENTAL && PPP
-+ help
-+ Support for PPP over Ethernet.
-+
-+ This driver requires the latest version of pppd from the CVS
-+ repository at cvs.samba.org. Alternatively, see the
-+ RoaringPenguin package (<http://www.roaringpenguin.com/pppoe>)
-+ which contains instruction on how to use this driver (under
-+ the heading "Kernel mode PPPoE").
-+
-+config PPPOATM
-+ tristate "PPP over ATM"
-+ depends on ATM && PPP
-+ help
-+ Support PPP (Point to Point Protocol) encapsulated in ATM frames.
-+ This implementation does not yet comply with section 8 of RFC2364,
-+ which can lead to bad results if the ATM peer loses state and
-+ changes its encapsulation unilaterally.
-+
-+config PPPOL2TP
-+ tristate "PPP over L2TP (EXPERIMENTAL)"
-+ depends on EXPERIMENTAL && L2TP && PPP
-+ help
-+ Support for PPP-over-L2TP socket family. L2TP is a protocol
-+ used by ISPs and enterprises to tunnel PPP traffic over UDP
-+ tunnels. L2TP is replacing PPTP for VPN uses.
-+
-+config SLIP
-+ tristate "SLIP (serial line) support"
-+ ---help---
-+ Say Y if you intend to use SLIP or CSLIP (compressed SLIP) to
-+ connect to your Internet service provider or to connect to some
-+ other local Unix box or if you want to configure your Linux box as a
-+ Slip/CSlip server for other people to dial in. SLIP (Serial Line
-+ Internet Protocol) is a protocol used to send Internet traffic over
-+ serial connections such as telephone lines or null modem cables;
-+ nowadays, the protocol PPP is more commonly used for this same
-+ purpose.
-+
-+ Normally, your access provider has to support SLIP in order for you
-+ to be able to use it, but there is now a SLIP emulator called SLiRP
-+ around (available from
-+ <ftp://ibiblio.org/pub/Linux/system/network/serial/>) which
-+ allows you to use SLIP over a regular dial up shell connection. If
-+ you plan to use SLiRP, make sure to say Y to CSLIP, below. The
-+ NET-3-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>, explains how to
-+ configure SLIP. Note that you don't need this option if you just
-+ want to run term (term is a program which gives you almost full
-+ Internet connectivity if you have a regular dial up shell account on
-+ some Internet connected Unix computer. Read
-+ <http://www.bart.nl/~patrickr/term-howto/Term-HOWTO.html>). SLIP
-+ support will enlarge your kernel by about 4 KB. If unsure, say N.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called slip.
-+
-+config SLIP_COMPRESSED
-+ bool "CSLIP compressed headers"
-+ depends on SLIP
-+ select SLHC
-+ ---help---
-+ This protocol is faster than SLIP because it uses compression on the
-+ TCP/IP headers (not on the data itself), but it has to be supported
-+ on both ends. Ask your access provider if you are not sure and
-+ answer Y, just in case. You will still be able to use plain SLIP. If
-+ you plan to use SLiRP, the SLIP emulator (available from
-+ <ftp://ibiblio.org/pub/Linux/system/network/serial/>) which
-+ allows you to use SLIP over a regular dial up shell connection, you
-+ definitely want to say Y here. The NET-3-HOWTO, available from
-+ <http://www.tldp.org/docs.html#howto>, explains how to configure
-+ CSLIP. This won't enlarge your kernel.
-+
-+config SLHC
-+ tristate
-+ help
-+ This option enables Van Jacobsen serial line header compression
-+ routines.
-+
-+config SLIP_SMART
-+ bool "Keepalive and linefill"
-+ depends on SLIP
-+ help
-+ Adds additional capabilities to the SLIP driver to support the
-+ RELCOM line fill and keepalive monitoring. Ideal on poor quality
-+ analogue lines.
-+
-+config SLIP_MODE_SLIP6
-+ bool "Six bit SLIP encapsulation"
-+ depends on SLIP
-+ help
-+ Just occasionally you may need to run IP over hostile serial
-+ networks that don't pass all control characters or are only seven
-+ bit. Saying Y here adds an extra mode you can use with SLIP:
-+ "slip6". In this mode, SLIP will only send normal ASCII symbols over
-+ the serial device. Naturally, this has to be supported at the other
-+ end of the link as well. It's good enough, for example, to run IP
-+ over the async ports of a Camtec JNT Pad. If unsure, say N.
-+
-+config NET_FC
-+ bool "Fibre Channel driver support"
-+ depends on SCSI && PCI
-+ help
-+ Fibre Channel is a high speed serial protocol mainly used to connect
-+ large storage devices to the computer; it is compatible with and
-+ intended to replace SCSI.
-+
-+ If you intend to use Fibre Channel, you need to have a Fibre channel
-+ adaptor card in your computer; say Y here and to the driver for your
-+ adaptor below. You also should have said Y to "SCSI support" and
-+ "SCSI generic support".
-+
-+config NETCONSOLE
-+ tristate "Network console logging support"
-+ ---help---
-+ If you want to log kernel messages over the network, enable this.
-+ See <file:Documentation/networking/netconsole.txt> for details.
-+
-+config NETCONSOLE_DYNAMIC
-+ bool "Dynamic reconfiguration of logging targets"
-+ depends on NETCONSOLE && SYSFS
-+ select CONFIGFS_FS
-+ help
-+ This option enables the ability to dynamically reconfigure target
-+ parameters (interface, IP addresses, port numbers, MAC addresses)
-+ at runtime through a userspace interface exported using configfs.
-+ See <file:Documentation/networking/netconsole.txt> for details.
-+
-+config NETPOLL
-+ def_bool NETCONSOLE
-+
-+config NETPOLL_TRAP
-+ bool "Netpoll traffic trapping"
-+ default n
-+ depends on NETPOLL
-+
-+config NET_POLL_CONTROLLER
-+ def_bool NETPOLL
-+
-+config VIRTIO_NET
-+ tristate "Virtio network driver (EXPERIMENTAL)"
-+ depends on EXPERIMENTAL && VIRTIO
-+ ---help---
-+ This is the virtual network driver for virtio. It can be used with
-+ lguest or QEMU based VMMs (like KVM or Xen). Say Y or M.
-+
-+config VMXNET3
-+ tristate "VMware VMXNET3 ethernet driver"
-+ depends on PCI && INET
-+ help
-+ This driver supports VMware's vmxnet3 virtual ethernet NIC.
-+ To compile this driver as a module, choose M here: the
-+ module will be called vmxnet3.
-+
-+endif # NETDEVICES
-diff -Nur linux-2.6.35.7.orig/drivers/net/Makefile linux-2.6.35.7/drivers/net/Makefile
---- linux-2.6.35.7.orig/drivers/net/Makefile 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/drivers/net/Makefile 2010-10-14 20:28:00.878101155 +0200
-@@ -109,6 +109,7 @@
- # end link order section
- #
-
-+obj-$(CONFIG_AG71XX) += ag71xx/
- obj-$(CONFIG_SUNDANCE) += sundance.o
- obj-$(CONFIG_HAMACHI) += hamachi.o
- obj-$(CONFIG_NET) += Space.o loopback.o
-diff -Nur linux-2.6.35.7.orig/drivers/net/phy/Kconfig linux-2.6.35.7/drivers/net/phy/Kconfig
---- linux-2.6.35.7.orig/drivers/net/phy/Kconfig 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/drivers/net/phy/Kconfig 2010-10-14 20:28:00.918101155 +0200
+diff -Nur linux-2.6.36.orig/drivers/net/phy/Kconfig linux-2.6.36/drivers/net/phy/Kconfig
+--- linux-2.6.36.orig/drivers/net/phy/Kconfig 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/net/phy/Kconfig 2010-11-18 21:16:15.000000000 +0100
@@ -93,6 +93,10 @@
---help---
Supports the KSZ9021, VSC8201, KS8001 PHYs.
@@ -22270,9 +14902,9 @@ diff -Nur linux-2.6.35.7.orig/drivers/net/phy/Kconfig linux-2.6.35.7/drivers/net
config FIXED_PHY
bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
depends on PHYLIB=y
-diff -Nur linux-2.6.35.7.orig/drivers/net/phy/phy.c linux-2.6.35.7/drivers/net/phy/phy.c
---- linux-2.6.35.7.orig/drivers/net/phy/phy.c 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/drivers/net/phy/phy.c 2010-10-14 20:28:00.948101153 +0200
+diff -Nur linux-2.6.36.orig/drivers/net/phy/phy.c linux-2.6.36/drivers/net/phy/phy.c
+--- linux-2.6.36.orig/drivers/net/phy/phy.c 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/net/phy/phy.c 2010-11-18 21:16:15.000000000 +0100
@@ -298,6 +298,50 @@
}
EXPORT_SYMBOL(phy_ethtool_gset);
@@ -22324,7 +14956,7 @@ diff -Nur linux-2.6.35.7.orig/drivers/net/phy/phy.c linux-2.6.35.7/drivers/net/p
/**
* phy_mii_ioctl - generic PHY MII ioctl interface
* @phydev: the phy_device struct
-@@ -351,7 +395,7 @@
+@@ -352,7 +396,7 @@
}
phy_write(phydev, mii_data->reg_num, val);
@@ -22333,7 +14965,7 @@ diff -Nur linux-2.6.35.7.orig/drivers/net/phy/phy.c linux-2.6.35.7/drivers/net/p
if (mii_data->reg_num == MII_BMCR &&
val & BMCR_RESET &&
phydev->drv->config_init) {
-@@ -465,7 +509,7 @@
+@@ -471,7 +515,7 @@
int idx;
idx = phy_find_setting(phydev->speed, phydev->duplex);
@@ -22342,9 +14974,9 @@ diff -Nur linux-2.6.35.7.orig/drivers/net/phy/phy.c linux-2.6.35.7/drivers/net/p
idx++;
idx = phy_find_valid(idx, phydev->supported);
-diff -Nur linux-2.6.35.7.orig/drivers/net/phy/phy_device.c linux-2.6.35.7/drivers/net/phy/phy_device.c
---- linux-2.6.35.7.orig/drivers/net/phy/phy_device.c 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/drivers/net/phy/phy_device.c 2010-10-14 20:28:01.005039092 +0200
+diff -Nur linux-2.6.36.orig/drivers/net/phy/phy_device.c linux-2.6.36/drivers/net/phy/phy_device.c
+--- linux-2.6.36.orig/drivers/net/phy/phy_device.c 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/net/phy/phy_device.c 2010-11-18 21:16:15.000000000 +0100
@@ -146,6 +146,18 @@
}
EXPORT_SYMBOL(phy_scan_fixups);
@@ -22373,1054 +15005,37 @@ diff -Nur linux-2.6.35.7.orig/drivers/net/phy/phy_device.c linux-2.6.35.7/driver
mutex_init(&dev->lock);
INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine);
-diff -Nur linux-2.6.35.7.orig/drivers/net/phy/phy_device.c.orig linux-2.6.35.7/drivers/net/phy/phy_device.c.orig
---- linux-2.6.35.7.orig/drivers/net/phy/phy_device.c.orig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/net/phy/phy_device.c.orig 2010-09-29 03:09:08.000000000 +0200
-@@ -0,0 +1,1041 @@
-+/*
-+ * drivers/net/phy/phy_device.c
-+ *
-+ * Framework for finding and configuring PHYs.
-+ * Also contains generic PHY driver
-+ *
-+ * Author: Andy Fleming
-+ *
-+ * Copyright (c) 2004 Freescale Semiconductor, Inc.
-+ *
-+ * 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.
-+ *
-+ */
-+#include <linux/kernel.h>
-+#include <linux/string.h>
-+#include <linux/errno.h>
-+#include <linux/unistd.h>
-+#include <linux/slab.h>
-+#include <linux/interrupt.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/skbuff.h>
-+#include <linux/mm.h>
-+#include <linux/module.h>
-+#include <linux/mii.h>
-+#include <linux/ethtool.h>
-+#include <linux/phy.h>
-+
-+#include <asm/io.h>
-+#include <asm/irq.h>
-+#include <asm/uaccess.h>
-+
-+MODULE_DESCRIPTION("PHY library");
-+MODULE_AUTHOR("Andy Fleming");
-+MODULE_LICENSE("GPL");
-+
-+void phy_device_free(struct phy_device *phydev)
-+{
-+ kfree(phydev);
-+}
-+EXPORT_SYMBOL(phy_device_free);
-+
-+static void phy_device_release(struct device *dev)
-+{
-+ phy_device_free(to_phy_device(dev));
-+}
-+
-+static struct phy_driver genphy_driver;
-+extern int mdio_bus_init(void);
-+extern void mdio_bus_exit(void);
-+
-+static LIST_HEAD(phy_fixup_list);
-+static DEFINE_MUTEX(phy_fixup_lock);
-+
-+/*
-+ * Creates a new phy_fixup and adds it to the list
-+ * @bus_id: A string which matches phydev->dev.bus_id (or PHY_ANY_ID)
-+ * @phy_uid: Used to match against phydev->phy_id (the UID of the PHY)
-+ * It can also be PHY_ANY_UID
-+ * @phy_uid_mask: Applied to phydev->phy_id and fixup->phy_uid before
-+ * comparison
-+ * @run: The actual code to be run when a matching PHY is found
-+ */
-+int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask,
-+ int (*run)(struct phy_device *))
-+{
-+ struct phy_fixup *fixup;
-+
-+ fixup = kzalloc(sizeof(struct phy_fixup), GFP_KERNEL);
-+ if (!fixup)
-+ return -ENOMEM;
-+
-+ strlcpy(fixup->bus_id, bus_id, sizeof(fixup->bus_id));
-+ fixup->phy_uid = phy_uid;
-+ fixup->phy_uid_mask = phy_uid_mask;
-+ fixup->run = run;
-+
-+ mutex_lock(&phy_fixup_lock);
-+ list_add_tail(&fixup->list, &phy_fixup_list);
-+ mutex_unlock(&phy_fixup_lock);
-+
-+ return 0;
-+}
-+EXPORT_SYMBOL(phy_register_fixup);
-+
-+/* Registers a fixup to be run on any PHY with the UID in phy_uid */
-+int phy_register_fixup_for_uid(u32 phy_uid, u32 phy_uid_mask,
-+ int (*run)(struct phy_device *))
-+{
-+ return phy_register_fixup(PHY_ANY_ID, phy_uid, phy_uid_mask, run);
-+}
-+EXPORT_SYMBOL(phy_register_fixup_for_uid);
-+
-+/* Registers a fixup to be run on the PHY with id string bus_id */
-+int phy_register_fixup_for_id(const char *bus_id,
-+ int (*run)(struct phy_device *))
-+{
-+ return phy_register_fixup(bus_id, PHY_ANY_UID, 0xffffffff, run);
-+}
-+EXPORT_SYMBOL(phy_register_fixup_for_id);
-+
-+/*
-+ * Returns 1 if fixup matches phydev in bus_id and phy_uid.
-+ * Fixups can be set to match any in one or more fields.
-+ */
-+static int phy_needs_fixup(struct phy_device *phydev, struct phy_fixup *fixup)
-+{
-+ if (strcmp(fixup->bus_id, dev_name(&phydev->dev)) != 0)
-+ if (strcmp(fixup->bus_id, PHY_ANY_ID) != 0)
-+ return 0;
-+
-+ if ((fixup->phy_uid & fixup->phy_uid_mask) !=
-+ (phydev->phy_id & fixup->phy_uid_mask))
-+ if (fixup->phy_uid != PHY_ANY_UID)
-+ return 0;
-+
-+ return 1;
-+}
-+
-+/* Runs any matching fixups for this phydev */
-+int phy_scan_fixups(struct phy_device *phydev)
-+{
-+ struct phy_fixup *fixup;
-+
-+ mutex_lock(&phy_fixup_lock);
-+ list_for_each_entry(fixup, &phy_fixup_list, list) {
-+ if (phy_needs_fixup(phydev, fixup)) {
-+ int err;
-+
-+ err = fixup->run(phydev);
-+
-+ if (err < 0) {
-+ mutex_unlock(&phy_fixup_lock);
-+ return err;
-+ }
-+ }
-+ }
-+ mutex_unlock(&phy_fixup_lock);
-+
-+ return 0;
-+}
-+EXPORT_SYMBOL(phy_scan_fixups);
-+
-+struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
-+{
-+ struct phy_device *dev;
-+
-+ /* We allocate the device, and initialize the
-+ * default values */
-+ dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-+
-+ if (NULL == dev)
-+ return (struct phy_device*) PTR_ERR((void*)-ENOMEM);
-+
-+ dev->dev.release = phy_device_release;
-+
-+ dev->speed = 0;
-+ dev->duplex = -1;
-+ dev->pause = dev->asym_pause = 0;
-+ dev->link = 1;
-+ dev->interface = PHY_INTERFACE_MODE_GMII;
-+
-+ dev->autoneg = AUTONEG_ENABLE;
-+
-+ dev->addr = addr;
-+ dev->phy_id = phy_id;
-+ dev->bus = bus;
-+ dev->dev.parent = bus->parent;
-+ dev->dev.bus = &mdio_bus_type;
-+ dev->irq = bus->irq != NULL ? bus->irq[addr] : PHY_POLL;
-+ dev_set_name(&dev->dev, PHY_ID_FMT, bus->id, addr);
-+
-+ dev->state = PHY_DOWN;
-+
-+ mutex_init(&dev->lock);
-+ INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine);
-+
-+ /* Request the appropriate module unconditionally; don't
-+ bother trying to do so only if it isn't already loaded,
-+ because that gets complicated. A hotplug event would have
-+ done an unconditional modprobe anyway.
-+ We don't do normal hotplug because it won't work for MDIO
-+ -- because it relies on the device staying around for long
-+ enough for the driver to get loaded. With MDIO, the NIC
-+ driver will get bored and give up as soon as it finds that
-+ there's no driver _already_ loaded. */
-+ request_module(MDIO_MODULE_PREFIX MDIO_ID_FMT, MDIO_ID_ARGS(phy_id));
-+
-+ return dev;
-+}
-+EXPORT_SYMBOL(phy_device_create);
-+
-+/**
-+ * get_phy_id - reads the specified addr for its ID.
-+ * @bus: the target MII bus
-+ * @addr: PHY address on the MII bus
-+ * @phy_id: where to store the ID retrieved.
-+ *
-+ * Description: Reads the ID registers of the PHY at @addr on the
-+ * @bus, stores it in @phy_id and returns zero on success.
-+ */
-+int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id)
-+{
-+ int phy_reg;
-+
-+ /* Grab the bits from PHYIR1, and put them
-+ * in the upper half */
-+ phy_reg = bus->read(bus, addr, MII_PHYSID1);
-+
-+ if (phy_reg < 0)
-+ return -EIO;
-+
-+ *phy_id = (phy_reg & 0xffff) << 16;
-+
-+ /* Grab the bits from PHYIR2, and put them in the lower half */
-+ phy_reg = bus->read(bus, addr, MII_PHYSID2);
-+
-+ if (phy_reg < 0)
-+ return -EIO;
-+
-+ *phy_id |= (phy_reg & 0xffff);
-+
-+ return 0;
-+}
-+EXPORT_SYMBOL(get_phy_id);
-+
-+/**
-+ * get_phy_device - reads the specified PHY device and returns its @phy_device struct
-+ * @bus: the target MII bus
-+ * @addr: PHY address on the MII bus
-+ *
-+ * Description: Reads the ID registers of the PHY at @addr on the
-+ * @bus, then allocates and returns the phy_device to represent it.
-+ */
-+struct phy_device * get_phy_device(struct mii_bus *bus, int addr)
-+{
-+ struct phy_device *dev = NULL;
-+ u32 phy_id;
-+ int r;
-+
-+ r = get_phy_id(bus, addr, &phy_id);
-+ if (r)
-+ return ERR_PTR(r);
-+
-+ /* If the phy_id is mostly Fs, there is no device there */
-+ if ((phy_id & 0x1fffffff) == 0x1fffffff)
-+ return NULL;
-+
-+ dev = phy_device_create(bus, addr, phy_id);
-+
-+ return dev;
-+}
-+EXPORT_SYMBOL(get_phy_device);
-+
-+/**
-+ * phy_device_register - Register the phy device on the MDIO bus
-+ * @phydev: phy_device structure to be added to the MDIO bus
-+ */
-+int phy_device_register(struct phy_device *phydev)
-+{
-+ int err;
-+
-+ /* Don't register a phy if one is already registered at this
-+ * address */
-+ if (phydev->bus->phy_map[phydev->addr])
-+ return -EINVAL;
-+ phydev->bus->phy_map[phydev->addr] = phydev;
-+
-+ /* Run all of the fixups for this PHY */
-+ phy_scan_fixups(phydev);
-+
-+ err = device_register(&phydev->dev);
-+ if (err) {
-+ pr_err("phy %d failed to register\n", phydev->addr);
-+ goto out;
-+ }
-+
-+ return 0;
-+
-+ out:
-+ phydev->bus->phy_map[phydev->addr] = NULL;
-+ return err;
-+}
-+EXPORT_SYMBOL(phy_device_register);
-+
-+/**
-+ * phy_find_first - finds the first PHY device on the bus
-+ * @bus: the target MII bus
-+ */
-+struct phy_device *phy_find_first(struct mii_bus *bus)
-+{
-+ int addr;
-+
-+ for (addr = 0; addr < PHY_MAX_ADDR; addr++) {
-+ if (bus->phy_map[addr])
-+ return bus->phy_map[addr];
-+ }
-+ return NULL;
-+}
-+EXPORT_SYMBOL(phy_find_first);
-+
-+/**
-+ * phy_prepare_link - prepares the PHY layer to monitor link status
-+ * @phydev: target phy_device struct
-+ * @handler: callback function for link status change notifications
-+ *
-+ * Description: Tells the PHY infrastructure to handle the
-+ * gory details on monitoring link status (whether through
-+ * polling or an interrupt), and to call back to the
-+ * connected device driver when the link status changes.
-+ * If you want to monitor your own link state, don't call
-+ * this function.
-+ */
-+void phy_prepare_link(struct phy_device *phydev,
-+ void (*handler)(struct net_device *))
-+{
-+ phydev->adjust_link = handler;
-+}
-+
-+/**
-+ * phy_connect_direct - connect an ethernet device to a specific phy_device
-+ * @dev: the network device to connect
-+ * @phydev: the pointer to the phy device
-+ * @handler: callback function for state change notifications
-+ * @flags: PHY device's dev_flags
-+ * @interface: PHY device's interface
-+ */
-+int phy_connect_direct(struct net_device *dev, struct phy_device *phydev,
-+ void (*handler)(struct net_device *), u32 flags,
-+ phy_interface_t interface)
-+{
-+ int rc;
-+
-+ rc = phy_attach_direct(dev, phydev, flags, interface);
-+ if (rc)
-+ return rc;
-+
-+ phy_prepare_link(phydev, handler);
-+ phy_start_machine(phydev, NULL);
-+ if (phydev->irq > 0)
-+ phy_start_interrupts(phydev);
-+
-+ return 0;
-+}
-+EXPORT_SYMBOL(phy_connect_direct);
-+
-+/**
-+ * phy_connect - connect an ethernet device to a PHY device
-+ * @dev: the network device to connect
-+ * @bus_id: the id string of the PHY device to connect
-+ * @handler: callback function for state change notifications
-+ * @flags: PHY device's dev_flags
-+ * @interface: PHY device's interface
-+ *
-+ * Description: Convenience function for connecting ethernet
-+ * devices to PHY devices. The default behavior is for
-+ * the PHY infrastructure to handle everything, and only notify
-+ * the connected driver when the link status changes. If you
-+ * don't want, or can't use the provided functionality, you may
-+ * choose to call only the subset of functions which provide
-+ * the desired functionality.
-+ */
-+struct phy_device * phy_connect(struct net_device *dev, const char *bus_id,
-+ void (*handler)(struct net_device *), u32 flags,
-+ phy_interface_t interface)
-+{
-+ struct phy_device *phydev;
-+ struct device *d;
-+ int rc;
-+
-+ /* Search the list of PHY devices on the mdio bus for the
-+ * PHY with the requested name */
-+ d = bus_find_device_by_name(&mdio_bus_type, NULL, bus_id);
-+ if (!d) {
-+ pr_err("PHY %s not found\n", bus_id);
-+ return ERR_PTR(-ENODEV);
-+ }
-+ phydev = to_phy_device(d);
-+
-+ rc = phy_connect_direct(dev, phydev, handler, flags, interface);
-+ if (rc)
-+ return ERR_PTR(rc);
-+
-+ return phydev;
-+}
-+EXPORT_SYMBOL(phy_connect);
-+
-+/**
-+ * phy_disconnect - disable interrupts, stop state machine, and detach a PHY device
-+ * @phydev: target phy_device struct
-+ */
-+void phy_disconnect(struct phy_device *phydev)
-+{
-+ if (phydev->irq > 0)
-+ phy_stop_interrupts(phydev);
-+
-+ phy_stop_machine(phydev);
-+
-+ phydev->adjust_link = NULL;
-+
-+ phy_detach(phydev);
-+}
-+EXPORT_SYMBOL(phy_disconnect);
-+
-+int phy_init_hw(struct phy_device *phydev)
-+{
-+ int ret;
-+
-+ if (!phydev->drv || !phydev->drv->config_init)
-+ return 0;
-+
-+ ret = phy_scan_fixups(phydev);
-+ if (ret < 0)
-+ return ret;
-+
-+ return phydev->drv->config_init(phydev);
-+}
-+
-+/**
-+ * phy_attach_direct - attach a network device to a given PHY device pointer
-+ * @dev: network device to attach
-+ * @phydev: Pointer to phy_device to attach
-+ * @flags: PHY device's dev_flags
-+ * @interface: PHY device's interface
-+ *
-+ * Description: Called by drivers to attach to a particular PHY
-+ * device. The phy_device is found, and properly hooked up
-+ * to the phy_driver. If no driver is attached, then the
-+ * genphy_driver is used. The phy_device is given a ptr to
-+ * the attaching device, and given a callback for link status
-+ * change. The phy_device is returned to the attaching driver.
-+ */
-+int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
-+ u32 flags, phy_interface_t interface)
-+{
-+ struct device *d = &phydev->dev;
-+
-+ /* Assume that if there is no driver, that it doesn't
-+ * exist, and we should use the genphy driver. */
-+ if (NULL == d->driver) {
-+ int err;
-+ d->driver = &genphy_driver.driver;
-+
-+ err = d->driver->probe(d);
-+ if (err >= 0)
-+ err = device_bind_driver(d);
-+
-+ if (err)
-+ return err;
-+ }
-+
-+ if (phydev->attached_dev) {
-+ dev_err(&dev->dev, "PHY already attached\n");
-+ return -EBUSY;
-+ }
-+
-+ phydev->attached_dev = dev;
-+
-+ phydev->dev_flags = flags;
-+
-+ phydev->interface = interface;
-+
-+ /* Do initial configuration here, now that
-+ * we have certain key parameters
-+ * (dev_flags and interface) */
-+ return phy_init_hw(phydev);
-+}
-+EXPORT_SYMBOL(phy_attach_direct);
-+
-+/**
-+ * phy_attach - attach a network device to a particular PHY device
-+ * @dev: network device to attach
-+ * @bus_id: Bus ID of PHY device to attach
-+ * @flags: PHY device's dev_flags
-+ * @interface: PHY device's interface
-+ *
-+ * Description: Same as phy_attach_direct() except that a PHY bus_id
-+ * string is passed instead of a pointer to a struct phy_device.
-+ */
-+struct phy_device *phy_attach(struct net_device *dev,
-+ const char *bus_id, u32 flags, phy_interface_t interface)
-+{
-+ struct bus_type *bus = &mdio_bus_type;
-+ struct phy_device *phydev;
-+ struct device *d;
-+ int rc;
-+
-+ /* Search the list of PHY devices on the mdio bus for the
-+ * PHY with the requested name */
-+ d = bus_find_device_by_name(bus, NULL, bus_id);
-+ if (!d) {
-+ pr_err("PHY %s not found\n", bus_id);
-+ return ERR_PTR(-ENODEV);
-+ }
-+ phydev = to_phy_device(d);
-+
-+ rc = phy_attach_direct(dev, phydev, flags, interface);
-+ if (rc)
-+ return ERR_PTR(rc);
-+
-+ return phydev;
-+}
-+EXPORT_SYMBOL(phy_attach);
-+
-+/**
-+ * phy_detach - detach a PHY device from its network device
-+ * @phydev: target phy_device struct
-+ */
-+void phy_detach(struct phy_device *phydev)
-+{
-+ phydev->attached_dev = NULL;
-+
-+ /* If the device had no specific driver before (i.e. - it
-+ * was using the generic driver), we unbind the device
-+ * from the generic driver so that there's a chance a
-+ * real driver could be loaded */
-+ if (phydev->dev.driver == &genphy_driver.driver)
-+ device_release_driver(&phydev->dev);
-+}
-+EXPORT_SYMBOL(phy_detach);
-+
-+
-+/* Generic PHY support and helper functions */
-+
-+/**
-+ * genphy_config_advert - sanitize and advertise auto-negotation parameters
-+ * @phydev: target phy_device struct
-+ *
-+ * Description: Writes MII_ADVERTISE with the appropriate values,
-+ * after sanitizing the values to make sure we only advertise
-+ * what is supported. Returns < 0 on error, 0 if the PHY's advertisement
-+ * hasn't changed, and > 0 if it has changed.
-+ */
-+int genphy_config_advert(struct phy_device *phydev)
-+{
-+ u32 advertise;
-+ int oldadv, adv;
-+ int err, changed = 0;
-+
-+ /* Only allow advertising what
-+ * this PHY supports */
-+ phydev->advertising &= phydev->supported;
-+ advertise = phydev->advertising;
-+
-+ /* Setup standard advertisement */
-+ oldadv = adv = phy_read(phydev, MII_ADVERTISE);
-+
-+ if (adv < 0)
-+ return adv;
-+
-+ adv &= ~(ADVERTISE_ALL | ADVERTISE_100BASE4 | ADVERTISE_PAUSE_CAP |
-+ ADVERTISE_PAUSE_ASYM);
-+ if (advertise & ADVERTISED_10baseT_Half)
-+ adv |= ADVERTISE_10HALF;
-+ if (advertise & ADVERTISED_10baseT_Full)
-+ adv |= ADVERTISE_10FULL;
-+ if (advertise & ADVERTISED_100baseT_Half)
-+ adv |= ADVERTISE_100HALF;
-+ if (advertise & ADVERTISED_100baseT_Full)
-+ adv |= ADVERTISE_100FULL;
-+ if (advertise & ADVERTISED_Pause)
-+ adv |= ADVERTISE_PAUSE_CAP;
-+ if (advertise & ADVERTISED_Asym_Pause)
-+ adv |= ADVERTISE_PAUSE_ASYM;
-+
-+ if (adv != oldadv) {
-+ err = phy_write(phydev, MII_ADVERTISE, adv);
-+
-+ if (err < 0)
-+ return err;
-+ changed = 1;
-+ }
-+
-+ /* Configure gigabit if it's supported */
-+ if (phydev->supported & (SUPPORTED_1000baseT_Half |
-+ SUPPORTED_1000baseT_Full)) {
-+ oldadv = adv = phy_read(phydev, MII_CTRL1000);
-+
-+ if (adv < 0)
-+ return adv;
-+
-+ adv &= ~(ADVERTISE_1000FULL | ADVERTISE_1000HALF);
-+ if (advertise & SUPPORTED_1000baseT_Half)
-+ adv |= ADVERTISE_1000HALF;
-+ if (advertise & SUPPORTED_1000baseT_Full)
-+ adv |= ADVERTISE_1000FULL;
-+
-+ if (adv != oldadv) {
-+ err = phy_write(phydev, MII_CTRL1000, adv);
-+
-+ if (err < 0)
-+ return err;
-+ changed = 1;
-+ }
-+ }
-+
-+ return changed;
-+}
-+EXPORT_SYMBOL(genphy_config_advert);
-+
-+/**
-+ * genphy_setup_forced - configures/forces speed/duplex from @phydev
-+ * @phydev: target phy_device struct
-+ *
-+ * Description: Configures MII_BMCR to force speed/duplex
-+ * to the values in phydev. Assumes that the values are valid.
-+ * Please see phy_sanitize_settings().
-+ */
-+int genphy_setup_forced(struct phy_device *phydev)
-+{
-+ int err;
-+ int ctl = 0;
-+
-+ phydev->pause = phydev->asym_pause = 0;
-+
-+ if (SPEED_1000 == phydev->speed)
-+ ctl |= BMCR_SPEED1000;
-+ else if (SPEED_100 == phydev->speed)
-+ ctl |= BMCR_SPEED100;
-+
-+ if (DUPLEX_FULL == phydev->duplex)
-+ ctl |= BMCR_FULLDPLX;
-+
-+ err = phy_write(phydev, MII_BMCR, ctl);
-+
-+ return err;
-+}
-+
-+
-+/**
-+ * genphy_restart_aneg - Enable and Restart Autonegotiation
-+ * @phydev: target phy_device struct
-+ */
-+int genphy_restart_aneg(struct phy_device *phydev)
-+{
-+ int ctl;
-+
-+ ctl = phy_read(phydev, MII_BMCR);
-+
-+ if (ctl < 0)
-+ return ctl;
-+
-+ ctl |= (BMCR_ANENABLE | BMCR_ANRESTART);
-+
-+ /* Don't isolate the PHY if we're negotiating */
-+ ctl &= ~(BMCR_ISOLATE);
-+
-+ ctl = phy_write(phydev, MII_BMCR, ctl);
-+
-+ return ctl;
-+}
-+EXPORT_SYMBOL(genphy_restart_aneg);
-+
-+
-+/**
-+ * genphy_config_aneg - restart auto-negotiation or write BMCR
-+ * @phydev: target phy_device struct
-+ *
-+ * Description: If auto-negotiation is enabled, we configure the
-+ * advertising, and then restart auto-negotiation. If it is not
-+ * enabled, then we write the BMCR.
-+ */
-+int genphy_config_aneg(struct phy_device *phydev)
-+{
-+ int result;
-+
-+ if (AUTONEG_ENABLE != phydev->autoneg)
-+ return genphy_setup_forced(phydev);
-+
-+ result = genphy_config_advert(phydev);
-+
-+ if (result < 0) /* error */
-+ return result;
-+
-+ if (result == 0) {
-+ /* Advertisment hasn't changed, but maybe aneg was never on to
-+ * begin with? Or maybe phy was isolated? */
-+ int ctl = phy_read(phydev, MII_BMCR);
-+
-+ if (ctl < 0)
-+ return ctl;
-+
-+ if (!(ctl & BMCR_ANENABLE) || (ctl & BMCR_ISOLATE))
-+ result = 1; /* do restart aneg */
-+ }
-+
-+ /* Only restart aneg if we are advertising something different
-+ * than we were before. */
-+ if (result > 0)
-+ result = genphy_restart_aneg(phydev);
-+
-+ return result;
-+}
-+EXPORT_SYMBOL(genphy_config_aneg);
-+
-+/**
-+ * genphy_update_link - update link status in @phydev
-+ * @phydev: target phy_device struct
-+ *
-+ * Description: Update the value in phydev->link to reflect the
-+ * current link value. In order to do this, we need to read
-+ * the status register twice, keeping the second value.
-+ */
-+int genphy_update_link(struct phy_device *phydev)
-+{
-+ int status;
-+
-+ /* Do a fake read */
-+ status = phy_read(phydev, MII_BMSR);
-+
-+ if (status < 0)
-+ return status;
-+
-+ /* Read link and autonegotiation status */
-+ status = phy_read(phydev, MII_BMSR);
-+
-+ if (status < 0)
-+ return status;
-+
-+ if ((status & BMSR_LSTATUS) == 0)
-+ phydev->link = 0;
-+ else
-+ phydev->link = 1;
-+
-+ return 0;
-+}
-+EXPORT_SYMBOL(genphy_update_link);
-+
-+/**
-+ * genphy_read_status - check the link status and update current link state
-+ * @phydev: target phy_device struct
-+ *
-+ * Description: Check the link, then figure out the current state
-+ * by comparing what we advertise with what the link partner
-+ * advertises. Start by checking the gigabit possibilities,
-+ * then move on to 10/100.
-+ */
-+int genphy_read_status(struct phy_device *phydev)
-+{
-+ int adv;
-+ int err;
-+ int lpa;
-+ int lpagb = 0;
-+
-+ /* Update the link, but return if there
-+ * was an error */
-+ err = genphy_update_link(phydev);
-+ if (err)
-+ return err;
-+
-+ if (AUTONEG_ENABLE == phydev->autoneg) {
-+ if (phydev->supported & (SUPPORTED_1000baseT_Half
-+ | SUPPORTED_1000baseT_Full)) {
-+ lpagb = phy_read(phydev, MII_STAT1000);
-+
-+ if (lpagb < 0)
-+ return lpagb;
-+
-+ adv = phy_read(phydev, MII_CTRL1000);
-+
-+ if (adv < 0)
-+ return adv;
-+
-+ lpagb &= adv << 2;
-+ }
-+
-+ lpa = phy_read(phydev, MII_LPA);
-+
-+ if (lpa < 0)
-+ return lpa;
-+
-+ adv = phy_read(phydev, MII_ADVERTISE);
-+
-+ if (adv < 0)
-+ return adv;
-+
-+ lpa &= adv;
-+
-+ phydev->speed = SPEED_10;
-+ phydev->duplex = DUPLEX_HALF;
-+ phydev->pause = phydev->asym_pause = 0;
-+
-+ if (lpagb & (LPA_1000FULL | LPA_1000HALF)) {
-+ phydev->speed = SPEED_1000;
-+
-+ if (lpagb & LPA_1000FULL)
-+ phydev->duplex = DUPLEX_FULL;
-+ } else if (lpa & (LPA_100FULL | LPA_100HALF)) {
-+ phydev->speed = SPEED_100;
-+
-+ if (lpa & LPA_100FULL)
-+ phydev->duplex = DUPLEX_FULL;
-+ } else
-+ if (lpa & LPA_10FULL)
-+ phydev->duplex = DUPLEX_FULL;
-+
-+ if (phydev->duplex == DUPLEX_FULL){
-+ phydev->pause = lpa & LPA_PAUSE_CAP ? 1 : 0;
-+ phydev->asym_pause = lpa & LPA_PAUSE_ASYM ? 1 : 0;
-+ }
-+ } else {
-+ int bmcr = phy_read(phydev, MII_BMCR);
-+ if (bmcr < 0)
-+ return bmcr;
-+
-+ if (bmcr & BMCR_FULLDPLX)
-+ phydev->duplex = DUPLEX_FULL;
-+ else
-+ phydev->duplex = DUPLEX_HALF;
-+
-+ if (bmcr & BMCR_SPEED1000)
-+ phydev->speed = SPEED_1000;
-+ else if (bmcr & BMCR_SPEED100)
-+ phydev->speed = SPEED_100;
-+ else
-+ phydev->speed = SPEED_10;
-+
-+ phydev->pause = phydev->asym_pause = 0;
-+ }
-+
-+ return 0;
-+}
-+EXPORT_SYMBOL(genphy_read_status);
-+
-+static int genphy_config_init(struct phy_device *phydev)
-+{
-+ int val;
-+ u32 features;
-+
-+ /* For now, I'll claim that the generic driver supports
-+ * all possible port types */
-+ features = (SUPPORTED_TP | SUPPORTED_MII
-+ | SUPPORTED_AUI | SUPPORTED_FIBRE |
-+ SUPPORTED_BNC);
-+
-+ /* Do we support autonegotiation? */
-+ val = phy_read(phydev, MII_BMSR);
-+
-+ if (val < 0)
-+ return val;
-+
-+ if (val & BMSR_ANEGCAPABLE)
-+ features |= SUPPORTED_Autoneg;
-+
-+ if (val & BMSR_100FULL)
-+ features |= SUPPORTED_100baseT_Full;
-+ if (val & BMSR_100HALF)
-+ features |= SUPPORTED_100baseT_Half;
-+ if (val & BMSR_10FULL)
-+ features |= SUPPORTED_10baseT_Full;
-+ if (val & BMSR_10HALF)
-+ features |= SUPPORTED_10baseT_Half;
-+
-+ if (val & BMSR_ESTATEN) {
-+ val = phy_read(phydev, MII_ESTATUS);
-+
-+ if (val < 0)
-+ return val;
-+
-+ if (val & ESTATUS_1000_TFULL)
-+ features |= SUPPORTED_1000baseT_Full;
-+ if (val & ESTATUS_1000_THALF)
-+ features |= SUPPORTED_1000baseT_Half;
-+ }
-+
-+ phydev->supported = features;
-+ phydev->advertising = features;
-+
-+ return 0;
-+}
-+int genphy_suspend(struct phy_device *phydev)
-+{
-+ int value;
-+
-+ mutex_lock(&phydev->lock);
-+
-+ value = phy_read(phydev, MII_BMCR);
-+ phy_write(phydev, MII_BMCR, (value | BMCR_PDOWN));
-+
-+ mutex_unlock(&phydev->lock);
-+
-+ return 0;
-+}
-+EXPORT_SYMBOL(genphy_suspend);
-+
-+int genphy_resume(struct phy_device *phydev)
-+{
-+ int value;
-+
-+ mutex_lock(&phydev->lock);
-+
-+ value = phy_read(phydev, MII_BMCR);
-+ phy_write(phydev, MII_BMCR, (value & ~BMCR_PDOWN));
-+
-+ mutex_unlock(&phydev->lock);
-+
-+ return 0;
-+}
-+EXPORT_SYMBOL(genphy_resume);
-+
-+/**
-+ * phy_probe - probe and init a PHY device
-+ * @dev: device to probe and init
-+ *
-+ * Description: Take care of setting up the phy_device structure,
-+ * set the state to READY (the driver's init function should
-+ * set it to STARTING if needed).
-+ */
-+static int phy_probe(struct device *dev)
-+{
-+ struct phy_device *phydev;
-+ struct phy_driver *phydrv;
-+ struct device_driver *drv;
-+ int err = 0;
-+
-+ phydev = to_phy_device(dev);
-+
-+ /* Make sure the driver is held.
-+ * XXX -- Is this correct? */
-+ drv = get_driver(phydev->dev.driver);
-+ phydrv = to_phy_driver(drv);
-+ phydev->drv = phydrv;
-+
-+ /* Disable the interrupt if the PHY doesn't support it */
-+ if (!(phydrv->flags & PHY_HAS_INTERRUPT))
-+ phydev->irq = PHY_POLL;
-+
-+ mutex_lock(&phydev->lock);
-+
-+ /* Start out supporting everything. Eventually,
-+ * a controller will attach, and may modify one
-+ * or both of these values */
-+ phydev->supported = phydrv->features;
-+ phydev->advertising = phydrv->features;
-+
-+ /* Set the state to READY by default */
-+ phydev->state = PHY_READY;
-+
-+ if (phydev->drv->probe)
-+ err = phydev->drv->probe(phydev);
-+
-+ mutex_unlock(&phydev->lock);
-+
-+ return err;
-+
-+}
-+
-+static int phy_remove(struct device *dev)
-+{
-+ struct phy_device *phydev;
-+
-+ phydev = to_phy_device(dev);
-+
-+ mutex_lock(&phydev->lock);
-+ phydev->state = PHY_DOWN;
-+ mutex_unlock(&phydev->lock);
-+
-+ if (phydev->drv->remove)
-+ phydev->drv->remove(phydev);
-+
-+ put_driver(dev->driver);
-+ phydev->drv = NULL;
-+
-+ return 0;
-+}
-+
-+/**
-+ * phy_driver_register - register a phy_driver with the PHY layer
-+ * @new_driver: new phy_driver to register
-+ */
-+int phy_driver_register(struct phy_driver *new_driver)
-+{
-+ int retval;
-+
-+ new_driver->driver.name = new_driver->name;
-+ new_driver->driver.bus = &mdio_bus_type;
-+ new_driver->driver.probe = phy_probe;
-+ new_driver->driver.remove = phy_remove;
-+
-+ retval = driver_register(&new_driver->driver);
-+
-+ if (retval) {
-+ printk(KERN_ERR "%s: Error %d in registering driver\n",
-+ new_driver->name, retval);
-+
-+ return retval;
-+ }
-+
-+ pr_debug("%s: Registered new driver\n", new_driver->name);
-+
-+ return 0;
-+}
-+EXPORT_SYMBOL(phy_driver_register);
-+
-+void phy_driver_unregister(struct phy_driver *drv)
-+{
-+ driver_unregister(&drv->driver);
-+}
-+EXPORT_SYMBOL(phy_driver_unregister);
-+
-+static struct phy_driver genphy_driver = {
-+ .phy_id = 0xffffffff,
-+ .phy_id_mask = 0xffffffff,
-+ .name = "Generic PHY",
-+ .config_init = genphy_config_init,
-+ .features = 0,
-+ .config_aneg = genphy_config_aneg,
-+ .read_status = genphy_read_status,
-+ .suspend = genphy_suspend,
-+ .resume = genphy_resume,
-+ .driver = {.owner= THIS_MODULE, },
-+};
-+
-+static int __init phy_init(void)
-+{
-+ int rc;
-+
-+ rc = mdio_bus_init();
-+ if (rc)
-+ return rc;
-+
-+ rc = phy_driver_register(&genphy_driver);
-+ if (rc)
-+ mdio_bus_exit();
-+
-+ return rc;
-+}
-+
-+static void __exit phy_exit(void)
-+{
-+ phy_driver_unregister(&genphy_driver);
-+ mdio_bus_exit();
-+}
+diff -Nur linux-2.6.36.orig/drivers/spi/Kconfig linux-2.6.36/drivers/spi/Kconfig
+--- linux-2.6.36.orig/drivers/spi/Kconfig 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/spi/Kconfig 2010-11-18 21:16:15.000000000 +0100
+@@ -53,6 +53,13 @@
+
+ comment "SPI Master Controller Drivers"
+
++config SPI_AR71XX
++ tristate "Atheros AR71xx SPI Controller"
++ depends on SPI_MASTER && ATHEROS_AR71XX
++ select SPI_BITBANG
++ help
++ This is the SPI contoller driver for Atheros AR71xx.
+
-+subsys_initcall(phy_init);
-+module_exit(phy_exit);
-diff -Nur linux-2.6.35.7.orig/drivers/spi/ap83_spi.c linux-2.6.35.7/drivers/spi/ap83_spi.c
---- linux-2.6.35.7.orig/drivers/spi/ap83_spi.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/spi/ap83_spi.c 2010-10-14 20:28:01.048101088 +0200
+ config SPI_ATMEL
+ tristate "Atmel SPI Controller"
+ depends on (ARCH_AT91 || AVR32)
+diff -Nur linux-2.6.36.orig/drivers/spi/Makefile linux-2.6.36/drivers/spi/Makefile
+--- linux-2.6.36.orig/drivers/spi/Makefile 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/spi/Makefile 2010-11-18 21:16:15.000000000 +0100
+@@ -11,6 +11,7 @@
+ obj-$(CONFIG_SPI_MASTER) += spi.o
+
+ # SPI master controller drivers (bus)
++obj-$(CONFIG_SPI_AR71XX) += ar71xx_spi.o
+ obj-$(CONFIG_SPI_ATMEL) += atmel_spi.o
+ obj-$(CONFIG_SPI_BFIN) += spi_bfin5xx.o
+ obj-$(CONFIG_SPI_BITBANG) += spi_bitbang.o
+diff -Nur linux-2.6.36.orig/drivers/spi/ap83_spi.c linux-2.6.36/drivers/spi/ap83_spi.c
+--- linux-2.6.36.orig/drivers/spi/ap83_spi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/drivers/spi/ap83_spi.c 2010-11-18 21:16:15.000000000 +0100
@@ -0,0 +1,282 @@
+/*
+ * Atheros AP83 board specific SPI Controller driver
@@ -23704,9 +15319,9 @@ diff -Nur linux-2.6.35.7.orig/drivers/spi/ap83_spi.c linux-2.6.35.7/drivers/spi/
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-2.6.35.7.orig/drivers/spi/ar71xx_spi.c linux-2.6.35.7/drivers/spi/ar71xx_spi.c
---- linux-2.6.35.7.orig/drivers/spi/ar71xx_spi.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/spi/ar71xx_spi.c 2010-10-14 20:28:01.088050552 +0200
+diff -Nur linux-2.6.36.orig/drivers/spi/ar71xx_spi.c linux-2.6.36/drivers/spi/ar71xx_spi.c
+--- linux-2.6.36.orig/drivers/spi/ar71xx_spi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/drivers/spi/ar71xx_spi.c 2010-11-18 21:16:15.000000000 +0100
@@ -0,0 +1,283 @@
+/*
+ * Atheros AR71xx SPI Controller driver
@@ -23991,37 +15606,9 @@ diff -Nur linux-2.6.35.7.orig/drivers/spi/ar71xx_spi.c linux-2.6.35.7/drivers/sp
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_AUTHOR("Imre Kaloz <kaloz@openwrt.org>");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-2.6.35.7.orig/drivers/spi/Kconfig linux-2.6.35.7/drivers/spi/Kconfig
---- linux-2.6.35.7.orig/drivers/spi/Kconfig 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/drivers/spi/Kconfig 2010-10-14 20:28:01.128101086 +0200
-@@ -53,6 +53,13 @@
-
- comment "SPI Master Controller Drivers"
-
-+config SPI_AR71XX
-+ tristate "Atheros AR71xx SPI Controller"
-+ depends on SPI_MASTER && ATHEROS_AR71XX
-+ select SPI_BITBANG
-+ help
-+ This is the SPI contoller driver for Atheros AR71xx.
-+
- config SPI_ATMEL
- tristate "Atmel SPI Controller"
- depends on (ARCH_AT91 || AVR32)
-diff -Nur linux-2.6.35.7.orig/drivers/spi/Makefile linux-2.6.35.7/drivers/spi/Makefile
---- linux-2.6.35.7.orig/drivers/spi/Makefile 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/drivers/spi/Makefile 2010-10-14 20:28:01.168101108 +0200
-@@ -11,6 +11,7 @@
- obj-$(CONFIG_SPI_MASTER) += spi.o
-
- # SPI master controller drivers (bus)
-+obj-$(CONFIG_SPI_AR71XX) += ar71xx_spi.o
- obj-$(CONFIG_SPI_ATMEL) += atmel_spi.o
- obj-$(CONFIG_SPI_BFIN) += spi_bfin5xx.o
- obj-$(CONFIG_SPI_BITBANG) += spi_bitbang.o
-diff -Nur linux-2.6.35.7.orig/drivers/spi/pb44_spi.c linux-2.6.35.7/drivers/spi/pb44_spi.c
---- linux-2.6.35.7.orig/drivers/spi/pb44_spi.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/spi/pb44_spi.c 2010-10-14 20:28:01.205601089 +0200
+diff -Nur linux-2.6.36.orig/drivers/spi/pb44_spi.c linux-2.6.36/drivers/spi/pb44_spi.c
+--- linux-2.6.36.orig/drivers/spi/pb44_spi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/drivers/spi/pb44_spi.c 2010-11-18 21:16:15.000000000 +0100
@@ -0,0 +1,299 @@
+/*
+ * Atheros PB44 board SPI controller driver
@@ -24322,9 +15909,9 @@ diff -Nur linux-2.6.35.7.orig/drivers/spi/pb44_spi.c linux-2.6.35.7/drivers/spi/
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-2.6.35.7.orig/drivers/spi/spi_vsc7385.c linux-2.6.35.7/drivers/spi/spi_vsc7385.c
---- linux-2.6.35.7.orig/drivers/spi/spi_vsc7385.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/spi/spi_vsc7385.c 2010-10-14 20:28:01.238101190 +0200
+diff -Nur linux-2.6.36.orig/drivers/spi/spi_vsc7385.c linux-2.6.36/drivers/spi/spi_vsc7385.c
+--- linux-2.6.36.orig/drivers/spi/spi_vsc7385.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/drivers/spi/spi_vsc7385.c 2010-11-18 21:16:15.000000000 +0100
@@ -0,0 +1,620 @@
+/*
+ * SPI driver for the Vitesse VSC7385 ethernet switch
@@ -24946,9 +16533,40 @@ diff -Nur linux-2.6.35.7.orig/drivers/spi/spi_vsc7385.c linux-2.6.35.7/drivers/s
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL v2");
+
-diff -Nur linux-2.6.35.7.orig/drivers/usb/host/ehci-ar71xx.c linux-2.6.35.7/drivers/usb/host/ehci-ar71xx.c
---- linux-2.6.35.7.orig/drivers/usb/host/ehci-ar71xx.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/usb/host/ehci-ar71xx.c 2010-10-14 20:28:01.285601150 +0200
+diff -Nur linux-2.6.36.orig/drivers/usb/host/Kconfig linux-2.6.36/drivers/usb/host/Kconfig
+--- linux-2.6.36.orig/drivers/usb/host/Kconfig 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/usb/host/Kconfig 2010-11-18 21:16:15.000000000 +0100
+@@ -112,6 +112,13 @@
+ support both high speed and full speed devices, or high speed
+ devices only.
+
++config USB_EHCI_AR71XX
++ bool "USB EHCI support for AR71xx"
++ depends on USB_EHCI_HCD && ATHEROS_AR71XX
++ default y
++ help
++ Support for Atheros AR71xx built-in EHCI controller
++
+ config USB_EHCI_FSL
+ bool "Support for Freescale on-chip EHCI USB controller"
+ depends on USB_EHCI_HCD && FSL_SOC
+@@ -225,6 +232,13 @@
+ Enables support for the on-chip OHCI controller on
+ OMAP3 and later chips.
+
++config USB_OHCI_AR71XX
++ bool "USB OHCI support for Atheros AR71xx"
++ depends on USB_OHCI_HCD && ATHEROS_AR71XX
++ default y
++ help
++ Support for Atheros AR71xx built-in OHCI controller
++
+ config USB_OHCI_HCD_PPC_SOC
+ bool "OHCI support for on-chip PPC USB controller"
+ depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
+diff -Nur linux-2.6.36.orig/drivers/usb/host/ehci-ar71xx.c linux-2.6.36/drivers/usb/host/ehci-ar71xx.c
+--- linux-2.6.36.orig/drivers/usb/host/ehci-ar71xx.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/drivers/usb/host/ehci-ar71xx.c 2010-11-18 21:16:15.000000000 +0100
@@ -0,0 +1,242 @@
+/*
+ * Bus Glue for Atheros AR71xx built-in EHCI controller.
@@ -25192,10 +16810,10 @@ diff -Nur linux-2.6.35.7.orig/drivers/usb/host/ehci-ar71xx.c linux-2.6.35.7/driv
+ .name = "ar71xx-ehci",
+ }
+};
-diff -Nur linux-2.6.35.7.orig/drivers/usb/host/ehci-hcd.c linux-2.6.35.7/drivers/usb/host/ehci-hcd.c
---- linux-2.6.35.7.orig/drivers/usb/host/ehci-hcd.c 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/drivers/usb/host/ehci-hcd.c 2010-10-14 20:28:01.328100455 +0200
-@@ -1158,6 +1158,11 @@
+diff -Nur linux-2.6.36.orig/drivers/usb/host/ehci-hcd.c linux-2.6.36/drivers/usb/host/ehci-hcd.c
+--- linux-2.6.36.orig/drivers/usb/host/ehci-hcd.c 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/usb/host/ehci-hcd.c 2010-11-18 21:16:15.000000000 +0100
+@@ -1197,6 +1197,11 @@
#define PLATFORM_DRIVER ehci_atmel_driver
#endif
@@ -25207,1753 +16825,9 @@ diff -Nur linux-2.6.35.7.orig/drivers/usb/host/ehci-hcd.c linux-2.6.35.7/drivers
#if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
!defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \
!defined(XILINX_OF_PLATFORM_DRIVER)
-diff -Nur linux-2.6.35.7.orig/drivers/usb/host/ehci-hcd.c.orig linux-2.6.35.7/drivers/usb/host/ehci-hcd.c.orig
---- linux-2.6.35.7.orig/drivers/usb/host/ehci-hcd.c.orig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/usb/host/ehci-hcd.c.orig 2010-09-29 03:09:08.000000000 +0200
-@@ -0,0 +1,1278 @@
-+/*
-+ * Copyright (c) 2000-2004 by David Brownell
-+ *
-+ * 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.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software Foundation,
-+ * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/pci.h>
-+#include <linux/dmapool.h>
-+#include <linux/kernel.h>
-+#include <linux/delay.h>
-+#include <linux/ioport.h>
-+#include <linux/sched.h>
-+#include <linux/vmalloc.h>
-+#include <linux/errno.h>
-+#include <linux/init.h>
-+#include <linux/timer.h>
-+#include <linux/ktime.h>
-+#include <linux/list.h>
-+#include <linux/interrupt.h>
-+#include <linux/usb.h>
-+#include <linux/usb/hcd.h>
-+#include <linux/moduleparam.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/debugfs.h>
-+#include <linux/slab.h>
-+
-+#include <asm/byteorder.h>
-+#include <asm/io.h>
-+#include <asm/irq.h>
-+#include <asm/system.h>
-+#include <asm/unaligned.h>
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/*
-+ * EHCI hc_driver implementation ... experimental, incomplete.
-+ * Based on the final 1.0 register interface specification.
-+ *
-+ * USB 2.0 shows up in upcoming www.pcmcia.org technology.
-+ * First was PCMCIA, like ISA; then CardBus, which is PCI.
-+ * Next comes "CardBay", using USB 2.0 signals.
-+ *
-+ * Contains additional contributions by Brad Hards, Rory Bolt, and others.
-+ * Special thanks to Intel and VIA for providing host controllers to
-+ * test this driver on, and Cypress (including In-System Design) for
-+ * providing early devices for those host controllers to talk to!
-+ */
-+
-+#define DRIVER_AUTHOR "David Brownell"
-+#define DRIVER_DESC "USB 2.0 'Enhanced' Host Controller (EHCI) Driver"
-+
-+static const char hcd_name [] = "ehci_hcd";
-+
-+
-+#undef VERBOSE_DEBUG
-+#undef EHCI_URB_TRACE
-+
-+#ifdef DEBUG
-+#define EHCI_STATS
-+#endif
-+
-+/* magic numbers that can affect system performance */
-+#define EHCI_TUNE_CERR 3 /* 0-3 qtd retries; 0 == don't stop */
-+#define EHCI_TUNE_RL_HS 4 /* nak throttle; see 4.9 */
-+#define EHCI_TUNE_RL_TT 0
-+#define EHCI_TUNE_MULT_HS 1 /* 1-3 transactions/uframe; 4.10.3 */
-+#define EHCI_TUNE_MULT_TT 1
-+#define EHCI_TUNE_FLS 2 /* (small) 256 frame schedule */
-+
-+#define EHCI_IAA_MSECS 10 /* arbitrary */
-+#define EHCI_IO_JIFFIES (HZ/10) /* io watchdog > irq_thresh */
-+#define EHCI_ASYNC_JIFFIES (HZ/20) /* async idle timeout */
-+#define EHCI_SHRINK_FRAMES 5 /* async qh unlink delay */
-+
-+/* Initial IRQ latency: faster than hw default */
-+static int log2_irq_thresh = 0; // 0 to 6
-+module_param (log2_irq_thresh, int, S_IRUGO);
-+MODULE_PARM_DESC (log2_irq_thresh, "log2 IRQ latency, 1-64 microframes");
-+
-+/* initial park setting: slower than hw default */
-+static unsigned park = 0;
-+module_param (park, uint, S_IRUGO);
-+MODULE_PARM_DESC (park, "park setting; 1-3 back-to-back async packets");
-+
-+/* for flakey hardware, ignore overcurrent indicators */
-+static int ignore_oc = 0;
-+module_param (ignore_oc, bool, S_IRUGO);
-+MODULE_PARM_DESC (ignore_oc, "ignore bogus hardware overcurrent indications");
-+
-+#define INTR_MASK (STS_IAA | STS_FATAL | STS_PCD | STS_ERR | STS_INT)
-+
-+/*-------------------------------------------------------------------------*/
-+
-+#include "ehci.h"
-+#include "ehci-dbg.c"
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static void
-+timer_action(struct ehci_hcd *ehci, enum ehci_timer_action action)
-+{
-+ /* Don't override timeouts which shrink or (later) disable
-+ * the async ring; just the I/O watchdog. Note that if a
-+ * SHRINK were pending, OFF would never be requested.
-+ */
-+ if (timer_pending(&ehci->watchdog)
-+ && ((BIT(TIMER_ASYNC_SHRINK) | BIT(TIMER_ASYNC_OFF))
-+ & ehci->actions))
-+ return;
-+
-+ if (!test_and_set_bit(action, &ehci->actions)) {
-+ unsigned long t;
-+
-+ switch (action) {
-+ case TIMER_IO_WATCHDOG:
-+ if (!ehci->need_io_watchdog)
-+ return;
-+ t = EHCI_IO_JIFFIES;
-+ break;
-+ case TIMER_ASYNC_OFF:
-+ t = EHCI_ASYNC_JIFFIES;
-+ break;
-+ /* case TIMER_ASYNC_SHRINK: */
-+ default:
-+ /* add a jiffie since we synch against the
-+ * 8 KHz uframe counter.
-+ */
-+ t = DIV_ROUND_UP(EHCI_SHRINK_FRAMES * HZ, 1000) + 1;
-+ break;
-+ }
-+ mod_timer(&ehci->watchdog, t + jiffies);
-+ }
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/*
-+ * handshake - spin reading hc until handshake completes or fails
-+ * @ptr: address of hc register to be read
-+ * @mask: bits to look at in result of read
-+ * @done: value of those bits when handshake succeeds
-+ * @usec: timeout in microseconds
-+ *
-+ * Returns negative errno, or zero on success
-+ *
-+ * Success happens when the "mask" bits have the specified value (hardware
-+ * handshake done). There are two failure modes: "usec" have passed (major
-+ * hardware flakeout), or the register reads as all-ones (hardware removed).
-+ *
-+ * That last failure should_only happen in cases like physical cardbus eject
-+ * before driver shutdown. But it also seems to be caused by bugs in cardbus
-+ * bridge shutdown: shutting down the bridge before the devices using it.
-+ */
-+static int handshake (struct ehci_hcd *ehci, void __iomem *ptr,
-+ u32 mask, u32 done, int usec)
-+{
-+ u32 result;
-+
-+ do {
-+ result = ehci_readl(ehci, ptr);
-+ if (result == ~(u32)0) /* card removed */
-+ return -ENODEV;
-+ result &= mask;
-+ if (result == done)
-+ return 0;
-+ udelay (1);
-+ usec--;
-+ } while (usec > 0);
-+ return -ETIMEDOUT;
-+}
-+
-+/* force HC to halt state from unknown (EHCI spec section 2.3) */
-+static int ehci_halt (struct ehci_hcd *ehci)
-+{
-+ u32 temp = ehci_readl(ehci, &ehci->regs->status);
-+
-+ /* disable any irqs left enabled by previous code */
-+ ehci_writel(ehci, 0, &ehci->regs->intr_enable);
-+
-+ if ((temp & STS_HALT) != 0)
-+ return 0;
-+
-+ temp = ehci_readl(ehci, &ehci->regs->command);
-+ temp &= ~CMD_RUN;
-+ ehci_writel(ehci, temp, &ehci->regs->command);
-+ return handshake (ehci, &ehci->regs->status,
-+ STS_HALT, STS_HALT, 16 * 125);
-+}
-+
-+static int handshake_on_error_set_halt(struct ehci_hcd *ehci, void __iomem *ptr,
-+ u32 mask, u32 done, int usec)
-+{
-+ int error;
-+
-+ error = handshake(ehci, ptr, mask, done, usec);
-+ if (error) {
-+ ehci_halt(ehci);
-+ ehci_to_hcd(ehci)->state = HC_STATE_HALT;
-+ ehci_err(ehci, "force halt; handshake %p %08x %08x -> %d\n",
-+ ptr, mask, done, error);
-+ }
-+
-+ return error;
-+}
-+
-+/* put TDI/ARC silicon into EHCI mode */
-+static void tdi_reset (struct ehci_hcd *ehci)
-+{
-+ u32 __iomem *reg_ptr;
-+ u32 tmp;
-+
-+ reg_ptr = (u32 __iomem *)(((u8 __iomem *)ehci->regs) + USBMODE);
-+ tmp = ehci_readl(ehci, reg_ptr);
-+ tmp |= USBMODE_CM_HC;
-+ /* The default byte access to MMR space is LE after
-+ * controller reset. Set the required endian mode
-+ * for transfer buffers to match the host microprocessor
-+ */
-+ if (ehci_big_endian_mmio(ehci))
-+ tmp |= USBMODE_BE;
-+ ehci_writel(ehci, tmp, reg_ptr);
-+}
-+
-+/* reset a non-running (STS_HALT == 1) controller */
-+static int ehci_reset (struct ehci_hcd *ehci)
-+{
-+ int retval;
-+ u32 command = ehci_readl(ehci, &ehci->regs->command);
-+
-+ /* If the EHCI debug controller is active, special care must be
-+ * taken before and after a host controller reset */
-+ if (ehci->debug && !dbgp_reset_prep())
-+ ehci->debug = NULL;
-+
-+ command |= CMD_RESET;
-+ dbg_cmd (ehci, "reset", command);
-+ ehci_writel(ehci, command, &ehci->regs->command);
-+ ehci_to_hcd(ehci)->state = HC_STATE_HALT;
-+ ehci->next_statechange = jiffies;
-+ retval = handshake (ehci, &ehci->regs->command,
-+ CMD_RESET, 0, 250 * 1000);
-+
-+ if (ehci->has_hostpc) {
-+ ehci_writel(ehci, USBMODE_EX_HC | USBMODE_EX_VBPS,
-+ (u32 __iomem *)(((u8 *)ehci->regs) + USBMODE_EX));
-+ ehci_writel(ehci, TXFIFO_DEFAULT,
-+ (u32 __iomem *)(((u8 *)ehci->regs) + TXFILLTUNING));
-+ }
-+ if (retval)
-+ return retval;
-+
-+ if (ehci_is_TDI(ehci))
-+ tdi_reset (ehci);
-+
-+ if (ehci->debug)
-+ dbgp_external_startup();
-+
-+ return retval;
-+}
-+
-+/* idle the controller (from running) */
-+static void ehci_quiesce (struct ehci_hcd *ehci)
-+{
-+ u32 temp;
-+
-+#ifdef DEBUG
-+ if (!HC_IS_RUNNING (ehci_to_hcd(ehci)->state))
-+ BUG ();
-+#endif
-+
-+ /* wait for any schedule enables/disables to take effect */
-+ temp = ehci_readl(ehci, &ehci->regs->command) << 10;
-+ temp &= STS_ASS | STS_PSS;
-+ if (handshake_on_error_set_halt(ehci, &ehci->regs->status,
-+ STS_ASS | STS_PSS, temp, 16 * 125))
-+ return;
-+
-+ /* then disable anything that's still active */
-+ temp = ehci_readl(ehci, &ehci->regs->command);
-+ temp &= ~(CMD_ASE | CMD_IAAD | CMD_PSE);
-+ ehci_writel(ehci, temp, &ehci->regs->command);
-+
-+ /* hardware can take 16 microframes to turn off ... */
-+ handshake_on_error_set_halt(ehci, &ehci->regs->status,
-+ STS_ASS | STS_PSS, 0, 16 * 125);
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static void end_unlink_async(struct ehci_hcd *ehci);
-+static void ehci_work(struct ehci_hcd *ehci);
-+
-+#include "ehci-hub.c"
-+#include "ehci-mem.c"
-+#include "ehci-q.c"
-+#include "ehci-sched.c"
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static void ehci_iaa_watchdog(unsigned long param)
-+{
-+ struct ehci_hcd *ehci = (struct ehci_hcd *) param;
-+ unsigned long flags;
-+
-+ spin_lock_irqsave (&ehci->lock, flags);
-+
-+ /* Lost IAA irqs wedge things badly; seen first with a vt8235.
-+ * So we need this watchdog, but must protect it against both
-+ * (a) SMP races against real IAA firing and retriggering, and
-+ * (b) clean HC shutdown, when IAA watchdog was pending.
-+ */
-+ if (ehci->reclaim
-+ && !timer_pending(&ehci->iaa_watchdog)
-+ && HC_IS_RUNNING(ehci_to_hcd(ehci)->state)) {
-+ u32 cmd, status;
-+
-+ /* If we get here, IAA is *REALLY* late. It's barely
-+ * conceivable that the system is so busy that CMD_IAAD
-+ * is still legitimately set, so let's be sure it's
-+ * clear before we read STS_IAA. (The HC should clear
-+ * CMD_IAAD when it sets STS_IAA.)
-+ */
-+ cmd = ehci_readl(ehci, &ehci->regs->command);
-+ if (cmd & CMD_IAAD)
-+ ehci_writel(ehci, cmd & ~CMD_IAAD,
-+ &ehci->regs->command);
-+
-+ /* If IAA is set here it either legitimately triggered
-+ * before we cleared IAAD above (but _way_ late, so we'll
-+ * still count it as lost) ... or a silicon erratum:
-+ * - VIA seems to set IAA without triggering the IRQ;
-+ * - IAAD potentially cleared without setting IAA.
-+ */
-+ status = ehci_readl(ehci, &ehci->regs->status);
-+ if ((status & STS_IAA) || !(cmd & CMD_IAAD)) {
-+ COUNT (ehci->stats.lost_iaa);
-+ ehci_writel(ehci, STS_IAA, &ehci->regs->status);
-+ }
-+
-+ ehci_vdbg(ehci, "IAA watchdog: status %x cmd %x\n",
-+ status, cmd);
-+ end_unlink_async(ehci);
-+ }
-+
-+ spin_unlock_irqrestore(&ehci->lock, flags);
-+}
-+
-+static void ehci_watchdog(unsigned long param)
-+{
-+ struct ehci_hcd *ehci = (struct ehci_hcd *) param;
-+ unsigned long flags;
-+
-+ spin_lock_irqsave(&ehci->lock, flags);
-+
-+ /* stop async processing after it's idled a bit */
-+ if (test_bit (TIMER_ASYNC_OFF, &ehci->actions))
-+ start_unlink_async (ehci, ehci->async);
-+
-+ /* ehci could run by timer, without IRQs ... */
-+ ehci_work (ehci);
-+
-+ spin_unlock_irqrestore (&ehci->lock, flags);
-+}
-+
-+/* On some systems, leaving remote wakeup enabled prevents system shutdown.
-+ * The firmware seems to think that powering off is a wakeup event!
-+ * This routine turns off remote wakeup and everything else, on all ports.
-+ */
-+static void ehci_turn_off_all_ports(struct ehci_hcd *ehci)
-+{
-+ int port = HCS_N_PORTS(ehci->hcs_params);
-+
-+ while (port--)
-+ ehci_writel(ehci, PORT_RWC_BITS,
-+ &ehci->regs->port_status[port]);
-+}
-+
-+/*
-+ * Halt HC, turn off all ports, and let the BIOS use the companion controllers.
-+ * Should be called with ehci->lock held.
-+ */
-+static void ehci_silence_controller(struct ehci_hcd *ehci)
-+{
-+ ehci_halt(ehci);
-+ ehci_turn_off_all_ports(ehci);
-+
-+ /* make BIOS/etc use companion controller during reboot */
-+ ehci_writel(ehci, 0, &ehci->regs->configured_flag);
-+
-+ /* unblock posted writes */
-+ ehci_readl(ehci, &ehci->regs->configured_flag);
-+}
-+
-+/* ehci_shutdown kick in for silicon on any bus (not just pci, etc).
-+ * This forcibly disables dma and IRQs, helping kexec and other cases
-+ * where the next system software may expect clean state.
-+ */
-+static void ehci_shutdown(struct usb_hcd *hcd)
-+{
-+ struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-+
-+ del_timer_sync(&ehci->watchdog);
-+ del_timer_sync(&ehci->iaa_watchdog);
-+
-+ spin_lock_irq(&ehci->lock);
-+ ehci_silence_controller(ehci);
-+ spin_unlock_irq(&ehci->lock);
-+}
-+
-+static void ehci_port_power (struct ehci_hcd *ehci, int is_on)
-+{
-+ unsigned port;
-+
-+ if (!HCS_PPC (ehci->hcs_params))
-+ return;
-+
-+ ehci_dbg (ehci, "...power%s ports...\n", is_on ? "up" : "down");
-+ for (port = HCS_N_PORTS (ehci->hcs_params); port > 0; )
-+ (void) ehci_hub_control(ehci_to_hcd(ehci),
-+ is_on ? SetPortFeature : ClearPortFeature,
-+ USB_PORT_FEAT_POWER,
-+ port--, NULL, 0);
-+ /* Flush those writes */
-+ ehci_readl(ehci, &ehci->regs->command);
-+ msleep(20);
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/*
-+ * ehci_work is called from some interrupts, timers, and so on.
-+ * it calls driver completion functions, after dropping ehci->lock.
-+ */
-+static void ehci_work (struct ehci_hcd *ehci)
-+{
-+ timer_action_done (ehci, TIMER_IO_WATCHDOG);
-+
-+ /* another CPU may drop ehci->lock during a schedule scan while
-+ * it reports urb completions. this flag guards against bogus
-+ * attempts at re-entrant schedule scanning.
-+ */
-+ if (ehci->scanning)
-+ return;
-+ ehci->scanning = 1;
-+ scan_async (ehci);
-+ if (ehci->next_uframe != -1)
-+ scan_periodic (ehci);
-+ ehci->scanning = 0;
-+
-+ /* the IO watchdog guards against hardware or driver bugs that
-+ * misplace IRQs, and should let us run completely without IRQs.
-+ * such lossage has been observed on both VT6202 and VT8235.
-+ */
-+ if (HC_IS_RUNNING (ehci_to_hcd(ehci)->state) &&
-+ (ehci->async->qh_next.ptr != NULL ||
-+ ehci->periodic_sched != 0))
-+ timer_action (ehci, TIMER_IO_WATCHDOG);
-+}
-+
-+/*
-+ * Called when the ehci_hcd module is removed.
-+ */
-+static void ehci_stop (struct usb_hcd *hcd)
-+{
-+ struct ehci_hcd *ehci = hcd_to_ehci (hcd);
-+
-+ ehci_dbg (ehci, "stop\n");
-+
-+ /* no more interrupts ... */
-+ del_timer_sync (&ehci->watchdog);
-+ del_timer_sync(&ehci->iaa_watchdog);
-+
-+ spin_lock_irq(&ehci->lock);
-+ if (HC_IS_RUNNING (hcd->state))
-+ ehci_quiesce (ehci);
-+
-+ ehci_silence_controller(ehci);
-+ ehci_reset (ehci);
-+ spin_unlock_irq(&ehci->lock);
-+
-+ remove_companion_file(ehci);
-+ remove_debug_files (ehci);
-+
-+ /* root hub is shut down separately (first, when possible) */
-+ spin_lock_irq (&ehci->lock);
-+ if (ehci->async)
-+ ehci_work (ehci);
-+ spin_unlock_irq (&ehci->lock);
-+ ehci_mem_cleanup (ehci);
-+
-+#ifdef EHCI_STATS
-+ ehci_dbg (ehci, "irq normal %ld err %ld reclaim %ld (lost %ld)\n",
-+ ehci->stats.normal, ehci->stats.error, ehci->stats.reclaim,
-+ ehci->stats.lost_iaa);
-+ ehci_dbg (ehci, "complete %ld unlink %ld\n",
-+ ehci->stats.complete, ehci->stats.unlink);
-+#endif
-+
-+ dbg_status (ehci, "ehci_stop completed",
-+ ehci_readl(ehci, &ehci->regs->status));
-+}
-+
-+/* one-time init, only for memory state */
-+static int ehci_init(struct usb_hcd *hcd)
-+{
-+ struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-+ u32 temp;
-+ int retval;
-+ u32 hcc_params;
-+ struct ehci_qh_hw *hw;
-+
-+ spin_lock_init(&ehci->lock);
-+
-+ /*
-+ * keep io watchdog by default, those good HCDs could turn off it later
-+ */
-+ ehci->need_io_watchdog = 1;
-+ init_timer(&ehci->watchdog);
-+ ehci->watchdog.function = ehci_watchdog;
-+ ehci->watchdog.data = (unsigned long) ehci;
-+
-+ init_timer(&ehci->iaa_watchdog);
-+ ehci->iaa_watchdog.function = ehci_iaa_watchdog;
-+ ehci->iaa_watchdog.data = (unsigned long) ehci;
-+
-+ /*
-+ * hw default: 1K periodic list heads, one per frame.
-+ * periodic_size can shrink by USBCMD update if hcc_params allows.
-+ */
-+ ehci->periodic_size = DEFAULT_I_TDPS;
-+ INIT_LIST_HEAD(&ehci->cached_itd_list);
-+ INIT_LIST_HEAD(&ehci->cached_sitd_list);
-+ if ((retval = ehci_mem_init(ehci, GFP_KERNEL)) < 0)
-+ return retval;
-+
-+ /* controllers may cache some of the periodic schedule ... */
-+ hcc_params = ehci_readl(ehci, &ehci->caps->hcc_params);
-+ if (HCC_ISOC_CACHE(hcc_params)) // full frame cache
-+ ehci->i_thresh = 2 + 8;
-+ else // N microframes cached
-+ ehci->i_thresh = 2 + HCC_ISOC_THRES(hcc_params);
-+
-+ ehci->reclaim = NULL;
-+ ehci->next_uframe = -1;
-+ ehci->clock_frame = -1;
-+
-+ /*
-+ * dedicate a qh for the async ring head, since we couldn't unlink
-+ * a 'real' qh without stopping the async schedule [4.8]. use it
-+ * as the 'reclamation list head' too.
-+ * its dummy is used in hw_alt_next of many tds, to prevent the qh
-+ * from automatically advancing to the next td after short reads.
-+ */
-+ ehci->async->qh_next.qh = NULL;
-+ hw = ehci->async->hw;
-+ hw->hw_next = QH_NEXT(ehci, ehci->async->qh_dma);
-+ hw->hw_info1 = cpu_to_hc32(ehci, QH_HEAD);
-+ hw->hw_token = cpu_to_hc32(ehci, QTD_STS_HALT);
-+ hw->hw_qtd_next = EHCI_LIST_END(ehci);
-+ ehci->async->qh_state = QH_STATE_LINKED;
-+ hw->hw_alt_next = QTD_NEXT(ehci, ehci->async->dummy->qtd_dma);
-+
-+ /* clear interrupt enables, set irq latency */
-+ if (log2_irq_thresh < 0 || log2_irq_thresh > 6)
-+ log2_irq_thresh = 0;
-+ temp = 1 << (16 + log2_irq_thresh);
-+ if (HCC_CANPARK(hcc_params)) {
-+ /* HW default park == 3, on hardware that supports it (like
-+ * NVidia and ALI silicon), maximizes throughput on the async
-+ * schedule by avoiding QH fetches between transfers.
-+ *
-+ * With fast usb storage devices and NForce2, "park" seems to
-+ * make problems: throughput reduction (!), data errors...
-+ */
-+ if (park) {
-+ park = min(park, (unsigned) 3);
-+ temp |= CMD_PARK;
-+ temp |= park << 8;
-+ }
-+ ehci_dbg(ehci, "park %d\n", park);
-+ }
-+ if (HCC_PGM_FRAMELISTLEN(hcc_params)) {
-+ /* periodic schedule size can be smaller than default */
-+ temp &= ~(3 << 2);
-+ temp |= (EHCI_TUNE_FLS << 2);
-+ switch (EHCI_TUNE_FLS) {
-+ case 0: ehci->periodic_size = 1024; break;
-+ case 1: ehci->periodic_size = 512; break;
-+ case 2: ehci->periodic_size = 256; break;
-+ default: BUG();
-+ }
-+ }
-+ ehci->command = temp;
-+
-+ /* Accept arbitrarily long scatter-gather lists */
-+ hcd->self.sg_tablesize = ~0;
-+ return 0;
-+}
-+
-+/* start HC running; it's halted, ehci_init() has been run (once) */
-+static int ehci_run (struct usb_hcd *hcd)
-+{
-+ struct ehci_hcd *ehci = hcd_to_ehci (hcd);
-+ int retval;
-+ u32 temp;
-+ u32 hcc_params;
-+
-+ hcd->uses_new_polling = 1;
-+ hcd->poll_rh = 0;
-+
-+ /* EHCI spec section 4.1 */
-+ if ((retval = ehci_reset(ehci)) != 0) {
-+ ehci_mem_cleanup(ehci);
-+ return retval;
-+ }
-+ ehci_writel(ehci, ehci->periodic_dma, &ehci->regs->frame_list);
-+ ehci_writel(ehci, (u32)ehci->async->qh_dma, &ehci->regs->async_next);
-+
-+ /*
-+ * hcc_params controls whether ehci->regs->segment must (!!!)
-+ * be used; it constrains QH/ITD/SITD and QTD locations.
-+ * pci_pool consistent memory always uses segment zero.
-+ * streaming mappings for I/O buffers, like pci_map_single(),
-+ * can return segments above 4GB, if the device allows.
-+ *
-+ * NOTE: the dma mask is visible through dma_supported(), so
-+ * drivers can pass this info along ... like NETIF_F_HIGHDMA,
-+ * Scsi_Host.highmem_io, and so forth. It's readonly to all
-+ * host side drivers though.
-+ */
-+ hcc_params = ehci_readl(ehci, &ehci->caps->hcc_params);
-+ if (HCC_64BIT_ADDR(hcc_params)) {
-+ ehci_writel(ehci, 0, &ehci->regs->segment);
-+#if 0
-+// this is deeply broken on almost all architectures
-+ if (!dma_set_mask(hcd->self.controller, DMA_BIT_MASK(64)))
-+ ehci_info(ehci, "enabled 64bit DMA\n");
-+#endif
-+ }
-+
-+
-+ // Philips, Intel, and maybe others need CMD_RUN before the
-+ // root hub will detect new devices (why?); NEC doesn't
-+ ehci->command &= ~(CMD_LRESET|CMD_IAAD|CMD_PSE|CMD_ASE|CMD_RESET);
-+ ehci->command |= CMD_RUN;
-+ ehci_writel(ehci, ehci->command, &ehci->regs->command);
-+ dbg_cmd (ehci, "init", ehci->command);
-+
-+ /*
-+ * Start, enabling full USB 2.0 functionality ... usb 1.1 devices
-+ * are explicitly handed to companion controller(s), so no TT is
-+ * involved with the root hub. (Except where one is integrated,
-+ * and there's no companion controller unless maybe for USB OTG.)
-+ *
-+ * Turning on the CF flag will transfer ownership of all ports
-+ * from the companions to the EHCI controller. If any of the
-+ * companions are in the middle of a port reset at the time, it
-+ * could cause trouble. Write-locking ehci_cf_port_reset_rwsem
-+ * guarantees that no resets are in progress. After we set CF,
-+ * a short delay lets the hardware catch up; new resets shouldn't
-+ * be started before the port switching actions could complete.
-+ */
-+ down_write(&ehci_cf_port_reset_rwsem);
-+ hcd->state = HC_STATE_RUNNING;
-+ ehci_writel(ehci, FLAG_CF, &ehci->regs->configured_flag);
-+ ehci_readl(ehci, &ehci->regs->command); /* unblock posted writes */
-+ msleep(5);
-+ up_write(&ehci_cf_port_reset_rwsem);
-+ ehci->last_periodic_enable = ktime_get_real();
-+
-+ temp = HC_VERSION(ehci_readl(ehci, &ehci->caps->hc_capbase));
-+ ehci_info (ehci,
-+ "USB %x.%x started, EHCI %x.%02x%s\n",
-+ ((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f),
-+ temp >> 8, temp & 0xff,
-+ ignore_oc ? ", overcurrent ignored" : "");
-+
-+ ehci_writel(ehci, INTR_MASK,
-+ &ehci->regs->intr_enable); /* Turn On Interrupts */
-+
-+ /* GRR this is run-once init(), being done every time the HC starts.
-+ * So long as they're part of class devices, we can't do it init()
-+ * since the class device isn't created that early.
-+ */
-+ create_debug_files(ehci);
-+ create_companion_file(ehci);
-+
-+ return 0;
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static irqreturn_t ehci_irq (struct usb_hcd *hcd)
-+{
-+ struct ehci_hcd *ehci = hcd_to_ehci (hcd);
-+ u32 status, masked_status, pcd_status = 0, cmd;
-+ int bh;
-+
-+ spin_lock (&ehci->lock);
-+
-+ status = ehci_readl(ehci, &ehci->regs->status);
-+
-+ /* e.g. cardbus physical eject */
-+ if (status == ~(u32) 0) {
-+ ehci_dbg (ehci, "device removed\n");
-+ goto dead;
-+ }
-+
-+ masked_status = status & INTR_MASK;
-+ if (!masked_status) { /* irq sharing? */
-+ spin_unlock(&ehci->lock);
-+ return IRQ_NONE;
-+ }
-+
-+ /* clear (just) interrupts */
-+ ehci_writel(ehci, masked_status, &ehci->regs->status);
-+ cmd = ehci_readl(ehci, &ehci->regs->command);
-+ bh = 0;
-+
-+#ifdef VERBOSE_DEBUG
-+ /* unrequested/ignored: Frame List Rollover */
-+ dbg_status (ehci, "irq", status);
-+#endif
-+
-+ /* INT, ERR, and IAA interrupt rates can be throttled */
-+
-+ /* normal [4.15.1.2] or error [4.15.1.1] completion */
-+ if (likely ((status & (STS_INT|STS_ERR)) != 0)) {
-+ if (likely ((status & STS_ERR) == 0))
-+ COUNT (ehci->stats.normal);
-+ else
-+ COUNT (ehci->stats.error);
-+ bh = 1;
-+ }
-+
-+ /* complete the unlinking of some qh [4.15.2.3] */
-+ if (status & STS_IAA) {
-+ /* guard against (alleged) silicon errata */
-+ if (cmd & CMD_IAAD) {
-+ ehci_writel(ehci, cmd & ~CMD_IAAD,
-+ &ehci->regs->command);
-+ ehci_dbg(ehci, "IAA with IAAD still set?\n");
-+ }
-+ if (ehci->reclaim) {
-+ COUNT(ehci->stats.reclaim);
-+ end_unlink_async(ehci);
-+ } else
-+ ehci_dbg(ehci, "IAA with nothing to reclaim?\n");
-+ }
-+
-+ /* remote wakeup [4.3.1] */
-+ if (status & STS_PCD) {
-+ unsigned i = HCS_N_PORTS (ehci->hcs_params);
-+
-+ /* kick root hub later */
-+ pcd_status = status;
-+
-+ /* resume root hub? */
-+ if (!(cmd & CMD_RUN))
-+ usb_hcd_resume_root_hub(hcd);
-+
-+ while (i--) {
-+ int pstatus = ehci_readl(ehci,
-+ &ehci->regs->port_status [i]);
-+
-+ if (pstatus & PORT_OWNER)
-+ continue;
-+ if (!(test_bit(i, &ehci->suspended_ports) &&
-+ ((pstatus & PORT_RESUME) ||
-+ !(pstatus & PORT_SUSPEND)) &&
-+ (pstatus & PORT_PE) &&
-+ ehci->reset_done[i] == 0))
-+ continue;
-+
-+ /* start 20 msec resume signaling from this port,
-+ * and make khubd collect PORT_STAT_C_SUSPEND to
-+ * stop that signaling. Use 5 ms extra for safety,
-+ * like usb_port_resume() does.
-+ */
-+ ehci->reset_done[i] = jiffies + msecs_to_jiffies(25);
-+ ehci_dbg (ehci, "port %d remote wakeup\n", i + 1);
-+ mod_timer(&hcd->rh_timer, ehci->reset_done[i]);
-+ }
-+ }
-+
-+ /* PCI errors [4.15.2.4] */
-+ if (unlikely ((status & STS_FATAL) != 0)) {
-+ ehci_err(ehci, "fatal error\n");
-+ dbg_cmd(ehci, "fatal", cmd);
-+ dbg_status(ehci, "fatal", status);
-+ ehci_halt(ehci);
-+dead:
-+ ehci_reset(ehci);
-+ ehci_writel(ehci, 0, &ehci->regs->configured_flag);
-+ /* generic layer kills/unlinks all urbs, then
-+ * uses ehci_stop to clean up the rest
-+ */
-+ bh = 1;
-+ }
-+
-+ if (bh)
-+ ehci_work (ehci);
-+ spin_unlock (&ehci->lock);
-+ if (pcd_status)
-+ usb_hcd_poll_rh_status(hcd);
-+ return IRQ_HANDLED;
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/*
-+ * non-error returns are a promise to giveback() the urb later
-+ * we drop ownership so next owner (or urb unlink) can get it
-+ *
-+ * urb + dev is in hcd.self.controller.urb_list
-+ * we're queueing TDs onto software and hardware lists
-+ *
-+ * hcd-specific init for hcpriv hasn't been done yet
-+ *
-+ * NOTE: control, bulk, and interrupt share the same code to append TDs
-+ * to a (possibly active) QH, and the same QH scanning code.
-+ */
-+static int ehci_urb_enqueue (
-+ struct usb_hcd *hcd,
-+ struct urb *urb,
-+ gfp_t mem_flags
-+) {
-+ struct ehci_hcd *ehci = hcd_to_ehci (hcd);
-+ struct list_head qtd_list;
-+
-+ INIT_LIST_HEAD (&qtd_list);
-+
-+ switch (usb_pipetype (urb->pipe)) {
-+ case PIPE_CONTROL:
-+ /* qh_completions() code doesn't handle all the fault cases
-+ * in multi-TD control transfers. Even 1KB is rare anyway.
-+ */
-+ if (urb->transfer_buffer_length > (16 * 1024))
-+ return -EMSGSIZE;
-+ /* FALLTHROUGH */
-+ /* case PIPE_BULK: */
-+ default:
-+ if (!qh_urb_transaction (ehci, urb, &qtd_list, mem_flags))
-+ return -ENOMEM;
-+ return submit_async(ehci, urb, &qtd_list, mem_flags);
-+
-+ case PIPE_INTERRUPT:
-+ if (!qh_urb_transaction (ehci, urb, &qtd_list, mem_flags))
-+ return -ENOMEM;
-+ return intr_submit(ehci, urb, &qtd_list, mem_flags);
-+
-+ case PIPE_ISOCHRONOUS:
-+ if (urb->dev->speed == USB_SPEED_HIGH)
-+ return itd_submit (ehci, urb, mem_flags);
-+ else
-+ return sitd_submit (ehci, urb, mem_flags);
-+ }
-+}
-+
-+static void unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh)
-+{
-+ /* failfast */
-+ if (!HC_IS_RUNNING(ehci_to_hcd(ehci)->state) && ehci->reclaim)
-+ end_unlink_async(ehci);
-+
-+ /* If the QH isn't linked then there's nothing we can do
-+ * unless we were called during a giveback, in which case
-+ * qh_completions() has to deal with it.
-+ */
-+ if (qh->qh_state != QH_STATE_LINKED) {
-+ if (qh->qh_state == QH_STATE_COMPLETING)
-+ qh->needs_rescan = 1;
-+ return;
-+ }
-+
-+ /* defer till later if busy */
-+ if (ehci->reclaim) {
-+ struct ehci_qh *last;
-+
-+ for (last = ehci->reclaim;
-+ last->reclaim;
-+ last = last->reclaim)
-+ continue;
-+ qh->qh_state = QH_STATE_UNLINK_WAIT;
-+ last->reclaim = qh;
-+
-+ /* start IAA cycle */
-+ } else
-+ start_unlink_async (ehci, qh);
-+}
-+
-+/* remove from hardware lists
-+ * completions normally happen asynchronously
-+ */
-+
-+static int ehci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
-+{
-+ struct ehci_hcd *ehci = hcd_to_ehci (hcd);
-+ struct ehci_qh *qh;
-+ unsigned long flags;
-+ int rc;
-+
-+ spin_lock_irqsave (&ehci->lock, flags);
-+ rc = usb_hcd_check_unlink_urb(hcd, urb, status);
-+ if (rc)
-+ goto done;
-+
-+ switch (usb_pipetype (urb->pipe)) {
-+ // case PIPE_CONTROL:
-+ // case PIPE_BULK:
-+ default:
-+ qh = (struct ehci_qh *) urb->hcpriv;
-+ if (!qh)
-+ break;
-+ switch (qh->qh_state) {
-+ case QH_STATE_LINKED:
-+ case QH_STATE_COMPLETING:
-+ unlink_async(ehci, qh);
-+ break;
-+ case QH_STATE_UNLINK:
-+ case QH_STATE_UNLINK_WAIT:
-+ /* already started */
-+ break;
-+ case QH_STATE_IDLE:
-+ /* QH might be waiting for a Clear-TT-Buffer */
-+ qh_completions(ehci, qh);
-+ break;
-+ }
-+ break;
-+
-+ case PIPE_INTERRUPT:
-+ qh = (struct ehci_qh *) urb->hcpriv;
-+ if (!qh)
-+ break;
-+ switch (qh->qh_state) {
-+ case QH_STATE_LINKED:
-+ case QH_STATE_COMPLETING:
-+ intr_deschedule (ehci, qh);
-+ break;
-+ case QH_STATE_IDLE:
-+ qh_completions (ehci, qh);
-+ break;
-+ default:
-+ ehci_dbg (ehci, "bogus qh %p state %d\n",
-+ qh, qh->qh_state);
-+ goto done;
-+ }
-+ break;
-+
-+ case PIPE_ISOCHRONOUS:
-+ // itd or sitd ...
-+
-+ // wait till next completion, do it then.
-+ // completion irqs can wait up to 1024 msec,
-+ break;
-+ }
-+done:
-+ spin_unlock_irqrestore (&ehci->lock, flags);
-+ return rc;
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+// bulk qh holds the data toggle
-+
-+static void
-+ehci_endpoint_disable (struct usb_hcd *hcd, struct usb_host_endpoint *ep)
-+{
-+ struct ehci_hcd *ehci = hcd_to_ehci (hcd);
-+ unsigned long flags;
-+ struct ehci_qh *qh, *tmp;
-+
-+ /* ASSERT: any requests/urbs are being unlinked */
-+ /* ASSERT: nobody can be submitting urbs for this any more */
-+
-+rescan:
-+ spin_lock_irqsave (&ehci->lock, flags);
-+ qh = ep->hcpriv;
-+ if (!qh)
-+ goto done;
-+
-+ /* endpoints can be iso streams. for now, we don't
-+ * accelerate iso completions ... so spin a while.
-+ */
-+ if (qh->hw == NULL) {
-+ ehci_vdbg (ehci, "iso delay\n");
-+ goto idle_timeout;
-+ }
-+
-+ if (!HC_IS_RUNNING (hcd->state))
-+ qh->qh_state = QH_STATE_IDLE;
-+ switch (qh->qh_state) {
-+ case QH_STATE_LINKED:
-+ case QH_STATE_COMPLETING:
-+ for (tmp = ehci->async->qh_next.qh;
-+ tmp && tmp != qh;
-+ tmp = tmp->qh_next.qh)
-+ continue;
-+ /* periodic qh self-unlinks on empty */
-+ if (!tmp)
-+ goto nogood;
-+ unlink_async (ehci, qh);
-+ /* FALL THROUGH */
-+ case QH_STATE_UNLINK: /* wait for hw to finish? */
-+ case QH_STATE_UNLINK_WAIT:
-+idle_timeout:
-+ spin_unlock_irqrestore (&ehci->lock, flags);
-+ schedule_timeout_uninterruptible(1);
-+ goto rescan;
-+ case QH_STATE_IDLE: /* fully unlinked */
-+ if (qh->clearing_tt)
-+ goto idle_timeout;
-+ if (list_empty (&qh->qtd_list)) {
-+ qh_put (qh);
-+ break;
-+ }
-+ /* else FALL THROUGH */
-+ default:
-+nogood:
-+ /* caller was supposed to have unlinked any requests;
-+ * that's not our job. just leak this memory.
-+ */
-+ ehci_err (ehci, "qh %p (#%02x) state %d%s\n",
-+ qh, ep->desc.bEndpointAddress, qh->qh_state,
-+ list_empty (&qh->qtd_list) ? "" : "(has tds)");
-+ break;
-+ }
-+ ep->hcpriv = NULL;
-+done:
-+ spin_unlock_irqrestore (&ehci->lock, flags);
-+ return;
-+}
-+
-+static void
-+ehci_endpoint_reset(struct usb_hcd *hcd, struct usb_host_endpoint *ep)
-+{
-+ struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-+ struct ehci_qh *qh;
-+ int eptype = usb_endpoint_type(&ep->desc);
-+ int epnum = usb_endpoint_num(&ep->desc);
-+ int is_out = usb_endpoint_dir_out(&ep->desc);
-+ unsigned long flags;
-+
-+ if (eptype != USB_ENDPOINT_XFER_BULK && eptype != USB_ENDPOINT_XFER_INT)
-+ return;
-+
-+ spin_lock_irqsave(&ehci->lock, flags);
-+ qh = ep->hcpriv;
-+
-+ /* For Bulk and Interrupt endpoints we maintain the toggle state
-+ * in the hardware; the toggle bits in udev aren't used at all.
-+ * When an endpoint is reset by usb_clear_halt() we must reset
-+ * the toggle bit in the QH.
-+ */
-+ if (qh) {
-+ usb_settoggle(qh->dev, epnum, is_out, 0);
-+ if (!list_empty(&qh->qtd_list)) {
-+ WARN_ONCE(1, "clear_halt for a busy endpoint\n");
-+ } else if (qh->qh_state == QH_STATE_LINKED ||
-+ qh->qh_state == QH_STATE_COMPLETING) {
-+
-+ /* The toggle value in the QH can't be updated
-+ * while the QH is active. Unlink it now;
-+ * re-linking will call qh_refresh().
-+ */
-+ if (eptype == USB_ENDPOINT_XFER_BULK)
-+ unlink_async(ehci, qh);
-+ else
-+ intr_deschedule(ehci, qh);
-+ }
-+ }
-+ spin_unlock_irqrestore(&ehci->lock, flags);
-+}
-+
-+static int ehci_get_frame (struct usb_hcd *hcd)
-+{
-+ struct ehci_hcd *ehci = hcd_to_ehci (hcd);
-+ return (ehci_readl(ehci, &ehci->regs->frame_index) >> 3) %
-+ ehci->periodic_size;
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+MODULE_DESCRIPTION(DRIVER_DESC);
-+MODULE_AUTHOR (DRIVER_AUTHOR);
-+MODULE_LICENSE ("GPL");
-+
-+#ifdef CONFIG_PCI
-+#include "ehci-pci.c"
-+#define PCI_DRIVER ehci_pci_driver
-+#endif
-+
-+#ifdef CONFIG_USB_EHCI_FSL
-+#include "ehci-fsl.c"
-+#define PLATFORM_DRIVER ehci_fsl_driver
-+#endif
-+
-+#ifdef CONFIG_USB_EHCI_MXC
-+#include "ehci-mxc.c"
-+#define PLATFORM_DRIVER ehci_mxc_driver
-+#endif
-+
-+#ifdef CONFIG_SOC_AU1200
-+#include "ehci-au1xxx.c"
-+#define PLATFORM_DRIVER ehci_hcd_au1xxx_driver
-+#endif
-+
-+#ifdef CONFIG_ARCH_OMAP3
-+#include "ehci-omap.c"
-+#define PLATFORM_DRIVER ehci_hcd_omap_driver
-+#endif
-+
-+#ifdef CONFIG_PPC_PS3
-+#include "ehci-ps3.c"
-+#define PS3_SYSTEM_BUS_DRIVER ps3_ehci_driver
-+#endif
-+
-+#ifdef CONFIG_USB_EHCI_HCD_PPC_OF
-+#include "ehci-ppc-of.c"
-+#define OF_PLATFORM_DRIVER ehci_hcd_ppc_of_driver
-+#endif
-+
-+#ifdef CONFIG_XPS_USB_HCD_XILINX
-+#include "ehci-xilinx-of.c"
-+#define XILINX_OF_PLATFORM_DRIVER ehci_hcd_xilinx_of_driver
-+#endif
-+
-+#ifdef CONFIG_PLAT_ORION
-+#include "ehci-orion.c"
-+#define PLATFORM_DRIVER ehci_orion_driver
-+#endif
-+
-+#ifdef CONFIG_ARCH_IXP4XX
-+#include "ehci-ixp4xx.c"
-+#define PLATFORM_DRIVER ixp4xx_ehci_driver
-+#endif
-+
-+#ifdef CONFIG_USB_W90X900_EHCI
-+#include "ehci-w90x900.c"
-+#define PLATFORM_DRIVER ehci_hcd_w90x900_driver
-+#endif
-+
-+#ifdef CONFIG_ARCH_AT91
-+#include "ehci-atmel.c"
-+#define PLATFORM_DRIVER ehci_atmel_driver
-+#endif
-+
-+#if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
-+ !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \
-+ !defined(XILINX_OF_PLATFORM_DRIVER)
-+#error "missing bus glue for ehci-hcd"
-+#endif
-+
-+static int __init ehci_hcd_init(void)
-+{
-+ int retval = 0;
-+
-+ if (usb_disabled())
-+ return -ENODEV;
-+
-+ printk(KERN_INFO "%s: " DRIVER_DESC "\n", hcd_name);
-+ set_bit(USB_EHCI_LOADED, &usb_hcds_loaded);
-+ if (test_bit(USB_UHCI_LOADED, &usb_hcds_loaded) ||
-+ test_bit(USB_OHCI_LOADED, &usb_hcds_loaded))
-+ printk(KERN_WARNING "Warning! ehci_hcd should always be loaded"
-+ " before uhci_hcd and ohci_hcd, not after\n");
-+
-+ pr_debug("%s: block sizes: qh %Zd qtd %Zd itd %Zd sitd %Zd\n",
-+ hcd_name,
-+ sizeof(struct ehci_qh), sizeof(struct ehci_qtd),
-+ sizeof(struct ehci_itd), sizeof(struct ehci_sitd));
-+
-+#ifdef DEBUG
-+ ehci_debug_root = debugfs_create_dir("ehci", usb_debug_root);
-+ if (!ehci_debug_root) {
-+ retval = -ENOENT;
-+ goto err_debug;
-+ }
-+#endif
-+
-+#ifdef PLATFORM_DRIVER
-+ retval = platform_driver_register(&PLATFORM_DRIVER);
-+ if (retval < 0)
-+ goto clean0;
-+#endif
-+
-+#ifdef PCI_DRIVER
-+ retval = pci_register_driver(&PCI_DRIVER);
-+ if (retval < 0)
-+ goto clean1;
-+#endif
-+
-+#ifdef PS3_SYSTEM_BUS_DRIVER
-+ retval = ps3_ehci_driver_register(&PS3_SYSTEM_BUS_DRIVER);
-+ if (retval < 0)
-+ goto clean2;
-+#endif
-+
-+#ifdef OF_PLATFORM_DRIVER
-+ retval = of_register_platform_driver(&OF_PLATFORM_DRIVER);
-+ if (retval < 0)
-+ goto clean3;
-+#endif
-+
-+#ifdef XILINX_OF_PLATFORM_DRIVER
-+ retval = of_register_platform_driver(&XILINX_OF_PLATFORM_DRIVER);
-+ if (retval < 0)
-+ goto clean4;
-+#endif
-+ return retval;
-+
-+#ifdef XILINX_OF_PLATFORM_DRIVER
-+ /* of_unregister_platform_driver(&XILINX_OF_PLATFORM_DRIVER); */
-+clean4:
-+#endif
-+#ifdef OF_PLATFORM_DRIVER
-+ of_unregister_platform_driver(&OF_PLATFORM_DRIVER);
-+clean3:
-+#endif
-+#ifdef PS3_SYSTEM_BUS_DRIVER
-+ ps3_ehci_driver_unregister(&PS3_SYSTEM_BUS_DRIVER);
-+clean2:
-+#endif
-+#ifdef PCI_DRIVER
-+ pci_unregister_driver(&PCI_DRIVER);
-+clean1:
-+#endif
-+#ifdef PLATFORM_DRIVER
-+ platform_driver_unregister(&PLATFORM_DRIVER);
-+clean0:
-+#endif
-+#ifdef DEBUG
-+ debugfs_remove(ehci_debug_root);
-+ ehci_debug_root = NULL;
-+err_debug:
-+#endif
-+ clear_bit(USB_EHCI_LOADED, &usb_hcds_loaded);
-+ return retval;
-+}
-+module_init(ehci_hcd_init);
-+
-+static void __exit ehci_hcd_cleanup(void)
-+{
-+#ifdef XILINX_OF_PLATFORM_DRIVER
-+ of_unregister_platform_driver(&XILINX_OF_PLATFORM_DRIVER);
-+#endif
-+#ifdef OF_PLATFORM_DRIVER
-+ of_unregister_platform_driver(&OF_PLATFORM_DRIVER);
-+#endif
-+#ifdef PLATFORM_DRIVER
-+ platform_driver_unregister(&PLATFORM_DRIVER);
-+#endif
-+#ifdef PCI_DRIVER
-+ pci_unregister_driver(&PCI_DRIVER);
-+#endif
-+#ifdef PS3_SYSTEM_BUS_DRIVER
-+ ps3_ehci_driver_unregister(&PS3_SYSTEM_BUS_DRIVER);
-+#endif
-+#ifdef DEBUG
-+ debugfs_remove(ehci_debug_root);
-+#endif
-+ clear_bit(USB_EHCI_LOADED, &usb_hcds_loaded);
-+}
-+module_exit(ehci_hcd_cleanup);
-+
-diff -Nur linux-2.6.35.7.orig/drivers/usb/host/Kconfig linux-2.6.35.7/drivers/usb/host/Kconfig
---- linux-2.6.35.7.orig/drivers/usb/host/Kconfig 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/drivers/usb/host/Kconfig 2010-10-14 20:28:01.385601136 +0200
-@@ -109,6 +109,13 @@
- support both high speed and full speed devices, or high speed
- devices only.
-
-+config USB_EHCI_AR71XX
-+ bool "USB EHCI support for AR71xx"
-+ depends on USB_EHCI_HCD && ATHEROS_AR71XX
-+ default y
-+ help
-+ Support for Atheros AR71xx built-in EHCI controller
-+
- config USB_EHCI_FSL
- bool "Support for Freescale on-chip EHCI USB controller"
- depends on USB_EHCI_HCD && FSL_SOC
-@@ -222,6 +229,13 @@
- Enables support for the on-chip OHCI controller on
- OMAP3 and later chips.
-
-+config USB_OHCI_AR71XX
-+ bool "USB OHCI support for Atheros AR71xx"
-+ depends on USB_OHCI_HCD && ATHEROS_AR71XX
-+ default y
-+ help
-+ Support for Atheros AR71xx built-in OHCI controller
-+
- config USB_OHCI_HCD_PPC_SOC
- bool "OHCI support for on-chip PPC USB controller"
- depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
-diff -Nur linux-2.6.35.7.orig/drivers/usb/host/Kconfig.orig linux-2.6.35.7/drivers/usb/host/Kconfig.orig
---- linux-2.6.35.7.orig/drivers/usb/host/Kconfig.orig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/usb/host/Kconfig.orig 2010-09-29 03:09:08.000000000 +0200
-@@ -0,0 +1,427 @@
-+#
-+# USB Host Controller Drivers
-+#
-+comment "USB Host Controller Drivers"
-+ depends on USB
-+
-+config USB_C67X00_HCD
-+ tristate "Cypress C67x00 HCD support"
-+ depends on USB
-+ help
-+ The Cypress C67x00 (EZ-Host/EZ-OTG) chips are dual-role
-+ host/peripheral/OTG USB controllers.
-+
-+ Enable this option to support this chip in host controller mode.
-+ If unsure, say N.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called c67x00.
-+
-+config USB_XHCI_HCD
-+ tristate "xHCI HCD (USB 3.0) support (EXPERIMENTAL)"
-+ depends on USB && PCI && EXPERIMENTAL
-+ ---help---
-+ The eXtensible Host Controller Interface (xHCI) is standard for USB 3.0
-+ "SuperSpeed" host controller hardware.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called xhci-hcd.
-+
-+config USB_XHCI_HCD_DEBUGGING
-+ bool "Debugging for the xHCI host controller"
-+ depends on USB_XHCI_HCD
-+ ---help---
-+ Say 'Y' to turn on debugging for the xHCI host controller driver.
-+ This will spew debugging output, even in interrupt context.
-+ This should only be used for debugging xHCI driver bugs.
-+
-+ If unsure, say N.
-+
-+config USB_EHCI_HCD
-+ tristate "EHCI HCD (USB 2.0) support"
-+ depends on USB && USB_ARCH_HAS_EHCI
-+ ---help---
-+ The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0
-+ "high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware.
-+ If your USB host controller supports USB 2.0, you will likely want to
-+ configure this Host Controller Driver.
-+
-+ EHCI controllers are packaged with "companion" host controllers (OHCI
-+ or UHCI) to handle USB 1.1 devices connected to root hub ports. Ports
-+ will connect to EHCI if the device is high speed, otherwise they
-+ connect to a companion controller. If you configure EHCI, you should
-+ probably configure the OHCI (for NEC and some other vendors) USB Host
-+ Controller Driver or UHCI (for Via motherboards) Host Controller
-+ Driver too.
-+
-+ You may want to read <file:Documentation/usb/ehci.txt>.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called ehci-hcd.
-+
-+config USB_EHCI_ROOT_HUB_TT
-+ bool "Root Hub Transaction Translators"
-+ depends on USB_EHCI_HCD
-+ ---help---
-+ Some EHCI chips have vendor-specific extensions to integrate
-+ transaction translators, so that no OHCI or UHCI companion
-+ controller is needed. It's safe to say "y" even if your
-+ controller doesn't support this feature.
-+
-+ This supports the EHCI implementation that's originally
-+ from ARC, and has since changed hands a few times.
-+
-+config USB_EHCI_TT_NEWSCHED
-+ bool "Improved Transaction Translator scheduling (EXPERIMENTAL)"
-+ depends on USB_EHCI_HCD && EXPERIMENTAL
-+ ---help---
-+ This changes the periodic scheduling code to fill more of the low
-+ and full speed bandwidth available from the Transaction Translator
-+ (TT) in USB 2.0 hubs. Without this, only one transfer will be
-+ issued in each microframe, significantly reducing the number of
-+ periodic low/fullspeed transfers possible.
-+
-+ If you have multiple periodic low/fullspeed devices connected to a
-+ highspeed USB hub which is connected to a highspeed USB Host
-+ Controller, and some of those devices will not work correctly
-+ (possibly due to "ENOSPC" or "-28" errors), say Y.
-+
-+ If unsure, say N.
-+
-+config USB_EHCI_BIG_ENDIAN_MMIO
-+ bool
-+ depends on USB_EHCI_HCD && (PPC_CELLEB || PPC_PS3 || 440EPX || ARCH_IXP4XX || XPS_USB_HCD_XILINX)
-+ default y
-+
-+config USB_EHCI_BIG_ENDIAN_DESC
-+ bool
-+ depends on USB_EHCI_HCD && (440EPX || ARCH_IXP4XX || XPS_USB_HCD_XILINX)
-+ default y
-+
-+config XPS_USB_HCD_XILINX
-+ bool "Use Xilinx usb host EHCI controller core"
-+ depends on USB_EHCI_HCD && (PPC32 || MICROBLAZE)
-+ select USB_EHCI_BIG_ENDIAN_DESC
-+ select USB_EHCI_BIG_ENDIAN_MMIO
-+ ---help---
-+ Xilinx xps USB host controller core is EHCI compilant and has
-+ transaction translator built-in. It can be configured to either
-+ support both high speed and full speed devices, or high speed
-+ devices only.
-+
-+config USB_EHCI_FSL
-+ bool "Support for Freescale on-chip EHCI USB controller"
-+ depends on USB_EHCI_HCD && FSL_SOC
-+ select USB_EHCI_ROOT_HUB_TT
-+ ---help---
-+ Variation of ARC USB block used in some Freescale chips.
-+
-+config USB_EHCI_MXC
-+ bool "Support for Freescale on-chip EHCI USB controller"
-+ depends on USB_EHCI_HCD && ARCH_MXC
-+ select USB_EHCI_ROOT_HUB_TT
-+ ---help---
-+ Variation of ARC USB block used in some Freescale chips.
-+
-+config USB_EHCI_HCD_PPC_OF
-+ bool "EHCI support for PPC USB controller on OF platform bus"
-+ depends on USB_EHCI_HCD && PPC_OF
-+ default y
-+ ---help---
-+ Enables support for the USB controller present on the PowerPC
-+ OpenFirmware platform bus.
-+
-+config USB_W90X900_EHCI
-+ bool "W90X900(W90P910) EHCI support"
-+ depends on USB_EHCI_HCD && ARCH_W90X900
-+ ---help---
-+ Enables support for the W90X900 USB controller
-+
-+config USB_OXU210HP_HCD
-+ tristate "OXU210HP HCD support"
-+ depends on USB
-+ ---help---
-+ The OXU210HP is an USB host/OTG/device controller. Enable this
-+ option if your board has this chip. If unsure, say N.
-+
-+ This driver does not support isochronous transfers and doesn't
-+ implement OTG nor USB device controllers.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called oxu210hp-hcd.
-+
-+config USB_ISP116X_HCD
-+ tristate "ISP116X HCD support"
-+ depends on USB
-+ ---help---
-+ The ISP1160 and ISP1161 chips are USB host controllers. Enable this
-+ option if your board has this chip. If unsure, say N.
-+
-+ This driver does not support isochronous transfers.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called isp116x-hcd.
-+
-+config USB_ISP1760_HCD
-+ tristate "ISP 1760 HCD support"
-+ depends on USB && EXPERIMENTAL
-+ ---help---
-+ The ISP1760 chip is a USB 2.0 host controller.
-+
-+ This driver does not support isochronous transfers or OTG.
-+ This USB controller is usually attached to a non-DMA-Master
-+ capable bus. NXP's eval kit brings this chip on PCI card
-+ where the chip itself is behind a PLB to simulate such
-+ a bus.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called isp1760.
-+
-+config USB_ISP1362_HCD
-+ tristate "ISP1362 HCD support"
-+ depends on USB
-+ default N
-+ ---help---
-+ Supports the Philips ISP1362 chip as a host controller
-+
-+ This driver does not support isochronous transfers.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called isp1362-hcd.
-+
-+config USB_OHCI_HCD
-+ tristate "OHCI HCD support"
-+ depends on USB && USB_ARCH_HAS_OHCI
-+ select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3
-+ select USB_OTG_UTILS if ARCH_OMAP
-+ ---help---
-+ The Open Host Controller Interface (OHCI) is a standard for accessing
-+ USB 1.1 host controller hardware. It does more in hardware than Intel's
-+ UHCI specification. If your USB host controller follows the OHCI spec,
-+ say Y. On most non-x86 systems, and on x86 hardware that's not using a
-+ USB controller from Intel or VIA, this is appropriate. If your host
-+ controller doesn't use PCI, this is probably appropriate. For a PCI
-+ based system where you're not sure, the "lspci -v" entry will list the
-+ right "prog-if" for your USB controller(s): EHCI, OHCI, or UHCI.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called ohci-hcd.
-+
-+config USB_OHCI_HCD_OMAP1
-+ bool "OHCI support for OMAP1/2 chips"
-+ depends on USB_OHCI_HCD && (ARCH_OMAP1 || ARCH_OMAP2)
-+ default y
-+ ---help---
-+ Enables support for the OHCI controller on OMAP1/2 chips.
-+
-+config USB_OHCI_HCD_OMAP3
-+ bool "OHCI support for OMAP3 and later chips"
-+ depends on USB_OHCI_HCD && (ARCH_OMAP3 || ARCH_OMAP4)
-+ default y
-+ ---help---
-+ Enables support for the on-chip OHCI controller on
-+ OMAP3 and later chips.
-+
-+config USB_OHCI_HCD_PPC_SOC
-+ bool "OHCI support for on-chip PPC USB controller"
-+ depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
-+ default y
-+ select USB_OHCI_BIG_ENDIAN_DESC
-+ select USB_OHCI_BIG_ENDIAN_MMIO
-+ ---help---
-+ Enables support for the USB controller on the MPC52xx or
-+ STB03xxx processor chip. If unsure, say Y.
-+
-+config USB_OHCI_HCD_PPC_OF_BE
-+ bool "OHCI support for OF platform bus (big endian)"
-+ depends on USB_OHCI_HCD && PPC_OF
-+ select USB_OHCI_BIG_ENDIAN_DESC
-+ select USB_OHCI_BIG_ENDIAN_MMIO
-+ ---help---
-+ Enables support for big-endian USB controllers present on the
-+ OpenFirmware platform bus.
-+
-+config USB_OHCI_HCD_PPC_OF_LE
-+ bool "OHCI support for OF platform bus (little endian)"
-+ depends on USB_OHCI_HCD && PPC_OF
-+ select USB_OHCI_LITTLE_ENDIAN
-+ ---help---
-+ Enables support for little-endian USB controllers present on the
-+ OpenFirmware platform bus.
-+
-+config USB_OHCI_HCD_PPC_OF
-+ bool
-+ depends on USB_OHCI_HCD && PPC_OF
-+ default USB_OHCI_HCD_PPC_OF_BE || USB_OHCI_HCD_PPC_OF_LE
-+
-+config USB_OHCI_HCD_PCI
-+ bool "OHCI support for PCI-bus USB controllers"
-+ depends on USB_OHCI_HCD && PCI && (STB03xxx || PPC_MPC52xx || USB_OHCI_HCD_PPC_OF)
-+ default y
-+ select USB_OHCI_LITTLE_ENDIAN
-+ ---help---
-+ Enables support for PCI-bus plug-in USB controller cards.
-+ If unsure, say Y.
-+
-+config USB_OHCI_HCD_SSB
-+ bool "OHCI support for Broadcom SSB OHCI core"
-+ depends on USB_OHCI_HCD && (SSB = y || SSB = USB_OHCI_HCD) && EXPERIMENTAL
-+ default n
-+ ---help---
-+ Support for the Sonics Silicon Backplane (SSB) attached
-+ Broadcom USB OHCI core.
-+
-+ This device is present in some embedded devices with
-+ Broadcom based SSB bus.
-+
-+ If unsure, say N.
-+
-+config USB_OHCI_BIG_ENDIAN_DESC
-+ bool
-+ depends on USB_OHCI_HCD
-+ default n
-+
-+config USB_OHCI_BIG_ENDIAN_MMIO
-+ bool
-+ depends on USB_OHCI_HCD
-+ default n
-+
-+config USB_OHCI_LITTLE_ENDIAN
-+ bool
-+ depends on USB_OHCI_HCD
-+ default n if STB03xxx || PPC_MPC52xx
-+ default y
-+
-+config USB_UHCI_HCD
-+ tristate "UHCI HCD (most Intel and VIA) support"
-+ depends on USB && PCI
-+ ---help---
-+ The Universal Host Controller Interface is a standard by Intel for
-+ accessing the USB hardware in the PC (which is also called the USB
-+ host controller). If your USB host controller conforms to this
-+ standard, you may want to say Y, but see below. All recent boards
-+ with Intel PCI chipsets (like intel 430TX, 440FX, 440LX, 440BX,
-+ i810, i820) conform to this standard. Also all VIA PCI chipsets
-+ (like VIA VP2, VP3, MVP3, Apollo Pro, Apollo Pro II or Apollo Pro
-+ 133). If unsure, say Y.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called uhci-hcd.
-+
-+config USB_FHCI_HCD
-+ tristate "Freescale QE USB Host Controller support"
-+ depends on USB && OF_GPIO && QE_GPIO && QUICC_ENGINE
-+ select FSL_GTM
-+ select QE_USB
-+ help
-+ This driver enables support for Freescale QE USB Host Controller
-+ (as found on MPC8360 and MPC8323 processors), the driver supports
-+ Full and Low Speed USB.
-+
-+config FHCI_DEBUG
-+ bool "Freescale QE USB Host Controller debug support"
-+ depends on USB_FHCI_HCD && DEBUG_FS
-+ help
-+ Say "y" to see some FHCI debug information and statistics
-+ throught debugfs.
-+
-+config USB_U132_HCD
-+ tristate "Elan U132 Adapter Host Controller"
-+ depends on USB && USB_FTDI_ELAN
-+ default M
-+ help
-+ The U132 adapter is a USB to CardBus adapter specifically designed
-+ for PC cards that contain an OHCI host controller. Typical PC cards
-+ are the Orange Mobile 3G Option GlobeTrotter Fusion card. The U132
-+ adapter will *NOT* work with PC cards that do not contain an OHCI
-+ controller.
-+
-+ For those PC cards that contain multiple OHCI controllers only the
-+ first one is used.
-+
-+ The driver consists of two modules, the "ftdi-elan" module is a
-+ USB client driver that interfaces to the FTDI chip within ELAN's
-+ USB-to-PCMCIA adapter, and this "u132-hcd" module is a USB host
-+ controller driver that talks to the OHCI controller within the
-+ CardBus cards that are inserted in the U132 adapter.
-+
-+ This driver has been tested with a CardBus OHCI USB adapter, and
-+ worked with a USB PEN Drive inserted into the first USB port of
-+ the PCCARD. A rather pointless thing to do, but useful for testing.
-+
-+ It is safe to say M here.
-+
-+ See also <http://www.elandigitalsystems.com/support/ufaq/u132linux.php>
-+
-+config USB_SL811_HCD
-+ tristate "SL811HS HCD support"
-+ depends on USB
-+ help
-+ The SL811HS is a single-port USB controller that supports either
-+ host side or peripheral side roles. Enable this option if your
-+ board has this chip, and you want to use it as a host controller.
-+ If unsure, say N.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called sl811-hcd.
-+
-+config USB_SL811_CS
-+ tristate "CF/PCMCIA support for SL811HS HCD"
-+ depends on USB_SL811_HCD && PCMCIA
-+ help
-+ Wraps a PCMCIA driver around the SL811HS HCD, supporting the RATOC
-+ REX-CFU1U CF card (often used with PDAs). If unsure, say N.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called "sl811_cs".
-+
-+config USB_R8A66597_HCD
-+ tristate "R8A66597 HCD support"
-+ depends on USB
-+ help
-+ The R8A66597 is a USB 2.0 host and peripheral controller.
-+
-+ Enable this option if your board has this chip, and you want
-+ to use it as a host controller. If unsure, say N.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called r8a66597-hcd.
-+
-+config USB_WHCI_HCD
-+ tristate "Wireless USB Host Controller Interface (WHCI) driver (EXPERIMENTAL)"
-+ depends on EXPERIMENTAL
-+ depends on PCI && USB
-+ select USB_WUSB
-+ select UWB_WHCI
-+ help
-+ A driver for PCI-based Wireless USB Host Controllers that are
-+ compliant with the WHCI specification.
-+
-+ To compile this driver a module, choose M here: the module
-+ will be called "whci-hcd".
-+
-+config USB_HWA_HCD
-+ tristate "Host Wire Adapter (HWA) driver (EXPERIMENTAL)"
-+ depends on EXPERIMENTAL
-+ depends on USB
-+ select USB_WUSB
-+ select UWB_HWA
-+ help
-+ This driver enables you to connect Wireless USB devices to
-+ your system using a Host Wire Adaptor USB dongle. This is an
-+ UWB Radio Controller and WUSB Host Controller connected to
-+ your machine via USB (specified in WUSB1.0).
-+
-+ To compile this driver a module, choose M here: the module
-+ will be called "hwa-hc".
-+
-+config USB_IMX21_HCD
-+ tristate "iMX21 HCD support"
-+ depends on USB && ARM && MACH_MX21
-+ help
-+ This driver enables support for the on-chip USB host in the
-+ iMX21 processor.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called "imx21-hcd".
-+
-diff -Nur linux-2.6.35.7.orig/drivers/usb/host/ohci-ar71xx.c linux-2.6.35.7/drivers/usb/host/ohci-ar71xx.c
---- linux-2.6.35.7.orig/drivers/usb/host/ohci-ar71xx.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/usb/host/ohci-ar71xx.c 2010-10-14 20:28:01.428101246 +0200
+diff -Nur linux-2.6.36.orig/drivers/usb/host/ohci-ar71xx.c linux-2.6.36/drivers/usb/host/ohci-ar71xx.c
+--- linux-2.6.36.orig/drivers/usb/host/ohci-ar71xx.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/drivers/usb/host/ohci-ar71xx.c 2010-11-18 21:16:16.000000000 +0100
@@ -0,0 +1,165 @@
+/*
+ * OHCI HCD (Host Controller Driver) for USB.
@@ -27120,11 +16994,11 @@ diff -Nur linux-2.6.35.7.orig/drivers/usb/host/ohci-ar71xx.c linux-2.6.35.7/driv
+ .owner = THIS_MODULE,
+ },
+};
-diff -Nur linux-2.6.35.7.orig/drivers/usb/host/ohci-hcd.c linux-2.6.35.7/drivers/usb/host/ohci-hcd.c
---- linux-2.6.35.7.orig/drivers/usb/host/ohci-hcd.c 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/drivers/usb/host/ohci-hcd.c 2010-10-14 20:28:01.468101083 +0200
-@@ -1095,6 +1095,11 @@
- #define TMIO_OHCI_DRIVER ohci_hcd_tmio_driver
+diff -Nur linux-2.6.36.orig/drivers/usb/host/ohci-hcd.c linux-2.6.36/drivers/usb/host/ohci-hcd.c
+--- linux-2.6.36.orig/drivers/usb/host/ohci-hcd.c 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/usb/host/ohci-hcd.c 2010-11-18 21:16:16.000000000 +0100
+@@ -1100,6 +1100,11 @@
+ #define PLATFORM_DRIVER ohci_hcd_jz4740_driver
#endif
+#ifdef CONFIG_USB_OHCI_AR71XX
@@ -27135,1290 +17009,37 @@ diff -Nur linux-2.6.35.7.orig/drivers/usb/host/ohci-hcd.c linux-2.6.35.7/drivers
#if !defined(PCI_DRIVER) && \
!defined(PLATFORM_DRIVER) && \
!defined(OMAP1_PLATFORM_DRIVER) && \
-diff -Nur linux-2.6.35.7.orig/drivers/usb/host/ohci-hcd.c.orig linux-2.6.35.7/drivers/usb/host/ohci-hcd.c.orig
---- linux-2.6.35.7.orig/drivers/usb/host/ohci-hcd.c.orig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/usb/host/ohci-hcd.c.orig 2010-09-29 03:09:08.000000000 +0200
-@@ -0,0 +1,1277 @@
-+/*
-+ * OHCI HCD (Host Controller Driver) for USB.
-+ *
-+ * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
-+ * (C) Copyright 2000-2004 David Brownell <dbrownell@users.sourceforge.net>
-+ *
-+ * [ Initialisation is based on Linus' ]
-+ * [ uhci code and gregs ohci fragments ]
-+ * [ (C) Copyright 1999 Linus Torvalds ]
-+ * [ (C) Copyright 1999 Gregory P. Smith]
-+ *
-+ *
-+ * OHCI is the main "non-Intel/VIA" standard for USB 1.1 host controller
-+ * interfaces (though some non-x86 Intel chips use it). It supports
-+ * smarter hardware than UHCI. A download link for the spec available
-+ * through the http://www.usb.org website.
-+ *
-+ * This file is licenced under the GPL.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/moduleparam.h>
-+#include <linux/pci.h>
-+#include <linux/kernel.h>
-+#include <linux/delay.h>
-+#include <linux/ioport.h>
-+#include <linux/sched.h>
-+#include <linux/slab.h>
-+#include <linux/errno.h>
-+#include <linux/init.h>
-+#include <linux/timer.h>
-+#include <linux/list.h>
-+#include <linux/usb.h>
-+#include <linux/usb/otg.h>
-+#include <linux/usb/hcd.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/dmapool.h>
-+#include <linux/workqueue.h>
-+#include <linux/debugfs.h>
-+
-+#include <asm/io.h>
-+#include <asm/irq.h>
-+#include <asm/system.h>
-+#include <asm/unaligned.h>
-+#include <asm/byteorder.h>
-+
-+
-+#define DRIVER_AUTHOR "Roman Weissgaerber, David Brownell"
-+#define DRIVER_DESC "USB 1.1 'Open' Host Controller (OHCI) Driver"
-+
-+/*-------------------------------------------------------------------------*/
-+
-+#undef OHCI_VERBOSE_DEBUG /* not always helpful */
-+
-+/* For initializing controller (mask in an HCFS mode too) */
-+#define OHCI_CONTROL_INIT OHCI_CTRL_CBSR
-+#define OHCI_INTR_INIT \
-+ (OHCI_INTR_MIE | OHCI_INTR_RHSC | OHCI_INTR_UE \
-+ | OHCI_INTR_RD | OHCI_INTR_WDH)
-+
-+#ifdef __hppa__
-+/* On PA-RISC, PDC can leave IR set incorrectly; ignore it there. */
-+#define IR_DISABLE
-+#endif
-+
-+#ifdef CONFIG_ARCH_OMAP
-+/* OMAP doesn't support IR (no SMM; not needed) */
-+#define IR_DISABLE
-+#endif
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static const char hcd_name [] = "ohci_hcd";
-+
-+#define STATECHANGE_DELAY msecs_to_jiffies(300)
-+
-+#include "ohci.h"
-+
-+static void ohci_dump (struct ohci_hcd *ohci, int verbose);
-+static int ohci_init (struct ohci_hcd *ohci);
-+static void ohci_stop (struct usb_hcd *hcd);
-+
-+#if defined(CONFIG_PM) || defined(CONFIG_PCI)
-+static int ohci_restart (struct ohci_hcd *ohci);
-+#endif
-+
-+#ifdef CONFIG_PCI
-+static void quirk_amd_pll(int state);
-+static void amd_iso_dev_put(void);
-+static void sb800_prefetch(struct ohci_hcd *ohci, int on);
-+#else
-+static inline void quirk_amd_pll(int state)
-+{
-+ return;
-+}
-+static inline void amd_iso_dev_put(void)
-+{
-+ return;
-+}
-+static inline void sb800_prefetch(struct ohci_hcd *ohci, int on)
-+{
-+ return;
-+}
-+#endif
-+
-+
-+#include "ohci-hub.c"
-+#include "ohci-dbg.c"
-+#include "ohci-mem.c"
-+#include "ohci-q.c"
-+
-+
-+/*
-+ * On architectures with edge-triggered interrupts we must never return
-+ * IRQ_NONE.
-+ */
-+#if defined(CONFIG_SA1111) /* ... or other edge-triggered systems */
-+#define IRQ_NOTMINE IRQ_HANDLED
-+#else
-+#define IRQ_NOTMINE IRQ_NONE
-+#endif
-+
-+
-+/* Some boards misreport power switching/overcurrent */
-+static int distrust_firmware = 1;
-+module_param (distrust_firmware, bool, 0);
-+MODULE_PARM_DESC (distrust_firmware,
-+ "true to distrust firmware power/overcurrent setup");
-+
-+/* Some boards leave IR set wrongly, since they fail BIOS/SMM handshakes */
-+static int no_handshake = 0;
-+module_param (no_handshake, bool, 0);
-+MODULE_PARM_DESC (no_handshake, "true (not default) disables BIOS handshake");
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/*
-+ * queue up an urb for anything except the root hub
-+ */
-+static int ohci_urb_enqueue (
-+ struct usb_hcd *hcd,
-+ struct urb *urb,
-+ gfp_t mem_flags
-+) {
-+ struct ohci_hcd *ohci = hcd_to_ohci (hcd);
-+ struct ed *ed;
-+ urb_priv_t *urb_priv;
-+ unsigned int pipe = urb->pipe;
-+ int i, size = 0;
-+ unsigned long flags;
-+ int retval = 0;
-+
-+#ifdef OHCI_VERBOSE_DEBUG
-+ urb_print(urb, "SUB", usb_pipein(pipe), -EINPROGRESS);
-+#endif
-+
-+ /* every endpoint has a ed, locate and maybe (re)initialize it */
-+ if (! (ed = ed_get (ohci, urb->ep, urb->dev, pipe, urb->interval)))
-+ return -ENOMEM;
-+
-+ /* for the private part of the URB we need the number of TDs (size) */
-+ switch (ed->type) {
-+ case PIPE_CONTROL:
-+ /* td_submit_urb() doesn't yet handle these */
-+ if (urb->transfer_buffer_length > 4096)
-+ return -EMSGSIZE;
-+
-+ /* 1 TD for setup, 1 for ACK, plus ... */
-+ size = 2;
-+ /* FALLTHROUGH */
-+ // case PIPE_INTERRUPT:
-+ // case PIPE_BULK:
-+ default:
-+ /* one TD for every 4096 Bytes (can be upto 8K) */
-+ size += urb->transfer_buffer_length / 4096;
-+ /* ... and for any remaining bytes ... */
-+ if ((urb->transfer_buffer_length % 4096) != 0)
-+ size++;
-+ /* ... and maybe a zero length packet to wrap it up */
-+ if (size == 0)
-+ size++;
-+ else if ((urb->transfer_flags & URB_ZERO_PACKET) != 0
-+ && (urb->transfer_buffer_length
-+ % usb_maxpacket (urb->dev, pipe,
-+ usb_pipeout (pipe))) == 0)
-+ size++;
-+ break;
-+ case PIPE_ISOCHRONOUS: /* number of packets from URB */
-+ size = urb->number_of_packets;
-+ break;
-+ }
-+
-+ /* allocate the private part of the URB */
-+ urb_priv = kzalloc (sizeof (urb_priv_t) + size * sizeof (struct td *),
-+ mem_flags);
-+ if (!urb_priv)
-+ return -ENOMEM;
-+ INIT_LIST_HEAD (&urb_priv->pending);
-+ urb_priv->length = size;
-+ urb_priv->ed = ed;
-+
-+ /* allocate the TDs (deferring hash chain updates) */
-+ for (i = 0; i < size; i++) {
-+ urb_priv->td [i] = td_alloc (ohci, mem_flags);
-+ if (!urb_priv->td [i]) {
-+ urb_priv->length = i;
-+ urb_free_priv (ohci, urb_priv);
-+ return -ENOMEM;
-+ }
-+ }
-+
-+ spin_lock_irqsave (&ohci->lock, flags);
-+
-+ /* don't submit to a dead HC */
-+ if (!test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags)) {
-+ retval = -ENODEV;
-+ goto fail;
-+ }
-+ if (!HC_IS_RUNNING(hcd->state)) {
-+ retval = -ENODEV;
-+ goto fail;
-+ }
-+ retval = usb_hcd_link_urb_to_ep(hcd, urb);
-+ if (retval)
-+ goto fail;
-+
-+ /* schedule the ed if needed */
-+ if (ed->state == ED_IDLE) {
-+ retval = ed_schedule (ohci, ed);
-+ if (retval < 0) {
-+ usb_hcd_unlink_urb_from_ep(hcd, urb);
-+ goto fail;
-+ }
-+ if (ed->type == PIPE_ISOCHRONOUS) {
-+ u16 frame = ohci_frame_no(ohci);
-+
-+ /* delay a few frames before the first TD */
-+ frame += max_t (u16, 8, ed->interval);
-+ frame &= ~(ed->interval - 1);
-+ frame |= ed->branch;
-+ urb->start_frame = frame;
-+
-+ /* yes, only URB_ISO_ASAP is supported, and
-+ * urb->start_frame is never used as input.
-+ */
-+ }
-+ } else if (ed->type == PIPE_ISOCHRONOUS)
-+ urb->start_frame = ed->last_iso + ed->interval;
-+
-+ /* fill the TDs and link them to the ed; and
-+ * enable that part of the schedule, if needed
-+ * and update count of queued periodic urbs
-+ */
-+ urb->hcpriv = urb_priv;
-+ td_submit_urb (ohci, urb);
-+
-+fail:
-+ if (retval)
-+ urb_free_priv (ohci, urb_priv);
-+ spin_unlock_irqrestore (&ohci->lock, flags);
-+ return retval;
-+}
-+
-+/*
-+ * decouple the URB from the HC queues (TDs, urb_priv).
-+ * reporting is always done
-+ * asynchronously, and we might be dealing with an urb that's
-+ * partially transferred, or an ED with other urbs being unlinked.
-+ */
-+static int ohci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
-+{
-+ struct ohci_hcd *ohci = hcd_to_ohci (hcd);
-+ unsigned long flags;
-+ int rc;
-+
-+#ifdef OHCI_VERBOSE_DEBUG
-+ urb_print(urb, "UNLINK", 1, status);
-+#endif
-+
-+ spin_lock_irqsave (&ohci->lock, flags);
-+ rc = usb_hcd_check_unlink_urb(hcd, urb, status);
-+ if (rc) {
-+ ; /* Do nothing */
-+ } else if (HC_IS_RUNNING(hcd->state)) {
-+ urb_priv_t *urb_priv;
-+
-+ /* Unless an IRQ completed the unlink while it was being
-+ * handed to us, flag it for unlink and giveback, and force
-+ * some upcoming INTR_SF to call finish_unlinks()
-+ */
-+ urb_priv = urb->hcpriv;
-+ if (urb_priv) {
-+ if (urb_priv->ed->state == ED_OPER)
-+ start_ed_unlink (ohci, urb_priv->ed);
-+ }
-+ } else {
-+ /*
-+ * with HC dead, we won't respect hc queue pointers
-+ * any more ... just clean up every urb's memory.
-+ */
-+ if (urb->hcpriv)
-+ finish_urb(ohci, urb, status);
-+ }
-+ spin_unlock_irqrestore (&ohci->lock, flags);
-+ return rc;
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/* frees config/altsetting state for endpoints,
-+ * including ED memory, dummy TD, and bulk/intr data toggle
-+ */
-+
-+static void
-+ohci_endpoint_disable (struct usb_hcd *hcd, struct usb_host_endpoint *ep)
-+{
-+ struct ohci_hcd *ohci = hcd_to_ohci (hcd);
-+ unsigned long flags;
-+ struct ed *ed = ep->hcpriv;
-+ unsigned limit = 1000;
-+
-+ /* ASSERT: any requests/urbs are being unlinked */
-+ /* ASSERT: nobody can be submitting urbs for this any more */
-+
-+ if (!ed)
-+ return;
-+
-+rescan:
-+ spin_lock_irqsave (&ohci->lock, flags);
-+
-+ if (!HC_IS_RUNNING (hcd->state)) {
-+sanitize:
-+ ed->state = ED_IDLE;
-+ if (quirk_zfmicro(ohci) && ed->type == PIPE_INTERRUPT)
-+ ohci->eds_scheduled--;
-+ finish_unlinks (ohci, 0);
-+ }
-+
-+ switch (ed->state) {
-+ case ED_UNLINK: /* wait for hw to finish? */
-+ /* major IRQ delivery trouble loses INTR_SF too... */
-+ if (limit-- == 0) {
-+ ohci_warn(ohci, "ED unlink timeout\n");
-+ if (quirk_zfmicro(ohci)) {
-+ ohci_warn(ohci, "Attempting ZF TD recovery\n");
-+ ohci->ed_to_check = ed;
-+ ohci->zf_delay = 2;
-+ }
-+ goto sanitize;
-+ }
-+ spin_unlock_irqrestore (&ohci->lock, flags);
-+ schedule_timeout_uninterruptible(1);
-+ goto rescan;
-+ case ED_IDLE: /* fully unlinked */
-+ if (list_empty (&ed->td_list)) {
-+ td_free (ohci, ed->dummy);
-+ ed_free (ohci, ed);
-+ break;
-+ }
-+ /* else FALL THROUGH */
-+ default:
-+ /* caller was supposed to have unlinked any requests;
-+ * that's not our job. can't recover; must leak ed.
-+ */
-+ ohci_err (ohci, "leak ed %p (#%02x) state %d%s\n",
-+ ed, ep->desc.bEndpointAddress, ed->state,
-+ list_empty (&ed->td_list) ? "" : " (has tds)");
-+ td_free (ohci, ed->dummy);
-+ break;
-+ }
-+ ep->hcpriv = NULL;
-+ spin_unlock_irqrestore (&ohci->lock, flags);
-+ return;
-+}
-+
-+static int ohci_get_frame (struct usb_hcd *hcd)
-+{
-+ struct ohci_hcd *ohci = hcd_to_ohci (hcd);
-+
-+ return ohci_frame_no(ohci);
-+}
-+
-+static void ohci_usb_reset (struct ohci_hcd *ohci)
-+{
-+ ohci->hc_control = ohci_readl (ohci, &ohci->regs->control);
-+ ohci->hc_control &= OHCI_CTRL_RWC;
-+ ohci_writel (ohci, ohci->hc_control, &ohci->regs->control);
-+}
-+
-+/* ohci_shutdown forcibly disables IRQs and DMA, helping kexec and
-+ * other cases where the next software may expect clean state from the
-+ * "firmware". this is bus-neutral, unlike shutdown() methods.
-+ */
-+static void
-+ohci_shutdown (struct usb_hcd *hcd)
-+{
-+ struct ohci_hcd *ohci;
-+
-+ ohci = hcd_to_ohci (hcd);
-+ ohci_writel (ohci, OHCI_INTR_MIE, &ohci->regs->intrdisable);
-+ ohci_usb_reset (ohci);
-+ /* flush the writes */
-+ (void) ohci_readl (ohci, &ohci->regs->control);
-+}
-+
-+static int check_ed(struct ohci_hcd *ohci, struct ed *ed)
-+{
-+ return (hc32_to_cpu(ohci, ed->hwINFO) & ED_IN) != 0
-+ && (hc32_to_cpu(ohci, ed->hwHeadP) & TD_MASK)
-+ == (hc32_to_cpu(ohci, ed->hwTailP) & TD_MASK)
-+ && !list_empty(&ed->td_list);
-+}
-+
-+/* ZF Micro watchdog timer callback. The ZF Micro chipset sometimes completes
-+ * an interrupt TD but neglects to add it to the donelist. On systems with
-+ * this chipset, we need to periodically check the state of the queues to look
-+ * for such "lost" TDs.
-+ */
-+static void unlink_watchdog_func(unsigned long _ohci)
-+{
-+ unsigned long flags;
-+ unsigned max;
-+ unsigned seen_count = 0;
-+ unsigned i;
-+ struct ed **seen = NULL;
-+ struct ohci_hcd *ohci = (struct ohci_hcd *) _ohci;
-+
-+ spin_lock_irqsave(&ohci->lock, flags);
-+ max = ohci->eds_scheduled;
-+ if (!max)
-+ goto done;
-+
-+ if (ohci->ed_to_check)
-+ goto out;
-+
-+ seen = kcalloc(max, sizeof *seen, GFP_ATOMIC);
-+ if (!seen)
-+ goto out;
-+
-+ for (i = 0; i < NUM_INTS; i++) {
-+ struct ed *ed = ohci->periodic[i];
-+
-+ while (ed) {
-+ unsigned temp;
-+
-+ /* scan this branch of the periodic schedule tree */
-+ for (temp = 0; temp < seen_count; temp++) {
-+ if (seen[temp] == ed) {
-+ /* we've checked it and what's after */
-+ ed = NULL;
-+ break;
-+ }
-+ }
-+ if (!ed)
-+ break;
-+ seen[seen_count++] = ed;
-+ if (!check_ed(ohci, ed)) {
-+ ed = ed->ed_next;
-+ continue;
-+ }
-+
-+ /* HC's TD list is empty, but HCD sees at least one
-+ * TD that's not been sent through the donelist.
-+ */
-+ ohci->ed_to_check = ed;
-+ ohci->zf_delay = 2;
-+
-+ /* The HC may wait until the next frame to report the
-+ * TD as done through the donelist and INTR_WDH. (We
-+ * just *assume* it's not a multi-TD interrupt URB;
-+ * those could defer the IRQ more than one frame, using
-+ * DI...) Check again after the next INTR_SF.
-+ */
-+ ohci_writel(ohci, OHCI_INTR_SF,
-+ &ohci->regs->intrstatus);
-+ ohci_writel(ohci, OHCI_INTR_SF,
-+ &ohci->regs->intrenable);
-+
-+ /* flush those writes */
-+ (void) ohci_readl(ohci, &ohci->regs->control);
-+
-+ goto out;
-+ }
-+ }
-+out:
-+ kfree(seen);
-+ if (ohci->eds_scheduled)
-+ mod_timer(&ohci->unlink_watchdog, round_jiffies(jiffies + HZ));
-+done:
-+ spin_unlock_irqrestore(&ohci->lock, flags);
-+}
-+
-+/*-------------------------------------------------------------------------*
-+ * HC functions
-+ *-------------------------------------------------------------------------*/
-+
-+/* init memory, and kick BIOS/SMM off */
-+
-+static int ohci_init (struct ohci_hcd *ohci)
-+{
-+ int ret;
-+ struct usb_hcd *hcd = ohci_to_hcd(ohci);
-+
-+ if (distrust_firmware)
-+ ohci->flags |= OHCI_QUIRK_HUB_POWER;
-+
-+ disable (ohci);
-+ ohci->regs = hcd->regs;
-+
-+ /* REVISIT this BIOS handshake is now moved into PCI "quirks", and
-+ * was never needed for most non-PCI systems ... remove the code?
-+ */
-+
-+#ifndef IR_DISABLE
-+ /* SMM owns the HC? not for long! */
-+ if (!no_handshake && ohci_readl (ohci,
-+ &ohci->regs->control) & OHCI_CTRL_IR) {
-+ u32 temp;
-+
-+ ohci_dbg (ohci, "USB HC TakeOver from BIOS/SMM\n");
-+
-+ /* this timeout is arbitrary. we make it long, so systems
-+ * depending on usb keyboards may be usable even if the
-+ * BIOS/SMM code seems pretty broken.
-+ */
-+ temp = 500; /* arbitrary: five seconds */
-+
-+ ohci_writel (ohci, OHCI_INTR_OC, &ohci->regs->intrenable);
-+ ohci_writel (ohci, OHCI_OCR, &ohci->regs->cmdstatus);
-+ while (ohci_readl (ohci, &ohci->regs->control) & OHCI_CTRL_IR) {
-+ msleep (10);
-+ if (--temp == 0) {
-+ ohci_err (ohci, "USB HC takeover failed!"
-+ " (BIOS/SMM bug)\n");
-+ return -EBUSY;
-+ }
-+ }
-+ ohci_usb_reset (ohci);
-+ }
-+#endif
-+
-+ /* Disable HC interrupts */
-+ ohci_writel (ohci, OHCI_INTR_MIE, &ohci->regs->intrdisable);
-+
-+ /* flush the writes, and save key bits like RWC */
-+ if (ohci_readl (ohci, &ohci->regs->control) & OHCI_CTRL_RWC)
-+ ohci->hc_control |= OHCI_CTRL_RWC;
-+
-+ /* Read the number of ports unless overridden */
-+ if (ohci->num_ports == 0)
-+ ohci->num_ports = roothub_a(ohci) & RH_A_NDP;
-+
-+ if (ohci->hcca)
-+ return 0;
-+
-+ ohci->hcca = dma_alloc_coherent (hcd->self.controller,
-+ sizeof *ohci->hcca, &ohci->hcca_dma, 0);
-+ if (!ohci->hcca)
-+ return -ENOMEM;
-+
-+ if ((ret = ohci_mem_init (ohci)) < 0)
-+ ohci_stop (hcd);
-+ else {
-+ create_debug_files (ohci);
-+ }
-+
-+ return ret;
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/* Start an OHCI controller, set the BUS operational
-+ * resets USB and controller
-+ * enable interrupts
-+ */
-+static int ohci_run (struct ohci_hcd *ohci)
-+{
-+ u32 mask, val;
-+ int first = ohci->fminterval == 0;
-+ struct usb_hcd *hcd = ohci_to_hcd(ohci);
-+
-+ disable (ohci);
-+
-+ /* boot firmware should have set this up (5.1.1.3.1) */
-+ if (first) {
-+
-+ val = ohci_readl (ohci, &ohci->regs->fminterval);
-+ ohci->fminterval = val & 0x3fff;
-+ if (ohci->fminterval != FI)
-+ ohci_dbg (ohci, "fminterval delta %d\n",
-+ ohci->fminterval - FI);
-+ ohci->fminterval |= FSMP (ohci->fminterval) << 16;
-+ /* also: power/overcurrent flags in roothub.a */
-+ }
-+
-+ /* Reset USB nearly "by the book". RemoteWakeupConnected has
-+ * to be checked in case boot firmware (BIOS/SMM/...) has set up
-+ * wakeup in a way the bus isn't aware of (e.g., legacy PCI PM).
-+ * If the bus glue detected wakeup capability then it should
-+ * already be enabled; if so we'll just enable it again.
-+ */
-+ if ((ohci->hc_control & OHCI_CTRL_RWC) != 0)
-+ device_set_wakeup_capable(hcd->self.controller, 1);
-+
-+ switch (ohci->hc_control & OHCI_CTRL_HCFS) {
-+ case OHCI_USB_OPER:
-+ val = 0;
-+ break;
-+ case OHCI_USB_SUSPEND:
-+ case OHCI_USB_RESUME:
-+ ohci->hc_control &= OHCI_CTRL_RWC;
-+ ohci->hc_control |= OHCI_USB_RESUME;
-+ val = 10 /* msec wait */;
-+ break;
-+ // case OHCI_USB_RESET:
-+ default:
-+ ohci->hc_control &= OHCI_CTRL_RWC;
-+ ohci->hc_control |= OHCI_USB_RESET;
-+ val = 50 /* msec wait */;
-+ break;
-+ }
-+ ohci_writel (ohci, ohci->hc_control, &ohci->regs->control);
-+ // flush the writes
-+ (void) ohci_readl (ohci, &ohci->regs->control);
-+ msleep(val);
-+
-+ memset (ohci->hcca, 0, sizeof (struct ohci_hcca));
-+
-+ /* 2msec timelimit here means no irqs/preempt */
-+ spin_lock_irq (&ohci->lock);
-+
-+retry:
-+ /* HC Reset requires max 10 us delay */
-+ ohci_writel (ohci, OHCI_HCR, &ohci->regs->cmdstatus);
-+ val = 30; /* ... allow extra time */
-+ while ((ohci_readl (ohci, &ohci->regs->cmdstatus) & OHCI_HCR) != 0) {
-+ if (--val == 0) {
-+ spin_unlock_irq (&ohci->lock);
-+ ohci_err (ohci, "USB HC reset timed out!\n");
-+ return -1;
-+ }
-+ udelay (1);
-+ }
-+
-+ /* now we're in the SUSPEND state ... must go OPERATIONAL
-+ * within 2msec else HC enters RESUME
-+ *
-+ * ... but some hardware won't init fmInterval "by the book"
-+ * (SiS, OPTi ...), so reset again instead. SiS doesn't need
-+ * this if we write fmInterval after we're OPERATIONAL.
-+ * Unclear about ALi, ServerWorks, and others ... this could
-+ * easily be a longstanding bug in chip init on Linux.
-+ */
-+ if (ohci->flags & OHCI_QUIRK_INITRESET) {
-+ ohci_writel (ohci, ohci->hc_control, &ohci->regs->control);
-+ // flush those writes
-+ (void) ohci_readl (ohci, &ohci->regs->control);
-+ }
-+
-+ /* Tell the controller where the control and bulk lists are
-+ * The lists are empty now. */
-+ ohci_writel (ohci, 0, &ohci->regs->ed_controlhead);
-+ ohci_writel (ohci, 0, &ohci->regs->ed_bulkhead);
-+
-+ /* a reset clears this */
-+ ohci_writel (ohci, (u32) ohci->hcca_dma, &ohci->regs->hcca);
-+
-+ periodic_reinit (ohci);
-+
-+ /* some OHCI implementations are finicky about how they init.
-+ * bogus values here mean not even enumeration could work.
-+ */
-+ if ((ohci_readl (ohci, &ohci->regs->fminterval) & 0x3fff0000) == 0
-+ || !ohci_readl (ohci, &ohci->regs->periodicstart)) {
-+ if (!(ohci->flags & OHCI_QUIRK_INITRESET)) {
-+ ohci->flags |= OHCI_QUIRK_INITRESET;
-+ ohci_dbg (ohci, "enabling initreset quirk\n");
-+ goto retry;
-+ }
-+ spin_unlock_irq (&ohci->lock);
-+ ohci_err (ohci, "init err (%08x %04x)\n",
-+ ohci_readl (ohci, &ohci->regs->fminterval),
-+ ohci_readl (ohci, &ohci->regs->periodicstart));
-+ return -EOVERFLOW;
-+ }
-+
-+ /* use rhsc irqs after khubd is fully initialized */
-+ hcd->poll_rh = 1;
-+ hcd->uses_new_polling = 1;
-+
-+ /* start controller operations */
-+ ohci->hc_control &= OHCI_CTRL_RWC;
-+ ohci->hc_control |= OHCI_CONTROL_INIT | OHCI_USB_OPER;
-+ ohci_writel (ohci, ohci->hc_control, &ohci->regs->control);
-+ hcd->state = HC_STATE_RUNNING;
-+
-+ /* wake on ConnectStatusChange, matching external hubs */
-+ ohci_writel (ohci, RH_HS_DRWE, &ohci->regs->roothub.status);
-+
-+ /* Choose the interrupts we care about now, others later on demand */
-+ mask = OHCI_INTR_INIT;
-+ ohci_writel (ohci, ~0, &ohci->regs->intrstatus);
-+ ohci_writel (ohci, mask, &ohci->regs->intrenable);
-+
-+ /* handle root hub init quirks ... */
-+ val = roothub_a (ohci);
-+ val &= ~(RH_A_PSM | RH_A_OCPM);
-+ if (ohci->flags & OHCI_QUIRK_SUPERIO) {
-+ /* NSC 87560 and maybe others */
-+ val |= RH_A_NOCP;
-+ val &= ~(RH_A_POTPGT | RH_A_NPS);
-+ ohci_writel (ohci, val, &ohci->regs->roothub.a);
-+ } else if ((ohci->flags & OHCI_QUIRK_AMD756) ||
-+ (ohci->flags & OHCI_QUIRK_HUB_POWER)) {
-+ /* hub power always on; required for AMD-756 and some
-+ * Mac platforms. ganged overcurrent reporting, if any.
-+ */
-+ val |= RH_A_NPS;
-+ ohci_writel (ohci, val, &ohci->regs->roothub.a);
-+ }
-+ ohci_writel (ohci, RH_HS_LPSC, &ohci->regs->roothub.status);
-+ ohci_writel (ohci, (val & RH_A_NPS) ? 0 : RH_B_PPCM,
-+ &ohci->regs->roothub.b);
-+ // flush those writes
-+ (void) ohci_readl (ohci, &ohci->regs->control);
-+
-+ ohci->next_statechange = jiffies + STATECHANGE_DELAY;
-+ spin_unlock_irq (&ohci->lock);
-+
-+ // POTPGT delay is bits 24-31, in 2 ms units.
-+ mdelay ((val >> 23) & 0x1fe);
-+ hcd->state = HC_STATE_RUNNING;
-+
-+ if (quirk_zfmicro(ohci)) {
-+ /* Create timer to watch for bad queue state on ZF Micro */
-+ setup_timer(&ohci->unlink_watchdog, unlink_watchdog_func,
-+ (unsigned long) ohci);
-+
-+ ohci->eds_scheduled = 0;
-+ ohci->ed_to_check = NULL;
-+ }
-+
-+ ohci_dump (ohci, 1);
-+
-+ return 0;
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/* an interrupt happens */
-+
-+static irqreturn_t ohci_irq (struct usb_hcd *hcd)
-+{
-+ struct ohci_hcd *ohci = hcd_to_ohci (hcd);
-+ struct ohci_regs __iomem *regs = ohci->regs;
-+ int ints;
-+
-+ /* Read interrupt status (and flush pending writes). We ignore the
-+ * optimization of checking the LSB of hcca->done_head; it doesn't
-+ * work on all systems (edge triggering for OHCI can be a factor).
-+ */
-+ ints = ohci_readl(ohci, &regs->intrstatus);
-+
-+ /* Check for an all 1's result which is a typical consequence
-+ * of dead, unclocked, or unplugged (CardBus...) devices
-+ */
-+ if (ints == ~(u32)0) {
-+ disable (ohci);
-+ ohci_dbg (ohci, "device removed!\n");
-+ return IRQ_HANDLED;
-+ }
-+
-+ /* We only care about interrupts that are enabled */
-+ ints &= ohci_readl(ohci, &regs->intrenable);
-+
-+ /* interrupt for some other device? */
-+ if (ints == 0)
-+ return IRQ_NOTMINE;
-+
-+ if (ints & OHCI_INTR_UE) {
-+ // e.g. due to PCI Master/Target Abort
-+ if (quirk_nec(ohci)) {
-+ /* Workaround for a silicon bug in some NEC chips used
-+ * in Apple's PowerBooks. Adapted from Darwin code.
-+ */
-+ ohci_err (ohci, "OHCI Unrecoverable Error, scheduling NEC chip restart\n");
-+
-+ ohci_writel (ohci, OHCI_INTR_UE, &regs->intrdisable);
-+
-+ schedule_work (&ohci->nec_work);
-+ } else {
-+ disable (ohci);
-+ ohci_err (ohci, "OHCI Unrecoverable Error, disabled\n");
-+ }
-+
-+ ohci_dump (ohci, 1);
-+ ohci_usb_reset (ohci);
-+ }
-+
-+ if (ints & OHCI_INTR_RHSC) {
-+ ohci_vdbg(ohci, "rhsc\n");
-+ ohci->next_statechange = jiffies + STATECHANGE_DELAY;
-+ ohci_writel(ohci, OHCI_INTR_RD | OHCI_INTR_RHSC,
-+ &regs->intrstatus);
-+
-+ /* NOTE: Vendors didn't always make the same implementation
-+ * choices for RHSC. Many followed the spec; RHSC triggers
-+ * on an edge, like setting and maybe clearing a port status
-+ * change bit. With others it's level-triggered, active
-+ * until khubd clears all the port status change bits. We'll
-+ * always disable it here and rely on polling until khubd
-+ * re-enables it.
-+ */
-+ ohci_writel(ohci, OHCI_INTR_RHSC, &regs->intrdisable);
-+ usb_hcd_poll_rh_status(hcd);
-+ }
-+
-+ /* For connect and disconnect events, we expect the controller
-+ * to turn on RHSC along with RD. But for remote wakeup events
-+ * this might not happen.
-+ */
-+ else if (ints & OHCI_INTR_RD) {
-+ ohci_vdbg(ohci, "resume detect\n");
-+ ohci_writel(ohci, OHCI_INTR_RD, &regs->intrstatus);
-+ hcd->poll_rh = 1;
-+ if (ohci->autostop) {
-+ spin_lock (&ohci->lock);
-+ ohci_rh_resume (ohci);
-+ spin_unlock (&ohci->lock);
-+ } else
-+ usb_hcd_resume_root_hub(hcd);
-+ }
-+
-+ if (ints & OHCI_INTR_WDH) {
-+ spin_lock (&ohci->lock);
-+ dl_done_list (ohci);
-+ spin_unlock (&ohci->lock);
-+ }
-+
-+ if (quirk_zfmicro(ohci) && (ints & OHCI_INTR_SF)) {
-+ spin_lock(&ohci->lock);
-+ if (ohci->ed_to_check) {
-+ struct ed *ed = ohci->ed_to_check;
-+
-+ if (check_ed(ohci, ed)) {
-+ /* HC thinks the TD list is empty; HCD knows
-+ * at least one TD is outstanding
-+ */
-+ if (--ohci->zf_delay == 0) {
-+ struct td *td = list_entry(
-+ ed->td_list.next,
-+ struct td, td_list);
-+ ohci_warn(ohci,
-+ "Reclaiming orphan TD %p\n",
-+ td);
-+ takeback_td(ohci, td);
-+ ohci->ed_to_check = NULL;
-+ }
-+ } else
-+ ohci->ed_to_check = NULL;
-+ }
-+ spin_unlock(&ohci->lock);
-+ }
-+
-+ /* could track INTR_SO to reduce available PCI/... bandwidth */
-+
-+ /* handle any pending URB/ED unlinks, leaving INTR_SF enabled
-+ * when there's still unlinking to be done (next frame).
-+ */
-+ spin_lock (&ohci->lock);
-+ if (ohci->ed_rm_list)
-+ finish_unlinks (ohci, ohci_frame_no(ohci));
-+ if ((ints & OHCI_INTR_SF) != 0
-+ && !ohci->ed_rm_list
-+ && !ohci->ed_to_check
-+ && HC_IS_RUNNING(hcd->state))
-+ ohci_writel (ohci, OHCI_INTR_SF, &regs->intrdisable);
-+ spin_unlock (&ohci->lock);
-+
-+ if (HC_IS_RUNNING(hcd->state)) {
-+ ohci_writel (ohci, ints, &regs->intrstatus);
-+ ohci_writel (ohci, OHCI_INTR_MIE, &regs->intrenable);
-+ // flush those writes
-+ (void) ohci_readl (ohci, &ohci->regs->control);
-+ }
-+
-+ return IRQ_HANDLED;
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static void ohci_stop (struct usb_hcd *hcd)
-+{
-+ struct ohci_hcd *ohci = hcd_to_ohci (hcd);
-+
-+ ohci_dump (ohci, 1);
-+
-+ flush_scheduled_work();
-+
-+ ohci_usb_reset (ohci);
-+ ohci_writel (ohci, OHCI_INTR_MIE, &ohci->regs->intrdisable);
-+ free_irq(hcd->irq, hcd);
-+ hcd->irq = -1;
-+
-+ if (quirk_zfmicro(ohci))
-+ del_timer(&ohci->unlink_watchdog);
-+ if (quirk_amdiso(ohci))
-+ amd_iso_dev_put();
-+
-+ remove_debug_files (ohci);
-+ ohci_mem_cleanup (ohci);
-+ if (ohci->hcca) {
-+ dma_free_coherent (hcd->self.controller,
-+ sizeof *ohci->hcca,
-+ ohci->hcca, ohci->hcca_dma);
-+ ohci->hcca = NULL;
-+ ohci->hcca_dma = 0;
-+ }
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+#if defined(CONFIG_PM) || defined(CONFIG_PCI)
-+
-+/* must not be called from interrupt context */
-+static int ohci_restart (struct ohci_hcd *ohci)
-+{
-+ int temp;
-+ int i;
-+ struct urb_priv *priv;
-+
-+ spin_lock_irq(&ohci->lock);
-+ disable (ohci);
-+
-+ /* Recycle any "live" eds/tds (and urbs). */
-+ if (!list_empty (&ohci->pending))
-+ ohci_dbg(ohci, "abort schedule...\n");
-+ list_for_each_entry (priv, &ohci->pending, pending) {
-+ struct urb *urb = priv->td[0]->urb;
-+ struct ed *ed = priv->ed;
-+
-+ switch (ed->state) {
-+ case ED_OPER:
-+ ed->state = ED_UNLINK;
-+ ed->hwINFO |= cpu_to_hc32(ohci, ED_DEQUEUE);
-+ ed_deschedule (ohci, ed);
-+
-+ ed->ed_next = ohci->ed_rm_list;
-+ ed->ed_prev = NULL;
-+ ohci->ed_rm_list = ed;
-+ /* FALLTHROUGH */
-+ case ED_UNLINK:
-+ break;
-+ default:
-+ ohci_dbg(ohci, "bogus ed %p state %d\n",
-+ ed, ed->state);
-+ }
-+
-+ if (!urb->unlinked)
-+ urb->unlinked = -ESHUTDOWN;
-+ }
-+ finish_unlinks (ohci, 0);
-+ spin_unlock_irq(&ohci->lock);
-+
-+ /* paranoia, in case that didn't work: */
-+
-+ /* empty the interrupt branches */
-+ for (i = 0; i < NUM_INTS; i++) ohci->load [i] = 0;
-+ for (i = 0; i < NUM_INTS; i++) ohci->hcca->int_table [i] = 0;
-+
-+ /* no EDs to remove */
-+ ohci->ed_rm_list = NULL;
-+
-+ /* empty control and bulk lists */
-+ ohci->ed_controltail = NULL;
-+ ohci->ed_bulktail = NULL;
-+
-+ if ((temp = ohci_run (ohci)) < 0) {
-+ ohci_err (ohci, "can't restart, %d\n", temp);
-+ return temp;
-+ }
-+ ohci_dbg(ohci, "restart complete\n");
-+ return 0;
-+}
-+
-+#endif
-+
-+/*-------------------------------------------------------------------------*/
-+
-+MODULE_AUTHOR (DRIVER_AUTHOR);
-+MODULE_DESCRIPTION(DRIVER_DESC);
-+MODULE_LICENSE ("GPL");
-+
-+#ifdef CONFIG_PCI
-+#include "ohci-pci.c"
-+#define PCI_DRIVER ohci_pci_driver
-+#endif
-+
-+#if defined(CONFIG_ARCH_SA1100) && defined(CONFIG_SA1111)
-+#include "ohci-sa1111.c"
-+#define SA1111_DRIVER ohci_hcd_sa1111_driver
-+#endif
-+
-+#if defined(CONFIG_ARCH_S3C2410) || defined(CONFIG_ARCH_S3C64XX)
-+#include "ohci-s3c2410.c"
-+#define PLATFORM_DRIVER ohci_hcd_s3c2410_driver
-+#endif
-+
-+#ifdef CONFIG_USB_OHCI_HCD_OMAP1
-+#include "ohci-omap.c"
-+#define OMAP1_PLATFORM_DRIVER ohci_hcd_omap_driver
-+#endif
-+
-+#ifdef CONFIG_USB_OHCI_HCD_OMAP3
-+#include "ohci-omap3.c"
-+#define OMAP3_PLATFORM_DRIVER ohci_hcd_omap3_driver
-+#endif
-+
-+#ifdef CONFIG_ARCH_LH7A404
-+#include "ohci-lh7a404.c"
-+#define PLATFORM_DRIVER ohci_hcd_lh7a404_driver
-+#endif
-+
-+#if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx)
-+#include "ohci-pxa27x.c"
-+#define PLATFORM_DRIVER ohci_hcd_pxa27x_driver
-+#endif
-+
-+#ifdef CONFIG_ARCH_EP93XX
-+#include "ohci-ep93xx.c"
-+#define PLATFORM_DRIVER ohci_hcd_ep93xx_driver
-+#endif
-+
-+#ifdef CONFIG_SOC_AU1X00
-+#include "ohci-au1xxx.c"
-+#define PLATFORM_DRIVER ohci_hcd_au1xxx_driver
-+#endif
-+
-+#ifdef CONFIG_PNX8550
-+#include "ohci-pnx8550.c"
-+#define PLATFORM_DRIVER ohci_hcd_pnx8550_driver
-+#endif
-+
-+#ifdef CONFIG_USB_OHCI_HCD_PPC_SOC
-+#include "ohci-ppc-soc.c"
-+#define PLATFORM_DRIVER ohci_hcd_ppc_soc_driver
-+#endif
-+
-+#ifdef CONFIG_ARCH_AT91
-+#include "ohci-at91.c"
-+#define PLATFORM_DRIVER ohci_hcd_at91_driver
-+#endif
-+
-+#ifdef CONFIG_ARCH_PNX4008
-+#include "ohci-pnx4008.c"
-+#define PLATFORM_DRIVER usb_hcd_pnx4008_driver
-+#endif
-+
-+#ifdef CONFIG_ARCH_DAVINCI_DA8XX
-+#include "ohci-da8xx.c"
-+#define PLATFORM_DRIVER ohci_hcd_da8xx_driver
-+#endif
-+
-+#if defined(CONFIG_CPU_SUBTYPE_SH7720) || \
-+ defined(CONFIG_CPU_SUBTYPE_SH7721) || \
-+ defined(CONFIG_CPU_SUBTYPE_SH7763) || \
-+ defined(CONFIG_CPU_SUBTYPE_SH7786)
-+#include "ohci-sh.c"
-+#define PLATFORM_DRIVER ohci_hcd_sh_driver
-+#endif
-+
-+
-+#ifdef CONFIG_USB_OHCI_HCD_PPC_OF
-+#include "ohci-ppc-of.c"
-+#define OF_PLATFORM_DRIVER ohci_hcd_ppc_of_driver
-+#endif
-+
-+#ifdef CONFIG_PPC_PS3
-+#include "ohci-ps3.c"
-+#define PS3_SYSTEM_BUS_DRIVER ps3_ohci_driver
-+#endif
-+
-+#ifdef CONFIG_USB_OHCI_HCD_SSB
-+#include "ohci-ssb.c"
-+#define SSB_OHCI_DRIVER ssb_ohci_driver
-+#endif
-+
-+#ifdef CONFIG_MFD_SM501
-+#include "ohci-sm501.c"
-+#define SM501_OHCI_DRIVER ohci_hcd_sm501_driver
-+#endif
-+
-+#ifdef CONFIG_MFD_TC6393XB
-+#include "ohci-tmio.c"
-+#define TMIO_OHCI_DRIVER ohci_hcd_tmio_driver
-+#endif
-+
-+#if !defined(PCI_DRIVER) && \
-+ !defined(PLATFORM_DRIVER) && \
-+ !defined(OMAP1_PLATFORM_DRIVER) && \
-+ !defined(OMAP3_PLATFORM_DRIVER) && \
-+ !defined(OF_PLATFORM_DRIVER) && \
-+ !defined(SA1111_DRIVER) && \
-+ !defined(PS3_SYSTEM_BUS_DRIVER) && \
-+ !defined(SM501_OHCI_DRIVER) && \
-+ !defined(TMIO_OHCI_DRIVER) && \
-+ !defined(SSB_OHCI_DRIVER)
-+#error "missing bus glue for ohci-hcd"
-+#endif
-+
-+static int __init ohci_hcd_mod_init(void)
-+{
-+ int retval = 0;
-+
-+ if (usb_disabled())
-+ return -ENODEV;
-+
-+ printk(KERN_INFO "%s: " DRIVER_DESC "\n", hcd_name);
-+ pr_debug ("%s: block sizes: ed %Zd td %Zd\n", hcd_name,
-+ sizeof (struct ed), sizeof (struct td));
-+ set_bit(USB_OHCI_LOADED, &usb_hcds_loaded);
-+
-+#ifdef DEBUG
-+ ohci_debug_root = debugfs_create_dir("ohci", usb_debug_root);
-+ if (!ohci_debug_root) {
-+ retval = -ENOENT;
-+ goto error_debug;
-+ }
-+#endif
-+
-+#ifdef PS3_SYSTEM_BUS_DRIVER
-+ retval = ps3_ohci_driver_register(&PS3_SYSTEM_BUS_DRIVER);
-+ if (retval < 0)
-+ goto error_ps3;
-+#endif
-+
-+#ifdef PLATFORM_DRIVER
-+ retval = platform_driver_register(&PLATFORM_DRIVER);
-+ if (retval < 0)
-+ goto error_platform;
-+#endif
-+
-+#ifdef OMAP1_PLATFORM_DRIVER
-+ retval = platform_driver_register(&OMAP1_PLATFORM_DRIVER);
-+ if (retval < 0)
-+ goto error_omap1_platform;
-+#endif
-+
-+#ifdef OMAP3_PLATFORM_DRIVER
-+ retval = platform_driver_register(&OMAP3_PLATFORM_DRIVER);
-+ if (retval < 0)
-+ goto error_omap3_platform;
-+#endif
-+
-+#ifdef OF_PLATFORM_DRIVER
-+ retval = of_register_platform_driver(&OF_PLATFORM_DRIVER);
-+ if (retval < 0)
-+ goto error_of_platform;
-+#endif
-+
-+#ifdef SA1111_DRIVER
-+ retval = sa1111_driver_register(&SA1111_DRIVER);
-+ if (retval < 0)
-+ goto error_sa1111;
-+#endif
-+
-+#ifdef PCI_DRIVER
-+ retval = pci_register_driver(&PCI_DRIVER);
-+ if (retval < 0)
-+ goto error_pci;
-+#endif
-+
-+#ifdef SSB_OHCI_DRIVER
-+ retval = ssb_driver_register(&SSB_OHCI_DRIVER);
-+ if (retval)
-+ goto error_ssb;
-+#endif
-+
-+#ifdef SM501_OHCI_DRIVER
-+ retval = platform_driver_register(&SM501_OHCI_DRIVER);
-+ if (retval < 0)
-+ goto error_sm501;
-+#endif
-+
-+#ifdef TMIO_OHCI_DRIVER
-+ retval = platform_driver_register(&TMIO_OHCI_DRIVER);
-+ if (retval < 0)
-+ goto error_tmio;
-+#endif
-+
-+ return retval;
-+
-+ /* Error path */
-+#ifdef TMIO_OHCI_DRIVER
-+ platform_driver_unregister(&TMIO_OHCI_DRIVER);
-+ error_tmio:
-+#endif
-+#ifdef SM501_OHCI_DRIVER
-+ platform_driver_unregister(&SM501_OHCI_DRIVER);
-+ error_sm501:
-+#endif
-+#ifdef SSB_OHCI_DRIVER
-+ ssb_driver_unregister(&SSB_OHCI_DRIVER);
-+ error_ssb:
-+#endif
-+#ifdef PCI_DRIVER
-+ pci_unregister_driver(&PCI_DRIVER);
-+ error_pci:
-+#endif
-+#ifdef SA1111_DRIVER
-+ sa1111_driver_unregister(&SA1111_DRIVER);
-+ error_sa1111:
-+#endif
-+#ifdef OF_PLATFORM_DRIVER
-+ of_unregister_platform_driver(&OF_PLATFORM_DRIVER);
-+ error_of_platform:
-+#endif
-+#ifdef PLATFORM_DRIVER
-+ platform_driver_unregister(&PLATFORM_DRIVER);
-+ error_platform:
-+#endif
-+#ifdef OMAP1_PLATFORM_DRIVER
-+ platform_driver_unregister(&OMAP1_PLATFORM_DRIVER);
-+ error_omap1_platform:
-+#endif
-+#ifdef OMAP3_PLATFORM_DRIVER
-+ platform_driver_unregister(&OMAP3_PLATFORM_DRIVER);
-+ error_omap3_platform:
-+#endif
-+#ifdef PS3_SYSTEM_BUS_DRIVER
-+ ps3_ohci_driver_unregister(&PS3_SYSTEM_BUS_DRIVER);
-+ error_ps3:
-+#endif
-+#ifdef DEBUG
-+ debugfs_remove(ohci_debug_root);
-+ ohci_debug_root = NULL;
-+ error_debug:
-+#endif
-+
-+ clear_bit(USB_OHCI_LOADED, &usb_hcds_loaded);
-+ return retval;
-+}
-+module_init(ohci_hcd_mod_init);
-+
-+static void __exit ohci_hcd_mod_exit(void)
-+{
-+#ifdef TMIO_OHCI_DRIVER
-+ platform_driver_unregister(&TMIO_OHCI_DRIVER);
-+#endif
-+#ifdef SM501_OHCI_DRIVER
-+ platform_driver_unregister(&SM501_OHCI_DRIVER);
-+#endif
-+#ifdef SSB_OHCI_DRIVER
-+ ssb_driver_unregister(&SSB_OHCI_DRIVER);
-+#endif
-+#ifdef PCI_DRIVER
-+ pci_unregister_driver(&PCI_DRIVER);
-+#endif
-+#ifdef SA1111_DRIVER
-+ sa1111_driver_unregister(&SA1111_DRIVER);
-+#endif
-+#ifdef OF_PLATFORM_DRIVER
-+ of_unregister_platform_driver(&OF_PLATFORM_DRIVER);
-+#endif
-+#ifdef PLATFORM_DRIVER
-+ platform_driver_unregister(&PLATFORM_DRIVER);
-+#endif
-+#ifdef PS3_SYSTEM_BUS_DRIVER
-+ ps3_ohci_driver_unregister(&PS3_SYSTEM_BUS_DRIVER);
-+#endif
-+#ifdef DEBUG
-+ debugfs_remove(ohci_debug_root);
-+#endif
-+ clear_bit(USB_OHCI_LOADED, &usb_hcds_loaded);
-+}
-+module_exit(ohci_hcd_mod_exit);
+diff -Nur linux-2.6.36.orig/drivers/watchdog/Kconfig linux-2.6.36/drivers/watchdog/Kconfig
+--- linux-2.6.36.orig/drivers/watchdog/Kconfig 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/watchdog/Kconfig 2010-11-18 21:16:17.000000000 +0100
+@@ -916,6 +916,13 @@
+ from the first interrupt, it is then only poked when the
+ device is written.
+
++config AR71XX_WDT
++ tristate "Atheros AR71xx Watchdog Timer"
++ depends on ATHEROS_AR71XX
++ help
++ Hardware driver for the built-in watchdog timer on the Atheros
++ AR71xx SoCs.
+
-diff -Nur linux-2.6.35.7.orig/drivers/watchdog/ar71xx_wdt.c linux-2.6.35.7/drivers/watchdog/ar71xx_wdt.c
---- linux-2.6.35.7.orig/drivers/watchdog/ar71xx_wdt.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/watchdog/ar71xx_wdt.c 2010-10-14 20:28:01.508101380 +0200
+ # PARISC Architecture
+
+ # POWERPC Architecture
+diff -Nur linux-2.6.36.orig/drivers/watchdog/Makefile linux-2.6.36/drivers/watchdog/Makefile
+--- linux-2.6.36.orig/drivers/watchdog/Makefile 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/watchdog/Makefile 2010-11-18 21:17:24.000000000 +0100
+@@ -116,6 +116,7 @@
+ obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
+ obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
+ obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
++obj-$(CONFIG_AR71XX_WDT) += ar71xx_wdt.o
+ obj-$(CONFIG_OCTEON_WDT) += octeon-wdt.o
+ octeon-wdt-y := octeon-wdt-main.o octeon-wdt-nmi.o
+
+diff -Nur linux-2.6.36.orig/drivers/watchdog/ar71xx_wdt.c linux-2.6.36/drivers/watchdog/ar71xx_wdt.c
+--- linux-2.6.36.orig/drivers/watchdog/ar71xx_wdt.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/drivers/watchdog/ar71xx_wdt.c 2010-11-18 21:16:17.000000000 +0100
@@ -0,0 +1,270 @@
+/*
+ * Driver for the Atheros AR71xx SoC's built-in hardware watchdog timer.
@@ -28690,1307 +17311,9 @@ diff -Nur linux-2.6.35.7.orig/drivers/watchdog/ar71xx_wdt.c linux-2.6.35.7/drive
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRV_NAME);
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-diff -Nur linux-2.6.35.7.orig/drivers/watchdog/Kconfig linux-2.6.35.7/drivers/watchdog/Kconfig
---- linux-2.6.35.7.orig/drivers/watchdog/Kconfig 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/drivers/watchdog/Kconfig 2010-10-14 20:28:01.548101099 +0200
-@@ -875,6 +875,13 @@
- help
- Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
-
-+config AR71XX_WDT
-+ tristate "Atheros AR71xx Watchdog Timer"
-+ depends on ATHEROS_AR71XX
-+ help
-+ Hardware driver for the built-in watchdog timer on the Atheros
-+ AR71xx SoCs.
-+
- # PARISC Architecture
-
- # POWERPC Architecture
-diff -Nur linux-2.6.35.7.orig/drivers/watchdog/Kconfig.orig linux-2.6.35.7/drivers/watchdog/Kconfig.orig
---- linux-2.6.35.7.orig/drivers/watchdog/Kconfig.orig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/watchdog/Kconfig.orig 2010-09-29 03:09:08.000000000 +0200
-@@ -0,0 +1,1114 @@
-+#
-+# Watchdog device configuration
-+#
-+
-+menuconfig WATCHDOG
-+ bool "Watchdog Timer Support"
-+ ---help---
-+ If you say Y here (and to one of the following options) and create a
-+ character special file /dev/watchdog with major number 10 and minor
-+ number 130 using mknod ("man mknod"), you will get a watchdog, i.e.:
-+ subsequently opening the file and then failing to write to it for
-+ longer than 1 minute will result in rebooting the machine. This
-+ could be useful for a networked machine that needs to come back
-+ on-line as fast as possible after a lock-up. There's both a watchdog
-+ implementation entirely in software (which can sometimes fail to
-+ reboot the machine) and a driver for hardware watchdog boards, which
-+ are more robust and can also keep track of the temperature inside
-+ your computer. For details, read
-+ <file:Documentation/watchdog/watchdog-api.txt> in the kernel source.
-+
-+ The watchdog is usually used together with the watchdog daemon
-+ which is available from
-+ <ftp://ibiblio.org/pub/Linux/system/daemons/watchdog/>. This daemon can
-+ also monitor NFS connections and can reboot the machine when the process
-+ table is full.
-+
-+ If unsure, say N.
-+
-+if WATCHDOG
-+
-+config WATCHDOG_NOWAYOUT
-+ bool "Disable watchdog shutdown on close"
-+ help
-+ The default watchdog behaviour (which you get if you say N here) is
-+ to stop the timer if the process managing it closes the file
-+ /dev/watchdog. It's always remotely possible that this process might
-+ get killed. If you say Y here, the watchdog cannot be stopped once
-+ it has been started.
-+
-+#
-+# General Watchdog drivers
-+#
-+
-+comment "Watchdog Device Drivers"
-+
-+# Architecture Independent
-+
-+config SOFT_WATCHDOG
-+ tristate "Software watchdog"
-+ help
-+ A software monitoring watchdog. This will fail to reboot your system
-+ from some situations that the hardware watchdog will recover
-+ from. Equally it's a lot cheaper to install.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called softdog.
-+
-+config WM831X_WATCHDOG
-+ tristate "WM831x watchdog"
-+ depends on MFD_WM831X
-+ help
-+ Support for the watchdog in the WM831x AudioPlus PMICs. When
-+ the watchdog triggers the system will be reset.
-+
-+config WM8350_WATCHDOG
-+ tristate "WM8350 watchdog"
-+ depends on MFD_WM8350
-+ help
-+ Support for the watchdog in the WM8350 AudioPlus PMIC. When
-+ the watchdog triggers the system will be reset.
-+
-+# ALPHA Architecture
-+
-+# ARM Architecture
-+
-+config AT91RM9200_WATCHDOG
-+ tristate "AT91RM9200 watchdog"
-+ depends on ARCH_AT91RM9200
-+ help
-+ Watchdog timer embedded into AT91RM9200 chips. This will reboot your
-+ system when the timeout is reached.
-+
-+config AT91SAM9X_WATCHDOG
-+ tristate "AT91SAM9X / AT91CAP9 watchdog"
-+ depends on ARCH_AT91 && !ARCH_AT91RM9200
-+ help
-+ Watchdog timer embedded into AT91SAM9X and AT91CAP9 chips. This will
-+ reboot your system when the timeout is reached.
-+
-+config 21285_WATCHDOG
-+ tristate "DC21285 watchdog"
-+ depends on FOOTBRIDGE
-+ help
-+ The Intel Footbridge chip contains a built-in watchdog circuit. Say Y
-+ here if you wish to use this. Alternatively say M to compile the
-+ driver as a module, which will be called wdt285.
-+
-+ This driver does not work on all machines. In particular, early CATS
-+ boards have hardware problems that will cause the machine to simply
-+ lock up if the watchdog fires.
-+
-+ "If in doubt, leave it out" - say N.
-+
-+config 977_WATCHDOG
-+ tristate "NetWinder WB83C977 watchdog"
-+ depends on FOOTBRIDGE && ARCH_NETWINDER
-+ help
-+ Say Y here to include support for the WB977 watchdog included in
-+ NetWinder machines. Alternatively say M to compile the driver as
-+ a module, which will be called wdt977.
-+
-+ Not sure? It's safe to say N.
-+
-+config IXP2000_WATCHDOG
-+ tristate "IXP2000 Watchdog"
-+ depends on ARCH_IXP2000
-+ help
-+ Say Y here if to include support for the watchdog timer
-+ in the Intel IXP2000(2400, 2800, 2850) network processors.
-+ This driver can be built as a module by choosing M. The module
-+ will be called ixp2000_wdt.
-+
-+ Say N if you are unsure.
-+
-+config IXP4XX_WATCHDOG
-+ tristate "IXP4xx Watchdog"
-+ depends on ARCH_IXP4XX
-+ help
-+ Say Y here if to include support for the watchdog timer
-+ in the Intel IXP4xx network processors. This driver can
-+ be built as a module by choosing M. The module will
-+ be called ixp4xx_wdt.
-+
-+ Note: The internal IXP4xx watchdog does a soft CPU reset
-+ which doesn't reset any peripherals. There are circumstances
-+ where the watchdog will fail to reset the board correctly
-+ (e.g., if the boot ROM is in an unreadable state).
-+
-+ Say N if you are unsure.
-+
-+config KS8695_WATCHDOG
-+ tristate "KS8695 watchdog"
-+ depends on ARCH_KS8695
-+ help
-+ Watchdog timer embedded into KS8695 processor. This will reboot your
-+ system when the timeout is reached.
-+
-+config HAVE_S3C2410_WATCHDOG
-+ bool
-+ help
-+ This will include watchdog timer support for Samsung SoCs. If
-+ you want to include watchdog support for any machine, kindly
-+ select this in the respective mach-XXXX/Kconfig file.
-+
-+config S3C2410_WATCHDOG
-+ tristate "S3C2410 Watchdog"
-+ depends on ARCH_S3C2410 || HAVE_S3C2410_WATCHDOG
-+ help
-+ Watchdog timer block in the Samsung SoCs. This will reboot
-+ the system when the timer expires with the watchdog enabled.
-+
-+ The driver is limited by the speed of the system's PCLK
-+ signal, so with reasonably fast systems (PCLK around 50-66MHz)
-+ then watchdog intervals of over approximately 20seconds are
-+ unavailable.
-+
-+ The driver can be built as a module by choosing M, and will
-+ be called s3c2410_wdt
-+
-+config SA1100_WATCHDOG
-+ tristate "SA1100/PXA2xx watchdog"
-+ depends on ARCH_SA1100 || ARCH_PXA
-+ help
-+ Watchdog timer embedded into SA11x0 and PXA2xx chips. This will
-+ reboot your system when timeout is reached.
-+
-+ NOTE: once enabled, this timer cannot be disabled.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called sa1100_wdt.
-+
-+config MPCORE_WATCHDOG
-+ tristate "MPcore watchdog"
-+ depends on HAVE_ARM_TWD
-+ help
-+ Watchdog timer embedded into the MPcore system.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called mpcore_wdt.
-+
-+config EP93XX_WATCHDOG
-+ tristate "EP93xx Watchdog"
-+ depends on ARCH_EP93XX
-+ help
-+ Say Y here if to include support for the watchdog timer
-+ embedded in the Cirrus Logic EP93xx family of devices.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called ep93xx_wdt.
-+
-+config OMAP_WATCHDOG
-+ tristate "OMAP Watchdog"
-+ depends on ARCH_OMAP16XX || ARCH_OMAP2PLUS
-+ help
-+ Support for TI OMAP1610/OMAP1710/OMAP2420/OMAP3430/OMAP4430 watchdog. Say 'Y'
-+ here to enable the OMAP1610/OMAP1710/OMAP2420/OMAP3430/OMAP4430 watchdog timer.
-+
-+config PNX4008_WATCHDOG
-+ tristate "PNX4008 Watchdog"
-+ depends on ARCH_PNX4008
-+ help
-+ Say Y here if to include support for the watchdog timer
-+ in the PNX4008 processor.
-+ This driver can be built as a module by choosing M. The module
-+ will be called pnx4008_wdt.
-+
-+ Say N if you are unsure.
-+
-+config IOP_WATCHDOG
-+ tristate "IOP Watchdog"
-+ depends on PLAT_IOP
-+ select WATCHDOG_NOWAYOUT if (ARCH_IOP32X || ARCH_IOP33X)
-+ help
-+ Say Y here if to include support for the watchdog timer
-+ in the Intel IOP3XX & IOP13XX I/O Processors. This driver can
-+ be built as a module by choosing M. The module will
-+ be called iop_wdt.
-+
-+ Note: The IOP13XX watchdog does an Internal Bus Reset which will
-+ affect both cores and the peripherals of the IOP. The ATU-X
-+ and/or ATUe configuration registers will remain intact, but if
-+ operating as an Root Complex and/or Central Resource, the PCI-X
-+ and/or PCIe busses will also be reset. THIS IS A VERY BIG HAMMER.
-+
-+config DAVINCI_WATCHDOG
-+ tristate "DaVinci watchdog"
-+ depends on ARCH_DAVINCI
-+ help
-+ Say Y here if to include support for the watchdog timer
-+ in the DaVinci DM644x/DM646x processors.
-+ To compile this driver as a module, choose M here: the
-+ module will be called davinci_wdt.
-+
-+ NOTE: once enabled, this timer cannot be disabled.
-+ Say N if you are unsure.
-+
-+config ORION_WATCHDOG
-+ tristate "Orion watchdog"
-+ depends on ARCH_ORION5X || ARCH_KIRKWOOD
-+ help
-+ Say Y here if to include support for the watchdog timer
-+ in the Marvell Orion5x and Kirkwood ARM SoCs.
-+ To compile this driver as a module, choose M here: the
-+ module will be called orion_wdt.
-+
-+config COH901327_WATCHDOG
-+ bool "ST-Ericsson COH 901 327 watchdog"
-+ depends on ARCH_U300
-+ default y if MACH_U300
-+ help
-+ Say Y here to include Watchdog timer support for the
-+ watchdog embedded into the ST-Ericsson U300 series platforms.
-+ This watchdog is used to reset the system and thus cannot be
-+ compiled as a module.
-+
-+config TWL4030_WATCHDOG
-+ tristate "TWL4030 Watchdog"
-+ depends on TWL4030_CORE
-+ help
-+ Support for TI TWL4030 watchdog. Say 'Y' here to enable the
-+ watchdog timer support for TWL4030 chips.
-+
-+config STMP3XXX_WATCHDOG
-+ tristate "Freescale STMP3XXX watchdog"
-+ depends on ARCH_STMP3XXX
-+ help
-+ Say Y here if to include support for the watchdog timer
-+ for the Sigmatel STMP37XX/378X SoC.
-+ To compile this driver as a module, choose M here: the
-+ module will be called stmp3xxx_wdt.
-+
-+config NUC900_WATCHDOG
-+ tristate "Nuvoton NUC900 watchdog"
-+ depends on ARCH_W90X900
-+ help
-+ Say Y here if to include support for the watchdog timer
-+ for the Nuvoton NUC900 series SoCs.
-+ To compile this driver as a module, choose M here: the
-+ module will be called nuc900_wdt.
-+
-+config ADX_WATCHDOG
-+ tristate "Avionic Design Xanthos watchdog"
-+ depends on ARCH_PXA_ADX
-+ help
-+ Say Y here if you want support for the watchdog timer on Avionic
-+ Design Xanthos boards.
-+
-+config TS72XX_WATCHDOG
-+ tristate "TS-72XX SBC Watchdog"
-+ depends on MACH_TS72XX
-+ help
-+ Technologic Systems TS-7200, TS-7250 and TS-7260 boards have
-+ watchdog timer implemented in a external CPLD chip. Say Y here
-+ if you want to support for the watchdog timer on TS-72XX boards.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called ts72xx_wdt.
-+
-+config MAX63XX_WATCHDOG
-+ tristate "Max63xx watchdog"
-+ depends on ARM && HAS_IOMEM
-+ help
-+ Support for memory mapped max63{69,70,71,72,73,74} watchdog timer.
-+
-+config IMX2_WDT
-+ tristate "IMX2+ Watchdog"
-+ depends on ARCH_MX2 || ARCH_MX25 || ARCH_MX3 || ARCH_MX5
-+ help
-+ This is the driver for the hardware watchdog
-+ on the Freescale IMX2 and later processors.
-+ If you have one of these processors and wish to have
-+ watchdog support enabled, say Y, otherwise say N.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called imx2_wdt.
-+
-+# AVR32 Architecture
-+
-+config AT32AP700X_WDT
-+ tristate "AT32AP700x watchdog"
-+ depends on CPU_AT32AP700X
-+ help
-+ Watchdog timer embedded into AT32AP700x devices. This will reboot
-+ your system when the timeout is reached.
-+
-+# BLACKFIN Architecture
-+
-+config BFIN_WDT
-+ tristate "Blackfin On-Chip Watchdog Timer"
-+ depends on BLACKFIN
-+ ---help---
-+ If you say yes here you will get support for the Blackfin On-Chip
-+ Watchdog Timer. If you have one of these processors and wish to
-+ have watchdog support enabled, say Y, otherwise say N.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called bfin_wdt.
-+
-+# CRIS Architecture
-+
-+# FRV Architecture
-+
-+# H8300 Architecture
-+
-+# X86 (i386 + ia64 + x86_64) Architecture
-+
-+config ACQUIRE_WDT
-+ tristate "Acquire SBC Watchdog Timer"
-+ depends on X86
-+ ---help---
-+ This is the driver for the hardware watchdog on Single Board
-+ Computers produced by Acquire Inc (and others). This watchdog
-+ simply watches your kernel to make sure it doesn't freeze, and if
-+ it does, it reboots your computer after a certain amount of time.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called acquirewdt.
-+
-+ Most people will say N.
-+
-+config ADVANTECH_WDT
-+ tristate "Advantech SBC Watchdog Timer"
-+ depends on X86
-+ help
-+ If you are configuring a Linux kernel for the Advantech single-board
-+ computer, say `Y' here to support its built-in watchdog timer
-+ feature. More information can be found at
-+ <http://www.advantech.com.tw/products/>
-+
-+config ALIM1535_WDT
-+ tristate "ALi M1535 PMU Watchdog Timer"
-+ depends on X86 && PCI
-+ ---help---
-+ This is the driver for the hardware watchdog on the ALi M1535 PMU.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called alim1535_wdt.
-+
-+ Most people will say N.
-+
-+config ALIM7101_WDT
-+ tristate "ALi M7101 PMU Computer Watchdog"
-+ depends on PCI
-+ help
-+ This is the driver for the hardware watchdog on the ALi M7101 PMU
-+ as used in the x86 Cobalt servers and also found in some
-+ SPARC Netra servers too.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called alim7101_wdt.
-+
-+ Most people will say N.
-+
-+config GEODE_WDT
-+ tristate "AMD Geode CS5535/CS5536 Watchdog"
-+ depends on CS5535_MFGPT
-+ help
-+ This driver enables a watchdog capability built into the
-+ CS5535/CS5536 companion chips for the AMD Geode GX and LX
-+ processors. This watchdog watches your kernel to make sure
-+ it doesn't freeze, and if it does, it reboots your computer after
-+ a certain amount of time.
-+
-+ You can compile this driver directly into the kernel, or use
-+ it as a module. The module will be called geodewdt.
-+
-+config SC520_WDT
-+ tristate "AMD Elan SC520 processor Watchdog"
-+ depends on X86
-+ help
-+ This is the driver for the hardware watchdog built in to the
-+ AMD "Elan" SC520 microcomputer commonly used in embedded systems.
-+ This watchdog simply watches your kernel to make sure it doesn't
-+ freeze, and if it does, it reboots your computer after a certain
-+ amount of time.
-+
-+ You can compile this driver directly into the kernel, or use
-+ it as a module. The module will be called sc520_wdt.
-+
-+config SBC_FITPC2_WATCHDOG
-+ tristate "Compulab SBC-FITPC2 watchdog"
-+ depends on X86
-+ ---help---
-+ This is the driver for the built-in watchdog timer on the fit-PC2,
-+ fit-PC2i, CM-iAM single-board computers made by Compulab.
-+
-+ It`s possible to enable watchdog timer either from BIOS (F2) or from booted Linux.
-+ When "Watchdog Timer Value" enabled one can set 31-255 s operational range.
-+
-+ Entering BIOS setup temporary disables watchdog operation regardless to current state,
-+ so system will not be restarted while user in BIOS setup.
-+
-+ Once watchdog was enabled the system will be restarted every
-+ "Watchdog Timer Value" period, so to prevent it user can restart or
-+ disable the watchdog.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called sbc_fitpc2_wdt.
-+
-+ Most people will say N.
-+
-+config EUROTECH_WDT
-+ tristate "Eurotech CPU-1220/1410 Watchdog Timer"
-+ depends on X86
-+ help
-+ Enable support for the watchdog timer on the Eurotech CPU-1220 and
-+ CPU-1410 cards. These are PC/104 SBCs. Spec sheets and product
-+ information are at <http://www.eurotech.it/>.
-+
-+config IB700_WDT
-+ tristate "IB700 SBC Watchdog Timer"
-+ depends on X86
-+ ---help---
-+ This is the driver for the hardware watchdog on the IB700 Single
-+ Board Computer produced by TMC Technology (www.tmc-uk.com). This watchdog
-+ simply watches your kernel to make sure it doesn't freeze, and if
-+ it does, it reboots your computer after a certain amount of time.
-+
-+ This driver is like the WDT501 driver but for slightly different hardware.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called ib700wdt.
-+
-+ Most people will say N.
-+
-+config IBMASR
-+ tristate "IBM Automatic Server Restart"
-+ depends on X86
-+ help
-+ This is the driver for the IBM Automatic Server Restart watchdog
-+ timer built-in into some eServer xSeries machines.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called ibmasr.
-+
-+config WAFER_WDT
-+ tristate "ICP Single Board Computer Watchdog Timer"
-+ depends on X86
-+ help
-+ This is a driver for the hardware watchdog on the ICP Single
-+ Board Computer. This driver is working on (at least) the following
-+ IPC SBC's: Wafer 5823, Rocky 4783, Rocky 3703 and Rocky 3782.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called wafer5823wdt.
-+
-+config I6300ESB_WDT
-+ tristate "Intel 6300ESB Timer/Watchdog"
-+ depends on X86 && PCI
-+ ---help---
-+ Hardware driver for the watchdog timer built into the Intel
-+ 6300ESB controller hub.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called i6300esb.
-+
-+config ITCO_WDT
-+ tristate "Intel TCO Timer/Watchdog"
-+ depends on (X86 || IA64) && PCI
-+ ---help---
-+ Hardware driver for the intel TCO timer based watchdog devices.
-+ These drivers are included in the Intel 82801 I/O Controller
-+ Hub family (from ICH0 up to ICH10) and in the Intel 63xxESB
-+ controller hub.
-+
-+ The TCO (Total Cost of Ownership) timer is a watchdog timer
-+ that will reboot the machine after its second expiration. The
-+ expiration time can be configured with the "heartbeat" parameter.
-+
-+ On some motherboards the driver may fail to reset the chipset's
-+ NO_REBOOT flag which prevents the watchdog from rebooting the
-+ machine. If this is the case you will get a kernel message like
-+ "failed to reset NO_REBOOT flag, reboot disabled by hardware".
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called iTCO_wdt.
-+
-+config ITCO_VENDOR_SUPPORT
-+ bool "Intel TCO Timer/Watchdog Specific Vendor Support"
-+ depends on ITCO_WDT
-+ ---help---
-+ Add vendor specific support to the intel TCO timer based watchdog
-+ devices. At this moment we only have additional support for some
-+ SuperMicro Inc. motherboards.
-+
-+config IT8712F_WDT
-+ tristate "IT8712F (Smart Guardian) Watchdog Timer"
-+ depends on X86
-+ ---help---
-+ This is the driver for the built-in watchdog timer on the IT8712F
-+ Super I/0 chipset used on many motherboards.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called it8712f_wdt.
-+
-+config IT87_WDT
-+ tristate "IT87 Watchdog Timer"
-+ depends on X86 && EXPERIMENTAL
-+ ---help---
-+ This is the driver for the hardware watchdog on the ITE IT8716,
-+ IT8718, IT8726, IT8712(Version J,K) Super I/O chips. This watchdog
-+ simply watches your kernel to make sure it doesn't freeze, and if
-+ it does, it reboots your computer after a certain amount of time.
-+
-+ To compile this driver as a module, choose M here: the module will
-+ be called it87_wdt.
-+
-+config HP_WATCHDOG
-+ tristate "HP Proliant iLO 2 Hardware Watchdog Timer"
-+ depends on X86
-+ help
-+ A software monitoring watchdog and NMI sourcing driver. This driver
-+ will detect lockups and provide stack trace. Also, when an NMI
-+ occurs this driver will make the necessary BIOS calls to log
-+ the cause of the NMI. This is a driver that will only load on a
-+ HP ProLiant system with a minimum of iLO2 support.
-+ To compile this driver as a module, choose M here: the
-+ module will be called hpwdt.
-+
-+config SC1200_WDT
-+ tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"
-+ depends on X86
-+ help
-+ This is a driver for National Semiconductor PC87307/PC97307 hardware
-+ watchdog cards as found on the SC1200. This watchdog is mainly used
-+ for power management purposes and can be used to power down the device
-+ during inactivity periods (includes interrupt activity monitoring).
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called sc1200wdt.
-+
-+ Most people will say N.
-+
-+config SCx200_WDT
-+ tristate "National Semiconductor SCx200 Watchdog"
-+ depends on SCx200 && PCI
-+ help
-+ Enable the built-in watchdog timer support on the National
-+ Semiconductor SCx200 processors.
-+
-+ If compiled as a module, it will be called scx200_wdt.
-+
-+config PC87413_WDT
-+ tristate "NS PC87413 watchdog"
-+ depends on X86
-+ ---help---
-+ This is the driver for the hardware watchdog on the PC87413 chipset
-+ This watchdog simply watches your kernel to make sure it doesn't
-+ freeze, and if it does, it reboots your computer after a certain
-+ amount of time.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called pc87413_wdt.
-+
-+ Most people will say N.
-+
-+config RDC321X_WDT
-+ tristate "RDC R-321x SoC watchdog"
-+ depends on X86_RDC321X
-+ help
-+ This is the driver for the built in hardware watchdog
-+ in the RDC R-321x SoC.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called rdc321x_wdt.
-+
-+config 60XX_WDT
-+ tristate "SBC-60XX Watchdog Timer"
-+ depends on X86
-+ help
-+ This driver can be used with the watchdog timer found on some
-+ single board computers, namely the 6010 PII based computer.
-+ It may well work with other cards. It reads port 0x443 to enable
-+ and re-set the watchdog timer, and reads port 0x45 to disable
-+ the watchdog. If you have a card that behave in similar ways,
-+ you can probably make this driver work with your card as well.
-+
-+ You can compile this driver directly into the kernel, or use
-+ it as a module. The module will be called sbc60xxwdt.
-+
-+config SBC8360_WDT
-+ tristate "SBC8360 Watchdog Timer"
-+ depends on X86
-+ ---help---
-+
-+ This is the driver for the hardware watchdog on the SBC8360 Single
-+ Board Computer produced by Axiomtek Co., Ltd. (www.axiomtek.com).
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called sbc8360.
-+
-+ Most people will say N.
-+
-+config SBC7240_WDT
-+ tristate "SBC Nano 7240 Watchdog Timer"
-+ depends on X86_32
-+ ---help---
-+ This is the driver for the hardware watchdog found on the IEI
-+ single board computers EPIC Nano 7240 (and likely others). This
-+ watchdog simply watches your kernel to make sure it doesn't freeze,
-+ and if it does, it reboots your computer after a certain amount of
-+ time.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called sbc7240_wdt.
-+
-+config CPU5_WDT
-+ tristate "SMA CPU5 Watchdog"
-+ depends on X86
-+ ---help---
-+ TBD.
-+ To compile this driver as a module, choose M here: the
-+ module will be called cpu5wdt.
-+
-+config SMSC_SCH311X_WDT
-+ tristate "SMSC SCH311X Watchdog Timer"
-+ depends on X86
-+ ---help---
-+ This is the driver for the hardware watchdog timer on the
-+ SMSC SCH3112, SCH3114 and SCH3116 Super IO chipset
-+ (LPC IO with 8042 KBC, Reset Generation, HWM and multiple
-+ serial ports).
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called sch311x_wdt.
-+
-+config SMSC37B787_WDT
-+ tristate "Winbond SMsC37B787 Watchdog Timer"
-+ depends on X86
-+ ---help---
-+ This is the driver for the hardware watchdog component on the
-+ Winbond SMsC37B787 chipset as used on the NetRunner Mainboard
-+ from Vision Systems and maybe others.
-+
-+ This watchdog simply watches your kernel to make sure it doesn't
-+ freeze, and if it does, it reboots your computer after a certain
-+ amount of time.
-+
-+ Usually a userspace daemon will notify the kernel WDT driver that
-+ userspace is still alive, at regular intervals.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called smsc37b787_wdt.
-+
-+ Most people will say N.
-+
-+config W83627HF_WDT
-+ tristate "W83627HF Watchdog Timer"
-+ depends on X86
-+ ---help---
-+ This is the driver for the hardware watchdog on the W83627HF chipset
-+ as used in Advantech PC-9578 and Tyan S2721-533 motherboards
-+ (and likely others). This watchdog simply watches your kernel to
-+ make sure it doesn't freeze, and if it does, it reboots your computer
-+ after a certain amount of time.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called w83627hf_wdt.
-+
-+ Most people will say N.
-+
-+config W83697HF_WDT
-+ tristate "W83697HF/W83697HG Watchdog Timer"
-+ depends on X86
-+ ---help---
-+ This is the driver for the hardware watchdog on the W83697HF/HG
-+ chipset as used in Dedibox/VIA motherboards (and likely others).
-+ This watchdog simply watches your kernel to make sure it doesn't
-+ freeze, and if it does, it reboots your computer after a certain
-+ amount of time.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called w83697hf_wdt.
-+
-+ Most people will say N.
-+
-+config W83697UG_WDT
-+ tristate "W83697UG/W83697UF Watchdog Timer"
-+ depends on X86
-+ ---help---
-+ This is the driver for the hardware watchdog on the W83697UG/UF
-+ chipset as used in MSI Fuzzy CX700 VIA motherboards (and likely others).
-+ This watchdog simply watches your kernel to make sure it doesn't
-+ freeze, and if it does, it reboots your computer after a certain
-+ amount of time.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called w83697ug_wdt.
-+
-+ Most people will say N.
-+
-+config W83877F_WDT
-+ tristate "W83877F (EMACS) Watchdog Timer"
-+ depends on X86
-+ ---help---
-+ This is the driver for the hardware watchdog on the W83877F chipset
-+ as used in EMACS PC-104 motherboards (and likely others). This
-+ watchdog simply watches your kernel to make sure it doesn't freeze,
-+ and if it does, it reboots your computer after a certain amount of
-+ time.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called w83877f_wdt.
-+
-+ Most people will say N.
-+
-+config W83977F_WDT
-+ tristate "W83977F (PCM-5335) Watchdog Timer"
-+ depends on X86
-+ ---help---
-+ This is the driver for the hardware watchdog on the W83977F I/O chip
-+ as used in AAEON's PCM-5335 SBC (and likely others). This
-+ watchdog simply watches your kernel to make sure it doesn't freeze,
-+ and if it does, it reboots your computer after a certain amount of
-+ time.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called w83977f_wdt.
-+
-+config MACHZ_WDT
-+ tristate "ZF MachZ Watchdog"
-+ depends on X86
-+ ---help---
-+ If you are using a ZF Micro MachZ processor, say Y here, otherwise
-+ N. This is the driver for the watchdog timer built-in on that
-+ processor using ZF-Logic interface. This watchdog simply watches
-+ your kernel to make sure it doesn't freeze, and if it does, it
-+ reboots your computer after a certain amount of time.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called machzwd.
-+
-+config SBC_EPX_C3_WATCHDOG
-+ tristate "Winsystems SBC EPX-C3 watchdog"
-+ depends on X86
-+ ---help---
-+ This is the driver for the built-in watchdog timer on the EPX-C3
-+ Single-board computer made by Winsystems, Inc.
-+
-+ *Note*: This hardware watchdog is not probeable and thus there
-+ is no way to know if writing to its IO address will corrupt
-+ your system or have any real effect. The only way to be sure
-+ that this driver does what you want is to make sure you
-+ are running it on an EPX-C3 from Winsystems with the watchdog
-+ timer at IO address 0x1ee and 0x1ef. It will write to both those
-+ IO ports. Basically, the assumption is made that if you compile
-+ this driver into your kernel and/or load it as a module, that you
-+ know what you are doing and that you are in fact running on an
-+ EPX-C3 board!
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called sbc_epx_c3.
-+
-+# M32R Architecture
-+
-+# M68K Architecture
-+
-+# M68KNOMMU Architecture
-+
-+# MIPS Architecture
-+
-+config BCM47XX_WDT
-+ tristate "Broadcom BCM47xx Watchdog Timer"
-+ depends on BCM47XX
-+ help
-+ Hardware driver for the Broadcom BCM47xx Watchog Timer.
-+
-+config RC32434_WDT
-+ tristate "IDT RC32434 SoC Watchdog Timer"
-+ depends on MIKROTIK_RB532
-+ help
-+ Hardware driver for the IDT RC32434 SoC built-in
-+ watchdog timer.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called rc32434_wdt.
-+
-+config INDYDOG
-+ tristate "Indy/I2 Hardware Watchdog"
-+ depends on SGI_HAS_INDYDOG
-+ help
-+ Hardware driver for the Indy's/I2's watchdog. This is a
-+ watchdog timer that will reboot the machine after a 60 second
-+ timer expired and no process has written to /dev/watchdog during
-+ that time.
-+
-+config WDT_MTX1
-+ tristate "MTX-1 Hardware Watchdog"
-+ depends on MIPS_MTX1
-+ help
-+ Hardware driver for the MTX-1 boards. This is a watchdog timer that
-+ will reboot the machine after a 100 seconds timer expired.
-+
-+config PNX833X_WDT
-+ tristate "PNX833x Hardware Watchdog"
-+ depends on SOC_PNX8335
-+ help
-+ Hardware driver for the PNX833x's watchdog. This is a
-+ watchdog timer that will reboot the machine after a programable
-+ timer has expired and no process has written to /dev/watchdog during
-+ that time.
-+
-+config SIBYTE_WDOG
-+ tristate "Sibyte SoC hardware watchdog"
-+ depends on CPU_SB1
-+ help
-+ Watchdog driver for the built in watchdog hardware in Sibyte
-+ SoC processors. There are apparently two watchdog timers
-+ on such processors; this driver supports only the first one,
-+ because currently Linux only supports exporting one watchdog
-+ to userspace.
-+
-+ To compile this driver as a loadable module, choose M here.
-+ The module will be called sb_wdog.
-+
-+config AR7_WDT
-+ tristate "TI AR7 Watchdog Timer"
-+ depends on AR7
-+ help
-+ Hardware driver for the TI AR7 Watchdog Timer.
-+
-+config TXX9_WDT
-+ tristate "Toshiba TXx9 Watchdog Timer"
-+ depends on CPU_TX39XX || CPU_TX49XX
-+ help
-+ Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
-+
-+# PARISC Architecture
-+
-+# POWERPC Architecture
-+
-+config GEF_WDT
-+ tristate "GE Watchdog Timer"
-+ depends on GEF_SBC610 || GEF_SBC310 || GEF_PPC9A
-+ ---help---
-+ Watchdog timer found in a number of GE single board computers.
-+
-+config MPC5200_WDT
-+ bool "MPC52xx Watchdog Timer"
-+ depends on PPC_MPC52xx
-+ help
-+ Use General Purpose Timer (GPT) 0 on the MPC5200 as Watchdog.
-+
-+config 8xxx_WDT
-+ tristate "MPC8xxx Platform Watchdog Timer"
-+ depends on PPC_8xx || PPC_83xx || PPC_86xx
-+ help
-+ This driver is for a SoC level watchdog that exists on some
-+ Freescale PowerPC processors. So far this driver supports:
-+ - MPC8xx watchdogs
-+ - MPC83xx watchdogs
-+ - MPC86xx watchdogs
-+
-+ For BookE processors (MPC85xx) use the BOOKE_WDT driver instead.
-+
-+config MV64X60_WDT
-+ tristate "MV64X60 (Marvell Discovery) Watchdog Timer"
-+ depends on MV64X60
-+
-+config PIKA_WDT
-+ tristate "PIKA FPGA Watchdog"
-+ depends on WARP
-+ default y
-+ help
-+ This enables the watchdog in the PIKA FPGA. Currently used on
-+ the Warp platform.
-+
-+config BOOKE_WDT
-+ bool "PowerPC Book-E Watchdog Timer"
-+ depends on BOOKE || 4xx
-+ ---help---
-+ Please see Documentation/watchdog/watchdog-api.txt for
-+ more information.
-+
-+# PPC64 Architecture
-+
-+config WATCHDOG_RTAS
-+ tristate "RTAS watchdog"
-+ depends on PPC_RTAS
-+ help
-+ This driver adds watchdog support for the RTAS watchdog.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called wdrtas.
-+
-+# S390 Architecture
-+
-+config ZVM_WATCHDOG
-+ tristate "z/VM Watchdog Timer"
-+ depends on S390
-+ help
-+ IBM s/390 and zSeries machines running under z/VM 5.1 or later
-+ provide a virtual watchdog timer to their guest that cause a
-+ user define Control Program command to be executed after a
-+ timeout.
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called vmwatchdog.
-+
-+# SUPERH (sh + sh64) Architecture
-+
-+config SH_WDT
-+ tristate "SuperH Watchdog"
-+ depends on SUPERH && (CPU_SH3 || CPU_SH4)
-+ help
-+ This driver adds watchdog support for the integrated watchdog in the
-+ SuperH processors. If you have one of these processors and wish
-+ to have watchdog support enabled, say Y, otherwise say N.
-+
-+ As a side note, saying Y here will automatically boost HZ to 1000
-+ so that the timer has a chance to clear the overflow counter. On
-+ slower systems (such as the SH-2 and SH-3) this will likely yield
-+ some performance issues. As such, the WDT should be avoided here
-+ unless it is absolutely necessary.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called shwdt.
-+
-+config SH_WDT_MMAP
-+ bool "Allow mmap of SH WDT"
-+ default n
-+ depends on SH_WDT
-+ help
-+ If you say Y here, user applications will be able to mmap the
-+ WDT/CPG registers.
-+
-+# SPARC Architecture
-+
-+# SPARC64 Architecture
-+
-+config WATCHDOG_CP1XXX
-+ tristate "CP1XXX Hardware Watchdog support"
-+ depends on SPARC64 && PCI
-+ ---help---
-+ This is the driver for the hardware watchdog timers present on
-+ Sun Microsystems CompactPCI models CP1400 and CP1500.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called cpwatchdog.
-+
-+ If you do not have a CompactPCI model CP1400 or CP1500, or
-+ another UltraSPARC-IIi-cEngine boardset with hardware watchdog,
-+ you should say N to this option.
-+
-+config WATCHDOG_RIO
-+ tristate "RIO Hardware Watchdog support"
-+ depends on SPARC64 && PCI
-+ help
-+ Say Y here to support the hardware watchdog capability on Sun RIO
-+ machines. The watchdog timeout period is normally one minute but
-+ can be changed with a boot-time parameter.
-+
-+# XTENSA Architecture
-+
-+#
-+# ISA-based Watchdog Cards
-+#
-+
-+comment "ISA-based Watchdog Cards"
-+ depends on ISA
-+
-+config PCWATCHDOG
-+ tristate "Berkshire Products ISA-PC Watchdog"
-+ depends on ISA
-+ ---help---
-+ This is the driver for the Berkshire Products ISA-PC Watchdog card.
-+ This card simply watches your kernel to make sure it doesn't freeze,
-+ and if it does, it reboots your computer after a certain amount of
-+ time. This driver is like the WDT501 driver but for different
-+ hardware. Please read <file:Documentation/watchdog/pcwd-watchdog.txt>. The PC
-+ watchdog cards can be ordered from <http://www.berkprod.com/>.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called pcwd.
-+
-+ Most people will say N.
-+
-+config MIXCOMWD
-+ tristate "Mixcom Watchdog"
-+ depends on ISA
-+ ---help---
-+ This is a driver for the Mixcom hardware watchdog cards. This
-+ watchdog simply watches your kernel to make sure it doesn't freeze,
-+ and if it does, it reboots your computer after a certain amount of
-+ time.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called mixcomwd.
-+
-+ Most people will say N.
-+
-+config WDT
-+ tristate "WDT Watchdog timer"
-+ depends on ISA
-+ ---help---
-+ If you have a WDT500P or WDT501P watchdog board, say Y here,
-+ otherwise N. It is not possible to probe for this board, which means
-+ that you have to inform the kernel about the IO port and IRQ that
-+ is needed (you can do this via the io and irq parameters)
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called wdt.
-+
-+#
-+# PCI-based Watchdog Cards
-+#
-+
-+comment "PCI-based Watchdog Cards"
-+ depends on PCI
-+
-+config PCIPCWATCHDOG
-+ tristate "Berkshire Products PCI-PC Watchdog"
-+ depends on PCI
-+ ---help---
-+ This is the driver for the Berkshire Products PCI-PC Watchdog card.
-+ This card simply watches your kernel to make sure it doesn't freeze,
-+ and if it does, it reboots your computer after a certain amount of
-+ time. The card can also monitor the internal temperature of the PC.
-+ More info is available at <http://www.berkprod.com/pci_pc_watchdog.htm>.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called pcwd_pci.
-+
-+ Most people will say N.
-+
-+config WDTPCI
-+ tristate "PCI-WDT500/501 Watchdog timer"
-+ depends on PCI
-+ ---help---
-+ If you have a PCI-WDT500/501 watchdog board, say Y here, otherwise N.
-+
-+ If you have a PCI-WDT501 watchdog board then you can enable the
-+ temperature sensor by setting the type parameter to 501.
-+
-+ If you want to enable the Fan Tachometer on the PCI-WDT501, then you
-+ can do this via the tachometer parameter. Only do this if you have a
-+ fan tachometer actually set up.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called wdt_pci.
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+
-+comment "USB-based Watchdog Cards"
-+ depends on USB
-+
-+config USBPCWATCHDOG
-+ tristate "Berkshire Products USB-PC Watchdog"
-+ depends on USB
-+ ---help---
-+ This is the driver for the Berkshire Products USB-PC Watchdog card.
-+ This card simply watches your kernel to make sure it doesn't freeze,
-+ and if it does, it reboots your computer after a certain amount of
-+ time. The card can also monitor the internal temperature of the PC.
-+ More info is available at <http://www.berkprod.com/usb_pc_watchdog.htm>.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called pcwd_usb.
-+
-+ Most people will say N.
-+
-+endif # WATCHDOG
-diff -Nur linux-2.6.35.7.orig/drivers/watchdog/Makefile linux-2.6.35.7/drivers/watchdog/Makefile
---- linux-2.6.35.7.orig/drivers/watchdog/Makefile 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/drivers/watchdog/Makefile 2010-10-14 20:28:01.588091787 +0200
-@@ -114,6 +114,7 @@
- obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
- obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
- obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
-+obj-$(CONFIG_AR71XX_WDT) += ar71xx_wdt.o
-
- # PARISC Architecture
-
-diff -Nur linux-2.6.35.7.orig/drivers/watchdog/Makefile.orig linux-2.6.35.7/drivers/watchdog/Makefile.orig
---- linux-2.6.35.7.orig/drivers/watchdog/Makefile.orig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/drivers/watchdog/Makefile.orig 2010-09-29 03:09:08.000000000 +0200
-@@ -0,0 +1,148 @@
-+#
-+# Makefile for the WatchDog device drivers.
-+#
-+
-+# Only one watchdog can succeed. We probe the ISA/PCI/USB based
-+# watchdog-cards first, then the architecture specific watchdog
-+# drivers and then the architecture independant "softdog" driver.
-+# This means that if your ISA/PCI/USB card isn't detected that
-+# you can fall back to an architecture specific driver and if
-+# that also fails then you can fall back to the software watchdog
-+# to give you some cover.
-+
-+# ISA-based Watchdog Cards
-+obj-$(CONFIG_PCWATCHDOG) += pcwd.o
-+obj-$(CONFIG_MIXCOMWD) += mixcomwd.o
-+obj-$(CONFIG_WDT) += wdt.o
-+
-+# PCI-based Watchdog Cards
-+obj-$(CONFIG_PCIPCWATCHDOG) += pcwd_pci.o
-+obj-$(CONFIG_WDTPCI) += wdt_pci.o
-+
-+# USB-based Watchdog Cards
-+obj-$(CONFIG_USBPCWATCHDOG) += pcwd_usb.o
-+
-+# ALPHA Architecture
-+
-+# ARM Architecture
-+obj-$(CONFIG_AT91RM9200_WATCHDOG) += at91rm9200_wdt.o
-+obj-$(CONFIG_AT91SAM9X_WATCHDOG) += at91sam9_wdt.o
-+obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o
-+obj-$(CONFIG_TWL4030_WATCHDOG) += twl4030_wdt.o
-+obj-$(CONFIG_21285_WATCHDOG) += wdt285.o
-+obj-$(CONFIG_977_WATCHDOG) += wdt977.o
-+obj-$(CONFIG_IXP2000_WATCHDOG) += ixp2000_wdt.o
-+obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o
-+obj-$(CONFIG_KS8695_WATCHDOG) += ks8695_wdt.o
-+obj-$(CONFIG_S3C2410_WATCHDOG) += s3c2410_wdt.o
-+obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o
-+obj-$(CONFIG_MPCORE_WATCHDOG) += mpcore_wdt.o
-+obj-$(CONFIG_EP93XX_WATCHDOG) += ep93xx_wdt.o
-+obj-$(CONFIG_PNX4008_WATCHDOG) += pnx4008_wdt.o
-+obj-$(CONFIG_IOP_WATCHDOG) += iop_wdt.o
-+obj-$(CONFIG_DAVINCI_WATCHDOG) += davinci_wdt.o
-+obj-$(CONFIG_ORION_WATCHDOG) += orion_wdt.o
-+obj-$(CONFIG_COH901327_WATCHDOG) += coh901327_wdt.o
-+obj-$(CONFIG_STMP3XXX_WATCHDOG) += stmp3xxx_wdt.o
-+obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o
-+obj-$(CONFIG_ADX_WATCHDOG) += adx_wdt.o
-+obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o
-+obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o
-+
-+# AVR32 Architecture
-+obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
-+
-+# BLACKFIN Architecture
-+obj-$(CONFIG_BFIN_WDT) += bfin_wdt.o
-+
-+# CRIS Architecture
-+
-+# FRV Architecture
-+
-+# H8300 Architecture
-+
-+# X86 (i386 + ia64 + x86_64) Architecture
-+obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o
-+obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o
-+obj-$(CONFIG_ALIM1535_WDT) += alim1535_wdt.o
-+obj-$(CONFIG_ALIM7101_WDT) += alim7101_wdt.o
-+obj-$(CONFIG_GEODE_WDT) += geodewdt.o
-+obj-$(CONFIG_SC520_WDT) += sc520_wdt.o
-+obj-$(CONFIG_SBC_FITPC2_WATCHDOG) += sbc_fitpc2_wdt.o
-+obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o
-+obj-$(CONFIG_IB700_WDT) += ib700wdt.o
-+obj-$(CONFIG_IBMASR) += ibmasr.o
-+obj-$(CONFIG_WAFER_WDT) += wafer5823wdt.o
-+obj-$(CONFIG_I6300ESB_WDT) += i6300esb.o
-+obj-$(CONFIG_ITCO_WDT) += iTCO_wdt.o
-+ifeq ($(CONFIG_ITCO_VENDOR_SUPPORT),y)
-+obj-$(CONFIG_ITCO_WDT) += iTCO_vendor_support.o
-+endif
-+obj-$(CONFIG_IT8712F_WDT) += it8712f_wdt.o
-+obj-$(CONFIG_IT87_WDT) += it87_wdt.o
-+obj-$(CONFIG_HP_WATCHDOG) += hpwdt.o
-+obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o
-+obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o
-+obj-$(CONFIG_PC87413_WDT) += pc87413_wdt.o
-+obj-$(CONFIG_RDC321X_WDT) += rdc321x_wdt.o
-+obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o
-+obj-$(CONFIG_SBC8360_WDT) += sbc8360.o
-+obj-$(CONFIG_SBC7240_WDT) += sbc7240_wdt.o
-+obj-$(CONFIG_CPU5_WDT) += cpu5wdt.o
-+obj-$(CONFIG_SMSC_SCH311X_WDT) += sch311x_wdt.o
-+obj-$(CONFIG_SMSC37B787_WDT) += smsc37b787_wdt.o
-+obj-$(CONFIG_W83627HF_WDT) += w83627hf_wdt.o
-+obj-$(CONFIG_W83697HF_WDT) += w83697hf_wdt.o
-+obj-$(CONFIG_W83697UG_WDT) += w83697ug_wdt.o
-+obj-$(CONFIG_W83877F_WDT) += w83877f_wdt.o
-+obj-$(CONFIG_W83977F_WDT) += w83977f_wdt.o
-+obj-$(CONFIG_MACHZ_WDT) += machzwd.o
-+obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o
-+
-+# M32R Architecture
-+
-+# M68K Architecture
-+
-+# M68KNOMMU Architecture
-+
-+# MIPS Architecture
-+obj-$(CONFIG_BCM47XX_WDT) += bcm47xx_wdt.o
-+obj-$(CONFIG_RC32434_WDT) += rc32434_wdt.o
-+obj-$(CONFIG_INDYDOG) += indydog.o
-+obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o
-+obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt.o
-+obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
-+obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
-+obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
-+
-+# PARISC Architecture
-+
-+# POWERPC Architecture
-+obj-$(CONFIG_GEF_WDT) += gef_wdt.o
-+obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o
-+obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o
-+obj-$(CONFIG_PIKA_WDT) += pika_wdt.o
-+obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o
-+
-+# PPC64 Architecture
-+obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
-+
-+# S390 Architecture
-+
-+# SUPERH (sh + sh64) Architecture
-+obj-$(CONFIG_SH_WDT) += shwdt.o
-+
-+# SPARC Architecture
-+
-+# SPARC64 Architecture
-+
-+obj-$(CONFIG_WATCHDOG_RIO) += riowd.o
-+obj-$(CONFIG_WATCHDOG_CP1XXX) += cpwd.o
-+
-+# XTENSA Architecture
-+
-+# Architecture Independant
-+obj-$(CONFIG_WM831X_WATCHDOG) += wm831x_wdt.o
-+obj-$(CONFIG_WM8350_WATCHDOG) += wm8350_wdt.o
-+obj-$(CONFIG_MAX63XX_WATCHDOG) += max63xx_wdt.o
-+obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
-diff -Nur linux-2.6.35.7.orig/include/linux/ath9k_platform.h linux-2.6.35.7/include/linux/ath9k_platform.h
---- linux-2.6.35.7.orig/include/linux/ath9k_platform.h 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/include/linux/ath9k_platform.h 2010-10-14 20:28:01.618101105 +0200
+diff -Nur linux-2.6.36.orig/include/linux/ath9k_platform.h linux-2.6.36/include/linux/ath9k_platform.h
+--- linux-2.6.36.orig/include/linux/ath9k_platform.h 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/include/linux/ath9k_platform.h 2010-11-18 21:16:18.000000000 +0100
@@ -1,19 +1,11 @@
/*
- * Copyright (c) 2008 Atheros Communications Inc.
@@ -30026,9 +17349,9 @@ diff -Nur linux-2.6.35.7.orig/include/linux/ath9k_platform.h linux-2.6.35.7/incl
};
#endif /* _LINUX_ATH9K_PLATFORM_H */
-diff -Nur linux-2.6.35.7.orig/include/linux/gpio_buttons.h linux-2.6.35.7/include/linux/gpio_buttons.h
---- linux-2.6.35.7.orig/include/linux/gpio_buttons.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/include/linux/gpio_buttons.h 2010-10-14 20:28:01.679342332 +0200
+diff -Nur linux-2.6.36.orig/include/linux/gpio_buttons.h linux-2.6.36/include/linux/gpio_buttons.h
+--- linux-2.6.36.orig/include/linux/gpio_buttons.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/include/linux/gpio_buttons.h 2010-11-18 21:16:18.000000000 +0100
@@ -0,0 +1,33 @@
+/*
+ * Definitions for the GPIO buttons interface driver
@@ -30063,9 +17386,9 @@ diff -Nur linux-2.6.35.7.orig/include/linux/gpio_buttons.h linux-2.6.35.7/includ
+};
+
+#endif /* _GPIO_BUTTONS_H_ */
-diff -Nur linux-2.6.35.7.orig/include/linux/gpio_dev.h linux-2.6.35.7/include/linux/gpio_dev.h
---- linux-2.6.35.7.orig/include/linux/gpio_dev.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/include/linux/gpio_dev.h 2010-10-14 20:28:01.715601023 +0200
+diff -Nur linux-2.6.36.orig/include/linux/gpio_dev.h linux-2.6.36/include/linux/gpio_dev.h
+--- linux-2.6.36.orig/include/linux/gpio_dev.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/include/linux/gpio_dev.h 2010-11-18 21:16:18.000000000 +0100
@@ -0,0 +1,11 @@
+#ifndef _GPIODEV_H__
+#define _GPIODEV_H__
@@ -30078,10 +17401,10 @@ diff -Nur linux-2.6.35.7.orig/include/linux/gpio_dev.h linux-2.6.35.7/include/li
+#define GPIO_DIR_OUT _IO(IOC_GPIODEV_MAGIC, 14)
+
+#endif
-diff -Nur linux-2.6.35.7.orig/include/linux/netdevice.h linux-2.6.35.7/include/linux/netdevice.h
---- linux-2.6.35.7.orig/include/linux/netdevice.h 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/include/linux/netdevice.h 2010-10-14 20:28:01.758101230 +0200
-@@ -932,6 +932,7 @@
+diff -Nur linux-2.6.36.orig/include/linux/netdevice.h linux-2.6.36/include/linux/netdevice.h
+--- linux-2.6.36.orig/include/linux/netdevice.h 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/include/linux/netdevice.h 2010-11-18 21:16:18.000000000 +0100
+@@ -949,6 +949,7 @@
void *ax25_ptr; /* AX.25 specific data */
struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data,
assign before registering */
@@ -30089,2362 +17412,9 @@ diff -Nur linux-2.6.35.7.orig/include/linux/netdevice.h linux-2.6.35.7/include/l
/*
* Cache line mostly used on receive path (including eth_type_trans())
-diff -Nur linux-2.6.35.7.orig/include/linux/netdevice.h.orig linux-2.6.35.7/include/linux/netdevice.h.orig
---- linux-2.6.35.7.orig/include/linux/netdevice.h.orig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/include/linux/netdevice.h.orig 2010-09-29 03:09:08.000000000 +0200
-@@ -0,0 +1,2349 @@
-+/*
-+ * INET An implementation of the TCP/IP protocol suite for the LINUX
-+ * operating system. INET is implemented using the BSD Socket
-+ * interface as the means of communication with the user level.
-+ *
-+ * Definitions for the Interfaces handler.
-+ *
-+ * Version: @(#)dev.h 1.0.10 08/12/93
-+ *
-+ * Authors: Ross Biro
-+ * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
-+ * Corey Minyard <wf-rch!minyard@relay.EU.net>
-+ * Donald J. Becker, <becker@cesdis.gsfc.nasa.gov>
-+ * Alan Cox, <alan@lxorguk.ukuu.org.uk>
-+ * Bjorn Ekwall. <bj0rn@blox.se>
-+ * Pekka Riikonen <priikone@poseidon.pspt.fi>
-+ *
-+ * 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.
-+ *
-+ * Moved to /usr/include/linux for NET3
-+ */
-+#ifndef _LINUX_NETDEVICE_H
-+#define _LINUX_NETDEVICE_H
-+
-+#include <linux/if.h>
-+#include <linux/if_ether.h>
-+#include <linux/if_packet.h>
-+#include <linux/if_link.h>
-+
-+#ifdef __KERNEL__
-+#include <linux/pm_qos_params.h>
-+#include <linux/timer.h>
-+#include <linux/delay.h>
-+#include <linux/mm.h>
-+#include <asm/atomic.h>
-+#include <asm/cache.h>
-+#include <asm/byteorder.h>
-+
-+#include <linux/device.h>
-+#include <linux/percpu.h>
-+#include <linux/rculist.h>
-+#include <linux/dmaengine.h>
-+#include <linux/workqueue.h>
-+
-+#include <linux/ethtool.h>
-+#include <net/net_namespace.h>
-+#include <net/dsa.h>
-+#ifdef CONFIG_DCB
-+#include <net/dcbnl.h>
-+#endif
-+
-+struct vlan_group;
-+struct netpoll_info;
-+/* 802.11 specific */
-+struct wireless_dev;
-+ /* source back-compat hooks */
-+#define SET_ETHTOOL_OPS(netdev,ops) \
-+ ( (netdev)->ethtool_ops = (ops) )
-+
-+#define HAVE_ALLOC_NETDEV /* feature macro: alloc_xxxdev
-+ functions are available. */
-+#define HAVE_FREE_NETDEV /* free_netdev() */
-+#define HAVE_NETDEV_PRIV /* netdev_priv() */
-+
-+/* Backlog congestion levels */
-+#define NET_RX_SUCCESS 0 /* keep 'em coming, baby */
-+#define NET_RX_DROP 1 /* packet dropped */
-+
-+/*
-+ * Transmit return codes: transmit return codes originate from three different
-+ * namespaces:
-+ *
-+ * - qdisc return codes
-+ * - driver transmit return codes
-+ * - errno values
-+ *
-+ * Drivers are allowed to return any one of those in their hard_start_xmit()
-+ * function. Real network devices commonly used with qdiscs should only return
-+ * the driver transmit return codes though - when qdiscs are used, the actual
-+ * transmission happens asynchronously, so the value is not propagated to
-+ * higher layers. Virtual network devices transmit synchronously, in this case
-+ * the driver transmit return codes are consumed by dev_queue_xmit(), all
-+ * others are propagated to higher layers.
-+ */
-+
-+/* qdisc ->enqueue() return codes. */
-+#define NET_XMIT_SUCCESS 0x00
-+#define NET_XMIT_DROP 0x01 /* skb dropped */
-+#define NET_XMIT_CN 0x02 /* congestion notification */
-+#define NET_XMIT_POLICED 0x03 /* skb is shot by police */
-+#define NET_XMIT_MASK 0x0f /* qdisc flags in net/sch_generic.h */
-+
-+/* NET_XMIT_CN is special. It does not guarantee that this packet is lost. It
-+ * indicates that the device will soon be dropping packets, or already drops
-+ * some packets of the same priority; prompting us to send less aggressively. */
-+#define net_xmit_eval(e) ((e) == NET_XMIT_CN ? 0 : (e))
-+#define net_xmit_errno(e) ((e) != NET_XMIT_CN ? -ENOBUFS : 0)
-+
-+/* Driver transmit return codes */
-+#define NETDEV_TX_MASK 0xf0
-+
-+enum netdev_tx {
-+ __NETDEV_TX_MIN = INT_MIN, /* make sure enum is signed */
-+ NETDEV_TX_OK = 0x00, /* driver took care of packet */
-+ NETDEV_TX_BUSY = 0x10, /* driver tx path was busy*/
-+ NETDEV_TX_LOCKED = 0x20, /* driver tx lock was already taken */
-+};
-+typedef enum netdev_tx netdev_tx_t;
-+
-+/*
-+ * Current order: NETDEV_TX_MASK > NET_XMIT_MASK >= 0 is significant;
-+ * hard_start_xmit() return < NET_XMIT_MASK means skb was consumed.
-+ */
-+static inline bool dev_xmit_complete(int rc)
-+{
-+ /*
-+ * Positive cases with an skb consumed by a driver:
-+ * - successful transmission (rc == NETDEV_TX_OK)
-+ * - error while transmitting (rc < 0)
-+ * - error while queueing to a different device (rc & NET_XMIT_MASK)
-+ */
-+ if (likely(rc < NET_XMIT_MASK))
-+ return true;
-+
-+ return false;
-+}
-+
-+#endif
-+
-+#define MAX_ADDR_LEN 32 /* Largest hardware address length */
-+
-+#ifdef __KERNEL__
-+/*
-+ * Compute the worst case header length according to the protocols
-+ * used.
-+ */
-+
-+#if defined(CONFIG_WLAN) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
-+# if defined(CONFIG_MAC80211_MESH)
-+# define LL_MAX_HEADER 128
-+# else
-+# define LL_MAX_HEADER 96
-+# endif
-+#elif defined(CONFIG_TR) || defined(CONFIG_TR_MODULE)
-+# define LL_MAX_HEADER 48
-+#else
-+# define LL_MAX_HEADER 32
-+#endif
-+
-+#if !defined(CONFIG_NET_IPIP) && !defined(CONFIG_NET_IPIP_MODULE) && \
-+ !defined(CONFIG_NET_IPGRE) && !defined(CONFIG_NET_IPGRE_MODULE) && \
-+ !defined(CONFIG_IPV6_SIT) && !defined(CONFIG_IPV6_SIT_MODULE) && \
-+ !defined(CONFIG_IPV6_TUNNEL) && !defined(CONFIG_IPV6_TUNNEL_MODULE)
-+#define MAX_HEADER LL_MAX_HEADER
-+#else
-+#define MAX_HEADER (LL_MAX_HEADER + 48)
-+#endif
-+
-+#endif /* __KERNEL__ */
-+
-+/*
-+ * Network device statistics. Akin to the 2.0 ether stats but
-+ * with byte counters.
-+ */
-+
-+struct net_device_stats {
-+ unsigned long rx_packets; /* total packets received */
-+ unsigned long tx_packets; /* total packets transmitted */
-+ unsigned long rx_bytes; /* total bytes received */
-+ unsigned long tx_bytes; /* total bytes transmitted */
-+ unsigned long rx_errors; /* bad packets received */
-+ unsigned long tx_errors; /* packet transmit problems */
-+ unsigned long rx_dropped; /* no space in linux buffers */
-+ unsigned long tx_dropped; /* no space available in linux */
-+ unsigned long multicast; /* multicast packets received */
-+ unsigned long collisions;
-+
-+ /* detailed rx_errors: */
-+ unsigned long rx_length_errors;
-+ unsigned long rx_over_errors; /* receiver ring buff overflow */
-+ unsigned long rx_crc_errors; /* recved pkt with crc error */
-+ unsigned long rx_frame_errors; /* recv'd frame alignment error */
-+ unsigned long rx_fifo_errors; /* recv'r fifo overrun */
-+ unsigned long rx_missed_errors; /* receiver missed packet */
-+
-+ /* detailed tx_errors */
-+ unsigned long tx_aborted_errors;
-+ unsigned long tx_carrier_errors;
-+ unsigned long tx_fifo_errors;
-+ unsigned long tx_heartbeat_errors;
-+ unsigned long tx_window_errors;
-+
-+ /* for cslip etc */
-+ unsigned long rx_compressed;
-+ unsigned long tx_compressed;
-+};
-+
-+
-+/* Media selection options. */
-+enum {
-+ IF_PORT_UNKNOWN = 0,
-+ IF_PORT_10BASE2,
-+ IF_PORT_10BASET,
-+ IF_PORT_AUI,
-+ IF_PORT_100BASET,
-+ IF_PORT_100BASETX,
-+ IF_PORT_100BASEFX
-+};
-+
-+#ifdef __KERNEL__
-+
-+#include <linux/cache.h>
-+#include <linux/skbuff.h>
-+
-+struct neighbour;
-+struct neigh_parms;
-+struct sk_buff;
-+
-+struct netdev_hw_addr {
-+ struct list_head list;
-+ unsigned char addr[MAX_ADDR_LEN];
-+ unsigned char type;
-+#define NETDEV_HW_ADDR_T_LAN 1
-+#define NETDEV_HW_ADDR_T_SAN 2
-+#define NETDEV_HW_ADDR_T_SLAVE 3
-+#define NETDEV_HW_ADDR_T_UNICAST 4
-+#define NETDEV_HW_ADDR_T_MULTICAST 5
-+ int refcount;
-+ bool synced;
-+ bool global_use;
-+ struct rcu_head rcu_head;
-+};
-+
-+struct netdev_hw_addr_list {
-+ struct list_head list;
-+ int count;
-+};
-+
-+#define netdev_hw_addr_list_count(l) ((l)->count)
-+#define netdev_hw_addr_list_empty(l) (netdev_hw_addr_list_count(l) == 0)
-+#define netdev_hw_addr_list_for_each(ha, l) \
-+ list_for_each_entry(ha, &(l)->list, list)
-+
-+#define netdev_uc_count(dev) netdev_hw_addr_list_count(&(dev)->uc)
-+#define netdev_uc_empty(dev) netdev_hw_addr_list_empty(&(dev)->uc)
-+#define netdev_for_each_uc_addr(ha, dev) \
-+ netdev_hw_addr_list_for_each(ha, &(dev)->uc)
-+
-+#define netdev_mc_count(dev) netdev_hw_addr_list_count(&(dev)->mc)
-+#define netdev_mc_empty(dev) netdev_hw_addr_list_empty(&(dev)->mc)
-+#define netdev_for_each_mc_addr(ha, dev) \
-+ netdev_hw_addr_list_for_each(ha, &(dev)->mc)
-+
-+struct hh_cache {
-+ struct hh_cache *hh_next; /* Next entry */
-+ atomic_t hh_refcnt; /* number of users */
-+/*
-+ * We want hh_output, hh_len, hh_lock and hh_data be a in a separate
-+ * cache line on SMP.
-+ * They are mostly read, but hh_refcnt may be changed quite frequently,
-+ * incurring cache line ping pongs.
-+ */
-+ __be16 hh_type ____cacheline_aligned_in_smp;
-+ /* protocol identifier, f.e ETH_P_IP
-+ * NOTE: For VLANs, this will be the
-+ * encapuslated type. --BLG
-+ */
-+ u16 hh_len; /* length of header */
-+ int (*hh_output)(struct sk_buff *skb);
-+ seqlock_t hh_lock;
-+
-+ /* cached hardware header; allow for machine alignment needs. */
-+#define HH_DATA_MOD 16
-+#define HH_DATA_OFF(__len) \
-+ (HH_DATA_MOD - (((__len - 1) & (HH_DATA_MOD - 1)) + 1))
-+#define HH_DATA_ALIGN(__len) \
-+ (((__len)+(HH_DATA_MOD-1))&~(HH_DATA_MOD - 1))
-+ unsigned long hh_data[HH_DATA_ALIGN(LL_MAX_HEADER) / sizeof(long)];
-+};
-+
-+/* Reserve HH_DATA_MOD byte aligned hard_header_len, but at least that much.
-+ * Alternative is:
-+ * dev->hard_header_len ? (dev->hard_header_len +
-+ * (HH_DATA_MOD - 1)) & ~(HH_DATA_MOD - 1) : 0
-+ *
-+ * We could use other alignment values, but we must maintain the
-+ * relationship HH alignment <= LL alignment.
-+ *
-+ * LL_ALLOCATED_SPACE also takes into account the tailroom the device
-+ * may need.
-+ */
-+#define LL_RESERVED_SPACE(dev) \
-+ ((((dev)->hard_header_len+(dev)->needed_headroom)&~(HH_DATA_MOD - 1)) + HH_DATA_MOD)
-+#define LL_RESERVED_SPACE_EXTRA(dev,extra) \
-+ ((((dev)->hard_header_len+(dev)->needed_headroom+(extra))&~(HH_DATA_MOD - 1)) + HH_DATA_MOD)
-+#define LL_ALLOCATED_SPACE(dev) \
-+ ((((dev)->hard_header_len+(dev)->needed_headroom+(dev)->needed_tailroom)&~(HH_DATA_MOD - 1)) + HH_DATA_MOD)
-+
-+struct header_ops {
-+ int (*create) (struct sk_buff *skb, struct net_device *dev,
-+ unsigned short type, const void *daddr,
-+ const void *saddr, unsigned len);
-+ int (*parse)(const struct sk_buff *skb, unsigned char *haddr);
-+ int (*rebuild)(struct sk_buff *skb);
-+#define HAVE_HEADER_CACHE
-+ int (*cache)(const struct neighbour *neigh, struct hh_cache *hh);
-+ void (*cache_update)(struct hh_cache *hh,
-+ const struct net_device *dev,
-+ const unsigned char *haddr);
-+};
-+
-+/* These flag bits are private to the generic network queueing
-+ * layer, they may not be explicitly referenced by any other
-+ * code.
-+ */
-+
-+enum netdev_state_t {
-+ __LINK_STATE_START,
-+ __LINK_STATE_PRESENT,
-+ __LINK_STATE_NOCARRIER,
-+ __LINK_STATE_LINKWATCH_PENDING,
-+ __LINK_STATE_DORMANT,
-+};
-+
-+
-+/*
-+ * This structure holds at boot time configured netdevice settings. They
-+ * are then used in the device probing.
-+ */
-+struct netdev_boot_setup {
-+ char name[IFNAMSIZ];
-+ struct ifmap map;
-+};
-+#define NETDEV_BOOT_SETUP_MAX 8
-+
-+extern int __init netdev_boot_setup(char *str);
-+
-+/*
-+ * Structure for NAPI scheduling similar to tasklet but with weighting
-+ */
-+struct napi_struct {
-+ /* The poll_list must only be managed by the entity which
-+ * changes the state of the NAPI_STATE_SCHED bit. This means
-+ * whoever atomically sets that bit can add this napi_struct
-+ * to the per-cpu poll_list, and whoever clears that bit
-+ * can remove from the list right before clearing the bit.
-+ */
-+ struct list_head poll_list;
-+
-+ unsigned long state;
-+ int weight;
-+ int (*poll)(struct napi_struct *, int);
-+#ifdef CONFIG_NETPOLL
-+ spinlock_t poll_lock;
-+ int poll_owner;
-+#endif
-+
-+ unsigned int gro_count;
-+
-+ struct net_device *dev;
-+ struct list_head dev_list;
-+ struct sk_buff *gro_list;
-+ struct sk_buff *skb;
-+};
-+
-+enum {
-+ NAPI_STATE_SCHED, /* Poll is scheduled */
-+ NAPI_STATE_DISABLE, /* Disable pending */
-+ NAPI_STATE_NPSVC, /* Netpoll - don't dequeue from poll_list */
-+};
-+
-+enum gro_result {
-+ GRO_MERGED,
-+ GRO_MERGED_FREE,
-+ GRO_HELD,
-+ GRO_NORMAL,
-+ GRO_DROP,
-+};
-+typedef enum gro_result gro_result_t;
-+
-+extern void __napi_schedule(struct napi_struct *n);
-+
-+static inline int napi_disable_pending(struct napi_struct *n)
-+{
-+ return test_bit(NAPI_STATE_DISABLE, &n->state);
-+}
-+
-+/**
-+ * napi_schedule_prep - check if napi can be scheduled
-+ * @n: napi context
-+ *
-+ * Test if NAPI routine is already running, and if not mark
-+ * it as running. This is used as a condition variable
-+ * insure only one NAPI poll instance runs. We also make
-+ * sure there is no pending NAPI disable.
-+ */
-+static inline int napi_schedule_prep(struct napi_struct *n)
-+{
-+ return !napi_disable_pending(n) &&
-+ !test_and_set_bit(NAPI_STATE_SCHED, &n->state);
-+}
-+
-+/**
-+ * napi_schedule - schedule NAPI poll
-+ * @n: napi context
-+ *
-+ * Schedule NAPI poll routine to be called if it is not already
-+ * running.
-+ */
-+static inline void napi_schedule(struct napi_struct *n)
-+{
-+ if (napi_schedule_prep(n))
-+ __napi_schedule(n);
-+}
-+
-+/* Try to reschedule poll. Called by dev->poll() after napi_complete(). */
-+static inline int napi_reschedule(struct napi_struct *napi)
-+{
-+ if (napi_schedule_prep(napi)) {
-+ __napi_schedule(napi);
-+ return 1;
-+ }
-+ return 0;
-+}
-+
-+/**
-+ * napi_complete - NAPI processing complete
-+ * @n: napi context
-+ *
-+ * Mark NAPI processing as complete.
-+ */
-+extern void __napi_complete(struct napi_struct *n);
-+extern void napi_complete(struct napi_struct *n);
-+
-+/**
-+ * napi_disable - prevent NAPI from scheduling
-+ * @n: napi context
-+ *
-+ * Stop NAPI from being scheduled on this context.
-+ * Waits till any outstanding processing completes.
-+ */
-+static inline void napi_disable(struct napi_struct *n)
-+{
-+ set_bit(NAPI_STATE_DISABLE, &n->state);
-+ while (test_and_set_bit(NAPI_STATE_SCHED, &n->state))
-+ msleep(1);
-+ clear_bit(NAPI_STATE_DISABLE, &n->state);
-+}
-+
-+/**
-+ * napi_enable - enable NAPI scheduling
-+ * @n: napi context
-+ *
-+ * Resume NAPI from being scheduled on this context.
-+ * Must be paired with napi_disable.
-+ */
-+static inline void napi_enable(struct napi_struct *n)
-+{
-+ BUG_ON(!test_bit(NAPI_STATE_SCHED, &n->state));
-+ smp_mb__before_clear_bit();
-+ clear_bit(NAPI_STATE_SCHED, &n->state);
-+}
-+
-+#ifdef CONFIG_SMP
-+/**
-+ * napi_synchronize - wait until NAPI is not running
-+ * @n: napi context
-+ *
-+ * Wait until NAPI is done being scheduled on this context.
-+ * Waits till any outstanding processing completes but
-+ * does not disable future activations.
-+ */
-+static inline void napi_synchronize(const struct napi_struct *n)
-+{
-+ while (test_bit(NAPI_STATE_SCHED, &n->state))
-+ msleep(1);
-+}
-+#else
-+# define napi_synchronize(n) barrier()
-+#endif
-+
-+enum netdev_queue_state_t {
-+ __QUEUE_STATE_XOFF,
-+ __QUEUE_STATE_FROZEN,
-+};
-+
-+struct netdev_queue {
-+/*
-+ * read mostly part
-+ */
-+ struct net_device *dev;
-+ struct Qdisc *qdisc;
-+ unsigned long state;
-+ struct Qdisc *qdisc_sleeping;
-+/*
-+ * write mostly part
-+ */
-+ spinlock_t _xmit_lock ____cacheline_aligned_in_smp;
-+ int xmit_lock_owner;
-+ /*
-+ * please use this field instead of dev->trans_start
-+ */
-+ unsigned long trans_start;
-+ unsigned long tx_bytes;
-+ unsigned long tx_packets;
-+ unsigned long tx_dropped;
-+} ____cacheline_aligned_in_smp;
-+
-+#ifdef CONFIG_RPS
-+/*
-+ * This structure holds an RPS map which can be of variable length. The
-+ * map is an array of CPUs.
-+ */
-+struct rps_map {
-+ unsigned int len;
-+ struct rcu_head rcu;
-+ u16 cpus[0];
-+};
-+#define RPS_MAP_SIZE(_num) (sizeof(struct rps_map) + (_num * sizeof(u16)))
-+
-+/*
-+ * The rps_dev_flow structure contains the mapping of a flow to a CPU and the
-+ * tail pointer for that CPU's input queue at the time of last enqueue.
-+ */
-+struct rps_dev_flow {
-+ u16 cpu;
-+ u16 fill;
-+ unsigned int last_qtail;
-+};
-+
-+/*
-+ * The rps_dev_flow_table structure contains a table of flow mappings.
-+ */
-+struct rps_dev_flow_table {
-+ unsigned int mask;
-+ struct rcu_head rcu;
-+ struct work_struct free_work;
-+ struct rps_dev_flow flows[0];
-+};
-+#define RPS_DEV_FLOW_TABLE_SIZE(_num) (sizeof(struct rps_dev_flow_table) + \
-+ (_num * sizeof(struct rps_dev_flow)))
-+
-+/*
-+ * The rps_sock_flow_table contains mappings of flows to the last CPU
-+ * on which they were processed by the application (set in recvmsg).
-+ */
-+struct rps_sock_flow_table {
-+ unsigned int mask;
-+ u16 ents[0];
-+};
-+#define RPS_SOCK_FLOW_TABLE_SIZE(_num) (sizeof(struct rps_sock_flow_table) + \
-+ (_num * sizeof(u16)))
-+
-+#define RPS_NO_CPU 0xffff
-+
-+static inline void rps_record_sock_flow(struct rps_sock_flow_table *table,
-+ u32 hash)
-+{
-+ if (table && hash) {
-+ unsigned int cpu, index = hash & table->mask;
-+
-+ /* We only give a hint, preemption can change cpu under us */
-+ cpu = raw_smp_processor_id();
-+
-+ if (table->ents[index] != cpu)
-+ table->ents[index] = cpu;
-+ }
-+}
-+
-+static inline void rps_reset_sock_flow(struct rps_sock_flow_table *table,
-+ u32 hash)
-+{
-+ if (table && hash)
-+ table->ents[hash & table->mask] = RPS_NO_CPU;
-+}
-+
-+extern struct rps_sock_flow_table *rps_sock_flow_table;
-+
-+/* This structure contains an instance of an RX queue. */
-+struct netdev_rx_queue {
-+ struct rps_map *rps_map;
-+ struct rps_dev_flow_table *rps_flow_table;
-+ struct kobject kobj;
-+ struct netdev_rx_queue *first;
-+ atomic_t count;
-+} ____cacheline_aligned_in_smp;
-+#endif /* CONFIG_RPS */
-+
-+/*
-+ * This structure defines the management hooks for network devices.
-+ * The following hooks can be defined; unless noted otherwise, they are
-+ * optional and can be filled with a null pointer.
-+ *
-+ * int (*ndo_init)(struct net_device *dev);
-+ * This function is called once when network device is registered.
-+ * The network device can use this to any late stage initializaton
-+ * or semantic validattion. It can fail with an error code which will
-+ * be propogated back to register_netdev
-+ *
-+ * void (*ndo_uninit)(struct net_device *dev);
-+ * This function is called when device is unregistered or when registration
-+ * fails. It is not called if init fails.
-+ *
-+ * int (*ndo_open)(struct net_device *dev);
-+ * This function is called when network device transistions to the up
-+ * state.
-+ *
-+ * int (*ndo_stop)(struct net_device *dev);
-+ * This function is called when network device transistions to the down
-+ * state.
-+ *
-+ * netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb,
-+ * struct net_device *dev);
-+ * Called when a packet needs to be transmitted.
-+ * Must return NETDEV_TX_OK , NETDEV_TX_BUSY.
-+ * (can also return NETDEV_TX_LOCKED iff NETIF_F_LLTX)
-+ * Required can not be NULL.
-+ *
-+ * u16 (*ndo_select_queue)(struct net_device *dev, struct sk_buff *skb);
-+ * Called to decide which queue to when device supports multiple
-+ * transmit queues.
-+ *
-+ * void (*ndo_change_rx_flags)(struct net_device *dev, int flags);
-+ * This function is called to allow device receiver to make
-+ * changes to configuration when multicast or promiscious is enabled.
-+ *
-+ * void (*ndo_set_rx_mode)(struct net_device *dev);
-+ * This function is called device changes address list filtering.
-+ *
-+ * void (*ndo_set_multicast_list)(struct net_device *dev);
-+ * This function is called when the multicast address list changes.
-+ *
-+ * int (*ndo_set_mac_address)(struct net_device *dev, void *addr);
-+ * This function is called when the Media Access Control address
-+ * needs to be changed. If this interface is not defined, the
-+ * mac address can not be changed.
-+ *
-+ * int (*ndo_validate_addr)(struct net_device *dev);
-+ * Test if Media Access Control address is valid for the device.
-+ *
-+ * int (*ndo_do_ioctl)(struct net_device *dev, struct ifreq *ifr, int cmd);
-+ * Called when a user request an ioctl which can't be handled by
-+ * the generic interface code. If not defined ioctl's return
-+ * not supported error code.
-+ *
-+ * int (*ndo_set_config)(struct net_device *dev, struct ifmap *map);
-+ * Used to set network devices bus interface parameters. This interface
-+ * is retained for legacy reason, new devices should use the bus
-+ * interface (PCI) for low level management.
-+ *
-+ * int (*ndo_change_mtu)(struct net_device *dev, int new_mtu);
-+ * Called when a user wants to change the Maximum Transfer Unit
-+ * of a device. If not defined, any request to change MTU will
-+ * will return an error.
-+ *
-+ * void (*ndo_tx_timeout)(struct net_device *dev);
-+ * Callback uses when the transmitter has not made any progress
-+ * for dev->watchdog ticks.
-+ *
-+ * struct net_device_stats* (*ndo_get_stats)(struct net_device *dev);
-+ * Called when a user wants to get the network device usage
-+ * statistics. If not defined, the counters in dev->stats will
-+ * be used.
-+ *
-+ * void (*ndo_vlan_rx_register)(struct net_device *dev, struct vlan_group *grp);
-+ * If device support VLAN receive accleration
-+ * (ie. dev->features & NETIF_F_HW_VLAN_RX), then this function is called
-+ * when vlan groups for the device changes. Note: grp is NULL
-+ * if no vlan's groups are being used.
-+ *
-+ * void (*ndo_vlan_rx_add_vid)(struct net_device *dev, unsigned short vid);
-+ * If device support VLAN filtering (dev->features & NETIF_F_HW_VLAN_FILTER)
-+ * this function is called when a VLAN id is registered.
-+ *
-+ * void (*ndo_vlan_rx_kill_vid)(struct net_device *dev, unsigned short vid);
-+ * If device support VLAN filtering (dev->features & NETIF_F_HW_VLAN_FILTER)
-+ * this function is called when a VLAN id is unregistered.
-+ *
-+ * void (*ndo_poll_controller)(struct net_device *dev);
-+ *
-+ * SR-IOV management functions.
-+ * int (*ndo_set_vf_mac)(struct net_device *dev, int vf, u8* mac);
-+ * int (*ndo_set_vf_vlan)(struct net_device *dev, int vf, u16 vlan, u8 qos);
-+ * int (*ndo_set_vf_tx_rate)(struct net_device *dev, int vf, int rate);
-+ * int (*ndo_get_vf_config)(struct net_device *dev,
-+ * int vf, struct ifla_vf_info *ivf);
-+ * int (*ndo_set_vf_port)(struct net_device *dev, int vf,
-+ * struct nlattr *port[]);
-+ * int (*ndo_get_vf_port)(struct net_device *dev, int vf, struct sk_buff *skb);
-+ */
-+#define HAVE_NET_DEVICE_OPS
-+struct net_device_ops {
-+ int (*ndo_init)(struct net_device *dev);
-+ void (*ndo_uninit)(struct net_device *dev);
-+ int (*ndo_open)(struct net_device *dev);
-+ int (*ndo_stop)(struct net_device *dev);
-+ netdev_tx_t (*ndo_start_xmit) (struct sk_buff *skb,
-+ struct net_device *dev);
-+ u16 (*ndo_select_queue)(struct net_device *dev,
-+ struct sk_buff *skb);
-+ void (*ndo_change_rx_flags)(struct net_device *dev,
-+ int flags);
-+ void (*ndo_set_rx_mode)(struct net_device *dev);
-+ void (*ndo_set_multicast_list)(struct net_device *dev);
-+ int (*ndo_set_mac_address)(struct net_device *dev,
-+ void *addr);
-+ int (*ndo_validate_addr)(struct net_device *dev);
-+ int (*ndo_do_ioctl)(struct net_device *dev,
-+ struct ifreq *ifr, int cmd);
-+ int (*ndo_set_config)(struct net_device *dev,
-+ struct ifmap *map);
-+ int (*ndo_change_mtu)(struct net_device *dev,
-+ int new_mtu);
-+ int (*ndo_neigh_setup)(struct net_device *dev,
-+ struct neigh_parms *);
-+ void (*ndo_tx_timeout) (struct net_device *dev);
-+
-+ struct net_device_stats* (*ndo_get_stats)(struct net_device *dev);
-+
-+ void (*ndo_vlan_rx_register)(struct net_device *dev,
-+ struct vlan_group *grp);
-+ void (*ndo_vlan_rx_add_vid)(struct net_device *dev,
-+ unsigned short vid);
-+ void (*ndo_vlan_rx_kill_vid)(struct net_device *dev,
-+ unsigned short vid);
-+#ifdef CONFIG_NET_POLL_CONTROLLER
-+ void (*ndo_poll_controller)(struct net_device *dev);
-+ void (*ndo_netpoll_cleanup)(struct net_device *dev);
-+#endif
-+ int (*ndo_set_vf_mac)(struct net_device *dev,
-+ int queue, u8 *mac);
-+ int (*ndo_set_vf_vlan)(struct net_device *dev,
-+ int queue, u16 vlan, u8 qos);
-+ int (*ndo_set_vf_tx_rate)(struct net_device *dev,
-+ int vf, int rate);
-+ int (*ndo_get_vf_config)(struct net_device *dev,
-+ int vf,
-+ struct ifla_vf_info *ivf);
-+ int (*ndo_set_vf_port)(struct net_device *dev,
-+ int vf,
-+ struct nlattr *port[]);
-+ int (*ndo_get_vf_port)(struct net_device *dev,
-+ int vf, struct sk_buff *skb);
-+#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
-+ int (*ndo_fcoe_enable)(struct net_device *dev);
-+ int (*ndo_fcoe_disable)(struct net_device *dev);
-+ int (*ndo_fcoe_ddp_setup)(struct net_device *dev,
-+ u16 xid,
-+ struct scatterlist *sgl,
-+ unsigned int sgc);
-+ int (*ndo_fcoe_ddp_done)(struct net_device *dev,
-+ u16 xid);
-+#define NETDEV_FCOE_WWNN 0
-+#define NETDEV_FCOE_WWPN 1
-+ int (*ndo_fcoe_get_wwn)(struct net_device *dev,
-+ u64 *wwn, int type);
-+#endif
-+};
-+
-+/*
-+ * The DEVICE structure.
-+ * Actually, this whole structure is a big mistake. It mixes I/O
-+ * data with strictly "high-level" data, and it has to know about
-+ * almost every data structure used in the INET module.
-+ *
-+ * FIXME: cleanup struct net_device such that network protocol info
-+ * moves out.
-+ */
-+
-+struct net_device {
-+
-+ /*
-+ * This is the first field of the "visible" part of this structure
-+ * (i.e. as seen by users in the "Space.c" file). It is the name
-+ * the interface.
-+ */
-+ char name[IFNAMSIZ];
-+
-+ struct pm_qos_request_list *pm_qos_req;
-+
-+ /* device name hash chain */
-+ struct hlist_node name_hlist;
-+ /* snmp alias */
-+ char *ifalias;
-+
-+ /*
-+ * I/O specific fields
-+ * FIXME: Merge these and struct ifmap into one
-+ */
-+ unsigned long mem_end; /* shared mem end */
-+ unsigned long mem_start; /* shared mem start */
-+ unsigned long base_addr; /* device I/O address */
-+ unsigned int irq; /* device IRQ number */
-+
-+ /*
-+ * Some hardware also needs these fields, but they are not
-+ * part of the usual set specified in Space.c.
-+ */
-+
-+ unsigned char if_port; /* Selectable AUI, TP,..*/
-+ unsigned char dma; /* DMA channel */
-+
-+ unsigned long state;
-+
-+ struct list_head dev_list;
-+ struct list_head napi_list;
-+ struct list_head unreg_list;
-+
-+ /* Net device features */
-+ unsigned long features;
-+#define NETIF_F_SG 1 /* Scatter/gather IO. */
-+#define NETIF_F_IP_CSUM 2 /* Can checksum TCP/UDP over IPv4. */
-+#define NETIF_F_NO_CSUM 4 /* Does not require checksum. F.e. loopack. */
-+#define NETIF_F_HW_CSUM 8 /* Can checksum all the packets. */
-+#define NETIF_F_IPV6_CSUM 16 /* Can checksum TCP/UDP over IPV6 */
-+#define NETIF_F_HIGHDMA 32 /* Can DMA to high memory. */
-+#define NETIF_F_FRAGLIST 64 /* Scatter/gather IO. */
-+#define NETIF_F_HW_VLAN_TX 128 /* Transmit VLAN hw acceleration */
-+#define NETIF_F_HW_VLAN_RX 256 /* Receive VLAN hw acceleration */
-+#define NETIF_F_HW_VLAN_FILTER 512 /* Receive filtering on VLAN */
-+#define NETIF_F_VLAN_CHALLENGED 1024 /* Device cannot handle VLAN packets */
-+#define NETIF_F_GSO 2048 /* Enable software GSO. */
-+#define NETIF_F_LLTX 4096 /* LockLess TX - deprecated. Please */
-+ /* do not use LLTX in new drivers */
-+#define NETIF_F_NETNS_LOCAL 8192 /* Does not change network namespaces */
-+#define NETIF_F_GRO 16384 /* Generic receive offload */
-+#define NETIF_F_LRO 32768 /* large receive offload */
-+
-+/* the GSO_MASK reserves bits 16 through 23 */
-+#define NETIF_F_FCOE_CRC (1 << 24) /* FCoE CRC32 */
-+#define NETIF_F_SCTP_CSUM (1 << 25) /* SCTP checksum offload */
-+#define NETIF_F_FCOE_MTU (1 << 26) /* Supports max FCoE MTU, 2158 bytes*/
-+#define NETIF_F_NTUPLE (1 << 27) /* N-tuple filters supported */
-+#define NETIF_F_RXHASH (1 << 28) /* Receive hashing offload */
-+
-+ /* Segmentation offload features */
-+#define NETIF_F_GSO_SHIFT 16
-+#define NETIF_F_GSO_MASK 0x00ff0000
-+#define NETIF_F_TSO (SKB_GSO_TCPV4 << NETIF_F_GSO_SHIFT)
-+#define NETIF_F_UFO (SKB_GSO_UDP << NETIF_F_GSO_SHIFT)
-+#define NETIF_F_GSO_ROBUST (SKB_GSO_DODGY << NETIF_F_GSO_SHIFT)
-+#define NETIF_F_TSO_ECN (SKB_GSO_TCP_ECN << NETIF_F_GSO_SHIFT)
-+#define NETIF_F_TSO6 (SKB_GSO_TCPV6 << NETIF_F_GSO_SHIFT)
-+#define NETIF_F_FSO (SKB_GSO_FCOE << NETIF_F_GSO_SHIFT)
-+
-+ /* List of features with software fallbacks. */
-+#define NETIF_F_GSO_SOFTWARE (NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6)
-+
-+
-+#define NETIF_F_GEN_CSUM (NETIF_F_NO_CSUM | NETIF_F_HW_CSUM)
-+#define NETIF_F_V4_CSUM (NETIF_F_GEN_CSUM | NETIF_F_IP_CSUM)
-+#define NETIF_F_V6_CSUM (NETIF_F_GEN_CSUM | NETIF_F_IPV6_CSUM)
-+#define NETIF_F_ALL_CSUM (NETIF_F_V4_CSUM | NETIF_F_V6_CSUM)
-+
-+ /*
-+ * If one device supports one of these features, then enable them
-+ * for all in netdev_increment_features.
-+ */
-+#define NETIF_F_ONE_FOR_ALL (NETIF_F_GSO_SOFTWARE | NETIF_F_GSO_ROBUST | \
-+ NETIF_F_SG | NETIF_F_HIGHDMA | \
-+ NETIF_F_FRAGLIST)
-+
-+ /* Interface index. Unique device identifier */
-+ int ifindex;
-+ int iflink;
-+
-+ struct net_device_stats stats;
-+
-+#ifdef CONFIG_WIRELESS_EXT
-+ /* List of functions to handle Wireless Extensions (instead of ioctl).
-+ * See <net/iw_handler.h> for details. Jean II */
-+ const struct iw_handler_def * wireless_handlers;
-+ /* Instance data managed by the core of Wireless Extensions. */
-+ struct iw_public_data * wireless_data;
-+#endif
-+ /* Management operations */
-+ const struct net_device_ops *netdev_ops;
-+ const struct ethtool_ops *ethtool_ops;
-+
-+ /* Hardware header description */
-+ const struct header_ops *header_ops;
-+
-+ unsigned int flags; /* interface flags (a la BSD) */
-+ unsigned short gflags;
-+ unsigned short priv_flags; /* Like 'flags' but invisible to userspace. */
-+ unsigned short padded; /* How much padding added by alloc_netdev() */
-+
-+ unsigned char operstate; /* RFC2863 operstate */
-+ unsigned char link_mode; /* mapping policy to operstate */
-+
-+ unsigned int mtu; /* interface MTU value */
-+ unsigned short type; /* interface hardware type */
-+ unsigned short hard_header_len; /* hardware hdr length */
-+
-+ /* extra head- and tailroom the hardware may need, but not in all cases
-+ * can this be guaranteed, especially tailroom. Some cases also use
-+ * LL_MAX_HEADER instead to allocate the skb.
-+ */
-+ unsigned short needed_headroom;
-+ unsigned short needed_tailroom;
-+
-+ struct net_device *master; /* Pointer to master device of a group,
-+ * which this device is member of.
-+ */
-+
-+ /* Interface address info. */
-+ unsigned char perm_addr[MAX_ADDR_LEN]; /* permanent hw address */
-+ unsigned char addr_len; /* hardware address length */
-+ unsigned short dev_id; /* for shared network cards */
-+
-+ spinlock_t addr_list_lock;
-+ struct netdev_hw_addr_list uc; /* Unicast mac addresses */
-+ struct netdev_hw_addr_list mc; /* Multicast mac addresses */
-+ int uc_promisc;
-+ unsigned int promiscuity;
-+ unsigned int allmulti;
-+
-+
-+ /* Protocol specific pointers */
-+
-+#ifdef CONFIG_NET_DSA
-+ void *dsa_ptr; /* dsa specific data */
-+#endif
-+ void *atalk_ptr; /* AppleTalk link */
-+ void *ip_ptr; /* IPv4 specific data */
-+ void *dn_ptr; /* DECnet specific data */
-+ void *ip6_ptr; /* IPv6 specific data */
-+ void *ec_ptr; /* Econet specific data */
-+ void *ax25_ptr; /* AX.25 specific data */
-+ struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data,
-+ assign before registering */
-+
-+/*
-+ * Cache line mostly used on receive path (including eth_type_trans())
-+ */
-+ unsigned long last_rx; /* Time of last Rx */
-+ /* Interface address info used in eth_type_trans() */
-+ unsigned char *dev_addr; /* hw address, (before bcast
-+ because most packets are
-+ unicast) */
-+
-+ struct netdev_hw_addr_list dev_addrs; /* list of device
-+ hw addresses */
-+
-+ unsigned char broadcast[MAX_ADDR_LEN]; /* hw bcast add */
-+
-+#ifdef CONFIG_RPS
-+ struct kset *queues_kset;
-+
-+ struct netdev_rx_queue *_rx;
-+
-+ /* Number of RX queues allocated at alloc_netdev_mq() time */
-+ unsigned int num_rx_queues;
-+#endif
-+
-+ struct netdev_queue rx_queue;
-+
-+ struct netdev_queue *_tx ____cacheline_aligned_in_smp;
-+
-+ /* Number of TX queues allocated at alloc_netdev_mq() time */
-+ unsigned int num_tx_queues;
-+
-+ /* Number of TX queues currently active in device */
-+ unsigned int real_num_tx_queues;
-+
-+ /* root qdisc from userspace point of view */
-+ struct Qdisc *qdisc;
-+
-+ unsigned long tx_queue_len; /* Max frames per queue allowed */
-+ spinlock_t tx_global_lock;
-+/*
-+ * One part is mostly used on xmit path (device)
-+ */
-+ /* These may be needed for future network-power-down code. */
-+
-+ /*
-+ * trans_start here is expensive for high speed devices on SMP,
-+ * please use netdev_queue->trans_start instead.
-+ */
-+ unsigned long trans_start; /* Time (in jiffies) of last Tx */
-+
-+ int watchdog_timeo; /* used by dev_watchdog() */
-+ struct timer_list watchdog_timer;
-+
-+ /* Number of references to this device */
-+ atomic_t refcnt ____cacheline_aligned_in_smp;
-+
-+ /* delayed register/unregister */
-+ struct list_head todo_list;
-+ /* device index hash chain */
-+ struct hlist_node index_hlist;
-+
-+ struct list_head link_watch_list;
-+
-+ /* register/unregister state machine */
-+ enum { NETREG_UNINITIALIZED=0,
-+ NETREG_REGISTERED, /* completed register_netdevice */
-+ NETREG_UNREGISTERING, /* called unregister_netdevice */
-+ NETREG_UNREGISTERED, /* completed unregister todo */
-+ NETREG_RELEASED, /* called free_netdev */
-+ NETREG_DUMMY, /* dummy device for NAPI poll */
-+ } reg_state:16;
-+
-+ enum {
-+ RTNL_LINK_INITIALIZED,
-+ RTNL_LINK_INITIALIZING,
-+ } rtnl_link_state:16;
-+
-+ /* Called from unregister, can be used to call free_netdev */
-+ void (*destructor)(struct net_device *dev);
-+
-+#ifdef CONFIG_NETPOLL
-+ struct netpoll_info *npinfo;
-+#endif
-+
-+#ifdef CONFIG_NET_NS
-+ /* Network namespace this network device is inside */
-+ struct net *nd_net;
-+#endif
-+
-+ /* mid-layer private */
-+ void *ml_priv;
-+
-+ /* bridge stuff */
-+ struct net_bridge_port *br_port;
-+ /* macvlan */
-+ struct macvlan_port *macvlan_port;
-+ /* GARP */
-+ struct garp_port *garp_port;
-+
-+ /* class/net/name entry */
-+ struct device dev;
-+ /* space for optional device, statistics, and wireless sysfs groups */
-+ const struct attribute_group *sysfs_groups[4];
-+
-+ /* rtnetlink link ops */
-+ const struct rtnl_link_ops *rtnl_link_ops;
-+
-+ /* VLAN feature mask */
-+ unsigned long vlan_features;
-+
-+ /* for setting kernel sock attribute on TCP connection setup */
-+#define GSO_MAX_SIZE 65536
-+ unsigned int gso_max_size;
-+
-+#ifdef CONFIG_DCB
-+ /* Data Center Bridging netlink ops */
-+ const struct dcbnl_rtnl_ops *dcbnl_ops;
-+#endif
-+
-+#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
-+ /* max exchange id for FCoE LRO by ddp */
-+ unsigned int fcoe_ddp_xid;
-+#endif
-+ /* n-tuple filter list attached to this device */
-+ struct ethtool_rx_ntuple_list ethtool_ntuple_list;
-+};
-+#define to_net_dev(d) container_of(d, struct net_device, dev)
-+
-+#define NETDEV_ALIGN 32
-+
-+static inline
-+struct netdev_queue *netdev_get_tx_queue(const struct net_device *dev,
-+ unsigned int index)
-+{
-+ return &dev->_tx[index];
-+}
-+
-+static inline void netdev_for_each_tx_queue(struct net_device *dev,
-+ void (*f)(struct net_device *,
-+ struct netdev_queue *,
-+ void *),
-+ void *arg)
-+{
-+ unsigned int i;
-+
-+ for (i = 0; i < dev->num_tx_queues; i++)
-+ f(dev, &dev->_tx[i], arg);
-+}
-+
-+/*
-+ * Net namespace inlines
-+ */
-+static inline
-+struct net *dev_net(const struct net_device *dev)
-+{
-+#ifdef CONFIG_NET_NS
-+ return dev->nd_net;
-+#else
-+ return &init_net;
-+#endif
-+}
-+
-+static inline
-+void dev_net_set(struct net_device *dev, struct net *net)
-+{
-+#ifdef CONFIG_NET_NS
-+ release_net(dev->nd_net);
-+ dev->nd_net = hold_net(net);
-+#endif
-+}
-+
-+static inline bool netdev_uses_dsa_tags(struct net_device *dev)
-+{
-+#ifdef CONFIG_NET_DSA_TAG_DSA
-+ if (dev->dsa_ptr != NULL)
-+ return dsa_uses_dsa_tags(dev->dsa_ptr);
-+#endif
-+
-+ return 0;
-+}
-+
-+#ifndef CONFIG_NET_NS
-+static inline void skb_set_dev(struct sk_buff *skb, struct net_device *dev)
-+{
-+ skb->dev = dev;
-+}
-+#else /* CONFIG_NET_NS */
-+void skb_set_dev(struct sk_buff *skb, struct net_device *dev);
-+#endif
-+
-+static inline bool netdev_uses_trailer_tags(struct net_device *dev)
-+{
-+#ifdef CONFIG_NET_DSA_TAG_TRAILER
-+ if (dev->dsa_ptr != NULL)
-+ return dsa_uses_trailer_tags(dev->dsa_ptr);
-+#endif
-+
-+ return 0;
-+}
-+
-+/**
-+ * netdev_priv - access network device private data
-+ * @dev: network device
-+ *
-+ * Get network device private data
-+ */
-+static inline void *netdev_priv(const struct net_device *dev)
-+{
-+ return (char *)dev + ALIGN(sizeof(struct net_device), NETDEV_ALIGN);
-+}
-+
-+/* Set the sysfs physical device reference for the network logical device
-+ * if set prior to registration will cause a symlink during initialization.
-+ */
-+#define SET_NETDEV_DEV(net, pdev) ((net)->dev.parent = (pdev))
-+
-+/* Set the sysfs device type for the network logical device to allow
-+ * fin grained indentification of different network device types. For
-+ * example Ethernet, Wirelss LAN, Bluetooth, WiMAX etc.
-+ */
-+#define SET_NETDEV_DEVTYPE(net, devtype) ((net)->dev.type = (devtype))
-+
-+/**
-+ * netif_napi_add - initialize a napi context
-+ * @dev: network device
-+ * @napi: napi context
-+ * @poll: polling function
-+ * @weight: default weight
-+ *
-+ * netif_napi_add() must be used to initialize a napi context prior to calling
-+ * *any* of the other napi related functions.
-+ */
-+void netif_napi_add(struct net_device *dev, struct napi_struct *napi,
-+ int (*poll)(struct napi_struct *, int), int weight);
-+
-+/**
-+ * netif_napi_del - remove a napi context
-+ * @napi: napi context
-+ *
-+ * netif_napi_del() removes a napi context from the network device napi list
-+ */
-+void netif_napi_del(struct napi_struct *napi);
-+
-+struct napi_gro_cb {
-+ /* Virtual address of skb_shinfo(skb)->frags[0].page + offset. */
-+ void *frag0;
-+
-+ /* Length of frag0. */
-+ unsigned int frag0_len;
-+
-+ /* This indicates where we are processing relative to skb->data. */
-+ int data_offset;
-+
-+ /* This is non-zero if the packet may be of the same flow. */
-+ int same_flow;
-+
-+ /* This is non-zero if the packet cannot be merged with the new skb. */
-+ int flush;
-+
-+ /* Number of segments aggregated. */
-+ int count;
-+
-+ /* Free the skb? */
-+ int free;
-+};
-+
-+#define NAPI_GRO_CB(skb) ((struct napi_gro_cb *)(skb)->cb)
-+
-+struct packet_type {
-+ __be16 type; /* This is really htons(ether_type). */
-+ struct net_device *dev; /* NULL is wildcarded here */
-+ int (*func) (struct sk_buff *,
-+ struct net_device *,
-+ struct packet_type *,
-+ struct net_device *);
-+ struct sk_buff *(*gso_segment)(struct sk_buff *skb,
-+ int features);
-+ int (*gso_send_check)(struct sk_buff *skb);
-+ struct sk_buff **(*gro_receive)(struct sk_buff **head,
-+ struct sk_buff *skb);
-+ int (*gro_complete)(struct sk_buff *skb);
-+ void *af_packet_priv;
-+ struct list_head list;
-+};
-+
-+#include <linux/interrupt.h>
-+#include <linux/notifier.h>
-+
-+extern rwlock_t dev_base_lock; /* Device list lock */
-+
-+
-+#define for_each_netdev(net, d) \
-+ list_for_each_entry(d, &(net)->dev_base_head, dev_list)
-+#define for_each_netdev_reverse(net, d) \
-+ list_for_each_entry_reverse(d, &(net)->dev_base_head, dev_list)
-+#define for_each_netdev_rcu(net, d) \
-+ list_for_each_entry_rcu(d, &(net)->dev_base_head, dev_list)
-+#define for_each_netdev_safe(net, d, n) \
-+ list_for_each_entry_safe(d, n, &(net)->dev_base_head, dev_list)
-+#define for_each_netdev_continue(net, d) \
-+ list_for_each_entry_continue(d, &(net)->dev_base_head, dev_list)
-+#define for_each_netdev_continue_rcu(net, d) \
-+ list_for_each_entry_continue_rcu(d, &(net)->dev_base_head, dev_list)
-+#define net_device_entry(lh) list_entry(lh, struct net_device, dev_list)
-+
-+static inline struct net_device *next_net_device(struct net_device *dev)
-+{
-+ struct list_head *lh;
-+ struct net *net;
-+
-+ net = dev_net(dev);
-+ lh = dev->dev_list.next;
-+ return lh == &net->dev_base_head ? NULL : net_device_entry(lh);
-+}
-+
-+static inline struct net_device *next_net_device_rcu(struct net_device *dev)
-+{
-+ struct list_head *lh;
-+ struct net *net;
-+
-+ net = dev_net(dev);
-+ lh = rcu_dereference(dev->dev_list.next);
-+ return lh == &net->dev_base_head ? NULL : net_device_entry(lh);
-+}
-+
-+static inline struct net_device *first_net_device(struct net *net)
-+{
-+ return list_empty(&net->dev_base_head) ? NULL :
-+ net_device_entry(net->dev_base_head.next);
-+}
-+
-+extern int netdev_boot_setup_check(struct net_device *dev);
-+extern unsigned long netdev_boot_base(const char *prefix, int unit);
-+extern struct net_device *dev_getbyhwaddr(struct net *net, unsigned short type, char *hwaddr);
-+extern struct net_device *dev_getfirstbyhwtype(struct net *net, unsigned short type);
-+extern struct net_device *__dev_getfirstbyhwtype(struct net *net, unsigned short type);
-+extern void dev_add_pack(struct packet_type *pt);
-+extern void dev_remove_pack(struct packet_type *pt);
-+extern void __dev_remove_pack(struct packet_type *pt);
-+
-+extern struct net_device *dev_get_by_flags(struct net *net, unsigned short flags,
-+ unsigned short mask);
-+extern struct net_device *dev_get_by_name(struct net *net, const char *name);
-+extern struct net_device *dev_get_by_name_rcu(struct net *net, const char *name);
-+extern struct net_device *__dev_get_by_name(struct net *net, const char *name);
-+extern int dev_alloc_name(struct net_device *dev, const char *name);
-+extern int dev_open(struct net_device *dev);
-+extern int dev_close(struct net_device *dev);
-+extern void dev_disable_lro(struct net_device *dev);
-+extern int dev_queue_xmit(struct sk_buff *skb);
-+extern int register_netdevice(struct net_device *dev);
-+extern void unregister_netdevice_queue(struct net_device *dev,
-+ struct list_head *head);
-+extern void unregister_netdevice_many(struct list_head *head);
-+static inline void unregister_netdevice(struct net_device *dev)
-+{
-+ unregister_netdevice_queue(dev, NULL);
-+}
-+
-+extern void free_netdev(struct net_device *dev);
-+extern void synchronize_net(void);
-+extern int register_netdevice_notifier(struct notifier_block *nb);
-+extern int unregister_netdevice_notifier(struct notifier_block *nb);
-+extern int init_dummy_netdev(struct net_device *dev);
-+extern void netdev_resync_ops(struct net_device *dev);
-+
-+extern int call_netdevice_notifiers(unsigned long val, struct net_device *dev);
-+extern struct net_device *dev_get_by_index(struct net *net, int ifindex);
-+extern struct net_device *__dev_get_by_index(struct net *net, int ifindex);
-+extern struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
-+extern int dev_restart(struct net_device *dev);
-+#ifdef CONFIG_NETPOLL_TRAP
-+extern int netpoll_trap(void);
-+#endif
-+extern int skb_gro_receive(struct sk_buff **head,
-+ struct sk_buff *skb);
-+extern void skb_gro_reset_offset(struct sk_buff *skb);
-+
-+static inline unsigned int skb_gro_offset(const struct sk_buff *skb)
-+{
-+ return NAPI_GRO_CB(skb)->data_offset;
-+}
-+
-+static inline unsigned int skb_gro_len(const struct sk_buff *skb)
-+{
-+ return skb->len - NAPI_GRO_CB(skb)->data_offset;
-+}
-+
-+static inline void skb_gro_pull(struct sk_buff *skb, unsigned int len)
-+{
-+ NAPI_GRO_CB(skb)->data_offset += len;
-+}
-+
-+static inline void *skb_gro_header_fast(struct sk_buff *skb,
-+ unsigned int offset)
-+{
-+ return NAPI_GRO_CB(skb)->frag0 + offset;
-+}
-+
-+static inline int skb_gro_header_hard(struct sk_buff *skb, unsigned int hlen)
-+{
-+ return NAPI_GRO_CB(skb)->frag0_len < hlen;
-+}
-+
-+static inline void *skb_gro_header_slow(struct sk_buff *skb, unsigned int hlen,
-+ unsigned int offset)
-+{
-+ NAPI_GRO_CB(skb)->frag0 = NULL;
-+ NAPI_GRO_CB(skb)->frag0_len = 0;
-+ return pskb_may_pull(skb, hlen) ? skb->data + offset : NULL;
-+}
-+
-+static inline void *skb_gro_mac_header(struct sk_buff *skb)
-+{
-+ return NAPI_GRO_CB(skb)->frag0 ?: skb_mac_header(skb);
-+}
-+
-+static inline void *skb_gro_network_header(struct sk_buff *skb)
-+{
-+ return (NAPI_GRO_CB(skb)->frag0 ?: skb->data) +
-+ skb_network_offset(skb);
-+}
-+
-+static inline int dev_hard_header(struct sk_buff *skb, struct net_device *dev,
-+ unsigned short type,
-+ const void *daddr, const void *saddr,
-+ unsigned len)
-+{
-+ if (!dev->header_ops || !dev->header_ops->create)
-+ return 0;
-+
-+ return dev->header_ops->create(skb, dev, type, daddr, saddr, len);
-+}
-+
-+static inline int dev_parse_header(const struct sk_buff *skb,
-+ unsigned char *haddr)
-+{
-+ const struct net_device *dev = skb->dev;
-+
-+ if (!dev->header_ops || !dev->header_ops->parse)
-+ return 0;
-+ return dev->header_ops->parse(skb, haddr);
-+}
-+
-+typedef int gifconf_func_t(struct net_device * dev, char __user * bufptr, int len);
-+extern int register_gifconf(unsigned int family, gifconf_func_t * gifconf);
-+static inline int unregister_gifconf(unsigned int family)
-+{
-+ return register_gifconf(family, NULL);
-+}
-+
-+/*
-+ * Incoming packets are placed on per-cpu queues
-+ */
-+struct softnet_data {
-+ struct Qdisc *output_queue;
-+ struct Qdisc **output_queue_tailp;
-+ struct list_head poll_list;
-+ struct sk_buff *completion_queue;
-+ struct sk_buff_head process_queue;
-+
-+ /* stats */
-+ unsigned int processed;
-+ unsigned int time_squeeze;
-+ unsigned int cpu_collision;
-+ unsigned int received_rps;
-+
-+#ifdef CONFIG_RPS
-+ struct softnet_data *rps_ipi_list;
-+
-+ /* Elements below can be accessed between CPUs for RPS */
-+ struct call_single_data csd ____cacheline_aligned_in_smp;
-+ struct softnet_data *rps_ipi_next;
-+ unsigned int cpu;
-+ unsigned int input_queue_head;
-+ unsigned int input_queue_tail;
-+#endif
-+ unsigned dropped;
-+ struct sk_buff_head input_pkt_queue;
-+ struct napi_struct backlog;
-+};
-+
-+static inline void input_queue_head_incr(struct softnet_data *sd)
-+{
-+#ifdef CONFIG_RPS
-+ sd->input_queue_head++;
-+#endif
-+}
-+
-+static inline void input_queue_tail_incr_save(struct softnet_data *sd,
-+ unsigned int *qtail)
-+{
-+#ifdef CONFIG_RPS
-+ *qtail = ++sd->input_queue_tail;
-+#endif
-+}
-+
-+DECLARE_PER_CPU_ALIGNED(struct softnet_data, softnet_data);
-+
-+#define HAVE_NETIF_QUEUE
-+
-+extern void __netif_schedule(struct Qdisc *q);
-+
-+static inline void netif_schedule_queue(struct netdev_queue *txq)
-+{
-+ if (!test_bit(__QUEUE_STATE_XOFF, &txq->state))
-+ __netif_schedule(txq->qdisc);
-+}
-+
-+static inline void netif_tx_schedule_all(struct net_device *dev)
-+{
-+ unsigned int i;
-+
-+ for (i = 0; i < dev->num_tx_queues; i++)
-+ netif_schedule_queue(netdev_get_tx_queue(dev, i));
-+}
-+
-+static inline void netif_tx_start_queue(struct netdev_queue *dev_queue)
-+{
-+ clear_bit(__QUEUE_STATE_XOFF, &dev_queue->state);
-+}
-+
-+/**
-+ * netif_start_queue - allow transmit
-+ * @dev: network device
-+ *
-+ * Allow upper layers to call the device hard_start_xmit routine.
-+ */
-+static inline void netif_start_queue(struct net_device *dev)
-+{
-+ netif_tx_start_queue(netdev_get_tx_queue(dev, 0));
-+}
-+
-+static inline void netif_tx_start_all_queues(struct net_device *dev)
-+{
-+ unsigned int i;
-+
-+ for (i = 0; i < dev->num_tx_queues; i++) {
-+ struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
-+ netif_tx_start_queue(txq);
-+ }
-+}
-+
-+static inline void netif_tx_wake_queue(struct netdev_queue *dev_queue)
-+{
-+#ifdef CONFIG_NETPOLL_TRAP
-+ if (netpoll_trap()) {
-+ netif_tx_start_queue(dev_queue);
-+ return;
-+ }
-+#endif
-+ if (test_and_clear_bit(__QUEUE_STATE_XOFF, &dev_queue->state))
-+ __netif_schedule(dev_queue->qdisc);
-+}
-+
-+/**
-+ * netif_wake_queue - restart transmit
-+ * @dev: network device
-+ *
-+ * Allow upper layers to call the device hard_start_xmit routine.
-+ * Used for flow control when transmit resources are available.
-+ */
-+static inline void netif_wake_queue(struct net_device *dev)
-+{
-+ netif_tx_wake_queue(netdev_get_tx_queue(dev, 0));
-+}
-+
-+static inline void netif_tx_wake_all_queues(struct net_device *dev)
-+{
-+ unsigned int i;
-+
-+ for (i = 0; i < dev->num_tx_queues; i++) {
-+ struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
-+ netif_tx_wake_queue(txq);
-+ }
-+}
-+
-+static inline void netif_tx_stop_queue(struct netdev_queue *dev_queue)
-+{
-+ set_bit(__QUEUE_STATE_XOFF, &dev_queue->state);
-+}
-+
-+/**
-+ * netif_stop_queue - stop transmitted packets
-+ * @dev: network device
-+ *
-+ * Stop upper layers calling the device hard_start_xmit routine.
-+ * Used for flow control when transmit resources are unavailable.
-+ */
-+static inline void netif_stop_queue(struct net_device *dev)
-+{
-+ netif_tx_stop_queue(netdev_get_tx_queue(dev, 0));
-+}
-+
-+static inline void netif_tx_stop_all_queues(struct net_device *dev)
-+{
-+ unsigned int i;
-+
-+ for (i = 0; i < dev->num_tx_queues; i++) {
-+ struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
-+ netif_tx_stop_queue(txq);
-+ }
-+}
-+
-+static inline int netif_tx_queue_stopped(const struct netdev_queue *dev_queue)
-+{
-+ return test_bit(__QUEUE_STATE_XOFF, &dev_queue->state);
-+}
-+
-+/**
-+ * netif_queue_stopped - test if transmit queue is flowblocked
-+ * @dev: network device
-+ *
-+ * Test if transmit queue on device is currently unable to send.
-+ */
-+static inline int netif_queue_stopped(const struct net_device *dev)
-+{
-+ return netif_tx_queue_stopped(netdev_get_tx_queue(dev, 0));
-+}
-+
-+static inline int netif_tx_queue_frozen(const struct netdev_queue *dev_queue)
-+{
-+ return test_bit(__QUEUE_STATE_FROZEN, &dev_queue->state);
-+}
-+
-+/**
-+ * netif_running - test if up
-+ * @dev: network device
-+ *
-+ * Test if the device has been brought up.
-+ */
-+static inline int netif_running(const struct net_device *dev)
-+{
-+ return test_bit(__LINK_STATE_START, &dev->state);
-+}
-+
-+/*
-+ * Routines to manage the subqueues on a device. We only need start
-+ * stop, and a check if it's stopped. All other device management is
-+ * done at the overall netdevice level.
-+ * Also test the device if we're multiqueue.
-+ */
-+
-+/**
-+ * netif_start_subqueue - allow sending packets on subqueue
-+ * @dev: network device
-+ * @queue_index: sub queue index
-+ *
-+ * Start individual transmit queue of a device with multiple transmit queues.
-+ */
-+static inline void netif_start_subqueue(struct net_device *dev, u16 queue_index)
-+{
-+ struct netdev_queue *txq = netdev_get_tx_queue(dev, queue_index);
-+
-+ netif_tx_start_queue(txq);
-+}
-+
-+/**
-+ * netif_stop_subqueue - stop sending packets on subqueue
-+ * @dev: network device
-+ * @queue_index: sub queue index
-+ *
-+ * Stop individual transmit queue of a device with multiple transmit queues.
-+ */
-+static inline void netif_stop_subqueue(struct net_device *dev, u16 queue_index)
-+{
-+ struct netdev_queue *txq = netdev_get_tx_queue(dev, queue_index);
-+#ifdef CONFIG_NETPOLL_TRAP
-+ if (netpoll_trap())
-+ return;
-+#endif
-+ netif_tx_stop_queue(txq);
-+}
-+
-+/**
-+ * netif_subqueue_stopped - test status of subqueue
-+ * @dev: network device
-+ * @queue_index: sub queue index
-+ *
-+ * Check individual transmit queue of a device with multiple transmit queues.
-+ */
-+static inline int __netif_subqueue_stopped(const struct net_device *dev,
-+ u16 queue_index)
-+{
-+ struct netdev_queue *txq = netdev_get_tx_queue(dev, queue_index);
-+
-+ return netif_tx_queue_stopped(txq);
-+}
-+
-+static inline int netif_subqueue_stopped(const struct net_device *dev,
-+ struct sk_buff *skb)
-+{
-+ return __netif_subqueue_stopped(dev, skb_get_queue_mapping(skb));
-+}
-+
-+/**
-+ * netif_wake_subqueue - allow sending packets on subqueue
-+ * @dev: network device
-+ * @queue_index: sub queue index
-+ *
-+ * Resume individual transmit queue of a device with multiple transmit queues.
-+ */
-+static inline void netif_wake_subqueue(struct net_device *dev, u16 queue_index)
-+{
-+ struct netdev_queue *txq = netdev_get_tx_queue(dev, queue_index);
-+#ifdef CONFIG_NETPOLL_TRAP
-+ if (netpoll_trap())
-+ return;
-+#endif
-+ if (test_and_clear_bit(__QUEUE_STATE_XOFF, &txq->state))
-+ __netif_schedule(txq->qdisc);
-+}
-+
-+/**
-+ * netif_is_multiqueue - test if device has multiple transmit queues
-+ * @dev: network device
-+ *
-+ * Check if device has multiple transmit queues
-+ */
-+static inline int netif_is_multiqueue(const struct net_device *dev)
-+{
-+ return (dev->num_tx_queues > 1);
-+}
-+
-+extern void netif_set_real_num_tx_queues(struct net_device *dev,
-+ unsigned int txq);
-+
-+/* Use this variant when it is known for sure that it
-+ * is executing from hardware interrupt context or with hardware interrupts
-+ * disabled.
-+ */
-+extern void dev_kfree_skb_irq(struct sk_buff *skb);
-+
-+/* Use this variant in places where it could be invoked
-+ * from either hardware interrupt or other context, with hardware interrupts
-+ * either disabled or enabled.
-+ */
-+extern void dev_kfree_skb_any(struct sk_buff *skb);
-+
-+#define HAVE_NETIF_RX 1
-+extern int netif_rx(struct sk_buff *skb);
-+extern int netif_rx_ni(struct sk_buff *skb);
-+#define HAVE_NETIF_RECEIVE_SKB 1
-+extern int netif_receive_skb(struct sk_buff *skb);
-+extern gro_result_t dev_gro_receive(struct napi_struct *napi,
-+ struct sk_buff *skb);
-+extern gro_result_t napi_skb_finish(gro_result_t ret, struct sk_buff *skb);
-+extern gro_result_t napi_gro_receive(struct napi_struct *napi,
-+ struct sk_buff *skb);
-+extern void napi_reuse_skb(struct napi_struct *napi,
-+ struct sk_buff *skb);
-+extern struct sk_buff * napi_get_frags(struct napi_struct *napi);
-+extern gro_result_t napi_frags_finish(struct napi_struct *napi,
-+ struct sk_buff *skb,
-+ gro_result_t ret);
-+extern struct sk_buff * napi_frags_skb(struct napi_struct *napi);
-+extern gro_result_t napi_gro_frags(struct napi_struct *napi);
-+
-+static inline void napi_free_frags(struct napi_struct *napi)
-+{
-+ kfree_skb(napi->skb);
-+ napi->skb = NULL;
-+}
-+
-+extern void netif_nit_deliver(struct sk_buff *skb);
-+extern int dev_valid_name(const char *name);
-+extern int dev_ioctl(struct net *net, unsigned int cmd, void __user *);
-+extern int dev_ethtool(struct net *net, struct ifreq *);
-+extern unsigned dev_get_flags(const struct net_device *);
-+extern int __dev_change_flags(struct net_device *, unsigned int flags);
-+extern int dev_change_flags(struct net_device *, unsigned);
-+extern void __dev_notify_flags(struct net_device *, unsigned int old_flags);
-+extern int dev_change_name(struct net_device *, const char *);
-+extern int dev_set_alias(struct net_device *, const char *, size_t);
-+extern int dev_change_net_namespace(struct net_device *,
-+ struct net *, const char *);
-+extern int dev_set_mtu(struct net_device *, int);
-+extern int dev_set_mac_address(struct net_device *,
-+ struct sockaddr *);
-+extern int dev_hard_start_xmit(struct sk_buff *skb,
-+ struct net_device *dev,
-+ struct netdev_queue *txq);
-+extern int dev_forward_skb(struct net_device *dev,
-+ struct sk_buff *skb);
-+
-+extern int netdev_budget;
-+
-+/* Called by rtnetlink.c:rtnl_unlock() */
-+extern void netdev_run_todo(void);
-+
-+/**
-+ * dev_put - release reference to device
-+ * @dev: network device
-+ *
-+ * Release reference to device to allow it to be freed.
-+ */
-+static inline void dev_put(struct net_device *dev)
-+{
-+ atomic_dec(&dev->refcnt);
-+}
-+
-+/**
-+ * dev_hold - get reference to device
-+ * @dev: network device
-+ *
-+ * Hold reference to device to keep it from being freed.
-+ */
-+static inline void dev_hold(struct net_device *dev)
-+{
-+ atomic_inc(&dev->refcnt);
-+}
-+
-+/* Carrier loss detection, dial on demand. The functions netif_carrier_on
-+ * and _off may be called from IRQ context, but it is caller
-+ * who is responsible for serialization of these calls.
-+ *
-+ * The name carrier is inappropriate, these functions should really be
-+ * called netif_lowerlayer_*() because they represent the state of any
-+ * kind of lower layer not just hardware media.
-+ */
-+
-+extern void linkwatch_fire_event(struct net_device *dev);
-+extern void linkwatch_forget_dev(struct net_device *dev);
-+
-+/**
-+ * netif_carrier_ok - test if carrier present
-+ * @dev: network device
-+ *
-+ * Check if carrier is present on device
-+ */
-+static inline int netif_carrier_ok(const struct net_device *dev)
-+{
-+ return !test_bit(__LINK_STATE_NOCARRIER, &dev->state);
-+}
-+
-+extern unsigned long dev_trans_start(struct net_device *dev);
-+
-+extern void __netdev_watchdog_up(struct net_device *dev);
-+
-+extern void netif_carrier_on(struct net_device *dev);
-+
-+extern void netif_carrier_off(struct net_device *dev);
-+
-+extern void netif_notify_peers(struct net_device *dev);
-+
-+/**
-+ * netif_dormant_on - mark device as dormant.
-+ * @dev: network device
-+ *
-+ * Mark device as dormant (as per RFC2863).
-+ *
-+ * The dormant state indicates that the relevant interface is not
-+ * actually in a condition to pass packets (i.e., it is not 'up') but is
-+ * in a "pending" state, waiting for some external event. For "on-
-+ * demand" interfaces, this new state identifies the situation where the
-+ * interface is waiting for events to place it in the up state.
-+ *
-+ */
-+static inline void netif_dormant_on(struct net_device *dev)
-+{
-+ if (!test_and_set_bit(__LINK_STATE_DORMANT, &dev->state))
-+ linkwatch_fire_event(dev);
-+}
-+
-+/**
-+ * netif_dormant_off - set device as not dormant.
-+ * @dev: network device
-+ *
-+ * Device is not in dormant state.
-+ */
-+static inline void netif_dormant_off(struct net_device *dev)
-+{
-+ if (test_and_clear_bit(__LINK_STATE_DORMANT, &dev->state))
-+ linkwatch_fire_event(dev);
-+}
-+
-+/**
-+ * netif_dormant - test if carrier present
-+ * @dev: network device
-+ *
-+ * Check if carrier is present on device
-+ */
-+static inline int netif_dormant(const struct net_device *dev)
-+{
-+ return test_bit(__LINK_STATE_DORMANT, &dev->state);
-+}
-+
-+
-+/**
-+ * netif_oper_up - test if device is operational
-+ * @dev: network device
-+ *
-+ * Check if carrier is operational
-+ */
-+static inline int netif_oper_up(const struct net_device *dev)
-+{
-+ return (dev->operstate == IF_OPER_UP ||
-+ dev->operstate == IF_OPER_UNKNOWN /* backward compat */);
-+}
-+
-+/**
-+ * netif_device_present - is device available or removed
-+ * @dev: network device
-+ *
-+ * Check if device has not been removed from system.
-+ */
-+static inline int netif_device_present(struct net_device *dev)
-+{
-+ return test_bit(__LINK_STATE_PRESENT, &dev->state);
-+}
-+
-+extern void netif_device_detach(struct net_device *dev);
-+
-+extern void netif_device_attach(struct net_device *dev);
-+
-+/*
-+ * Network interface message level settings
-+ */
-+#define HAVE_NETIF_MSG 1
-+
-+enum {
-+ NETIF_MSG_DRV = 0x0001,
-+ NETIF_MSG_PROBE = 0x0002,
-+ NETIF_MSG_LINK = 0x0004,
-+ NETIF_MSG_TIMER = 0x0008,
-+ NETIF_MSG_IFDOWN = 0x0010,
-+ NETIF_MSG_IFUP = 0x0020,
-+ NETIF_MSG_RX_ERR = 0x0040,
-+ NETIF_MSG_TX_ERR = 0x0080,
-+ NETIF_MSG_TX_QUEUED = 0x0100,
-+ NETIF_MSG_INTR = 0x0200,
-+ NETIF_MSG_TX_DONE = 0x0400,
-+ NETIF_MSG_RX_STATUS = 0x0800,
-+ NETIF_MSG_PKTDATA = 0x1000,
-+ NETIF_MSG_HW = 0x2000,
-+ NETIF_MSG_WOL = 0x4000,
-+};
-+
-+#define netif_msg_drv(p) ((p)->msg_enable & NETIF_MSG_DRV)
-+#define netif_msg_probe(p) ((p)->msg_enable & NETIF_MSG_PROBE)
-+#define netif_msg_link(p) ((p)->msg_enable & NETIF_MSG_LINK)
-+#define netif_msg_timer(p) ((p)->msg_enable & NETIF_MSG_TIMER)
-+#define netif_msg_ifdown(p) ((p)->msg_enable & NETIF_MSG_IFDOWN)
-+#define netif_msg_ifup(p) ((p)->msg_enable & NETIF_MSG_IFUP)
-+#define netif_msg_rx_err(p) ((p)->msg_enable & NETIF_MSG_RX_ERR)
-+#define netif_msg_tx_err(p) ((p)->msg_enable & NETIF_MSG_TX_ERR)
-+#define netif_msg_tx_queued(p) ((p)->msg_enable & NETIF_MSG_TX_QUEUED)
-+#define netif_msg_intr(p) ((p)->msg_enable & NETIF_MSG_INTR)
-+#define netif_msg_tx_done(p) ((p)->msg_enable & NETIF_MSG_TX_DONE)
-+#define netif_msg_rx_status(p) ((p)->msg_enable & NETIF_MSG_RX_STATUS)
-+#define netif_msg_pktdata(p) ((p)->msg_enable & NETIF_MSG_PKTDATA)
-+#define netif_msg_hw(p) ((p)->msg_enable & NETIF_MSG_HW)
-+#define netif_msg_wol(p) ((p)->msg_enable & NETIF_MSG_WOL)
-+
-+static inline u32 netif_msg_init(int debug_value, int default_msg_enable_bits)
-+{
-+ /* use default */
-+ if (debug_value < 0 || debug_value >= (sizeof(u32) * 8))
-+ return default_msg_enable_bits;
-+ if (debug_value == 0) /* no output */
-+ return 0;
-+ /* set low N bits */
-+ return (1 << debug_value) - 1;
-+}
-+
-+static inline void __netif_tx_lock(struct netdev_queue *txq, int cpu)
-+{
-+ spin_lock(&txq->_xmit_lock);
-+ txq->xmit_lock_owner = cpu;
-+}
-+
-+static inline void __netif_tx_lock_bh(struct netdev_queue *txq)
-+{
-+ spin_lock_bh(&txq->_xmit_lock);
-+ txq->xmit_lock_owner = smp_processor_id();
-+}
-+
-+static inline int __netif_tx_trylock(struct netdev_queue *txq)
-+{
-+ int ok = spin_trylock(&txq->_xmit_lock);
-+ if (likely(ok))
-+ txq->xmit_lock_owner = smp_processor_id();
-+ return ok;
-+}
-+
-+static inline void __netif_tx_unlock(struct netdev_queue *txq)
-+{
-+ txq->xmit_lock_owner = -1;
-+ spin_unlock(&txq->_xmit_lock);
-+}
-+
-+static inline void __netif_tx_unlock_bh(struct netdev_queue *txq)
-+{
-+ txq->xmit_lock_owner = -1;
-+ spin_unlock_bh(&txq->_xmit_lock);
-+}
-+
-+static inline void txq_trans_update(struct netdev_queue *txq)
-+{
-+ if (txq->xmit_lock_owner != -1)
-+ txq->trans_start = jiffies;
-+}
-+
-+/**
-+ * netif_tx_lock - grab network device transmit lock
-+ * @dev: network device
-+ *
-+ * Get network device transmit lock
-+ */
-+static inline void netif_tx_lock(struct net_device *dev)
-+{
-+ unsigned int i;
-+ int cpu;
-+
-+ spin_lock(&dev->tx_global_lock);
-+ cpu = smp_processor_id();
-+ for (i = 0; i < dev->num_tx_queues; i++) {
-+ struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
-+
-+ /* We are the only thread of execution doing a
-+ * freeze, but we have to grab the _xmit_lock in
-+ * order to synchronize with threads which are in
-+ * the ->hard_start_xmit() handler and already
-+ * checked the frozen bit.
-+ */
-+ __netif_tx_lock(txq, cpu);
-+ set_bit(__QUEUE_STATE_FROZEN, &txq->state);
-+ __netif_tx_unlock(txq);
-+ }
-+}
-+
-+static inline void netif_tx_lock_bh(struct net_device *dev)
-+{
-+ local_bh_disable();
-+ netif_tx_lock(dev);
-+}
-+
-+static inline void netif_tx_unlock(struct net_device *dev)
-+{
-+ unsigned int i;
-+
-+ for (i = 0; i < dev->num_tx_queues; i++) {
-+ struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
-+
-+ /* No need to grab the _xmit_lock here. If the
-+ * queue is not stopped for another reason, we
-+ * force a schedule.
-+ */
-+ clear_bit(__QUEUE_STATE_FROZEN, &txq->state);
-+ netif_schedule_queue(txq);
-+ }
-+ spin_unlock(&dev->tx_global_lock);
-+}
-+
-+static inline void netif_tx_unlock_bh(struct net_device *dev)
-+{
-+ netif_tx_unlock(dev);
-+ local_bh_enable();
-+}
-+
-+#define HARD_TX_LOCK(dev, txq, cpu) { \
-+ if ((dev->features & NETIF_F_LLTX) == 0) { \
-+ __netif_tx_lock(txq, cpu); \
-+ } \
-+}
-+
-+#define HARD_TX_UNLOCK(dev, txq) { \
-+ if ((dev->features & NETIF_F_LLTX) == 0) { \
-+ __netif_tx_unlock(txq); \
-+ } \
-+}
-+
-+static inline void netif_tx_disable(struct net_device *dev)
-+{
-+ unsigned int i;
-+ int cpu;
-+
-+ local_bh_disable();
-+ cpu = smp_processor_id();
-+ for (i = 0; i < dev->num_tx_queues; i++) {
-+ struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
-+
-+ __netif_tx_lock(txq, cpu);
-+ netif_tx_stop_queue(txq);
-+ __netif_tx_unlock(txq);
-+ }
-+ local_bh_enable();
-+}
-+
-+static inline void netif_addr_lock(struct net_device *dev)
-+{
-+ spin_lock(&dev->addr_list_lock);
-+}
-+
-+static inline void netif_addr_lock_bh(struct net_device *dev)
-+{
-+ spin_lock_bh(&dev->addr_list_lock);
-+}
-+
-+static inline void netif_addr_unlock(struct net_device *dev)
-+{
-+ spin_unlock(&dev->addr_list_lock);
-+}
-+
-+static inline void netif_addr_unlock_bh(struct net_device *dev)
-+{
-+ spin_unlock_bh(&dev->addr_list_lock);
-+}
-+
-+/*
-+ * dev_addrs walker. Should be used only for read access. Call with
-+ * rcu_read_lock held.
-+ */
-+#define for_each_dev_addr(dev, ha) \
-+ list_for_each_entry_rcu(ha, &dev->dev_addrs.list, list)
-+
-+/* These functions live elsewhere (drivers/net/net_init.c, but related) */
-+
-+extern void ether_setup(struct net_device *dev);
-+
-+/* Support for loadable net-drivers */
-+extern struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name,
-+ void (*setup)(struct net_device *),
-+ unsigned int queue_count);
-+#define alloc_netdev(sizeof_priv, name, setup) \
-+ alloc_netdev_mq(sizeof_priv, name, setup, 1)
-+extern int register_netdev(struct net_device *dev);
-+extern void unregister_netdev(struct net_device *dev);
-+
-+/* General hardware address lists handling functions */
-+extern int __hw_addr_add_multiple(struct netdev_hw_addr_list *to_list,
-+ struct netdev_hw_addr_list *from_list,
-+ int addr_len, unsigned char addr_type);
-+extern void __hw_addr_del_multiple(struct netdev_hw_addr_list *to_list,
-+ struct netdev_hw_addr_list *from_list,
-+ int addr_len, unsigned char addr_type);
-+extern int __hw_addr_sync(struct netdev_hw_addr_list *to_list,
-+ struct netdev_hw_addr_list *from_list,
-+ int addr_len);
-+extern void __hw_addr_unsync(struct netdev_hw_addr_list *to_list,
-+ struct netdev_hw_addr_list *from_list,
-+ int addr_len);
-+extern void __hw_addr_flush(struct netdev_hw_addr_list *list);
-+extern void __hw_addr_init(struct netdev_hw_addr_list *list);
-+
-+/* Functions used for device addresses handling */
-+extern int dev_addr_add(struct net_device *dev, unsigned char *addr,
-+ unsigned char addr_type);
-+extern int dev_addr_del(struct net_device *dev, unsigned char *addr,
-+ unsigned char addr_type);
-+extern int dev_addr_add_multiple(struct net_device *to_dev,
-+ struct net_device *from_dev,
-+ unsigned char addr_type);
-+extern int dev_addr_del_multiple(struct net_device *to_dev,
-+ struct net_device *from_dev,
-+ unsigned char addr_type);
-+extern void dev_addr_flush(struct net_device *dev);
-+extern int dev_addr_init(struct net_device *dev);
-+
-+/* Functions used for unicast addresses handling */
-+extern int dev_uc_add(struct net_device *dev, unsigned char *addr);
-+extern int dev_uc_del(struct net_device *dev, unsigned char *addr);
-+extern int dev_uc_sync(struct net_device *to, struct net_device *from);
-+extern void dev_uc_unsync(struct net_device *to, struct net_device *from);
-+extern void dev_uc_flush(struct net_device *dev);
-+extern void dev_uc_init(struct net_device *dev);
-+
-+/* Functions used for multicast addresses handling */
-+extern int dev_mc_add(struct net_device *dev, unsigned char *addr);
-+extern int dev_mc_add_global(struct net_device *dev, unsigned char *addr);
-+extern int dev_mc_del(struct net_device *dev, unsigned char *addr);
-+extern int dev_mc_del_global(struct net_device *dev, unsigned char *addr);
-+extern int dev_mc_sync(struct net_device *to, struct net_device *from);
-+extern void dev_mc_unsync(struct net_device *to, struct net_device *from);
-+extern void dev_mc_flush(struct net_device *dev);
-+extern void dev_mc_init(struct net_device *dev);
-+
-+/* Functions used for secondary unicast and multicast support */
-+extern void dev_set_rx_mode(struct net_device *dev);
-+extern void __dev_set_rx_mode(struct net_device *dev);
-+extern int dev_set_promiscuity(struct net_device *dev, int inc);
-+extern int dev_set_allmulti(struct net_device *dev, int inc);
-+extern void netdev_state_change(struct net_device *dev);
-+extern int netdev_bonding_change(struct net_device *dev,
-+ unsigned long event);
-+extern void netdev_features_change(struct net_device *dev);
-+/* Load a device via the kmod */
-+extern void dev_load(struct net *net, const char *name);
-+extern void dev_mcast_init(void);
-+extern const struct net_device_stats *dev_get_stats(struct net_device *dev);
-+extern void dev_txq_stats_fold(const struct net_device *dev, struct net_device_stats *stats);
-+
-+extern int netdev_max_backlog;
-+extern int netdev_tstamp_prequeue;
-+extern int weight_p;
-+extern int netdev_set_master(struct net_device *dev, struct net_device *master);
-+extern int skb_checksum_help(struct sk_buff *skb);
-+extern struct sk_buff *skb_gso_segment(struct sk_buff *skb, int features);
-+#ifdef CONFIG_BUG
-+extern void netdev_rx_csum_fault(struct net_device *dev);
-+#else
-+static inline void netdev_rx_csum_fault(struct net_device *dev)
-+{
-+}
-+#endif
-+/* rx skb timestamps */
-+extern void net_enable_timestamp(void);
-+extern void net_disable_timestamp(void);
-+
-+#ifdef CONFIG_PROC_FS
-+extern void *dev_seq_start(struct seq_file *seq, loff_t *pos);
-+extern void *dev_seq_next(struct seq_file *seq, void *v, loff_t *pos);
-+extern void dev_seq_stop(struct seq_file *seq, void *v);
-+#endif
-+
-+extern int netdev_class_create_file(struct class_attribute *class_attr);
-+extern void netdev_class_remove_file(struct class_attribute *class_attr);
-+
-+extern char *netdev_drivername(const struct net_device *dev, char *buffer, int len);
-+
-+extern void linkwatch_run_queue(void);
-+
-+unsigned long netdev_increment_features(unsigned long all, unsigned long one,
-+ unsigned long mask);
-+unsigned long netdev_fix_features(unsigned long features, const char *name);
-+
-+void netif_stacked_transfer_operstate(const struct net_device *rootdev,
-+ struct net_device *dev);
-+
-+static inline int net_gso_ok(int features, int gso_type)
-+{
-+ int feature = gso_type << NETIF_F_GSO_SHIFT;
-+ return (features & feature) == feature;
-+}
-+
-+static inline int skb_gso_ok(struct sk_buff *skb, int features)
-+{
-+ return net_gso_ok(features, skb_shinfo(skb)->gso_type) &&
-+ (!skb_has_frags(skb) || (features & NETIF_F_FRAGLIST));
-+}
-+
-+static inline int netif_needs_gso(struct net_device *dev, struct sk_buff *skb)
-+{
-+ return skb_is_gso(skb) &&
-+ (!skb_gso_ok(skb, dev->features) ||
-+ unlikely(skb->ip_summed != CHECKSUM_PARTIAL));
-+}
-+
-+static inline void netif_set_gso_max_size(struct net_device *dev,
-+ unsigned int size)
-+{
-+ dev->gso_max_size = size;
-+}
-+
-+extern int __skb_bond_should_drop(struct sk_buff *skb,
-+ struct net_device *master);
-+
-+static inline int skb_bond_should_drop(struct sk_buff *skb,
-+ struct net_device *master)
-+{
-+ if (master)
-+ return __skb_bond_should_drop(skb, master);
-+ return 0;
-+}
-+
-+extern struct pernet_operations __net_initdata loopback_net_ops;
-+
-+static inline int dev_ethtool_get_settings(struct net_device *dev,
-+ struct ethtool_cmd *cmd)
-+{
-+ if (!dev->ethtool_ops || !dev->ethtool_ops->get_settings)
-+ return -EOPNOTSUPP;
-+ return dev->ethtool_ops->get_settings(dev, cmd);
-+}
-+
-+static inline u32 dev_ethtool_get_rx_csum(struct net_device *dev)
-+{
-+ if (!dev->ethtool_ops || !dev->ethtool_ops->get_rx_csum)
-+ return 0;
-+ return dev->ethtool_ops->get_rx_csum(dev);
-+}
-+
-+static inline u32 dev_ethtool_get_flags(struct net_device *dev)
-+{
-+ if (!dev->ethtool_ops || !dev->ethtool_ops->get_flags)
-+ return 0;
-+ return dev->ethtool_ops->get_flags(dev);
-+}
-+
-+/* Logging, debugging and troubleshooting/diagnostic helpers. */
-+
-+/* netdev_printk helpers, similar to dev_printk */
-+
-+static inline const char *netdev_name(const struct net_device *dev)
-+{
-+ if (dev->reg_state != NETREG_REGISTERED)
-+ return "(unregistered net_device)";
-+ return dev->name;
-+}
-+
-+#define netdev_printk(level, netdev, format, args...) \
-+ dev_printk(level, (netdev)->dev.parent, \
-+ "%s: " format, \
-+ netdev_name(netdev), ##args)
-+
-+#define netdev_emerg(dev, format, args...) \
-+ netdev_printk(KERN_EMERG, dev, format, ##args)
-+#define netdev_alert(dev, format, args...) \
-+ netdev_printk(KERN_ALERT, dev, format, ##args)
-+#define netdev_crit(dev, format, args...) \
-+ netdev_printk(KERN_CRIT, dev, format, ##args)
-+#define netdev_err(dev, format, args...) \
-+ netdev_printk(KERN_ERR, dev, format, ##args)
-+#define netdev_warn(dev, format, args...) \
-+ netdev_printk(KERN_WARNING, dev, format, ##args)
-+#define netdev_notice(dev, format, args...) \
-+ netdev_printk(KERN_NOTICE, dev, format, ##args)
-+#define netdev_info(dev, format, args...) \
-+ netdev_printk(KERN_INFO, dev, format, ##args)
-+
-+#if defined(DEBUG)
-+#define netdev_dbg(__dev, format, args...) \
-+ netdev_printk(KERN_DEBUG, __dev, format, ##args)
-+#elif defined(CONFIG_DYNAMIC_DEBUG)
-+#define netdev_dbg(__dev, format, args...) \
-+do { \
-+ dynamic_dev_dbg((__dev)->dev.parent, "%s: " format, \
-+ netdev_name(__dev), ##args); \
-+} while (0)
-+#else
-+#define netdev_dbg(__dev, format, args...) \
-+({ \
-+ if (0) \
-+ netdev_printk(KERN_DEBUG, __dev, format, ##args); \
-+ 0; \
-+})
-+#endif
-+
-+#if defined(VERBOSE_DEBUG)
-+#define netdev_vdbg netdev_dbg
-+#else
-+
-+#define netdev_vdbg(dev, format, args...) \
-+({ \
-+ if (0) \
-+ netdev_printk(KERN_DEBUG, dev, format, ##args); \
-+ 0; \
-+})
-+#endif
-+
-+/*
-+ * netdev_WARN() acts like dev_printk(), but with the key difference
-+ * of using a WARN/WARN_ON to get the message out, including the
-+ * file/line information and a backtrace.
-+ */
-+#define netdev_WARN(dev, format, args...) \
-+ WARN(1, "netdevice: %s\n" format, netdev_name(dev), ##args);
-+
-+/* netif printk helpers, similar to netdev_printk */
-+
-+#define netif_printk(priv, type, level, dev, fmt, args...) \
-+do { \
-+ if (netif_msg_##type(priv)) \
-+ netdev_printk(level, (dev), fmt, ##args); \
-+} while (0)
-+
-+#define netif_emerg(priv, type, dev, fmt, args...) \
-+ netif_printk(priv, type, KERN_EMERG, dev, fmt, ##args)
-+#define netif_alert(priv, type, dev, fmt, args...) \
-+ netif_printk(priv, type, KERN_ALERT, dev, fmt, ##args)
-+#define netif_crit(priv, type, dev, fmt, args...) \
-+ netif_printk(priv, type, KERN_CRIT, dev, fmt, ##args)
-+#define netif_err(priv, type, dev, fmt, args...) \
-+ netif_printk(priv, type, KERN_ERR, dev, fmt, ##args)
-+#define netif_warn(priv, type, dev, fmt, args...) \
-+ netif_printk(priv, type, KERN_WARNING, dev, fmt, ##args)
-+#define netif_notice(priv, type, dev, fmt, args...) \
-+ netif_printk(priv, type, KERN_NOTICE, dev, fmt, ##args)
-+#define netif_info(priv, type, dev, fmt, args...) \
-+ netif_printk(priv, type, KERN_INFO, (dev), fmt, ##args)
-+
-+#if defined(DEBUG)
-+#define netif_dbg(priv, type, dev, format, args...) \
-+ netif_printk(priv, type, KERN_DEBUG, dev, format, ##args)
-+#elif defined(CONFIG_DYNAMIC_DEBUG)
-+#define netif_dbg(priv, type, netdev, format, args...) \
-+do { \
-+ if (netif_msg_##type(priv)) \
-+ dynamic_dev_dbg((netdev)->dev.parent, \
-+ "%s: " format, \
-+ netdev_name(netdev), ##args); \
-+} while (0)
-+#else
-+#define netif_dbg(priv, type, dev, format, args...) \
-+({ \
-+ if (0) \
-+ netif_printk(priv, type, KERN_DEBUG, dev, format, ##args); \
-+ 0; \
-+})
-+#endif
-+
-+#if defined(VERBOSE_DEBUG)
-+#define netif_vdbg netif_dbg
-+#else
-+#define netif_vdbg(priv, type, dev, format, args...) \
-+({ \
-+ if (0) \
-+ netif_printk(priv, type, KERN_DEBUG, dev, format, ##args); \
-+ 0; \
-+})
-+#endif
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _LINUX_NETDEVICE_H */
-diff -Nur linux-2.6.35.7.orig/include/linux/nxp_74hc153.h linux-2.6.35.7/include/linux/nxp_74hc153.h
---- linux-2.6.35.7.orig/include/linux/nxp_74hc153.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/include/linux/nxp_74hc153.h 2010-10-14 20:28:01.798101112 +0200
+diff -Nur linux-2.6.36.orig/include/linux/nxp_74hc153.h linux-2.6.36/include/linux/nxp_74hc153.h
+--- linux-2.6.36.orig/include/linux/nxp_74hc153.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/include/linux/nxp_74hc153.h 2010-11-18 21:16:19.000000000 +0100
@@ -0,0 +1,24 @@
+/*
+ * NXP 74HC153 - Dual 4-input multiplexer defines
@@ -32470,10 +17440,10 @@ diff -Nur linux-2.6.35.7.orig/include/linux/nxp_74hc153.h linux-2.6.35.7/include
+};
+
+#endif /* _NXP_74HC153_H */
-diff -Nur linux-2.6.35.7.orig/include/linux/phy.h linux-2.6.35.7/include/linux/phy.h
---- linux-2.6.35.7.orig/include/linux/phy.h 2010-09-29 03:09:08.000000000 +0200
-+++ linux-2.6.35.7/include/linux/phy.h 2010-10-14 20:28:01.834368168 +0200
-@@ -330,6 +330,20 @@
+diff -Nur linux-2.6.36.orig/include/linux/phy.h linux-2.6.36/include/linux/phy.h
+--- linux-2.6.36.orig/include/linux/phy.h 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/include/linux/phy.h 2010-11-18 21:16:19.000000000 +0100
+@@ -332,6 +332,20 @@
void (*adjust_link)(struct net_device *dev);
void (*adjust_state)(struct net_device *dev);
@@ -32494,540 +17464,17 @@ diff -Nur linux-2.6.35.7.orig/include/linux/phy.h linux-2.6.35.7/include/linux/p
};
#define to_phy_device(d) container_of(d, struct phy_device, dev)
-@@ -497,6 +511,7 @@
+@@ -519,6 +533,7 @@
void phy_stop_machine(struct phy_device *phydev);
int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr);
int phy_mii_ioctl(struct phy_device *phydev,
- struct mii_ioctl_data *mii_data, int cmd);
+ struct ifreq *ifr, int cmd);
int phy_start_interrupts(struct phy_device *phydev);
-diff -Nur linux-2.6.35.7.orig/include/linux/phy.h.orig linux-2.6.35.7/include/linux/phy.h.orig
---- linux-2.6.35.7.orig/include/linux/phy.h.orig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/include/linux/phy.h.orig 2010-09-29 03:09:08.000000000 +0200
-@@ -0,0 +1,519 @@
-+/*
-+ * include/linux/phy.h
-+ *
-+ * Framework and drivers for configuring and reading different PHYs
-+ * Based on code in sungem_phy.c and gianfar_phy.c
-+ *
-+ * Author: Andy Fleming
-+ *
-+ * Copyright (c) 2004 Freescale Semiconductor, Inc.
-+ *
-+ * 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.
-+ *
-+ */
-+
-+#ifndef __PHY_H
-+#define __PHY_H
-+
-+#include <linux/spinlock.h>
-+#include <linux/device.h>
-+#include <linux/ethtool.h>
-+#include <linux/mii.h>
-+#include <linux/timer.h>
-+#include <linux/workqueue.h>
-+#include <linux/mod_devicetable.h>
-+
-+#include <asm/atomic.h>
-+
-+#define PHY_BASIC_FEATURES (SUPPORTED_10baseT_Half | \
-+ SUPPORTED_10baseT_Full | \
-+ SUPPORTED_100baseT_Half | \
-+ SUPPORTED_100baseT_Full | \
-+ SUPPORTED_Autoneg | \
-+ SUPPORTED_TP | \
-+ SUPPORTED_MII)
-+
-+#define PHY_GBIT_FEATURES (PHY_BASIC_FEATURES | \
-+ SUPPORTED_1000baseT_Half | \
-+ SUPPORTED_1000baseT_Full)
-+
-+/*
-+ * Set phydev->irq to PHY_POLL if interrupts are not supported,
-+ * or not desired for this PHY. Set to PHY_IGNORE_INTERRUPT if
-+ * the attached driver handles the interrupt
-+ */
-+#define PHY_POLL -1
-+#define PHY_IGNORE_INTERRUPT -2
-+
-+#define PHY_HAS_INTERRUPT 0x00000001
-+#define PHY_HAS_MAGICANEG 0x00000002
-+
-+/* Interface Mode definitions */
-+typedef enum {
-+ PHY_INTERFACE_MODE_MII,
-+ PHY_INTERFACE_MODE_GMII,
-+ PHY_INTERFACE_MODE_SGMII,
-+ PHY_INTERFACE_MODE_TBI,
-+ PHY_INTERFACE_MODE_RMII,
-+ PHY_INTERFACE_MODE_RGMII,
-+ PHY_INTERFACE_MODE_RGMII_ID,
-+ PHY_INTERFACE_MODE_RGMII_RXID,
-+ PHY_INTERFACE_MODE_RGMII_TXID,
-+ PHY_INTERFACE_MODE_RTBI
-+} phy_interface_t;
-+
-+
-+#define PHY_INIT_TIMEOUT 100000
-+#define PHY_STATE_TIME 1
-+#define PHY_FORCE_TIMEOUT 10
-+#define PHY_AN_TIMEOUT 10
-+
-+#define PHY_MAX_ADDR 32
-+
-+/* Used when trying to connect to a specific phy (mii bus id:phy device id) */
-+#define PHY_ID_FMT "%s:%02x"
-+
-+/*
-+ * Need to be a little smaller than phydev->dev.bus_id to leave room
-+ * for the ":%02x"
-+ */
-+#define MII_BUS_ID_SIZE (20 - 3)
-+
-+/* Or MII_ADDR_C45 into regnum for read/write on mii_bus to enable the 21 bit
-+ IEEE 802.3ae clause 45 addressing mode used by 10GIGE phy chips. */
-+#define MII_ADDR_C45 (1<<30)
-+
-+/*
-+ * The Bus class for PHYs. Devices which provide access to
-+ * PHYs should register using this structure
-+ */
-+struct mii_bus {
-+ const char *name;
-+ char id[MII_BUS_ID_SIZE];
-+ void *priv;
-+ int (*read)(struct mii_bus *bus, int phy_id, int regnum);
-+ int (*write)(struct mii_bus *bus, int phy_id, int regnum, u16 val);
-+ int (*reset)(struct mii_bus *bus);
-+
-+ /*
-+ * A lock to ensure that only one thing can read/write
-+ * the MDIO bus at a time
-+ */
-+ struct mutex mdio_lock;
-+
-+ struct device *parent;
-+ enum {
-+ MDIOBUS_ALLOCATED = 1,
-+ MDIOBUS_REGISTERED,
-+ MDIOBUS_UNREGISTERED,
-+ MDIOBUS_RELEASED,
-+ } state;
-+ struct device dev;
-+
-+ /* list of all PHYs on bus */
-+ struct phy_device *phy_map[PHY_MAX_ADDR];
-+
-+ /* Phy addresses to be ignored when probing */
-+ u32 phy_mask;
-+
-+ /*
-+ * Pointer to an array of interrupts, each PHY's
-+ * interrupt at the index matching its address
-+ */
-+ int *irq;
-+};
-+#define to_mii_bus(d) container_of(d, struct mii_bus, dev)
-+
-+struct mii_bus *mdiobus_alloc(void);
-+int mdiobus_register(struct mii_bus *bus);
-+void mdiobus_unregister(struct mii_bus *bus);
-+void mdiobus_free(struct mii_bus *bus);
-+struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr);
-+int mdiobus_read(struct mii_bus *bus, int addr, u32 regnum);
-+int mdiobus_write(struct mii_bus *bus, int addr, u32 regnum, u16 val);
-+
-+
-+#define PHY_INTERRUPT_DISABLED 0x0
-+#define PHY_INTERRUPT_ENABLED 0x80000000
-+
-+/* PHY state machine states:
-+ *
-+ * DOWN: PHY device and driver are not ready for anything. probe
-+ * should be called if and only if the PHY is in this state,
-+ * given that the PHY device exists.
-+ * - PHY driver probe function will, depending on the PHY, set
-+ * the state to STARTING or READY
-+ *
-+ * STARTING: PHY device is coming up, and the ethernet driver is
-+ * not ready. PHY drivers may set this in the probe function.
-+ * If they do, they are responsible for making sure the state is
-+ * eventually set to indicate whether the PHY is UP or READY,
-+ * depending on the state when the PHY is done starting up.
-+ * - PHY driver will set the state to READY
-+ * - start will set the state to PENDING
-+ *
-+ * READY: PHY is ready to send and receive packets, but the
-+ * controller is not. By default, PHYs which do not implement
-+ * probe will be set to this state by phy_probe(). If the PHY
-+ * driver knows the PHY is ready, and the PHY state is STARTING,
-+ * then it sets this STATE.
-+ * - start will set the state to UP
-+ *
-+ * PENDING: PHY device is coming up, but the ethernet driver is
-+ * ready. phy_start will set this state if the PHY state is
-+ * STARTING.
-+ * - PHY driver will set the state to UP when the PHY is ready
-+ *
-+ * UP: The PHY and attached device are ready to do work.
-+ * Interrupts should be started here.
-+ * - timer moves to AN
-+ *
-+ * AN: The PHY is currently negotiating the link state. Link is
-+ * therefore down for now. phy_timer will set this state when it
-+ * detects the state is UP. config_aneg will set this state
-+ * whenever called with phydev->autoneg set to AUTONEG_ENABLE.
-+ * - If autonegotiation finishes, but there's no link, it sets
-+ * the state to NOLINK.
-+ * - If aneg finishes with link, it sets the state to RUNNING,
-+ * and calls adjust_link
-+ * - If autonegotiation did not finish after an arbitrary amount
-+ * of time, autonegotiation should be tried again if the PHY
-+ * supports "magic" autonegotiation (back to AN)
-+ * - If it didn't finish, and no magic_aneg, move to FORCING.
-+ *
-+ * NOLINK: PHY is up, but not currently plugged in.
-+ * - If the timer notes that the link comes back, we move to RUNNING
-+ * - config_aneg moves to AN
-+ * - phy_stop moves to HALTED
-+ *
-+ * FORCING: PHY is being configured with forced settings
-+ * - if link is up, move to RUNNING
-+ * - If link is down, we drop to the next highest setting, and
-+ * retry (FORCING) after a timeout
-+ * - phy_stop moves to HALTED
-+ *
-+ * RUNNING: PHY is currently up, running, and possibly sending
-+ * and/or receiving packets
-+ * - timer will set CHANGELINK if we're polling (this ensures the
-+ * link state is polled every other cycle of this state machine,
-+ * which makes it every other second)
-+ * - irq will set CHANGELINK
-+ * - config_aneg will set AN
-+ * - phy_stop moves to HALTED
-+ *
-+ * CHANGELINK: PHY experienced a change in link state
-+ * - timer moves to RUNNING if link
-+ * - timer moves to NOLINK if the link is down
-+ * - phy_stop moves to HALTED
-+ *
-+ * HALTED: PHY is up, but no polling or interrupts are done. Or
-+ * PHY is in an error state.
-+ *
-+ * - phy_start moves to RESUMING
-+ *
-+ * RESUMING: PHY was halted, but now wants to run again.
-+ * - If we are forcing, or aneg is done, timer moves to RUNNING
-+ * - If aneg is not done, timer moves to AN
-+ * - phy_stop moves to HALTED
-+ */
-+enum phy_state {
-+ PHY_DOWN=0,
-+ PHY_STARTING,
-+ PHY_READY,
-+ PHY_PENDING,
-+ PHY_UP,
-+ PHY_AN,
-+ PHY_RUNNING,
-+ PHY_NOLINK,
-+ PHY_FORCING,
-+ PHY_CHANGELINK,
-+ PHY_HALTED,
-+ PHY_RESUMING
-+};
-+
-+/* phy_device: An instance of a PHY
-+ *
-+ * drv: Pointer to the driver for this PHY instance
-+ * bus: Pointer to the bus this PHY is on
-+ * dev: driver model device structure for this PHY
-+ * phy_id: UID for this device found during discovery
-+ * state: state of the PHY for management purposes
-+ * dev_flags: Device-specific flags used by the PHY driver.
-+ * addr: Bus address of PHY
-+ * link_timeout: The number of timer firings to wait before the
-+ * giving up on the current attempt at acquiring a link
-+ * irq: IRQ number of the PHY's interrupt (-1 if none)
-+ * phy_timer: The timer for handling the state machine
-+ * phy_queue: A work_queue for the interrupt
-+ * attached_dev: The attached enet driver's device instance ptr
-+ * adjust_link: Callback for the enet controller to respond to
-+ * changes in the link state.
-+ * adjust_state: Callback for the enet driver to respond to
-+ * changes in the state machine.
-+ *
-+ * speed, duplex, pause, supported, advertising, and
-+ * autoneg are used like in mii_if_info
-+ *
-+ * interrupts currently only supports enabled or disabled,
-+ * but could be changed in the future to support enabling
-+ * and disabling specific interrupts
-+ *
-+ * Contains some infrastructure for polling and interrupt
-+ * handling, as well as handling shifts in PHY hardware state
-+ */
-+struct phy_device {
-+ /* Information about the PHY type */
-+ /* And management functions */
-+ struct phy_driver *drv;
-+
-+ struct mii_bus *bus;
-+
-+ struct device dev;
-+
-+ u32 phy_id;
-+
-+ enum phy_state state;
-+
-+ u32 dev_flags;
-+
-+ phy_interface_t interface;
-+
-+ /* Bus address of the PHY (0-32) */
-+ int addr;
-+
-+ /*
-+ * forced speed & duplex (no autoneg)
-+ * partner speed & duplex & pause (autoneg)
-+ */
-+ int speed;
-+ int duplex;
-+ int pause;
-+ int asym_pause;
-+
-+ /* The most recently read link state */
-+ int link;
-+
-+ /* Enabled Interrupts */
-+ u32 interrupts;
-+
-+ /* Union of PHY and Attached devices' supported modes */
-+ /* See mii.h for more info */
-+ u32 supported;
-+ u32 advertising;
-+
-+ int autoneg;
-+
-+ int link_timeout;
-+
-+ /*
-+ * Interrupt number for this PHY
-+ * -1 means no interrupt
-+ */
-+ int irq;
-+
-+ /* private data pointer */
-+ /* For use by PHYs to maintain extra state */
-+ void *priv;
-+
-+ /* Interrupt and Polling infrastructure */
-+ struct work_struct phy_queue;
-+ struct delayed_work state_queue;
-+ atomic_t irq_disable;
-+
-+ struct mutex lock;
-+
-+ struct net_device *attached_dev;
-+
-+ void (*adjust_link)(struct net_device *dev);
-+
-+ void (*adjust_state)(struct net_device *dev);
-+};
-+#define to_phy_device(d) container_of(d, struct phy_device, dev)
-+
-+/* struct phy_driver: Driver structure for a particular PHY type
-+ *
-+ * phy_id: The result of reading the UID registers of this PHY
-+ * type, and ANDing them with the phy_id_mask. This driver
-+ * only works for PHYs with IDs which match this field
-+ * name: The friendly name of this PHY type
-+ * phy_id_mask: Defines the important bits of the phy_id
-+ * features: A list of features (speed, duplex, etc) supported
-+ * by this PHY
-+ * flags: A bitfield defining certain other features this PHY
-+ * supports (like interrupts)
-+ *
-+ * The drivers must implement config_aneg and read_status. All
-+ * other functions are optional. Note that none of these
-+ * functions should be called from interrupt time. The goal is
-+ * for the bus read/write functions to be able to block when the
-+ * bus transaction is happening, and be freed up by an interrupt
-+ * (The MPC85xx has this ability, though it is not currently
-+ * supported in the driver).
-+ */
-+struct phy_driver {
-+ u32 phy_id;
-+ char *name;
-+ unsigned int phy_id_mask;
-+ u32 features;
-+ u32 flags;
-+
-+ /*
-+ * Called to initialize the PHY,
-+ * including after a reset
-+ */
-+ int (*config_init)(struct phy_device *phydev);
-+
-+ /*
-+ * Called during discovery. Used to set
-+ * up device-specific structures, if any
-+ */
-+ int (*probe)(struct phy_device *phydev);
-+
-+ /* PHY Power Management */
-+ int (*suspend)(struct phy_device *phydev);
-+ int (*resume)(struct phy_device *phydev);
-+
-+ /*
-+ * Configures the advertisement and resets
-+ * autonegotiation if phydev->autoneg is on,
-+ * forces the speed to the current settings in phydev
-+ * if phydev->autoneg is off
-+ */
-+ int (*config_aneg)(struct phy_device *phydev);
-+
-+ /* Determines the negotiated speed and duplex */
-+ int (*read_status)(struct phy_device *phydev);
-+
-+ /* Clears any pending interrupts */
-+ int (*ack_interrupt)(struct phy_device *phydev);
-+
-+ /* Enables or disables interrupts */
-+ int (*config_intr)(struct phy_device *phydev);
-+
-+ /*
-+ * Checks if the PHY generated an interrupt.
-+ * For multi-PHY devices with shared PHY interrupt pin
-+ */
-+ int (*did_interrupt)(struct phy_device *phydev);
-+
-+ /* Clears up any memory if needed */
-+ void (*remove)(struct phy_device *phydev);
-+
-+ struct device_driver driver;
-+};
-+#define to_phy_driver(d) container_of(d, struct phy_driver, driver)
-+
-+#define PHY_ANY_ID "MATCH ANY PHY"
-+#define PHY_ANY_UID 0xffffffff
-+
-+/* A Structure for boards to register fixups with the PHY Lib */
-+struct phy_fixup {
-+ struct list_head list;
-+ char bus_id[20];
-+ u32 phy_uid;
-+ u32 phy_uid_mask;
-+ int (*run)(struct phy_device *phydev);
-+};
-+
-+/**
-+ * phy_read - Convenience function for reading a given PHY register
-+ * @phydev: the phy_device struct
-+ * @regnum: register number to read
-+ *
-+ * NOTE: MUST NOT be called from interrupt context,
-+ * because the bus read/write functions may wait for an interrupt
-+ * to conclude the operation.
-+ */
-+static inline int phy_read(struct phy_device *phydev, u32 regnum)
-+{
-+ return mdiobus_read(phydev->bus, phydev->addr, regnum);
-+}
-+
-+/**
-+ * phy_write - Convenience function for writing a given PHY register
-+ * @phydev: the phy_device struct
-+ * @regnum: register number to write
-+ * @val: value to write to @regnum
-+ *
-+ * NOTE: MUST NOT be called from interrupt context,
-+ * because the bus read/write functions may wait for an interrupt
-+ * to conclude the operation.
-+ */
-+static inline int phy_write(struct phy_device *phydev, u32 regnum, u16 val)
-+{
-+ return mdiobus_write(phydev->bus, phydev->addr, regnum, val);
-+}
-+
-+int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id);
-+struct phy_device* get_phy_device(struct mii_bus *bus, int addr);
-+int phy_device_register(struct phy_device *phy);
-+int phy_clear_interrupt(struct phy_device *phydev);
-+int phy_config_interrupt(struct phy_device *phydev, u32 interrupts);
-+int phy_init_hw(struct phy_device *phydev);
-+int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
-+ u32 flags, phy_interface_t interface);
-+struct phy_device * phy_attach(struct net_device *dev,
-+ const char *bus_id, u32 flags, phy_interface_t interface);
-+struct phy_device *phy_find_first(struct mii_bus *bus);
-+int phy_connect_direct(struct net_device *dev, struct phy_device *phydev,
-+ void (*handler)(struct net_device *), u32 flags,
-+ phy_interface_t interface);
-+struct phy_device * phy_connect(struct net_device *dev, const char *bus_id,
-+ void (*handler)(struct net_device *), u32 flags,
-+ phy_interface_t interface);
-+void phy_disconnect(struct phy_device *phydev);
-+void phy_detach(struct phy_device *phydev);
-+void phy_start(struct phy_device *phydev);
-+void phy_stop(struct phy_device *phydev);
-+int phy_start_aneg(struct phy_device *phydev);
-+
-+void phy_sanitize_settings(struct phy_device *phydev);
-+int phy_stop_interrupts(struct phy_device *phydev);
-+int phy_enable_interrupts(struct phy_device *phydev);
-+int phy_disable_interrupts(struct phy_device *phydev);
-+
-+static inline int phy_read_status(struct phy_device *phydev) {
-+ return phydev->drv->read_status(phydev);
-+}
-+
-+int genphy_config_advert(struct phy_device *phydev);
-+int genphy_setup_forced(struct phy_device *phydev);
-+int genphy_restart_aneg(struct phy_device *phydev);
-+int genphy_config_aneg(struct phy_device *phydev);
-+int genphy_update_link(struct phy_device *phydev);
-+int genphy_read_status(struct phy_device *phydev);
-+int genphy_suspend(struct phy_device *phydev);
-+int genphy_resume(struct phy_device *phydev);
-+void phy_driver_unregister(struct phy_driver *drv);
-+int phy_driver_register(struct phy_driver *new_driver);
-+void phy_prepare_link(struct phy_device *phydev,
-+ void (*adjust_link)(struct net_device *));
-+void phy_state_machine(struct work_struct *work);
-+void phy_start_machine(struct phy_device *phydev,
-+ void (*handler)(struct net_device *));
-+void phy_stop_machine(struct phy_device *phydev);
-+int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
-+int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
-+int phy_mii_ioctl(struct phy_device *phydev,
-+ struct mii_ioctl_data *mii_data, int cmd);
-+int phy_start_interrupts(struct phy_device *phydev);
-+void phy_print_status(struct phy_device *phydev);
-+struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id);
-+void phy_device_free(struct phy_device *phydev);
-+
-+int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask,
-+ int (*run)(struct phy_device *));
-+int phy_register_fixup_for_id(const char *bus_id,
-+ int (*run)(struct phy_device *));
-+int phy_register_fixup_for_uid(u32 phy_uid, u32 phy_uid_mask,
-+ int (*run)(struct phy_device *));
-+int phy_scan_fixups(struct phy_device *phydev);
-+
-+int __init mdio_bus_init(void);
-+void mdio_bus_exit(void);
-+
-+extern struct bus_type mdio_bus_type;
-+#endif /* __PHY_H */
-diff -Nur linux-2.6.35.7.orig/include/linux/spi/vsc7385.h linux-2.6.35.7/include/linux/spi/vsc7385.h
---- linux-2.6.35.7.orig/include/linux/spi/vsc7385.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/include/linux/spi/vsc7385.h 2010-10-14 20:28:01.878101023 +0200
+diff -Nur linux-2.6.36.orig/include/linux/spi/vsc7385.h linux-2.6.36/include/linux/spi/vsc7385.h
+--- linux-2.6.36.orig/include/linux/spi/vsc7385.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/include/linux/spi/vsc7385.h 2010-11-18 21:16:19.000000000 +0100
@@ -0,0 +1,19 @@
+/*
+ * Platform data definition for the Vitesse VSC7385 ethernet switch driver
@@ -33048,9 +17495,9 @@ diff -Nur linux-2.6.35.7.orig/include/linux/spi/vsc7385.h linux-2.6.35.7/include
+ u32 clk_sel:3;
+ } mac_cfg;
+};
-diff -Nur linux-2.6.35.7.orig/net/dsa/ar7240.c linux-2.6.35.7/net/dsa/ar7240.c
---- linux-2.6.35.7.orig/net/dsa/ar7240.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/net/dsa/ar7240.c 2010-10-14 20:28:01.915601104 +0200
+diff -Nur linux-2.6.36.orig/net/dsa/ar7240.c linux-2.6.36/net/dsa/ar7240.c
+--- linux-2.6.36.orig/net/dsa/ar7240.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/net/dsa/ar7240.c 2010-11-18 21:16:19.000000000 +0100
@@ -0,0 +1,736 @@
+/*
+ * DSA driver for the built-in ethernet switch of the Atheros AR7240 SoC
@@ -33788,9 +18235,9 @@ diff -Nur linux-2.6.35.7.orig/net/dsa/ar7240.c linux-2.6.35.7/net/dsa/ar7240.c
+ unregister_switch_driver(&ar7240_dsa_driver);
+}
+module_exit(dsa_ar7240_cleanup);
-diff -Nur linux-2.6.35.7.orig/net/dsa/mv88e6063.c linux-2.6.35.7/net/dsa/mv88e6063.c
---- linux-2.6.35.7.orig/net/dsa/mv88e6063.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/net/dsa/mv88e6063.c 2010-10-14 20:28:01.954381749 +0200
+diff -Nur linux-2.6.36.orig/net/dsa/mv88e6063.c linux-2.6.36/net/dsa/mv88e6063.c
+--- linux-2.6.36.orig/net/dsa/mv88e6063.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/net/dsa/mv88e6063.c 2010-11-18 21:16:19.000000000 +0100
@@ -0,0 +1,294 @@
+/*
+ * net/dsa/mv88e6063.c - Driver for Marvell 88e6063 switch chips
@@ -34086,9 +18533,9 @@ diff -Nur linux-2.6.35.7.orig/net/dsa/mv88e6063.c linux-2.6.35.7/net/dsa/mv88e60
+ unregister_switch_driver(&mv88e6063_switch_driver);
+}
+module_exit(mv88e6063_cleanup);
-diff -Nur linux-2.6.35.7.orig/net/dsa/tag_qinq.c linux-2.6.35.7/net/dsa/tag_qinq.c
---- linux-2.6.35.7.orig/net/dsa/tag_qinq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.35.7/net/dsa/tag_qinq.c 2010-10-14 20:28:01.998101297 +0200
+diff -Nur linux-2.6.36.orig/net/dsa/tag_qinq.c linux-2.6.36/net/dsa/tag_qinq.c
+--- linux-2.6.36.orig/net/dsa/tag_qinq.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.36/net/dsa/tag_qinq.c 2010-11-18 21:16:19.000000000 +0100
@@ -0,0 +1,127 @@
+/*
+ * net/dsa/tag_qinq.c - QinQ tag format handling
diff --git a/target/rb532/kernel.config b/target/rb532/kernel.config
index 904207e07..87d3437d2 100644
--- a/target/rb532/kernel.config
+++ b/target/rb532/kernel.config
@@ -1,20 +1,21 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.33
-# Thu Apr 22 20:08:10 2010
+# Linux kernel version: 2.6.36
+# Thu Nov 18 20:51:39 2010
#
CONFIG_MIPS=y
#
# Machine selection
#
-# CONFIG_MACH_ALCHEMY is not set
+# CONFIG_MIPS_ALCHEMY is not set
# CONFIG_AR7 is not set
# CONFIG_BCM47XX is not set
# CONFIG_BCM63XX is not set
# CONFIG_MIPS_COBALT is not set
# CONFIG_MACH_DECSTATION is not set
# CONFIG_MACH_JAZZ is not set
+# CONFIG_MACH_JZ4740 is not set
# CONFIG_LASAT is not set
# CONFIG_MACH_LOONGSON is not set
# CONFIG_MIPS_MALTA is not set
@@ -48,7 +49,9 @@ CONFIG_MIKROTIK_RB532=y
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
+CONFIG_CAVIUM_OCTEON_HELPER=y
CONFIG_LOONGSON_UART_BASE=y
+# CONFIG_LOONGSON_MC146818 is not set
CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -57,7 +60,6 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_TIME=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
@@ -67,10 +69,9 @@ CONFIG_CEVT_R4K=y
CONFIG_CSRC_R4K_LIB=y
CONFIG_CSRC_R4K=y
CONFIG_DMA_NONCOHERENT=y
-CONFIG_DMA_NEED_PCI_MAP_STATE=y
+CONFIG_NEED_DMA_MAP_STATE=y
# CONFIG_NO_IOPORT is not set
CONFIG_GENERIC_GPIO=y
-# CONFIG_CPU_BIG_ENDIAN is not set
CONFIG_CPU_LITTLE_ENDIAN=y
CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
CONFIG_IRQ_CPU=y
@@ -80,29 +81,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=4
#
# CPU selection
#
-# CONFIG_CPU_LOONGSON2E is not set
-# CONFIG_CPU_LOONGSON2F is not set
CONFIG_CPU_MIPS32_R1=y
-# CONFIG_CPU_MIPS32_R2 is not set
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_VR41XX is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R5500 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-# CONFIG_CPU_CAVIUM_OCTEON is not set
CONFIG_SYS_HAS_CPU_MIPS32_R1=y
CONFIG_CPU_MIPS32=y
CONFIG_CPU_MIPSR1=y
@@ -114,16 +93,12 @@ CONFIG_HARDWARE_WATCHPOINTS=y
# Kernel type
#
CONFIG_32BIT=y
-# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_8KB is not set
# CONFIG_PAGE_SIZE_16KB is not set
-# CONFIG_PAGE_SIZE_32KB is not set
# CONFIG_PAGE_SIZE_64KB is not set
CONFIG_CPU_HAS_PREFETCH=y
CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_MT_SMP is not set
-# CONFIG_MIPS_MT_SMTC is not set
+# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
CONFIG_CPU_HAS_SYNC=y
CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_IRQ_PROBE=y
@@ -132,8 +107,6 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
CONFIG_ARCH_POPULATES_NODE_MAP=y
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_PAGEFLAGS_EXTENDED=y
@@ -172,6 +145,7 @@ CONFIG_CONSTRUCTORS=y
CONFIG_EXPERIMENTAL=y
CONFIG_BROKEN_ON_SMP=y
CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
# CONFIG_SWAP is not set
@@ -186,7 +160,6 @@ CONFIG_SYSVIPC_SYSCTL=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
# CONFIG_TINY_RCU is not set
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=32
@@ -194,7 +167,6 @@ CONFIG_RCU_FANOUT=32
# CONFIG_TREE_RCU_TRACE is not set
# CONFIG_IKCONFIG is not set
CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_GROUP_SCHED is not set
# CONFIG_CGROUPS is not set
# CONFIG_SYSFS_DEPRECATED_V2 is not set
# CONFIG_RELAY is not set
@@ -231,11 +203,13 @@ CONFIG_SLAB=y
# CONFIG_SLOB is not set
# CONFIG_PROFILING is not set
CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
#
# GCOV-based kernel profiling
#
-# CONFIG_SLOW_WORK is not set
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
@@ -257,8 +231,6 @@ CONFIG_BLOCK=y
CONFIG_IOSCHED_NOOP=y
# CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_IOSCHED_CFQ is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
CONFIG_DEFAULT_NOOP=y
CONFIG_DEFAULT_IOSCHED="noop"
# CONFIG_INLINE_SPIN_TRYLOCK is not set
@@ -299,7 +271,6 @@ CONFIG_HW_HAS_PCI=y
CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
# CONFIG_ARCH_SUPPORTS_MSI is not set
-# CONFIG_PCI_LEGACY is not set
# CONFIG_PCI_STUB is not set
# CONFIG_PCI_IOV is not set
CONFIG_MMU=y
@@ -326,7 +297,6 @@ CONFIG_NET=y
# Networking options
#
CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
CONFIG_UNIX=y
# CONFIG_NET_KEY is not set
CONFIG_INET=y
@@ -354,12 +324,14 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_TCP_MD5SIG is not set
# CONFIG_IPV6 is not set
# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
# CONFIG_NETFILTER is not set
# CONFIG_IP_DCCP is not set
# CONFIG_IP_SCTP is not set
# CONFIG_RDS is not set
# CONFIG_TIPC is not set
# CONFIG_ATM is not set
+# CONFIG_L2TP is not set
# CONFIG_BRIDGE is not set
# CONFIG_NET_DSA is not set
# CONFIG_VLAN_8021Q is not set
@@ -392,9 +364,14 @@ CONFIG_WIRELESS=y
#
# CFG80211 needs to be enabled for MAC80211
#
+
+#
+# Some wireless drivers require a rate control algorithm
+#
# CONFIG_WIMAX is not set
# CONFIG_RFKILL is not set
# CONFIG_NET_9P is not set
+# CONFIG_CAIF is not set
#
# Device Drivers
@@ -432,6 +409,7 @@ CONFIG_MTD_BLOCK=y
# CONFIG_INFTL is not set
# CONFIG_RFD_FTL is not set
# CONFIG_SSFDC is not set
+# CONFIG_SM_FTL is not set
# CONFIG_MTD_OOPS is not set
#
@@ -475,11 +453,15 @@ CONFIG_MTD_CFI_I2=y
# CONFIG_MTD_DOC2000 is not set
# CONFIG_MTD_DOC2001 is not set
# CONFIG_MTD_DOC2001PLUS is not set
+CONFIG_MTD_NAND_ECC=y
+# CONFIG_MTD_NAND_ECC_SMC is not set
CONFIG_MTD_NAND=y
# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_SM_COMMON is not set
# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+# CONFIG_MTD_NAND_DENALI is not set
CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND_RICOH is not set
# CONFIG_MTD_NAND_DISKONCHIP is not set
# CONFIG_MTD_NAND_CAFE is not set
# CONFIG_MTD_NAND_NANDSIM is not set
@@ -520,6 +502,7 @@ CONFIG_HAVE_IDE=y
#
# SCSI device support
#
+CONFIG_SCSI_MOD=y
# CONFIG_RAID_ATTRS is not set
CONFIG_SCSI=y
CONFIG_SCSI_DMA=y
@@ -552,6 +535,7 @@ CONFIG_SCSI_WAIT_SCAN=m
# CONFIG_SCSI_SRP_ATTRS is not set
CONFIG_SCSI_LOWLEVEL=y
# CONFIG_ISCSI_TCP is not set
+# CONFIG_ISCSI_BOOT_SYSFS is not set
# CONFIG_SCSI_BNX2_ISCSI is not set
# CONFIG_BE2ISCSI is not set
# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -602,67 +586,94 @@ CONFIG_ATA=y
# CONFIG_ATA_NONSTANDARD is not set
# CONFIG_ATA_VERBOSE_ERROR is not set
# CONFIG_SATA_PMP is not set
+
+#
+# Controllers with non-SFF native interface
+#
# CONFIG_SATA_AHCI is not set
+# CONFIG_SATA_AHCI_PLATFORM is not set
+# CONFIG_SATA_INIC162X is not set
# CONFIG_SATA_SIL24 is not set
CONFIG_ATA_SFF=y
-# CONFIG_SATA_SVW is not set
+
+#
+# SFF controllers with custom DMA interface
+#
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_SX4 is not set
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
# CONFIG_ATA_PIIX is not set
# CONFIG_SATA_MV is not set
# CONFIG_SATA_NV is not set
-# CONFIG_PDC_ADMA is not set
-# CONFIG_SATA_QSTOR is not set
# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_SX4 is not set
# CONFIG_SATA_SIL is not set
# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
# CONFIG_SATA_ULI is not set
# CONFIG_SATA_VIA is not set
# CONFIG_SATA_VITESSE is not set
-# CONFIG_SATA_INIC162X is not set
+
+#
+# PATA SFF controllers with BMDMA
+#
# CONFIG_PATA_ALI is not set
# CONFIG_PATA_AMD is not set
# CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATP867X is not set
# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_ATP867X is not set
# CONFIG_PATA_CMD64X is not set
# CONFIG_PATA_CS5520 is not set
# CONFIG_PATA_CS5530 is not set
# CONFIG_PATA_CYPRESS is not set
# CONFIG_PATA_EFAR is not set
-# CONFIG_ATA_GENERIC is not set
# CONFIG_PATA_HPT366 is not set
# CONFIG_PATA_HPT37X is not set
# CONFIG_PATA_HPT3X2N is not set
# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_IT821X is not set
# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_TRIFLEX is not set
# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_OLDPIIX is not set
# CONFIG_PATA_NETCELL is not set
# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87410 is not set
# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OLDPIIX is not set
# CONFIG_PATA_OPTIDMA is not set
# CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_RADISYS is not set
-CONFIG_PATA_RB532=y
# CONFIG_PATA_RDC is not set
-# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SCH is not set
# CONFIG_PATA_SERVERWORKS is not set
# CONFIG_PATA_SIL680 is not set
# CONFIG_PATA_SIS is not set
# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
# CONFIG_PATA_VIA is not set
# CONFIG_PATA_WINBOND is not set
+
+#
+# PIO-only SFF controllers
+#
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
# CONFIG_PATA_PLATFORM is not set
-# CONFIG_PATA_SCH is not set
+CONFIG_PATA_RB532=y
+# CONFIG_PATA_RZ1000 is not set
+
+#
+# Generic fallback / legacy drivers
+#
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_LEGACY is not set
# CONFIG_MD is not set
# CONFIG_FUSION is not set
@@ -679,6 +690,7 @@ CONFIG_PATA_RB532=y
#
# CONFIG_FIREWIRE is not set
# CONFIG_IEEE1394 is not set
+# CONFIG_FIREWIRE_NOSY is not set
# CONFIG_I2O is not set
CONFIG_NETDEVICES=y
# CONFIG_DUMMY is not set
@@ -715,6 +727,7 @@ CONFIG_NET_PCI=y
# CONFIG_PCNET32 is not set
# CONFIG_AMD8111_ETH is not set
# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_KSZ884X_PCI is not set
# CONFIG_B44 is not set
# CONFIG_FORCEDETH is not set
# CONFIG_TC35815 is not set
@@ -730,7 +743,6 @@ CONFIG_NET_PCI=y
# CONFIG_SMSC9420 is not set
# CONFIG_SUNDANCE is not set
# CONFIG_TLAN is not set
-# CONFIG_KS8842 is not set
# CONFIG_KS8851_MLL is not set
CONFIG_VIA_RHINE=y
CONFIG_VIA_RHINE_MMIO=y
@@ -748,6 +760,10 @@ CONFIG_WLAN=y
# Enable WiMAX (Networking options) to see the WiMAX drivers
#
# CONFIG_WAN is not set
+
+#
+# CAIF transport drivers
+#
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
# CONFIG_PPP is not set
@@ -798,6 +814,7 @@ CONFIG_INPUT=y
# CONFIG_VT is not set
# CONFIG_DEVKMEM is not set
# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_N_GSM is not set
# CONFIG_NOZOMI is not set
#
@@ -813,9 +830,13 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1
#
# Non-8250 serial port support
#
+# CONFIG_SERIAL_MFD_HSU is not set
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_TIMBERDALE is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
CONFIG_UNIX98_PTYS=y
# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
# CONFIG_LEGACY_PTYS is not set
@@ -826,6 +847,7 @@ CONFIG_UNIX98_PTYS=y
# CONFIG_RAW_DRIVER is not set
# CONFIG_TCG_TPM is not set
CONFIG_DEVPORT=y
+# CONFIG_RAMOOPS is not set
# CONFIG_I2C is not set
# CONFIG_SPI is not set
@@ -840,6 +862,8 @@ CONFIG_GPIOLIB=y
#
# Memory mapped GPIO expanders:
#
+# CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_SCH is not set
#
# I2C GPIO expanders:
@@ -851,6 +875,7 @@ CONFIG_GPIOLIB=y
# CONFIG_GPIO_CS5535 is not set
# CONFIG_GPIO_BT8XX is not set
# CONFIG_GPIO_LANGWELL is not set
+# CONFIG_GPIO_RDC321X is not set
#
# SPI GPIO expanders:
@@ -859,6 +884,10 @@ CONFIG_GPIOLIB=y
#
# AC97 GPIO expanders:
#
+
+#
+# MODULbus GPIO expanders:
+#
# CONFIG_W1 is not set
# CONFIG_POWER_SUPPLY is not set
# CONFIG_HWMON is not set
@@ -884,14 +913,7 @@ CONFIG_SSB_POSSIBLE=y
# Sonics Silicon Backplane
#
# CONFIG_SSB is not set
-
-#
-# Multifunction device drivers
-#
-# CONFIG_MFD_CORE is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_SUPPORT is not set
# CONFIG_REGULATOR is not set
# CONFIG_MEDIA_SUPPORT is not set
@@ -911,26 +933,7 @@ CONFIG_SSB_POSSIBLE=y
# CONFIG_DISPLAY_SUPPORT is not set
# CONFIG_SOUND is not set
# CONFIG_HID_SUPPORT is not set
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-# CONFIG_USB is not set
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-
-#
-# Enable Host or Gadget support to see Inventra options
-#
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# OTG and related infrastructure
-#
+# CONFIG_USB_SUPPORT is not set
# CONFIG_UWB is not set
# CONFIG_MMC is not set
# CONFIG_MEMSTICK is not set
@@ -942,10 +945,6 @@ CONFIG_RTC_LIB=y
# CONFIG_DMADEVICES is not set
# CONFIG_AUXDISPLAY is not set
# CONFIG_UIO is not set
-
-#
-# TI VLYNQ
-#
# CONFIG_STAGING is not set
#
@@ -961,11 +960,9 @@ CONFIG_RTC_LIB=y
# CONFIG_OCFS2_FS is not set
# CONFIG_BTRFS_FS is not set
# CONFIG_NILFS2_FS is not set
-# CONFIG_AUFS_FS is not set
CONFIG_FILE_LOCKING=y
# CONFIG_FSNOTIFY is not set
# CONFIG_DNOTIFY is not set
-# CONFIG_INOTIFY is not set
# CONFIG_INOTIFY_USER is not set
# CONFIG_QUOTA is not set
# CONFIG_AUTOFS_FS is not set
@@ -1016,11 +1013,14 @@ CONFIG_YAFFS_YAFFS1=y
# CONFIG_YAFFS_DOES_ECC is not set
CONFIG_YAFFS_YAFFS2=y
CONFIG_YAFFS_AUTO_YAFFS2=y
-# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
-# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
+# CONFIG_YAFFS_DISABLE_TAGS_ECC is not set
# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
-CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
+# CONFIG_YAFFS_EMPTY_LOST_AND_FOUND is not set
+# CONFIG_YAFFS_DISABLE_BLOCK_REFRESHING is not set
+# CONFIG_YAFFS_DISABLE_BACKGROUND is not set
+# CONFIG_YAFFS_XATTR is not set
# CONFIG_JFFS2_FS is not set
+# CONFIG_LOGFS is not set
# CONFIG_CRAMFS is not set
# CONFIG_SQUASHFS is not set
# CONFIG_VXFS_FS is not set
@@ -1031,14 +1031,7 @@ CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
# CONFIG_ROMFS_FS is not set
# CONFIG_SYSV_FS is not set
# CONFIG_UFS_FS is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-# CONFIG_NFS_FS is not set
-# CONFIG_NFSD is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_CIFS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
+# CONFIG_NETWORK_FILESYSTEMS is not set
#
# Partition Types
@@ -1056,12 +1049,13 @@ CONFIG_PRINTK_TIME=y
# CONFIG_ENABLE_WARN_DEPRECATED is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_FRAME_WARN=1024
-CONFIG_MAGIC_SYSRQ=y
+# CONFIG_MAGIC_SYSRQ is not set
# CONFIG_STRIP_ASM_SYMS is not set
# CONFIG_UNUSED_SYMBOLS is not set
# CONFIG_DEBUG_FS is not set
# CONFIG_HEADERS_CHECK is not set
# CONFIG_DEBUG_KERNEL is not set
+# CONFIG_HARDLOCKUP_DETECTOR is not set
# CONFIG_DEBUG_MEMORY_INIT is not set
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
# CONFIG_SYSCTL_SYSCALL_CHECK is not set
@@ -1072,10 +1066,11 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
CONFIG_TRACING_SUPPORT=y
# CONFIG_FTRACE is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
# CONFIG_SAMPLES is not set
CONFIG_HAVE_ARCH_KGDB=y
CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE=""
+CONFIG_CMDLINE="console=ttyS0,115200n8"
# CONFIG_CMDLINE_OVERRIDE is not set
#
@@ -1084,9 +1079,6 @@ CONFIG_CMDLINE=""
# CONFIG_KEYS is not set
# CONFIG_SECURITY is not set
# CONFIG_SECURITYFS is not set
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
CONFIG_DEFAULT_SECURITY_DAC=y
CONFIG_DEFAULT_SECURITY=""
CONFIG_CRYPTO=y
@@ -1199,3 +1191,4 @@ CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
CONFIG_NLATTR=y
+CONFIG_GENERIC_ATOMIC64=y
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-17 02:46:11 +0000